shithub: openh264

Info  •  Files  •  Log  •  Branches

Merge pull request #1416 from ruil2/fix

modify trace level and fix potential issues

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

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

@@ -384,7 +384,7 @@

 int ParseCommandLine (int argc, char** argv, SSourcePicture* pSrcPic, SEncParamExt& pSvcParam, SFilesSet& sFileSet) {

   char* pCommand = NULL;

-  SLayerPEncCtx sLayerCtx[3];

+  SLayerPEncCtx sLayerCtx[MAX_SPATIAL_LAYER_NUM];

   int n = 0;

   string str_ ("SlicesAssign");

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

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

@@ -356,7 +356,7 @@

         return ENC_RETURN_UNSUPPORTED_PARA;

       }

       if (pSpatialLayer->sSliceCfg.sSliceArgument.uiSliceNum == 1) {

-        WelsLog (pLogCtx, WELS_LOG_ERROR,

+        WelsLog (pLogCtx, WELS_LOG_WARNING,

                  "ParamValidationExt(), pSlice setting for SM_RASTER_SLICE now turn to SM_SINGLE_SLICE!");

         pSpatialLayer->sSliceCfg.uiSliceMode	= SM_SINGLE_SLICE;

         break;