shithub: openh264

Info  •  Files  •  Log  •  Branches

Merge pull request #219 from volvet/mozilla_bug_963392_fix

fix crash bug 963392 and update the print help text.  

--- a/codec/console/enc/src/welsenc.cpp

+++ b/codec/console/enc/src/welsenc.cpp

@@ -394,7 +394,7 @@

   printf ("\n Supported Options:\n");

   printf ("  -bf     Bit Stream File\n");

   printf ("  -frms   Number of total frames to be encoded\n");

-  printf ("  -gop    GOPSize - GOP size (2,4,8,16,32,64, default: 1)\n");

+  printf ("  -gop    GOPSize - GOP size (1,2,4,8, default: 1)\n");

   printf ("  -iper   Intra period (default: -1) : must be a power of 2 of GOP size (or -1)\n");

   printf ("  -spsid   Enable id adding in SPS/PPS per IDR \n");

   printf ("  -denois Control denoising  (default: 0)\n");

--- a/codec/encoder/core/src/encoder_ext.cpp

+++ b/codec/encoder/core/src/encoder_ext.cpp

@@ -3747,7 +3747,7 @@

     }

     if (iCurTid < pCtx->uiSpatialLayersInTemporal[d_idx] - 1 || pSvcParam->iDecompStages == 0) {

-      if ((iCurTid >= MAX_TEMPORAL_LEVEL) || (pCtx->uiSpatialLayersInTemporal[d_idx] - 1 >= MAX_TEMPORAL_LEVEL)) {

+      if ((iCurTid >= MAX_TEMPORAL_LEVEL) || (pCtx->uiSpatialLayersInTemporal[d_idx] - 1 > MAX_TEMPORAL_LEVEL)) {

         ForceCodingIDR (pCtx);	// some logic error

         return -1;

       }