Changeset 57 in 3DVCSoftware for trunk/source

Timestamp:

14 May 2012, 12:44:40 (13 years ago)

Author:

hschwarz

Message:

corrected output of decoded camera parameter files

Location:

trunk/source

Files:

• App/TAppDecoder/TAppDecTop.cpp (modified) (4 diffs)
• Lib/TLibDecoder/TDecTop.cpp (modified) (2 diffs)
• Lib/TLibDecoder/TDecTop.h (modified) (3 diffs)

trunk/source/App/TAppDecoder/TAppDecTop.cpp

@@ -57 +57 @@
   ::memset (m_abDecFlag, 0, sizeof (m_abDecFlag));
   m_useDepth = false;
+  m_pScaleOffsetFile  = 0;
 }
 
@@ -209 +210 @@
     previousViewDepthId = viewDepthId;
   } 
+  if( m_cCamParsCollector.isInitialized() )
+  {
+    m_cCamParsCollector.setSlice( 0 );
+  }
   // last frame
   for( Int viewDepthIdx = 0; viewDepthIdx < m_tDecTop.size(); viewDepthIdx++ )
@@ -249 +254 @@
       m_tDecTop[viewDepthIdx] = NULL ;
     }
+  }
+
+  m_cCamParsCollector.uninit();
+  if( m_pScaleOffsetFile ) 
+  { 
+    ::fclose( m_pScaleOffsetFile ); 
   }
 }
@@ -429 +440 @@
       m_tDecTop.back()->setIsDepth( isDepth );
       m_tDecTop.back()->setPictureDigestEnabled(m_pictureDigestEnabled);
+      m_tDecTop.back()->setCamParsCollector( &m_cCamParsCollector );
     }
   }

trunk/source/Lib/TLibDecoder/TDecTop.cpp

@@ -265 +265 @@
   m_bFirstSliceInPicture    = true;
   m_bFirstSliceInSequence   = true;
+  m_pcCamParsCollector = 0;
 }
 
@@ -1038 +1039 @@
   //  Decode a picture
   m_cGopDecoder.decompressGop(nalu.m_Bitstream, pcPic, false);
+
+  if( m_pcCamParsCollector )
+  {
+    m_pcCamParsCollector->setSlice( pcSlice );
+  }
 
   m_bFirstSliceInPicture = false;

trunk/source/Lib/TLibDecoder/TDecTop.h

@@ -74 +74 @@
   Void  uninit      ();
   Void  setSlice    ( TComSlice* pcSlice );
+
+  Bool  isInitialized() const { return m_bInitialized; }
 
 private:
@@ -150 +152 @@
   Bool                    m_isDepth;
   TAppDecTop*             m_tAppDecTop;
+  CamParsCollector*       m_pcCamParsCollector;
   NalUnitType             m_nalUnitTypeBaseView;  
 
@@ -185 +188 @@
   TComDepthMapGenerator*  getDepthMapGenerator  () { return &m_cDepthMapGenerator; }
 #endif
+
+  Void setCamParsCollector( CamParsCollector* pcCamParsCollector ) { m_pcCamParsCollector = pcCamParsCollector; }
 
   TComList<TComPic*>* getListPic()                              { return &m_cListPic; }