Changeset 5513 for pjproject/branches/projects/uwp/pjmedia/src/pjmedia/ffmpeg_util.c

Timestamp:

Dec 28, 2016 3:40:07 AM (7 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/ffmpeg_util.c (modified) (8 diffs)

pjproject/branches/projects/uwp/pjmedia/src/pjmedia/ffmpeg_util.c

@@ -22 +22 @@
 #include <pj/string.h>
 
-#if PJMEDIA_HAS_LIBAVFORMAT && PJMEDIA_HAS_LIBAVUTIL
+#if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0) && \
+    defined(PJMEDIA_HAS_LIBAVFORMAT) && (PJMEDIA_HAS_LIBAVFORMAT != 0)
 
 #include "ffmpeg_util.h"
@@ -34 +35 @@
 } ffmpeg_fmt_table[] =
 {
-    { PJMEDIA_FORMAT_RGBA, AV_PIX_FMT_RGBA},
-    { PJMEDIA_FORMAT_RGB24,AV_PIX_FMT_BGR24},
-    { PJMEDIA_FORMAT_BGRA, AV_PIX_FMT_BGRA},
-    { PJMEDIA_FORMAT_GBRP, AV_PIX_FMT_GBRP},
+    { PJMEDIA_FORMAT_RGBA, AV(PIX_FMT_RGBA)},
+    { PJMEDIA_FORMAT_RGB24,AV(PIX_FMT_BGR24)},
+    { PJMEDIA_FORMAT_BGRA, AV(PIX_FMT_BGRA)},
+    { PJMEDIA_FORMAT_GBRP, AV(PIX_FMT_GBRP)},
 
-    { PJMEDIA_FORMAT_AYUV, AV_PIX_FMT_NONE},
-    { PJMEDIA_FORMAT_YUY2, AV_PIX_FMT_YUYV422},
-    { PJMEDIA_FORMAT_UYVY, AV_PIX_FMT_UYVY422},
-    { PJMEDIA_FORMAT_I420, AV_PIX_FMT_YUV420P},
-    //{ PJMEDIA_FORMAT_YV12, AV_PIX_FMT_YUV420P},
-    { PJMEDIA_FORMAT_I422, AV_PIX_FMT_YUV422P},
-    { PJMEDIA_FORMAT_I420JPEG, AV_PIX_FMT_YUVJ420P},
-    { PJMEDIA_FORMAT_I422JPEG, AV_PIX_FMT_YUVJ422P},
+    { PJMEDIA_FORMAT_AYUV, AV(PIX_FMT_NONE)},
+    { PJMEDIA_FORMAT_YUY2, AV(PIX_FMT_YUYV422)},
+    { PJMEDIA_FORMAT_UYVY, AV(PIX_FMT_UYVY422)},
+    { PJMEDIA_FORMAT_I420, AV(PIX_FMT_YUV420P)},
+    //{ PJMEDIA_FORMAT_YV12, AV(PIX_FMT_YUV420P)},
+    { PJMEDIA_FORMAT_I422, AV(PIX_FMT_YUV422P)},
+    { PJMEDIA_FORMAT_I420JPEG, AV(PIX_FMT_YUVJ420P)},
+    { PJMEDIA_FORMAT_I422JPEG, AV(PIX_FMT_YUVJ422P)},
 };
 
@@ -56 +57 @@
 } ffmpeg_codec_table[] =
 {
-    {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}
+    {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)}
 };
 
@@ -132 +133 @@
     for (i=0; i<PJ_ARRAY_SIZE(ffmpeg_fmt_table); ++i) {
         const struct ffmpeg_fmt_table_t *t = &ffmpeg_fmt_table[i];
-        if (t->id==fmt_id && t->pf != AV_PIX_FMT_NONE) {
+        if (t->id==fmt_id && t->pf != AV(PIX_FMT_NONE)) {
             *pixel_format = t->pf;
             return PJ_SUCCESS;
@@ -138 +139 @@
     }
 
-    *pixel_format = AV_PIX_FMT_NONE;
+    *pixel_format = AV(PIX_FMT_NONE);
     return PJ_ENOTFOUND;
 }
@@ -163 +164 @@
     for (i=0; i<PJ_ARRAY_SIZE(ffmpeg_codec_table); ++i) {
         const struct ffmpeg_codec_table_t *t = &ffmpeg_codec_table[i];
-        if (t->id==fmt_id && t->codec_id != AV_PIX_FMT_NONE) {
+        if (t->id==fmt_id && t->codec_id != AV(PIX_FMT_NONE)) {
             *codec_id = t->codec_id;
             return PJ_SUCCESS;
@@ -169 +170 @@
     }
 
-    *codec_id = (unsigned)AV_PIX_FMT_NONE;
+    *codec_id = (unsigned)AV(PIX_FMT_NONE);
     return PJ_ENOTFOUND;
 }
@@ -194 +195 @@
 #endif
 
-#endif  /* #if PJMEDIA_HAS_LIBAVFORMAT && PJMEDIA_HAS_LIBAVUTIL */
+#endif  /* PJMEDIA_HAS_LIBAVFORMAT */