Changeset 1352 in SHVCSoftware

Timestamp:

22 Jul 2015, 03:36:39 (9 years ago)

Author:

seregin

Message:

port rev 4430

Location:

branches/SHM-dev/source/Lib

Files:

• TLibCommon/TComBitCounter.h (modified) (1 diff)
• TLibCommon/TComBitStream.h (modified) (2 diffs)
• TLibDecoder/SEIread.cpp (modified) (1 diff)
• TLibDecoder/TDecCAVLC.cpp (modified) (3 diffs)
• TLibEncoder/NALwrite.cpp (modified) (1 diff)
• TLibEncoder/NALwrite.h (modified) (1 diff)
• TLibEncoder/SEIwrite.cpp (modified) (4 diffs)
• TLibEncoder/SEIwrite.h (modified) (3 diffs)
• TLibEncoder/SyntaxElementWriter.cpp (modified) (1 diff)
• TLibEncoder/SyntaxElementWriter.h (modified) (1 diff)
• TLibEncoder/TEncCavlc.cpp (modified) (3 diffs)
• TLibEncoder/TEncGOP.cpp (modified) (6 diffs)

branches/SHM-dev/source/Lib/TLibCommon/TComBitCounter.h

@@ -63 +63 @@
 
   Void        write                 ( UInt /*uiBits*/, UInt uiNumberOfBits )  { m_uiBitCounter += uiNumberOfBits; }
-  Void        resetBits             ()                                    { m_uiBitCounter = 0;               }
-  UInt getNumberOfWrittenBits() const { return m_uiBitCounter; }
+  Void        resetBits             ()                                        { m_uiBitCounter = 0;               }
+  UInt        getNumberOfWrittenBits() const                                  { return m_uiBitCounter; }
+  Int         getNumBitsUntilByteAligned() const                              { return (8 - m_uiBitCounter) & 0x7;}
+
 };
 

branches/SHM-dev/source/Lib/TLibCommon/TComBitStream.h

@@ -63 +63 @@
   virtual Void        write                 ( UInt uiBits, UInt uiNumberOfBits )  = 0;
   virtual Void        resetBits             ()                                    = 0;
-  virtual UInt getNumberOfWrittenBits() const = 0;
+  virtual UInt        getNumberOfWrittenBits() const = 0;
+  virtual Int         getNumBitsUntilByteAligned() const = 0;
   virtual ~TComBitIf() {}
 };
@@ -130 +131 @@
    * achieve byte alignment.
    */
-  Int getNumBitsUntilByteAligned() { return (8 - m_num_held_bits) & 0x7; }
+  Int getNumBitsUntilByteAligned() const { return (8 - m_num_held_bits) & 0x7; }
 
   /**

branches/SHM-dev/source/Lib/TLibDecoder/SEIread.cpp

@@ -139 +139 @@
   while (m_pcBitstream->getNumBitsLeft() > 8);
 
-  UInt rbspTrailingBits;
-  sei_read_code(NULL, 8, rbspTrailingBits, "rbsp_trailing_bits");
-  assert(rbspTrailingBits == 0x80);
+  xReadRbspTrailingBits();
 }
 

branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -492 +492 @@
     }
   }
+  xReadRbspTrailingBits();
 }
 
@@ -1026 +1027 @@
     }
   }
+
+  xReadRbspTrailingBits();
 }
 
@@ -1178 +1181 @@
 #endif
 
-  return;
+  xReadRbspTrailingBits();
 }
 

branches/SHM-dev/source/Lib/TLibEncoder/NALwrite.cpp

@@ -123 +123 @@
 }
 
-/**
- * Write rbsp_trailing_bits to bs causing it to become byte-aligned
- */
-Void writeRBSPTrailingBits(TComOutputBitstream& bs)
-{
-  bs.write( 1, 1 );
-  bs.writeAlignZero();
-}
-
 //! \}

branches/SHM-dev/source/Lib/TLibEncoder/NALwrite.h

@@ -84 +84 @@
 
 Void write(std::ostream& out, OutputNALUnit& nalu);
-Void writeRBSPTrailingBits(TComOutputBitstream& bs);
 
 inline NALUnitEBSP::NALUnitEBSP(OutputNALUnit& nalu)

branches/SHM-dev/source/Lib/TLibEncoder/SEIwrite.cpp

@@ -216 +216 @@
  */
 #if O0164_MULTI_LAYER_HRD
