add decide frame type for screen content

ruil2 committed 12 years ago

Commit 2eff8081 parent 082248d3 files · +64 −23Browse files

Showing the changes to codec/encoder/core/src/encoder.cpp (1 of 3 files). Show all

Unified · Split

codec/encoder/core/src/encoder.cpp+58−23

   pSrcPic->iPicHeight		= kiHeight;
   //currently encoder only supports videoFormatI420.
-  if((kiColorspace & (~videoFormatVFlip))!= videoFormatI420)
+  if ((kiColorspace & (~videoFormatVFlip)) != videoFormatI420)
-      return 2;
+    return 2;
   switch (kiColorspace & (~videoFormatVFlip)) {
   case videoFormatI420:
   case videoFormatYV12:
   WelsInitIntraPredFuncs (pFuncList, uiCpuFlag);
   /* ME func */
-  WelsInitMeFunc(pFuncList, uiCpuFlag, SCREEN_CONTENT_REAL_TIME==pParam->iUsageType);
+  WelsInitMeFunc (pFuncList, uiCpuFlag, SCREEN_CONTENT_REAL_TIME == pParam->iUsageType);
   /* sad, satd, average */
   WelsInitSampleSadFunc (pFuncList, uiCpuFlag);
   WelsBlockFuncInit (&pFuncList->pfSetNZCZero, uiCpuFlag);
   InitFillNeighborCacheInterFunc (pFuncList, pParam->bEnableBackgroundDetection);
-  InitRefListMgrFunc(pFuncList,pParam->iUsageType);
+  InitRefListMgrFunc (pFuncList, pParam->iUsageType);
   return iReturn;
 }
   EVideoFrameType iFrameType = videoFrameTypeInvalid;
   bool bSceneChangeFlag = false;
-  // perform scene change detection
+  if (pSvcParam->iUsageType == SCREEN_CONTENT_REAL_TIME) {
-  if ((!pSvcParam->bEnableSceneChangeDetect) || pEncCtx->pVaa->bIdrPeriodFlag ||
+    if ((!pSvcParam->bEnableSceneChangeDetect) || pEncCtx->pVaa->bIdrPeriodFlag ||
-      (kiSpatialNum < pSvcParam->iSpatialLayerNum)
+        (kiSpatialNum < pSvcParam->iSpatialLayerNum)) {
-      || (pEncCtx->iFrameIndex < (VGOP_SIZE << 1))) { // avoid too frequent I frame coding, rc control
+      bSceneChangeFlag = false;
-    bSceneChangeFlag = false;
+    } else {
+      bSceneChangeFlag = pEncCtx->pVaa->bSceneChangeFlag;
+    }
+    pEncCtx->bCurFrameMarkedAsSceneLtr   = false;
+    if (pEncCtx->pVaa->bIdrPeriodFlag || pEncCtx->bEncCurFrmAsIdrFlag || (!pSvcParam->bEnableLongTermReference
+        && bSceneChangeFlag)) {
+      iFrameType = videoFrameTypeIDR;
+    } else if (pSvcParam->bEnableLongTermReference && (bSceneChangeFlag
+               || pEncCtx->pVaa->eSceneChangeIdc == LARGE_CHANGED_SCENE)) {
+      int iActualLtrcount = 0;
+      SPicture** pLongTermRefList = pEncCtx->ppRefPicListExt[0]->pLongRefList;
+      for (int i = 0; i < pSvcParam->iLTRRefNum; ++i) {
+        if (NULL != pLongTermRefList[i] && pLongTermRefList[i]->bUsedAsRef && pLongTermRefList[i]->bIsLongRef
+            && pLongTermRefList[i]->bIsSceneLTR) {
+          ++iActualLtrcount;
+        }
+      }
+      if (iActualLtrcount == pSvcParam->iLTRRefNum && bSceneChangeFlag) {
+        iFrameType = videoFrameTypeIDR;
+      } else {
+        iFrameType = videoFrameTypeP;
+        pEncCtx->bCurFrameMarkedAsSceneLtr = true;
+      }
+    } else {
+      iFrameType = videoFrameTypeP;
+    }
+    if (videoFrameTypeIDR == iFrameType) {
+      pEncCtx->iCodingIndex = 0;
+      pEncCtx->bCurFrameMarkedAsSceneLtr   = true;
+    }
   } else {
-    bSceneChangeFlag = pEncCtx->pVaa->bSceneChangeFlag;
+    // perform scene change detection
-  }
+    if ((!pSvcParam->bEnableSceneChangeDetect) || pEncCtx->pVaa->bIdrPeriodFlag ||
+        (kiSpatialNum < pSvcParam->iSpatialLayerNum)
+        || (pEncCtx->iFrameIndex < (VGOP_SIZE << 1))) { // avoid too frequent I frame coding, rc control
+      bSceneChangeFlag = false;
+    } else {
+      bSceneChangeFlag = pEncCtx->pVaa->bSceneChangeFlag;
+    }
-  //scene_changed_flag: RC enable && iSpatialNum == pSvcParam->iSpatialLayerNum
+    //scene_changed_flag: RC enable && iSpatialNum == pSvcParam->iSpatialLayerNum
-  //bIdrPeriodFlag: RC disable || iSpatialNum != pSvcParam->iSpatialLayerNum
+    //bIdrPeriodFlag: RC disable || iSpatialNum != pSvcParam->iSpatialLayerNum
-  //pEncCtx->bEncCurFrmAsIdrFlag: 1. first frame should be IDR; 2. idr pause; 3. idr request
+    //pEncCtx->bEncCurFrmAsIdrFlag: 1. first frame should be IDR; 2. idr pause; 3. idr request
-  iFrameType = (pEncCtx->pVaa->bIdrPeriodFlag || bSceneChangeFlag
+    iFrameType = (pEncCtx->pVaa->bIdrPeriodFlag || bSceneChangeFlag
-                || pEncCtx->bEncCurFrmAsIdrFlag) ? videoFrameTypeIDR : videoFrameTypeP;
+                  || pEncCtx->bEncCurFrmAsIdrFlag) ? videoFrameTypeIDR : videoFrameTypeP;
-  if (videoFrameTypeP == iFrameType && pEncCtx->iSkipFrameFlag > 0) {  // for frame skip, 1/5/2010
+    if (videoFrameTypeP == iFrameType && pEncCtx->iSkipFrameFlag > 0) {  // for frame skip, 1/5/2010
-    -- pEncCtx->iSkipFrameFlag;
+      -- pEncCtx->iSkipFrameFlag;
-    iFrameType = videoFrameTypeSkip;
+      iFrameType = videoFrameTypeSkip;
-  } else if (videoFrameTypeIDR == iFrameType) {
+    } else if (videoFrameTypeIDR == iFrameType) {
-    pEncCtx->iCodingIndex = 0;
+      pEncCtx->iCodingIndex = 0;
+    }
   }
   return iFrameType;
 }

add decide frame type for screen content

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code