Changeset 5045 for pjproject/trunk/pjmedia/src/pjmedia-codec/openh264.cpp

Timestamp:

Apr 6, 2015 6:13:51 AM (9 years ago)

Author:

nanang

Message:

Misc (re #1782): Fixed various compile warnings on MSVC.

File:

• pjproject/trunk/pjmedia/src/pjmedia-codec/openh264.cpp (modified) (3 diffs)

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

@@ -195 +195 @@
                                         &h264_name,
                                         &pjmedia_vid_codec_h264_match_sdp);
-    pj_assert(status == PJ_SUCCESS);
+    if (status != PJ_SUCCESS)
+        goto on_error;
 
     /* Register codec factory to codec manager. */
     status = pjmedia_vid_codec_mgr_register_factory(mgr,
                                                     &oh264_factory.base);
+    if (status != PJ_SUCCESS)
+        goto on_error;
 
     PJ_LOG(4,(THIS_FILE, "OpenH264 codec initialized"));
@@ -373 +376 @@
     PJ_ASSERT_RETURN(codec, PJ_EINVAL);
 
+    PJ_UNUSED_ARG(factory);
+
     oh264_data = (oh264_codec_data*) codec->codec_data;
     if (oh264_data->enc) {
@@ -471 +476 @@
     eprm.iPicWidth                      = param->enc_fmt.det.vid.size.w;
     eprm.iPicHeight                     = param->enc_fmt.det.vid.size.h;
-    eprm.fMaxFrameRate                  = (param->enc_fmt.det.vid.fps.num * 1.0 /
+    eprm.fMaxFrameRate                  = (param->enc_fmt.det.vid.fps.num *
+                                           1.0f /
                                            param->enc_fmt.det.vid.fps.denum);
-    eprm.uiFrameToBeCoded               = -1;
+    eprm.uiFrameToBeCoded               = (unsigned int) -1;
     eprm.iTemporalLayerNum              = 1;
     eprm.uiIntraPeriod                  = 0; /* I-Frame interval in frames */