diff options
| author | Benny Prijono <bennylp@teluu.com> | 2011-08-29 07:57:55 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2011-08-29 07:57:55 +0000 |
| commit | 8213d3bb9bacf702286538d87c1da03dd2c7b84c (patch) | |
| tree | e555e8a238135eb7aa8b0b9c5e6748d170f7ca14 | |
| parent | b5dfe94be5bc5feb74845d47898562db9e45d419 (diff) | |
Disabled H.264 codec [re #1320/Misc]
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3734 74dad513-b988-da41-8d7b-12977e46ad98
| -rw-r--r-- | pjmedia/src/pjmedia-codec/ffmpeg_codecs.c | 30 |
1 files changed, 10 insertions, 20 deletions
diff --git a/pjmedia/src/pjmedia-codec/ffmpeg_codecs.c b/pjmedia/src/pjmedia-codec/ffmpeg_codecs.c index 79a25def..16afce33 100644 --- a/pjmedia/src/pjmedia-codec/ffmpeg_codecs.c +++ b/pjmedia/src/pjmedia-codec/ffmpeg_codecs.c @@ -43,6 +43,7 @@ #include <libavcodec/avcodec.h> #include <libavformat/avformat.h> +#define ENABLE_H264 0 /* Prototypes for FFMPEG codecs factory */ static pj_status_t ffmpeg_test_alloc( pjmedia_vid_codec_factory *factory, @@ -89,9 +90,6 @@ static pj_status_t ffmpeg_codec_decode( pjmedia_vid_codec *codec, const pjmedia_frame *input, 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. */ static pjmedia_vid_codec_op ffmpeg_op = @@ -105,7 +103,7 @@ static pjmedia_vid_codec_op ffmpeg_op = &ffmpeg_unpacketize, &ffmpeg_codec_encode, &ffmpeg_codec_decode, - NULL //&ffmpeg_codec_recover + NULL }; /* Definition for FFMPEG codecs factory operations. */ @@ -219,6 +217,7 @@ struct ffmpeg_codec_desc }; +#if ENABLE_H264 /* H264 constants */ #define PROFILE_H264_BASELINE 66 #define PROFILE_H264_MAIN 77 @@ -226,9 +225,11 @@ struct ffmpeg_codec_desc /* Codec specific functions */ 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); @@ -236,6 +237,7 @@ static FUNC_UNPACKETIZE(h263_unpacketize); /* Internal codec info */ ffmpeg_codec_desc codec_desc[] = { +#if ENABLE_H264 { {PJMEDIA_FORMAT_H264, PJMEDIA_RTP_PT_H264, {"H264",4}, {"Constrained Baseline (level=30, pack=1)", 39}}, @@ -255,6 +257,7 @@ ffmpeg_codec_desc codec_desc[] = {2, { {{"profile-level-id",16}, {"42001e",6}}, {{" packetization-mode",19}, {"1",1}}, } }, }, +#endif { {PJMEDIA_FORMAT_H263P, PJMEDIA_RTP_PT_H263P, {"H263-1998",9}}, PJMEDIA_FORMAT_H263, 1000000, 2000000, @@ -287,7 +290,7 @@ ffmpeg_codec_desc codec_desc[] = }, }; - +#if ENABLE_H264 typedef struct h264_data { pjmedia_vid_codec_h264_fmtp fmtp; @@ -418,7 +421,7 @@ static FUNC_UNPACKETIZE(h264_unpacketize) return pjmedia_h264_unpacketize(data->pktz, payload, payload_len, bits, bits_len, bits_pos); } - +#endif /* ENABLE_H264 */ typedef struct h263_data { @@ -1472,19 +1475,6 @@ static pj_status_t ffmpeg_codec_decode( pjmedia_vid_codec *codec, return PJ_SUCCESS; } -/* - * 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 # pragma comment( lib, "avcodec.lib") |