Changeset 296 in 3DVCSoftware for trunk/source/App/TAppDecoder/TAppDecTop.h

Timestamp:

20 Feb 2013, 22:07:43 (12 years ago)

Author:

tech

Message:

Reintegrated branch 5.1-dev0 rev. 295.

File:

• trunk/source/App/TAppDecoder/TAppDecTop.h (modified) (2 diffs)

trunk/source/App/TAppDecoder/TAppDecTop.h

@@ -112 +112 @@
 #endif
 
+#if MERL_VSP_C0152
+  Void  setBWVSPLUT( TComSlice* pcSlice, Int iCodedViewIdx, Int iCurPoc   );
+#endif
+
 protected:
 //  Void  xCreateDecLib     (); ///< create internal classes
@@ -117 +121 @@
 //  Void  xInitDecLib       (); ///< initialize decoder class
   
-#if H0567_DPB_PARAMETERS_PER_TEMPORAL_LAYER
   Void  xWriteOutput      ( TComList<TComPic*>* pcListPic, Int viewDepthId, UInt tId); ///< write YUV to file
-#else
-  Void  xWriteOutput      ( TComList<TComPic*>* pcListPic, Int viewDepthId ); ///< write YUV to file
-#endif
   Void  xFlushOutput      ( TComList<TComPic*>* pcListPic, Int viewDepthId ); ///< flush all remaining decoded pictures to file