Changeset 440 in SHVCSoftware for branches

Timestamp:

17 Oct 2013, 21:22:34 (11 years ago)

Author:

seregin

Message:

set IRAP alignment flag to false for AVC BL

Location:

branches/SHM-3.1-dev/source

Files:

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

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

@@ -264 +264 @@
   // delete buffers
 #if AVC_BASE
+  UInt layerIdmin = m_acTDecTop[0].getBLReconFile()->is_open() ? 1 : 0;
+
   if( streamYUV.is_open() )
   {
@@ -274 +276 @@
   }
 #endif
-  pcBLPic.destroy();
-
-  UInt layerIdmin = m_acTDecTop[0].getBLReconFile()->is_open() ? 1 : 0;
+  pcBLPic.destroy();  
 
   for(UInt layer = layerIdmin; layer <= m_tgtLayerId; layer++)

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

@@ -1091 +1091 @@
         }
       }
-    }   
+    }
+
+    if( vps->getAvcBaseLayerFlag() )
+    {
+      vps->setCrossLayerIrapAlignFlag(false);
+    }
 #endif 
 #if M0040_ADAPTIVE_RESOLUTION_CHANGE

branches/SHM-3.1-dev/source/Lib/TLibCommon/TComSlice.cpp

@@ -278 +278 @@
   }
 #if POC_RESET_FLAG
-    assert( pcPic->getSlice(0)->isReferenced() );
+  assert( pcPic->getSlice(0)->isReferenced() );
 #endif
   return  pcPic;

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

@@ -1159 +1159 @@
         const Window &scalEL = pcSlice->getSPS()->getScaledRefLayerWindow(refLayerIdc);
 
-
         Int widthBL   = pcSlice->getBaseColPic(refLayerIdc)->getPicYuvRec()->getWidth();
         Int heightBL  = pcSlice->getBaseColPic(refLayerIdc)->getPicYuvRec()->getHeight();