Mercurial > libavformat.hg
changeset 6469:eb68008daac2 libavformat
Add a muxer and demuxer for raw G.722
author | mstorsjo |
---|---|
date | Thu, 09 Sep 2010 19:27:41 +0000 |
parents | 317dedc6b9a2 |
children | 5d5fbab4d608 |
files | Makefile allformats.c avformat.h rawdec.c rawenc.c |
diffstat | 5 files changed, 33 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Wed Sep 08 20:22:02 2010 +0000 +++ b/Makefile Thu Sep 09 19:27:41 2010 +0000 @@ -85,6 +85,8 @@ OBJS-$(CONFIG_GSM_DEMUXER) += rawdec.o OBJS-$(CONFIG_GXF_DEMUXER) += gxf.o OBJS-$(CONFIG_GXF_MUXER) += gxfenc.o audiointerleave.o +OBJS-$(CONFIG_G722_DEMUXER) += rawdec.o +OBJS-$(CONFIG_G722_MUXER) += rawenc.o OBJS-$(CONFIG_H261_DEMUXER) += h261dec.o rawdec.o OBJS-$(CONFIG_H261_MUXER) += rawenc.o OBJS-$(CONFIG_H263_DEMUXER) += h263dec.o rawdec.o
--- a/allformats.c Wed Sep 08 20:22:02 2010 +0000 +++ b/allformats.c Thu Sep 09 19:27:41 2010 +0000 @@ -92,6 +92,7 @@ REGISTER_DEMUXER (FOURXM, fourxm); REGISTER_MUXER (FRAMECRC, framecrc); REGISTER_MUXER (FRAMEMD5, framemd5); + REGISTER_MUXDEMUX (G722, g722); REGISTER_MUXER (GIF, gif); REGISTER_DEMUXER (GSM, gsm); REGISTER_MUXDEMUX (GXF, gxf);
--- a/avformat.h Wed Sep 08 20:22:02 2010 +0000 +++ b/avformat.h Thu Sep 09 19:27:41 2010 +0000 @@ -23,7 +23,7 @@ #define LIBAVFORMAT_VERSION_MAJOR 52 #define LIBAVFORMAT_VERSION_MINOR 78 -#define LIBAVFORMAT_VERSION_MICRO 3 +#define LIBAVFORMAT_VERSION_MICRO 4 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \
--- a/rawdec.c Wed Sep 08 20:22:02 2010 +0000 +++ b/rawdec.c Thu Sep 09 19:27:41 2010 +0000 @@ -137,6 +137,20 @@ /* Note: Do not forget to add new entries to the Makefile as well. */ +#if CONFIG_G722_DEMUXER +AVInputFormat g722_demuxer = { + "g722", + NULL_IF_CONFIG_SMALL("raw G.722"), + 0, + NULL, + ff_raw_read_header, + ff_raw_read_partial_packet, + .flags= AVFMT_GENERIC_INDEX, + .extensions = "g722,722", + .value = CODEC_ID_ADPCM_G722, +}; +#endif + #if CONFIG_GSM_DEMUXER AVInputFormat gsm_demuxer = { "gsm",
--- a/rawenc.c Wed Sep 08 20:22:02 2010 +0000 +++ b/rawenc.c Thu Sep 09 19:27:41 2010 +0000 @@ -107,6 +107,21 @@ }; #endif +#if CONFIG_G722_MUXER +AVOutputFormat g722_muxer = { + "g722", + NULL_IF_CONFIG_SMALL("raw G.722"), + "audio/G722", + "g722", + 0, + CODEC_ID_ADPCM_G722, + CODEC_ID_NONE, + NULL, + ff_raw_write_packet, + .flags= AVFMT_NOTIMESTAMPS, +}; +#endif + #if CONFIG_H261_MUXER AVOutputFormat h261_muxer = { "h261",