Changeset 4808

Timestamp:

Apr 1, 2014 9:47:15 AM (11 years ago)

Author:

nanang

Message:

Re #1750:

• Replaced "enum CodecID" with "unsigned" (previous fix raised compile error for some older ffmpeg versions).
• Handled PIX_FMT_GBR24P hassle.

Location:

pjproject/trunk/pjmedia/src/pjmedia

Files:

• ffmpeg_util.c (modified) (6 diffs)
• ffmpeg_util.h (modified) (2 diffs)

pjproject/trunk/pjmedia/src/pjmedia/ffmpeg_util.c

@@ -27 +27 @@
 #include <libavformat/avformat.h>
 
-#define MAKE_VER(mj,mn,mi)      ((mj << 16) | (mn << 8) | (mi << 0))
-#define VER_AT_LEAST(mj,mn,mi)  (MAKE_VER(LIBAVUTIL_VERSION_MAJOR, \
-                                          LIBAVUTIL_VERSION_MINOR, \
-                                          LIBAVUTIL_VERSION_MICRO) >= \
-                                 MAKE_VER(mj,mn,mi))
-
-
+/* PIX_FMT_GBR24P hassle:
+ * - PIX_FMT_GBR24P is introduced (perhaps in avutil 51.20.1)
+ * - suddenly PIX_FMT_GBR24P is replaced by PIX_FMT_GBRP, no alias defined,
+ *   so PIX_FMT_GBR24P is just gone! (perhaps in avutil 51.42.0)
+ * - then lately PIX_FMT_GBR24P is defined as PIX_FMT_GBRP
+ */
+#if !defined(PIX_FMT_GBR24P) && \
+    LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51,42,0)
+#  define PIX_FMT_GBR24P PIX_FMT_GBRP
+#endif
 
 /* Conversion table between pjmedia_format_id and PixelFormat */
@@ -45 +48 @@
     { PJMEDIA_FORMAT_RGB24,PIX_FMT_BGR24},
     { PJMEDIA_FORMAT_BGRA, PIX_FMT_BGRA},
-#if VER_AT_LEAST(51,20,1)
+#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51, 20, 1)
     { PJMEDIA_FORMAT_GBRP, PIX_FMT_GBR24P},
 #endif
@@ -63 +66 @@
 {
     pjmedia_format_id   id;
-    enum CodecID        codec_id;
+    unsigned            codec_id;
 } ffmpeg_codec_table[] =
 {
@@ -168 +171 @@
 
 pj_status_t pjmedia_format_id_to_CodecID(pjmedia_format_id fmt_id,
-                                         enum CodecID *codec_id)
+                                         unsigned *codec_id)
 {
     unsigned i;
@@ -179 +182 @@
     }
 
-    *codec_id = PIX_FMT_NONE;
-    return PJ_ENOTFOUND;
-}
-
-pj_status_t CodecID_to_pjmedia_format_id(enum CodecID codec_id,
+    *codec_id = (unsigned)PIX_FMT_NONE;
+    return PJ_ENOTFOUND;
+}
+
+pj_status_t CodecID_to_pjmedia_format_id(unsigned codec_id,
                                          pjmedia_format_id *fmt_id)
 {
@@ -189 +192 @@
     for (i=0; i<PJ_ARRAY_SIZE(ffmpeg_codec_table); ++i) {
         const struct ffmpeg_codec_table_t *t = &ffmpeg_codec_table[i];
-        if (t->codec_id == codec_id) {
+        if ((unsigned)t->codec_id == codec_id) {
             if (fmt_id) *fmt_id = t->id;
             return PJ_SUCCESS;

pjproject/trunk/pjmedia/src/pjmedia/ffmpeg_util.h

@@ -38 +38 @@
 #include <libavcodec/avcodec.h>
 
-#ifndef CodecID
-  #define CodecID AVCodecID
-#endif
-
 void pjmedia_ffmpeg_add_ref();
 void pjmedia_ffmpeg_dec_ref();
@@ -52 +48 @@
 
 pj_status_t pjmedia_format_id_to_CodecID(pjmedia_format_id fmt_id,
-                                         enum CodecID *codec_id);
+                                         unsigned *codec_id);
 
-pj_status_t CodecID_to_pjmedia_format_id(enum CodecID codec_id,
+pj_status_t CodecID_to_pjmedia_format_id(unsigned codec_id,
                                          pjmedia_format_id *fmt_id);