-Void SEIWriter::writeSEImessages(TComBitIf& bs, const SEIMessages &seiList, const TComVPS *vps, const TComSPS *sps, const SEIScalableNesting* nestingSei, const SEIBspNesting* bspNestingSei)
+Void SEIWriter::writeSEImessages(TComBitIf& bs, const SEIMessages &seiList, const TComVPS *vps, const TComSPS *sps, Bool isNested, const SEIScalableNesting* nestingSei, const SEIBspNesting* bspNestingSei)
 #else
-Void SEIWriter::writeSEImessages(TComBitIf& bs, const SEIMessages &seiList, const TComSPS *sps)
+Void SEIWriter::writeSEImessages(TComBitIf& bs, const SEIMessages &seiList, const TComSPS *sps, Bool isNested)
 #endif
 {
@@ -276 +276 @@
     xWriteSEIpayloadData(bs, **sei, sps);
 #endif
+  }
+  if (!isNested)
+  {
+    xWriteRbspTrailingBits();
   }
 }
@@ -793 +797 @@
 
   // write nested SEI messages
-#if O0164_MULTI_LAYER_HRD  
-  writeSEImessages(bs, sei.m_nestedSEIs, vps, sps, &sei);
+#if O0164_MULTI_LAYER_HRD
+  writeSEImessages(bs, sei.m_nestedSEIs, vps, sps, true, &sei);
 #else
-  writeSEImessages(bs, sei.m_nestedSEIs, sps);
+  writeSEImessages(bs, sei.m_nestedSEIs, sps, true);
 #endif
 }
@@ -1145 +1149 @@
   
   // write nested SEI messages
-  writeSEImessages(bs, sei.m_nestedSEIs, vps, sps, &nestingSei, &sei);
+  writeSEImessages(bs, sei.m_nestedSEIs, vps, sps, true, &nestingSei, &sei);
 }
 

branches/SHM-dev/source/Lib/TLibEncoder/SEIwrite.h

@@ -51 +51 @@
 
 #if O0164_MULTI_LAYER_HRD
-  Void writeSEImessages(TComBitIf& bs, const SEIMessages &seiList, const TComVPS *vps, const TComSPS *sps, const SEIScalableNesting* nestingSei=NULL, const SEIBspNesting* bspNestingSei=NULL);
+  Void writeSEImessages(TComBitIf& bs, const SEIMessages &seiList, const TComVPS *vps, const TComSPS *sps, Bool isNested, const SEIScalableNesting* nestingSei=NULL, const SEIBspNesting* bspNestingSei=NULL);
 #else
-  Void writeSEImessages(TComBitIf& bs, const SEIMessages &seiList, const TComSPS *sps);
+  Void writeSEImessages(TComBitIf& bs, const SEIMessages &seiList, const TComSPS *sps, Bool isNested);
 #endif
 
@@ -64 +64 @@
   Void xWriteSEIuserDataUnregistered(const SEIuserDataUnregistered &sei);
   Void xWriteSEIActiveParameterSets(const SEIActiveParameterSets& sei);
-  Void xWriteSEIDecodedPictureHash(const SEIDecodedPictureHash& sei);
 #if SVC_EXTENSION
   Void xWriteSEIDecodingUnitInfo(const SEIDecodingUnitInfo& sei, const TComSPS *sps, const SEIScalableNesting* nestingSei, const SEIBspNesting* bspNestingSei, const TComVPS *vps);
@@ -71 +70 @@
 #else
   Void xWriteSEIDecodingUnitInfo(const SEIDecodingUnitInfo& sei, const TComSPS *sps);
+#endif
+  Void xWriteSEIDecodedPictureHash(const SEIDecodedPictureHash& sei);
+#if !SVC_EXTENSION
   Void xWriteSEIBufferingPeriod(const SEIBufferingPeriod& sei, const TComSPS *sps);
   Void xWriteSEIPictureTiming(const SEIPictureTiming& sei, const TComSPS *sps);

branches/SHM-dev/source/Lib/TLibEncoder/SyntaxElementWriter.cpp

@@ -142 +142 @@
 }
 
+Void SyntaxElementWriter::xWriteRbspTrailingBits()
+{
+  WRITE_FLAG( 1, "rbsp_stop_one_bit");
+  Int cnt = 0;
+  while (m_pcBitIf->getNumBitsUntilByteAligned())
+  {
+    WRITE_FLAG( 0, "rbsp_alignment_zero_bit");
+    cnt++;
+  }
+  assert(cnt<8);
+}
+
 #if Q0096_OVERLAY_SEI
 Void  SyntaxElementWriter::xWriteString( UChar* sCode, UInt uiLength)

branches/SHM-dev/source/Lib/TLibEncoder/SyntaxElementWriter.h

