use cavlc if profile is baseline(following profile set)

Karina committed 9 years ago

Commit 6a8f6c91 parent f6c37b03 files · +25 −32Browse files

Showing the changes to test/api/BaseEncoderTest.cpp (1 of 3 files). Show all

Unified · Split

     param.iPicWidth      = pEncParamExt->iPicWidth;
     param.iPicHeight     = pEncParamExt->iPicHeight;
     param.iTargetBitrate = 5000000;
     return encoder->Initialize (&param);
   } else {
     SEncParamExt param;
     param.bIsLosslessLink  = pEncParamExt->bIsLosslessLink;
     param.bEnableLongTermReference = pEncParamExt->bEnableLongTermReference;
     param.iEntropyCodingModeFlag   = pEncParamExt->iEntropyCodingModeFlag ? 1 : 0;
-    if (eSliceMode != SM_SINGLE_SLICE && eSliceMode != SM_SIZELIMITED_SLICE) //SM_SIZELIMITED_SLICE don't support multi-thread now
+    if (eSliceMode != SM_SINGLE_SLICE
+        && eSliceMode != SM_SIZELIMITED_SLICE) //SM_SIZELIMITED_SLICE don't support multi-thread now
       param.iMultipleThreadIdc = 2;
     for (int i = 0; i < param.iSpatialLayerNum; i++) {
         param.iMultipleThreadIdc = 4;
         param.bUseLoadBalancing = false;
       }
+      if (param.iEntropyCodingModeFlag) {
+        param.sSpatialLayers[i].uiProfileIdc = PRO_MAIN;
+      }
     }
     param.iTargetBitrate *= param.iSpatialLayerNum;
     return encoder->InitializeExt (&param);
   }
 }

Keyboard shortcuts