shithub: openh264

Info  •  Files  •  Log  •  Branches

Merge pull request #2589 from ruil2/reset_code

change log type to avoid too many logs

--- a/codec/encoder/plus/src/welsEncoderExt.cpp

+++ b/codec/encoder/plus/src/welsEncoderExt.cpp

@@ -1111,7 +1111,7 @@

   case ENCODER_OPTION_DELIVERY_STATUS: {

     SDeliveryStatus* pValue = (static_cast<SDeliveryStatus*> (pOption));

     m_pEncContext->bDeliveryFlag = pValue->bDeliveryFlag;

-    WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,

+    WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_DEBUG,

              "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_DELIVERY_STATUS,bDeliveryFlag = %d", pValue->bDeliveryFlag);

   }

   break;

--- a/test/api/encode_options_test.cpp

+++ b/test/api/encode_options_test.cpp

@@ -1233,7 +1233,7 @@

   {true, false, true, 2, 3072, 3072, 1, SM_RESERVED, 0, 15.0, 1, ""}, //30

   //{true, false, true, 2, 3072, 3072, 1, SM_RESERVED, 0, 15.0, 4, ""}, //14760

   {false, false, true, 2, 1072, 8576, 1, SM_RESERVED, 0, 15.0, 1, ""},

-  //{false, true, true, 2, 8576, 1072, 24, SM_SINGLE_SLICE, 0, 15.0, 1, ""}, //14754

+  {false, false, true, 2, 8576, 1072, 24, SM_SINGLE_SLICE, 0, 15.0, 1, ""}, //14754

   //{false, false, false, 2, 8576, 1088, 24, SM_SINGLE_SLICE, 0, 15.0, 1, ""}, //14755

   //{false, false, false, 2, 1088, 8576, 24, SM_SINGLE_SLICE, 0, 15.0, 1, ""}, //14755

   {false, false, true, 2, 8688, 1072, 24, SM_SINGLE_SLICE, 0, 15.0, 1, ""}, //Annex A: PicWidthInMbs <= sqrt(36864*8) = 543; 543*16=8688; 36864/543=67; 67*16=1072