Changeset 3734 for pjproject/trunk

Timestamp:

Aug 29, 2011 7:57:55 AM (13 years ago)

Author:

bennylp

Message:

Disabled H.264 codec [re #1320/Misc]

File:

• pjproject/trunk/pjmedia/src/pjmedia-codec/ffmpeg_codecs.c (modified) (10 diffs)

pjproject/trunk/pjmedia/src/pjmedia-codec/ffmpeg_codecs.c

@@ -44 +44 @@
 #include <libavformat/avformat.h>
 
+#define ENABLE_H264     0
 
 /* Prototypes for FFMPEG codecs factory */
@@ -90 +91 @@
                                          unsigned output_buf_len, 
                                          pjmedia_frame *output);
-static pj_status_t  ffmpeg_codec_recover( pjmedia_vid_codec *codec, 
-                                          unsigned output_buf_len, 
-                                          pjmedia_frame *output);
 
 /* Definition for FFMPEG codecs operations. */
@@ -106 +104 @@
     &ffmpeg_codec_encode,
     &ffmpeg_codec_decode,
-    NULL //&ffmpeg_codec_recover
+    NULL
 };
 
@@ -220 +218 @@
 
 
+#if ENABLE_H264
 /* H264 constants */
 #define PROFILE_H264_BASELINE           66
@@ -227 +226 @@
 static pj_status_t h264_preopen(ffmpeg_private *ff);
 static pj_status_t h264_postopen(ffmpeg_private *ff);
-static pj_status_t h263_preopen(ffmpeg_private *ff);
 static FUNC_PACKETIZE(h264_packetize);
 static FUNC_UNPACKETIZE(h264_unpacketize);
+#endif  /* ENABLE_H264 */
+
+static pj_status_t h263_preopen(ffmpeg_private *ff);
 static FUNC_PACKETIZE(h263_packetize);
 static FUNC_UNPACKETIZE(h263_unpacketize);
@@ -237 +238 @@
 ffmpeg_codec_desc codec_desc[] =
 {
+#if ENABLE_H264
     {
         {PJMEDIA_FORMAT_H264, PJMEDIA_RTP_PT_H264, {"H264",4},
@@ -256 +258 @@
               {{" packetization-mode",19},  {"1",1}}, } },
     },
+#endif
     {
         {PJMEDIA_FORMAT_H263P, PJMEDIA_RTP_PT_H263P, {"H263-1998",9}},
@@ -288 +291 @@
 };
 
-
+#if ENABLE_H264
 typedef struct h264_data
 {
@@ -419 +422 @@
                                     bits, bits_len, bits_pos);
 }
-
+#endif  /* ENABLE_H264 */
 
 typedef struct h263_data
@@ -1473 +1476 @@
 }
 
-/* 
- * Recover lost frame.
- */
-static pj_status_t  ffmpeg_codec_recover( pjmedia_vid_codec *codec, 
-                                          unsigned output_buf_len, 
-                                          pjmedia_frame *output)
-{
-    PJ_UNUSED_ARG(codec);
-    PJ_UNUSED_ARG(output_buf_len);
-    PJ_UNUSED_ARG(output);
-
-    return PJ_ENOTSUP;
-}
 
 #ifdef _MSC_VER