@@ -100 +100 @@
 #endif
 #endif
+  Void xWriteRbspTrailingBits();
 
   UInt  xConvertToUInt        ( Int iValue ) {  return ( iValue <= 0) ? -iValue<<1 : (iValue<<1)-1; }

branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.cpp

@@ -369 +369 @@
     } // loop over PPS flags
   } // pps_extension_present_flag is non-zero
+  xWriteRbspTrailingBits();
 }
 
@@ -780 +781 @@
     }
   }
+  xWriteRbspTrailingBits();
 }
 
@@ -891 +893 @@
 #else
   WRITE_FLAG( 0,                     "vps_extension_flag" );
-#endif  
+#endif    
+
   //future extensions here..
-
-  return;
+  xWriteRbspTrailingBits();
 }
 

branches/SHM-dev/source/Lib/TLibEncoder/TEncGOP.cpp

@@ -231 +231 @@
   m_pcEntropyCoder->setBitstream(&nalu.m_Bitstream);
   m_pcEntropyCoder->encodeVPS(vps);
-  writeRBSPTrailingBits(nalu.m_Bitstream);
   accessUnit.push_back(new NALUnitEBSP(nalu));
   return (Int)(accessUnit.back()->m_nalUnitData.str().size()) * 8;
@@ -253 +252 @@
   m_pcEntropyCoder->setBitstream(&nalu.m_Bitstream);
   m_pcEntropyCoder->encodeSPS(sps);
-  writeRBSPTrailingBits(nalu.m_Bitstream);
   accessUnit.push_back(new NALUnitEBSP(nalu));
   return (Int)(accessUnit.back()->m_nalUnitData.str().size()) * 8;
@@ -280 +278 @@
 #else
   m_pcEntropyCoder->encodePPS(pps);
-#endif
-  writeRBSPTrailingBits(nalu.m_Bitstream);
+#endif  
   accessUnit.push_back(new NALUnitEBSP(nalu));
   return (Int)(accessUnit.back()->m_nalUnitData.str().size()) * 8;
@@ -312 +309 @@
 #if O0164_MULTI_LAYER_HRD
   OutputNALUnit nalu(naluType, temporalId, sps->getLayerId());
-  m_seiWriter.writeSEImessages(nalu.m_Bitstream, seiMessages, vps, sps, nestingSei, bspNestingSei);
+  m_seiWriter.writeSEImessages(nalu.m_Bitstream, seiMessages, vps, sps, false, nestingSei, bspNestingSei);
 #else
   OutputNALUnit nalu(naluType, temporalId);
-  m_seiWriter.writeSEImessages(nalu.m_Bitstream, seiMessages, sps);
-#endif
-  writeRBSPTrailingBits(nalu.m_Bitstream);
+  m_seiWriter.writeSEImessages(nalu.m_Bitstream, seiMessages, sps, false);
+#endif  
   auPos = accessUnit.insert(auPos, new NALUnitEBSP(nalu));
   auPos++;
@@ -339 +335 @@
 #if O0164_MULTI_LAYER_HRD
     OutputNALUnit nalu(naluType, temporalId, sps->getLayerId());
-    m_seiWriter.writeSEImessages(nalu.m_Bitstream, tmpMessages, vps, sps, nestingSei, bspNestingSei);
+    m_seiWriter.writeSEImessages(nalu.m_Bitstream, tmpMessages, vps, sps, false, nestingSei, bspNestingSei);
 #else
     OutputNALUnit nalu(naluType, temporalId);
-    m_seiWriter.writeSEImessages(nalu.m_Bitstream, tmpMessages, sps);
-#endif
-    writeRBSPTrailingBits(nalu.m_Bitstream);
+    m_seiWriter.writeSEImessages(nalu.m_Bitstream, tmpMessages, sps, false);
+#endif
     auPos = accessUnit.insert(auPos, new NALUnitEBSP(nalu));
     auPos++;
@@ -2577 +2572 @@
       OutputNALUnit nalu(NAL_UNIT_PPS, 0, m_layerId);
       m_pcEntropyCoder->setBitstream(&nalu.m_Bitstream);
-      m_pcEntropyCoder->encodePPS(pcSlice->getPPS() , &m_Enc3DAsymLUTPPS );
-      writeRBSPTrailingBits(nalu.m_Bitstream);
+      m_pcEntropyCoder->encodePPS(pcSlice->getPPS() , &m_Enc3DAsymLUTPPS );      
       accessUnit.push_back(new NALUnitEBSP(nalu));
     }