Changeset 389 in SHVCSoftware for branches/SHM-3.1-dev/source/App/TAppDecoder

Timestamp:

10 Sep 2013, 17:27:55 (11 years ago)

Author:

qualcomm

Message:

Signaling representation format in VPS (MACRO: REPN_FORMAT_IN_VPS)

Includes signaling of representation format - including picture resolution, bit depth, chroma format - in the VPS, with the option of updating them in the SPS. The configuration file has "RepFormatIdx%d" added to indicate for each layer which representation format is used. The rep_format() structures are automatically created by the encoder. If the bit depth and the chroma format are also changed across layers, some more configuration support would be needed.

From: Adarsh K. Ramasubramonian <aramasub@…>

File:

• branches/SHM-3.1-dev/source/App/TAppDecoder/TAppDecTop.cpp (modified) (4 diffs)

branches/SHM-3.1-dev/source/App/TAppDecoder/TAppDecTop.cpp

@@ -551 +551 @@
         const Window &conf = pcPic->getConformanceWindow();
         const Window &defDisp = m_respectDefDispWindow ? pcPic->getDefDisplayWindow() : Window();
+#if REPN_FORMAT_IN_VPS
+        UInt chromaFormatIdc = pcPic->getSlice(0)->getChromaFormatIdc();
+        Int xScal =  TComSPS::getWinUnitX( chromaFormatIdc ), yScal = TComSPS::getWinUnitY( chromaFormatIdc );
+        m_acTVideoIOYuvReconFile[layerId].write( pcPic->getPicYuvRec(),
+                                       conf.getWindowLeftOffset()  * xScal + defDisp.getWindowLeftOffset(),
+                                       conf.getWindowRightOffset() * xScal + defDisp.getWindowRightOffset(),
+                                       conf.getWindowTopOffset()   * yScal + defDisp.getWindowTopOffset(),
+                                       conf.getWindowBottomOffset()* yScal + defDisp.getWindowBottomOffset() );
+
+#else
         m_acTVideoIOYuvReconFile[layerId].write( pcPic->getPicYuvRec(),
                                        conf.getWindowLeftOffset() + defDisp.getWindowLeftOffset(),
@@ -556 +566 @@
                                        conf.getWindowTopOffset() + defDisp.getWindowTopOffset(),
                                        conf.getWindowBottomOffset() + defDisp.getWindowBottomOffset() );
+#endif
       }
       
@@ -630 +641 @@
         const Window &conf = pcPic->getConformanceWindow();
         const Window &defDisp = m_respectDefDispWindow ? pcPic->getDefDisplayWindow() : Window();
+#if REPN_FORMAT_IN_VPS
+        UInt chromaFormatIdc = pcPic->getSlice(0)->getChromaFormatIdc();
+        Int xScal =  TComSPS::getWinUnitX( chromaFormatIdc ), yScal = TComSPS::getWinUnitY( chromaFormatIdc );
+        m_acTVideoIOYuvReconFile[layerId].write( pcPic->getPicYuvRec(),
+                                       conf.getWindowLeftOffset()  *xScal + defDisp.getWindowLeftOffset(),
+                                       conf.getWindowRightOffset() *xScal + defDisp.getWindowRightOffset(),
+                                       conf.getWindowTopOffset()   *yScal + defDisp.getWindowTopOffset(),
+                                       conf.getWindowBottomOffset()*yScal + defDisp.getWindowBottomOffset() );
+
+#else
         m_acTVideoIOYuvReconFile[layerId].write( pcPic->getPicYuvRec(),
                                        conf.getWindowLeftOffset() + defDisp.getWindowLeftOffset(),
@@ -635 +656 @@
                                        conf.getWindowTopOffset() + defDisp.getWindowTopOffset(),
                                        conf.getWindowBottomOffset() + defDisp.getWindowBottomOffset() );
+#endif
       }