Commit 9013560f authored by Martin Storsjö's avatar Martin Storsjö
Browse files

Add a muxer and demuxer for raw G.722

Originally committed as revision 25087 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 58e37eaf
...@@ -85,6 +85,8 @@ OBJS-$(CONFIG_GIF_MUXER) += gif.o ...@@ -85,6 +85,8 @@ OBJS-$(CONFIG_GIF_MUXER) += gif.o
OBJS-$(CONFIG_GSM_DEMUXER) += rawdec.o OBJS-$(CONFIG_GSM_DEMUXER) += rawdec.o
OBJS-$(CONFIG_GXF_DEMUXER) += gxf.o OBJS-$(CONFIG_GXF_DEMUXER) += gxf.o
OBJS-$(CONFIG_GXF_MUXER) += gxfenc.o audiointerleave.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_DEMUXER) += h261dec.o rawdec.o
OBJS-$(CONFIG_H261_MUXER) += rawenc.o OBJS-$(CONFIG_H261_MUXER) += rawenc.o
OBJS-$(CONFIG_H263_DEMUXER) += h263dec.o rawdec.o OBJS-$(CONFIG_H263_DEMUXER) += h263dec.o rawdec.o
......
...@@ -92,6 +92,7 @@ void av_register_all(void) ...@@ -92,6 +92,7 @@ void av_register_all(void)
REGISTER_DEMUXER (FOURXM, fourxm); REGISTER_DEMUXER (FOURXM, fourxm);
REGISTER_MUXER (FRAMECRC, framecrc); REGISTER_MUXER (FRAMECRC, framecrc);
REGISTER_MUXER (FRAMEMD5, framemd5); REGISTER_MUXER (FRAMEMD5, framemd5);
REGISTER_MUXDEMUX (G722, g722);
REGISTER_MUXER (GIF, gif); REGISTER_MUXER (GIF, gif);
REGISTER_DEMUXER (GSM, gsm); REGISTER_DEMUXER (GSM, gsm);
REGISTER_MUXDEMUX (GXF, gxf); REGISTER_MUXDEMUX (GXF, gxf);
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#define LIBAVFORMAT_VERSION_MAJOR 52 #define LIBAVFORMAT_VERSION_MAJOR 52
#define LIBAVFORMAT_VERSION_MINOR 78 #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, \ #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
LIBAVFORMAT_VERSION_MINOR, \ LIBAVFORMAT_VERSION_MINOR, \
......
...@@ -137,6 +137,20 @@ int ff_raw_video_read_header(AVFormatContext *s, ...@@ -137,6 +137,20 @@ int ff_raw_video_read_header(AVFormatContext *s,
/* Note: Do not forget to add new entries to the Makefile as well. */ /* 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 #if CONFIG_GSM_DEMUXER
AVInputFormat gsm_demuxer = { AVInputFormat gsm_demuxer = {
"gsm", "gsm",
......
...@@ -107,6 +107,21 @@ AVOutputFormat eac3_muxer = { ...@@ -107,6 +107,21 @@ AVOutputFormat eac3_muxer = {
}; };
#endif #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 #if CONFIG_H261_MUXER
AVOutputFormat h261_muxer = { AVOutputFormat h261_muxer = {
"h261", "h261",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment