Changeset 4827 for pjproject/trunk

Timestamp:

Apr 25, 2014 7:52:27 AM (11 years ago)

Author:

bennylp

Message:

More #1758: updated to the latest OpenH264 code

Location:

pjproject/trunk

Files:

• aconfigure (modified) (1 diff)
• aconfigure.ac (modified) (1 diff)
• pjmedia/src/pjmedia-codec/openh264.cpp (modified) (6 diffs)

pjproject/trunk/aconfigure

@@ -7114 +7114 @@
 main ()
 {
-int main() { CreateSVCEncoder(0); return 0; }
+WelsCreateSVCEncoder(0);
 
   ;

pjproject/trunk/aconfigure.ac

@@ -1146 +1146 @@
                                                     #include <wels/codec_app_def.h>
                                                   ]],
-                                                  [int main() { CreateSVCEncoder(0); return 0; }]
+                                                  [WelsCreateSVCEncoder(0);]
                                                  )],
                                  [ ac_openh264_cflags="-DPJMEDIA_HAS_OPENH264_CODEC=1 $OPENH264_CFLAGS"

pjproject/trunk/pjmedia/src/pjmedia-codec/openh264.cpp

@@ -334 +334 @@
 
     /* encoder allocation */
-    rc = CreateSVCEncoder(&oh264_data->enc);
+    rc = WelsCreateSVCEncoder(&oh264_data->enc);
     if (rc != 0)
         goto on_error;
@@ -341 +341 @@
 
     /* decoder allocation */
-    rc = CreateDecoder(&oh264_data->dec);
+    rc = WelsCreateDecoder(&oh264_data->dec);
     if (rc != 0)
         goto on_error;
@@ -362 +362 @@
     oh264_data = (oh264_codec_data*) codec->codec_data;
     if (oh264_data->enc) {
-        DestroySVCEncoder(oh264_data->enc);
+        WelsDestroySVCEncoder(oh264_data->enc);
         oh264_data->enc = NULL;
     }
     if (oh264_data->dec) {
         oh264_data->dec->Uninitialize();
-        DestroyDecoder(oh264_data->dec);
+        WelsDestroyDecoder(oh264_data->dec);
         oh264_data->dec = NULL;
     }
@@ -455 +455 @@
     pj_bzero(&eprm, sizeof(eprm));
     eprm.iInputCsp                      = videoFormatI420;
-    eprm.sSpatialLayers[0].uiProfileIdc = 66;   // PRO_BASELINE
+    eprm.sSpatialLayers[0].uiProfileIdc = PRO_BASELINE;
     eprm.iPicWidth                      = param->enc_fmt.det.vid.size.w;
     eprm.iPicHeight                     = param->enc_fmt.det.vid.size.h;
@@ -469 +469 @@
     eprm.iLoopFilterBetaOffset          = 0;
     eprm.iMultipleThreadIdc             = 1;
-    eprm.bEnableRc                      = 1;
+    //eprm.bEnableRc                    = 1;
     eprm.iTargetBitrate                 = param->enc_fmt.det.vid.avg_bps;
     eprm.bEnableFrameSkip               = 1;
@@ -543 +543 @@
     // Apply "sprop-parameter-sets" here
 
-    rc = CreateDecoder(&oh264_data->dec);
+    rc = WelsCreateDecoder(&oh264_data->dec);
     if (rc) {
         PJ_LOG(4,(THIS_FILE, "Unable to create OpenH264 decoder"));