Update codec id enum to the AV-prefixed version

This ensures future breakage and provides a compatibility layer. Signed-off-by: Vittorio Giovara <vittorio.giovara@savoirfairelinux.com>
kodawah · Jun 9, 2014 · cec5a30 · cec5a30
1 parent 2b1fb22
commit cec5a30
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 15 deletions.
diff --git a/pjmedia/src/pjmedia-codec/ffmpeg_vid_codecs.c b/pjmedia/src/pjmedia-codec/ffmpeg_vid_codecs.c
@@ -636,7 +636,7 @@ PJ_DEF(pj_status_t) pjmedia_codec_ffmpeg_vid_init(pjmedia_vid_codec_mgr *mgr,
          */
 
 	//PJ_LOG(3, (THIS_FILE, "%s", c->name));
-	status = CodecID_to_pjmedia_format_id(c->id, &fmt_id);
+	status = AVCodecID_to_pjmedia_format_id(c->id, &fmt_id);
 	/* Skip if format ID is unknown */
 	if (status != PJ_SUCCESS)
 	    continue;

diff --git a/pjmedia/src/pjmedia/ffmpeg_util.c b/pjmedia/src/pjmedia/ffmpeg_util.c
@@ -55,18 +55,18 @@ static const struct ffmpeg_fmt_table_t
 /* Conversion table between pjmedia_format_id and CodecID */
 static const struct ffmpeg_codec_table_t
 {
-    pjmedia_format_id	id;
-    unsigned		codec_id;
+    pjmedia_format_id id;
+    unsigned codec_id;
 } ffmpeg_codec_table[] =
 {
-    {PJMEDIA_FORMAT_H261,	CODEC_ID_H261},
-    {PJMEDIA_FORMAT_H263,	CODEC_ID_H263},
-    {PJMEDIA_FORMAT_H263P,	CODEC_ID_H263P},
-    {PJMEDIA_FORMAT_H264,	CODEC_ID_H264},
-    {PJMEDIA_FORMAT_MPEG1VIDEO,	CODEC_ID_MPEG1VIDEO},
-    {PJMEDIA_FORMAT_MPEG2VIDEO, CODEC_ID_MPEG2VIDEO},
-    {PJMEDIA_FORMAT_MPEG4,	CODEC_ID_MPEG4},
-    {PJMEDIA_FORMAT_MJPEG,	CODEC_ID_MJPEG}
+    {PJMEDIA_FORMAT_H261,       AV_CODEC_ID_H261},
+    {PJMEDIA_FORMAT_H263,       AV_CODEC_ID_H263},
+    {PJMEDIA_FORMAT_H263P,      AV_CODEC_ID_H263P},
+    {PJMEDIA_FORMAT_H264,       AV_CODEC_ID_H264},
+    {PJMEDIA_FORMAT_MPEG1VIDEO, AV_CODEC_ID_MPEG1VIDEO},
+    {PJMEDIA_FORMAT_MPEG2VIDEO, AV_CODEC_ID_MPEG2VIDEO},
+    {PJMEDIA_FORMAT_MPEG4,      AV_CODEC_ID_MPEG4},
+    {PJMEDIA_FORMAT_MJPEG,      AV_CODEC_ID_MJPEG}
 };
 
 static int pjmedia_ffmpeg_ref_cnt;

diff --git a/pjmedia/src/pjmedia/ffmpeg_util.h b/pjmedia/src/pjmedia/ffmpeg_util.h
@@ -68,6 +68,18 @@
 #  define AV_PIX_FMT_YUVJ422P PIX_FMT_YUVJ422P
 #endif
 
+#if !LIBAVUTIL_VERSION_CHECK(51, 25, 0, 51, 0)
+#  define AVCodecID CodecID
+#  define AV_CODEC_ID_H261       CODEC_ID_H261
+#  define AV_CODEC_ID_H263       CODEC_ID_H263
+#  define AV_CODEC_ID_H263P      CODEC_ID_H263P
+#  define AV_CODEC_ID_H264       CODEC_ID_H264
+#  define AV_CODEC_ID_MPEG1VIDEO CODEC_ID_MPEG1VIDEO
+#  define AV_CODEC_ID_MPEG2VIDEO CODEC_ID_MPEG2VIDEO
+#  define AV_CODEC_ID_MPEG4      CODEC_ID_MPEG4
+#  define AV_CODEC_ID_MJPEG      CODEC_ID_MJPEG
+#endif
+
 void pjmedia_ffmpeg_add_ref();
 void pjmedia_ffmpeg_dec_ref();
 
@@ -77,10 +89,10 @@ pj_status_t pjmedia_format_id_to_AVPixelFormat(pjmedia_format_id fmt_id,
 pj_status_t AVPixelFormat_to_pjmedia_format_id(enum AVPixelFormat pf,
                                                pjmedia_format_id *fmt_id);
 
-pj_status_t pjmedia_format_id_to_CodecID(pjmedia_format_id fmt_id,
-					 unsigned *codec_id);
+pj_status_t pjmedia_format_id_to_AVCodecID(pjmedia_format_id fmt_id,
+                                           unsigned *codec_id);
 
-pj_status_t CodecID_to_pjmedia_format_id(unsigned codec_id,
-					 pjmedia_format_id *fmt_id);
+pj_status_t AVCodecID_to_pjmedia_format_id(unsigned codec_id,
+                                           pjmedia_format_id *fmt_id);
 
 #endif /* __PJMEDIA_FFMPEG_UTIL_H__ */