shithub: openh264

Download patch

ref: 6bb23f5df409b9957b9c498770f2da15ce1a49b4
parent: cad753d87126cbc818dbfa2ee416547774d30e43
author: ruil2 <[email protected]>
date: Tue Apr 1 05:24:57 EDT 2014 

use WelsLog instead of fprintf to have a unified trace output


--- a/codec/encoder/core/src/encoder_ext.cpp
+++ b/codec/encoder/core/src/encoder_ext.cpp
@@ -90,19 +90,15 @@
     if (fDlp->fOutputFrameRate > fDlp->fInputFrameRate || (fDlp->fInputFrameRate >= -fEpsn
         && fDlp->fInputFrameRate <= fEpsn)
         || (fDlp->fOutputFrameRate >= -fEpsn && fDlp->fOutputFrameRate <= fEpsn)) {
-#if defined (_DEBUG)
-      fprintf (stderr, "Invalid settings in input frame rate(%.6f) or output frame rate(%.6f) of layer #%d config file..\n",
+      WelsLog (NULL, WELS_LOG_ERROR,"Invalid settings in input frame rate(%.6f) or output frame rate(%.6f) of layer #%d config file..\n",
                fDlp->fInputFrameRate, fDlp->fOutputFrameRate, i);
-#endif
-      return 1;
+      return ENC_RETURN_INVALIDINPUT;
     }
     if (UINT_MAX == GetLogFactor (fDlp->fOutputFrameRate, fDlp->fInputFrameRate)) {
-#if defined (_DEBUG)
-      fprintf (stderr,
+      WelsLog (NULL,WELS_LOG_ERROR,
                "Invalid settings in input frame rate(%.6f) and output frame rate(%.6f) of layer #%d config file: iResult of output frame rate divided by input frame rate should be power of 2(i.e,in/pOut=2^n)..\n",
                fDlp->fInputFrameRate, fDlp->fOutputFrameRate, i);
-#endif
-      return 1;
+      return ENC_RETURN_INVALIDINPUT;
     }
   }
 
@@ -117,7 +113,7 @@
     pCfg->fMaxFrameRate	= fMaxFrameRate;
   }
 
-  return 0;
+  return ENC_RETURN_SUCCESS;
 }