Changeset 5513 for pjproject/branches/projects/uwp/pjmedia/src/pjmedia-codec/ffmpeg_vid_codecs.c

Timestamp:

Dec 28, 2016 3:40:07 AM (8 years ago)

Author:

nanang

Message:

Re #1900: More merged from trunk (r5512 mistakenly contains merged changes in third-party dir only).

Location:

pjproject/branches/projects/uwp

Files:

• . (modified) (1 prop)
• pjmedia/src/pjmedia-codec/ffmpeg_vid_codecs.c (modified) (3 diffs)

pjproject/branches/projects/uwp/pjmedia/src/pjmedia-codec/ffmpeg_vid_codecs.c

@@ -1430 +1430 @@
     PJ_ASSERT_RETURN(ff->enc_ctx, PJ_EINVALIDOP);
 
+#ifdef PJMEDIA_USE_OLD_FFMPEG
+    avcodec_get_frame_defaults(&avframe);
+#else
     pj_bzero(&avframe, sizeof(avframe));
     av_frame_unref(&avframe);
+#endif
 
     // Let ffmpeg manage the timestamps
@@ -1473 +1477 @@
         return PJMEDIA_CODEC_EFAILED;
     } else {
+        pj_bool_t has_key_frame = PJ_FALSE;
         output->size = err;
         output->bit_info = 0;
-        if (ff->enc_ctx->coded_frame->key_frame)
-            output->bit_info |= PJMEDIA_VID_FRM_KEYFRAME;
+
+#if LIBAVCODEC_VER_AT_LEAST(54,15)
+        has_key_frame = (avpacket.flags & AV_PKT_FLAG_KEY);
+#else
+        has_key_frame = ff->enc_ctx->coded_frame->key_frame;        
+#endif
+        if (has_key_frame)    
+            output->bit_info |= PJMEDIA_VID_FRM_KEYFRAME;
     }
 
@@ -1681 +1692 @@
      * closed).
      */
+#ifdef PJMEDIA_USE_OLD_FFMPEG
+    avcodec_get_frame_defaults(&avframe);
+#else
     pj_bzero(&avframe, sizeof(avframe));
     av_frame_unref(&avframe);
+#endif
 
     /* Init packet, the container of the encoded data */