Changeset 152 in SHVCSoftware for branches/SHM-2.0-dev/source

Timestamp:

4 May 2013, 01:18:19 (12 years ago)

Author:

seregin

Message:

decoded picture output for SYNTAX_OUTPU

Location:

branches/SHM-2.0-dev/source

Files:

• App/TAppDecoder/TAppDecTop.cpp (modified) (2 diffs)
• App/TAppEncoder/TAppEncTop.cpp (modified) (1 diff)
• Lib/TLibCommon/TypeDef.h (modified) (1 diff)
• Lib/TLibDecoder/TDecTop.cpp (modified) (1 diff)

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

@@ -574 +574 @@
         const Window &conf = pcPic->getConformanceWindow();
         const Window &defDisp = m_respectDefDispWindow ? pcPic->getDefDisplayWindow() : Window();
+#if SYNTAX_OUTPUT && ILP_DECODED_PICTURE
+      m_cTVideoIOYuvReconFile.write( pcPic->getPicYuvRec() );
+#else
         m_cTVideoIOYuvReconFile.write( pcPic->getPicYuvRec(),
                                        conf.getWindowLeftOffset() + defDisp.getWindowLeftOffset(),
@@ -579 +582 @@
                                        conf.getWindowTopOffset() + defDisp.getWindowTopOffset(),
                                        conf.getWindowBottomOffset() + defDisp.getWindowBottomOffset() );
+#endif
       }
       

branches/SHM-2.0-dev/source/App/TAppEncoder/TAppEncTop.cpp

@@ -1316 +1316 @@
     if (m_pchReconFile)
     {
+#if SYNTAX_OUTPUT && ILP_DECODED_PICTURE
+      m_cTVideoIOYuvReconFile.write( pcPicYuvRec );
+#else
       m_cTVideoIOYuvReconFile.write( pcPicYuvRec, m_confLeft, m_confRight, m_confTop, m_confBottom );
+#endif
     }
 

branches/SHM-2.0-dev/source/Lib/TLibCommon/TypeDef.h

@@ -111 +111 @@
 #endif
 #else
+#define ILP_DECODED_PICTURE              0
 #define SYNTAX_OUTPUT                    0
 #endif

branches/SHM-2.0-dev/source/Lib/TLibDecoder/TDecTop.cpp

@@ -851 +851 @@
 #endif
 
+#endif //SVC_EXTENSION
+
     // For generalized B
     // note: maybe not existed case (always L0 is copied to L1 if L1 is empty)