Changeset 5302 for pjproject

Timestamp:

May 17, 2016 3:54:14 PM (8 years ago)

Author:

riza

Message:

Re #1920: Since FFmpeg version 0.7 (June 2011), the struct AVFormatParameters,
the function av_open_input_stream, and function av_close_input_stream
are deprecated. With FFmpeg 0.11, those three symbols were removed.

Thanks to Alexander Traud for the patch.

File:

• pjproject/trunk/pjmedia/src/pjmedia-videodev/ffmpeg_dev.c (modified) (5 diffs)

pjproject/trunk/pjmedia/src/pjmedia-videodev/ffmpeg_dev.c

@@ -45 +45 @@
 #define THIS_FILE               "ffmpeg.c"
 
+#define LIBAVFORMAT_VER_AT_LEAST(major,minor)  (LIBAVFORMAT_VERSION_MAJOR > major || \
+                                               (LIBAVFORMAT_VERSION_MAJOR == major && \
+                                                LIBAVFORMAT_VERSION_MINOR >= minor))
+
 #include "../pjmedia/ffmpeg_util.h"
 #include <libavdevice/avdevice.h>
 #include <libavformat/avformat.h>
+#if LIBAVFORMAT_VER_AT_LEAST(53,2)
+# include <libavutil/pixdesc.h>
+#endif
 
 #define MAX_DEV_CNT     8
@@ -159 +166 @@
                                        const pjmedia_vid_dev_param *param)
 {
+#if LIBAVFORMAT_VER_AT_LEAST(53,2)
+    AVDictionary *format_opts = NULL;
+    char buf[128];
+#else
     AVFormatParameters fp;
+#endif
     pjmedia_video_format_detail *vfd;
     int err;
@@ -172 +184 @@
     *ctx = avformat_alloc_context();
 
+#if LIBAVFORMAT_VER_AT_LEAST(53,2)
+    /* Init ffmpeg dictionary */
+    snprintf(buf, sizeof(buf), "%d/%d", vfd->fps.num, vfd->fps.denum);
+    av_dict_set(&format_opts, "framerate", buf, 0);
+    snprintf(buf, sizeof(buf), "%dx%d", vfd->size.w, vfd->size.h);
+    av_dict_set(&format_opts, "video_size", buf, 0);
+    av_dict_set(&format_opts, "pixel_format", av_get_pix_fmt_name(PIX_FMT_BGR24), 0);
+
+    /* Open capture stream */
+    err = avformat_open_input(ctx, dev_name, ifmt, &format_opts);
+#else
     /* Init ffmpeg format param */
     pj_bzero(&fp, sizeof(fp));
@@ -183 +206 @@
     /* Open capture stream */
     err = av_open_input_stream(ctx, NULL, dev_name, ifmt, &fp);
+#endif
     if (err < 0) {
         *ctx = NULL; /* ffmpeg freed its states on failure, do we must too */
@@ -195 +219 @@
 {
     if (ctx)
+#if LIBAVFORMAT_VER_AT_LEAST(53,2)
+        avformat_close_input(&ctx);
+#else
         av_close_input_stream(ctx);
+#endif
 }