Ticket #511: patch_for_ticket#511.patch

Lib/TLibCommon/TComSlice.cpp

@@ -103 +103 @@
 , m_puiSubstreamSizes             ( NULL )
 , m_cabacInitFlag                 ( false )
 , m_numEntryPointOffsets          ( 0 )
+, m_bLMvdL1Zero                   ( false )
 #if !REFERENCE_PICTURE_DEFN
 , m_nalRefFlag                    ( 0 )
 #endif
@@ -207 +208 @@
 
   m_uiTileCount          = 0;
   m_cabacInitFlag        = false;
+  m_bLMvdL1Zero          =  false;
   m_numEntryPointOffsets = 0;
   m_enableTMVPFlag = true;
 #if DEPENDENT_SLICES

Lib/TLibDecoder/TDecCAVLC.cpp

@@ -1248 +1248 @@
           }
         }
       }
+      READ_FLAG( uiCode, "mvd_l1_zero_flag" );
+      rpcSlice->setMvdL1ZeroFlag( (uiCode ? true : false) );
     }  
     else
     {
@@ -1261 +1263 @@
     sps = rpcSlice->getSPS();
   }
 
-  if (rpcSlice->isInterB())
-  {
-    READ_FLAG( uiCode, "mvd_l1_zero_flag" );       rpcSlice->setMvdL1ZeroFlag( (uiCode ? true : false) );
-  }
-
   rpcSlice->setCabacInitFlag( false ); // default
   if(pps->getCabacInitPresentFlag() && !rpcSlice->isIntra())
   {

Lib/TLibEncoder/TEncCavlc.cpp

@@ -609 +609 @@
   WRITE_UVLC( pcSlice->getSliceType(),       "slice_type" );
   Bool bDependentSlice = (!pcSlice->isNextSlice());
   WRITE_FLAG( bDependentSlice ? 1 : 0, "dependent_slice_flag" );
-  
+
 #if DEPENDENT_SLICES
   if( pcSlice->getPPS()->getDependentSlicesEnabledFlag() && bDependentSlice )
     return;
@@ -848 +848 @@
         }
       }
     }
+    if (pcSlice->isInterB())
+    {
+      WRITE_FLAG( pcSlice->getMvdL1ZeroFlag() ? 1 : 0,   "mvd_l1_zero_flag");
+    }
   }
-    
-  if (pcSlice->isInterB())
-  {
-    WRITE_FLAG( pcSlice->getMvdL1ZeroFlag() ? 1 : 0,   "mvd_l1_zero_flag");
-  }
 
   if(!pcSlice->isIntra())
   {