Changeset 195 in 3DVCSoftware for branches/HTM-5.0-Qualcomm/source/Lib/TLibEncoder/TEncCavlc.cpp

Timestamp:

26 Nov 2012, 22:32:00 (13 years ago)

Author:

tech

Message:

Changed macro switch names to match conventions.

File:

• branches/HTM-5.0-Qualcomm/source/Lib/TLibEncoder/TEncCavlc.cpp (modified) (5 diffs)

branches/HTM-5.0-Qualcomm/source/Lib/TLibEncoder/TEncCavlc.cpp

@@ -375 +375 @@
 }
 
-#if MVHEVC
+#if QC_MVHEVC_B0046
 Void TEncCavlc::codeVPS( TComVPS* pcVPS )
 {
@@ -708 +708 @@
 #endif
   WRITE_FLAG( 1, "sps_extension_flag" );
-#if !MVHEVC
+#if !QC_MVHEVC_B0046
   WRITE_FLAG( (pcSPS->getNumberOfUsableInterViewRefs() > 0) ? 1 : 0, "interview_refs_present_flag" );
   if( pcSPS->getNumberOfUsableInterViewRefs() > 0 )
@@ -884 +884 @@
   if (!bEntropySlice)
   {
-#if MVHEVC
+#if QC_MVHEVC_B0046
     WRITE_UVLC( 0, "pic_parameter_set_id" );
 #else
@@ -895 +895 @@
     }
 #endif
-#if QC_REM_IDV
+#if QC_REM_IDV_B0046
     if(pcSlice->getNalUnitType()==NAL_UNIT_CODED_SLICE_IDR && pcSlice->getViewId() == 0) 
 #else
@@ -907 +907 @@
     {
       WRITE_CODE( (pcSlice->getPOC()-pcSlice->getLastIDR()+(1<<pcSlice->getSPS()->getBitsForPOC()))%(1<<pcSlice->getSPS()->getBitsForPOC()), pcSlice->getSPS()->getBitsForPOC(), "pic_order_cnt_lsb");
-#if QC_REM_IDV
+#if QC_REM_IDV_B0046
       if( pcSlice->getPOC() == 0 && !(pcSlice->getSPS()->getViewId() && (pcSlice->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR || pcSlice->getNalUnitType() == NAL_UNIT_CODED_SLICE_CRA)))
 #else