Changeset 4867

Timestamp:

Jul 2, 2014 5:55:45 PM (10 years ago)

Author:

bennylp

Message:

Re #1758: updated with the latest OpenH264 to fix compilation error with bsi->eOutuptFrameType and missing int32_t type on Windows

File:

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

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

@@ -563 +563 @@
     }
 
-    int32_t color_fmt = videoFormatI420;
+    pj_int32_t color_fmt = videoFormatI420;
     rc = oh264_data->dec->SetOption (DECODER_OPTION_DATAFORMAT,  &color_fmt);
     if (rc) {
@@ -648 +648 @@
     }
 
-    if (oh264_data->bsi.eOutputFrameType == videoFrameTypeSkip) {
+    if (oh264_data->bsi.eFrameType == videoFrameTypeSkip) {
         output->size = 0;
         output->type = PJMEDIA_FRAME_TYPE_NONE;
@@ -747 +747 @@
         output->size = payload_len;
 
-        if (oh264_data->bsi.eOutputFrameType == videoFrameTypeIDR) {
+        if (oh264_data->bsi.eFrameType == videoFrameTypeIDR) {
             output->bit_info |= PJMEDIA_VID_FRM_KEYFRAME;
         }
@@ -796 +796 @@
     output->size = payload_len;
 
-    if (oh264_data->bsi.eOutputFrameType == videoFrameTypeIDR) {
+    if (oh264_data->bsi.eFrameType == videoFrameTypeIDR) {
         output->bit_info |= PJMEDIA_VID_FRM_KEYFRAME;
     }
@@ -1045 +1045 @@
 
     /* Signal that we have no more frames */
-    int32_t iEndOfStreamFlag;
-    iEndOfStreamFlag = true;
+    pj_int32_t iEndOfStreamFlag = true;
     oh264_data->dec->SetOption( DECODER_OPTION_END_OF_STREAM,
                                 (void*)&iEndOfStreamFlag);