From 490ae95aa81db681f426e8ca7f8a539adfebc895 Mon Sep 17 00:00:00 2001 From: Dmitry Samonenko Date: Sat, 22 Sep 2012 14:32:37 +0400 Subject: rtpenc: Add support for packetizing speex MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This packetization scheme simply places the full packets into the RTP packet without any extra header bytes. Signed-off-by: Martin Storsjö --- libavformat/rtpenc.c | 1 + libavformat/sdp.c | 4 ++++ libavformat/version.h | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) (limited to 'libavformat') diff --git a/libavformat/rtpenc.c b/libavformat/rtpenc.c index 33a1f05dd7..dc257f6391 100644 --- a/libavformat/rtpenc.c +++ b/libavformat/rtpenc.c @@ -76,6 +76,7 @@ static int is_supported(enum AVCodecID id) case AV_CODEC_ID_ADPCM_G726: case AV_CODEC_ID_ILBC: case AV_CODEC_ID_MJPEG: + case AV_CODEC_ID_SPEEX: return 1; default: return 0; diff --git a/libavformat/sdp.c b/libavformat/sdp.c index a77c8ebcac..3791930b59 100644 --- a/libavformat/sdp.c +++ b/libavformat/sdp.c @@ -572,6 +572,10 @@ static char *sdp_write_media_attributes(char *buff, int size, AVCodecContext *c, payload_type, c->sample_rate, payload_type, c->block_align == 38 ? 20 : 30); break; + case AV_CODEC_ID_SPEEX: + av_strlcatf(buff, size, "a=rtpmap:%d speex/%d\r\n", + payload_type, c->sample_rate); + break; default: /* Nothing special to do here... */ break; diff --git a/libavformat/version.h b/libavformat/version.h index 2539d6054e..3cb6d82e10 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -31,7 +31,7 @@ #define LIBAVFORMAT_VERSION_MAJOR 54 #define LIBAVFORMAT_VERSION_MINOR 17 -#define LIBAVFORMAT_VERSION_MICRO 0 +#define LIBAVFORMAT_VERSION_MICRO 1 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ -- cgit v1.2.3 From b6bf1490daa85fdbf5464525e9ca19dee0b520e2 Mon Sep 17 00:00:00 2001 From: Dmitry Samonenko Date: Sat, 22 Sep 2012 14:39:03 +0400 Subject: rtpdec: Support depacketizing speex MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Martin Storsjö --- libavformat/rtpdec.c | 7 +++++++ libavformat/version.h | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'libavformat') diff --git a/libavformat/rtpdec.c b/libavformat/rtpdec.c index fedab61988..8b6f7b7327 100644 --- a/libavformat/rtpdec.c +++ b/libavformat/rtpdec.c @@ -49,6 +49,12 @@ static RTPDynamicProtocolHandler ff_realmedia_mp3_dynamic_handler = { .codec_id = AV_CODEC_ID_MP3ADU, }; +static RTPDynamicProtocolHandler speex_dynamic_handler = { + .enc_name = "speex", + .codec_type = AVMEDIA_TYPE_AUDIO, + .codec_id = AV_CODEC_ID_SPEEX, +}; + /* statistics functions */ static RTPDynamicProtocolHandler *RTPFirstDynamicPayloadHandler= NULL; @@ -78,6 +84,7 @@ void av_register_rtp_dynamic_payload_handlers(void) ff_register_dynamic_payload_handler(&ff_vp8_dynamic_handler); ff_register_dynamic_payload_handler(&ff_qcelp_dynamic_handler); ff_register_dynamic_payload_handler(&ff_realmedia_mp3_dynamic_handler); + ff_register_dynamic_payload_handler(&speex_dynamic_handler); ff_register_dynamic_payload_handler(&ff_ms_rtp_asf_pfv_handler); ff_register_dynamic_payload_handler(&ff_ms_rtp_asf_pfa_handler); diff --git a/libavformat/version.h b/libavformat/version.h index 3cb6d82e10..f343a38a78 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -31,7 +31,7 @@ #define LIBAVFORMAT_VERSION_MAJOR 54 #define LIBAVFORMAT_VERSION_MINOR 17 -#define LIBAVFORMAT_VERSION_MICRO 1 +#define LIBAVFORMAT_VERSION_MICRO 2 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ -- cgit v1.2.3 From 69673138c57f665ca8b77ed4009e0827e76bf961 Mon Sep 17 00:00:00 2001 From: Martin Storsjö Date: Sun, 23 Sep 2012 13:32:41 +0300 Subject: rtpdec: Remove a useless ff_ prefix from a static symbol MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Martin Storsjö --- libavformat/rtpdec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libavformat') diff --git a/libavformat/rtpdec.c b/libavformat/rtpdec.c index 8b6f7b7327..0f4e1d1d86 100644 --- a/libavformat/rtpdec.c +++ b/libavformat/rtpdec.c @@ -43,7 +43,7 @@ 'ffio_open_dyn_packet_buf') */ -static RTPDynamicProtocolHandler ff_realmedia_mp3_dynamic_handler = { +static RTPDynamicProtocolHandler realmedia_mp3_dynamic_handler = { .enc_name = "X-MP3-draft-00", .codec_type = AVMEDIA_TYPE_AUDIO, .codec_id = AV_CODEC_ID_MP3ADU, @@ -83,7 +83,7 @@ void av_register_rtp_dynamic_payload_handlers(void) ff_register_dynamic_payload_handler(&ff_mp4a_latm_dynamic_handler); ff_register_dynamic_payload_handler(&ff_vp8_dynamic_handler); ff_register_dynamic_payload_handler(&ff_qcelp_dynamic_handler); - ff_register_dynamic_payload_handler(&ff_realmedia_mp3_dynamic_handler); + ff_register_dynamic_payload_handler(&realmedia_mp3_dynamic_handler); ff_register_dynamic_payload_handler(&speex_dynamic_handler); ff_register_dynamic_payload_handler(&ff_ms_rtp_asf_pfv_handler); -- cgit v1.2.3 From 93e81ee81c33e74e6047053f6086d63d2f8293d4 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Tue, 25 Sep 2012 19:02:42 +0200 Subject: nutdec: const correctness for get_v_trace/get_s_trace function arguments --- libavformat/nutdec.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libavformat') diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c index da438ad127..2013bc83b4 100644 --- a/libavformat/nutdec.c +++ b/libavformat/nutdec.c @@ -76,8 +76,8 @@ static uint64_t get_fourcc(AVIOContext *bc) } #ifdef TRACE -static inline uint64_t get_v_trace(AVIOContext *bc, char *file, - char *func, int line) +static inline uint64_t get_v_trace(AVIOContext *bc, const char *file, + const char *func, int line) { uint64_t v = ffio_read_varlen(bc); @@ -86,8 +86,8 @@ static inline uint64_t get_v_trace(AVIOContext *bc, char *file, return v; } -static inline int64_t get_s_trace(AVIOContext *bc, char *file, - char *func, int line) +static inline int64_t get_s_trace(AVIOContext *bc, const char *file, + const char *func, int line) { int64_t v = get_s(bc); -- cgit v1.2.3