Mercurial > libavformat.hg
changeset 6446:659a7e022950 libavformat
move pcm muxers to their own file
| author | aurel |
|---|---|
| date | Mon, 30 Aug 2010 22:42:25 +0000 |
| parents | 4aaed59641ff |
| children | ef0ad6df55b2 |
| files | Makefile pcmenc.c raw.c |
| diffstat | 3 files changed, 117 insertions(+), 104 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Mon Aug 30 21:17:34 2010 +0000 +++ b/Makefile Mon Aug 30 22:42:25 2010 +0000 @@ -162,45 +162,45 @@ vorbiscomment.o OBJS-$(CONFIG_OMA_DEMUXER) += oma.o pcm.o id3v2.o id3v1.o OBJS-$(CONFIG_PCM_ALAW_DEMUXER) += pcmdec.o pcm.o raw.o -OBJS-$(CONFIG_PCM_ALAW_MUXER) += raw.o +OBJS-$(CONFIG_PCM_ALAW_MUXER) += pcmenc.o raw.o OBJS-$(CONFIG_PCM_F32BE_DEMUXER) += pcmdec.o pcm.o raw.o -OBJS-$(CONFIG_PCM_F32BE_MUXER) += raw.o +OBJS-$(CONFIG_PCM_F32BE_MUXER) += pcmenc.o raw.o OBJS-$(CONFIG_PCM_F32LE_DEMUXER) += pcmdec.o pcm.o raw.o -OBJS-$(CONFIG_PCM_F32LE_MUXER) += raw.o +OBJS-$(CONFIG_PCM_F32LE_MUXER) += pcmenc.o raw.o OBJS-$(CONFIG_PCM_F64BE_DEMUXER) += pcmdec.o pcm.o raw.o -OBJS-$(CONFIG_PCM_F64BE_MUXER) += raw.o +OBJS-$(CONFIG_PCM_F64BE_MUXER) += pcmenc.o raw.o OBJS-$(CONFIG_PCM_F64LE_DEMUXER) += pcmdec.o pcm.o raw.o -OBJS-$(CONFIG_PCM_F64LE_MUXER) += raw.o +OBJS-$(CONFIG_PCM_F64LE_MUXER) += pcmenc.o raw.o OBJS-$(CONFIG_PCM_MULAW_DEMUXER) += pcmdec.o pcm.o raw.o -OBJS-$(CONFIG_PCM_MULAW_MUXER) += raw.o +OBJS-$(CONFIG_PCM_MULAW_MUXER) += pcmenc.o raw.o OBJS-$(CONFIG_PCM_S16BE_DEMUXER) += pcmdec.o pcm.o raw.o -OBJS-$(CONFIG_PCM_S16BE_MUXER) += raw.o +OBJS-$(CONFIG_PCM_S16BE_MUXER) += pcmenc.o raw.o OBJS-$(CONFIG_PCM_S16LE_DEMUXER) += pcmdec.o pcm.o raw.o -OBJS-$(CONFIG_PCM_S16LE_MUXER) += raw.o +OBJS-$(CONFIG_PCM_S16LE_MUXER) += pcmenc.o raw.o OBJS-$(CONFIG_PCM_S24BE_DEMUXER) += pcmdec.o pcm.o raw.o -OBJS-$(CONFIG_PCM_S24BE_MUXER) += raw.o +OBJS-$(CONFIG_PCM_S24BE_MUXER) += pcmenc.o raw.o OBJS-$(CONFIG_PCM_S24LE_DEMUXER) += pcmdec.o pcm.o raw.o -OBJS-$(CONFIG_PCM_S24LE_MUXER) += raw.o +OBJS-$(CONFIG_PCM_S24LE_MUXER) += pcmenc.o raw.o OBJS-$(CONFIG_PCM_S32BE_DEMUXER) += pcmdec.o pcm.o raw.o -OBJS-$(CONFIG_PCM_S32BE_MUXER) += raw.o +OBJS-$(CONFIG_PCM_S32BE_MUXER) += pcmenc.o raw.o OBJS-$(CONFIG_PCM_S32LE_DEMUXER) += pcmdec.o pcm.o raw.o -OBJS-$(CONFIG_PCM_S32LE_MUXER) += raw.o +OBJS-$(CONFIG_PCM_S32LE_MUXER) += pcmenc.o raw.o OBJS-$(CONFIG_PCM_S8_DEMUXER) += pcmdec.o pcm.o raw.o -OBJS-$(CONFIG_PCM_S8_MUXER) += raw.o +OBJS-$(CONFIG_PCM_S8_MUXER) += pcmenc.o raw.o OBJS-$(CONFIG_PCM_U16BE_DEMUXER) += pcmdec.o pcm.o raw.o -OBJS-$(CONFIG_PCM_U16BE_MUXER) += raw.o +OBJS-$(CONFIG_PCM_U16BE_MUXER) += pcmenc.o raw.o OBJS-$(CONFIG_PCM_U16LE_DEMUXER) += pcmdec.o pcm.o raw.o -OBJS-$(CONFIG_PCM_U16LE_MUXER) += raw.o +OBJS-$(CONFIG_PCM_U16LE_MUXER) += pcmenc.o raw.o OBJS-$(CONFIG_PCM_U24BE_DEMUXER) += pcmdec.o pcm.o raw.o -OBJS-$(CONFIG_PCM_U24BE_MUXER) += raw.o +OBJS-$(CONFIG_PCM_U24BE_MUXER) += pcmenc.o raw.o OBJS-$(CONFIG_PCM_U24LE_DEMUXER) += pcmdec.o pcm.o raw.o -OBJS-$(CONFIG_PCM_U24LE_MUXER) += raw.o +OBJS-$(CONFIG_PCM_U24LE_MUXER) += pcmenc.o raw.o OBJS-$(CONFIG_PCM_U32BE_DEMUXER) += pcmdec.o pcm.o raw.o -OBJS-$(CONFIG_PCM_U32BE_MUXER) += raw.o +OBJS-$(CONFIG_PCM_U32BE_MUXER) += pcmenc.o raw.o OBJS-$(CONFIG_PCM_U32LE_DEMUXER) += pcmdec.o pcm.o raw.o -OBJS-$(CONFIG_PCM_U32LE_MUXER) += raw.o +OBJS-$(CONFIG_PCM_U32LE_MUXER) += pcmenc.o raw.o OBJS-$(CONFIG_PCM_U8_DEMUXER) += pcmdec.o pcm.o raw.o -OBJS-$(CONFIG_PCM_U8_MUXER) += raw.o +OBJS-$(CONFIG_PCM_U8_MUXER) += pcmenc.o raw.o OBJS-$(CONFIG_PVA_DEMUXER) += pva.o OBJS-$(CONFIG_QCP_DEMUXER) += qcp.o OBJS-$(CONFIG_R3D_DEMUXER) += r3d.o
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pcmenc.c Mon Aug 30 22:42:25 2010 +0000 @@ -0,0 +1,97 @@ +/* + * RAW PCM muxers + * Copyright (c) 2002 Fabrice Bellard + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "avformat.h" +#include "raw.h" + +#define PCMDEF(name, long_name, ext, codec) \ +AVOutputFormat pcm_ ## name ## _muxer = {\ + #name,\ + NULL_IF_CONFIG_SMALL(long_name),\ + NULL,\ + ext,\ + 0,\ + codec,\ + CODEC_ID_NONE,\ + NULL,\ + ff_raw_write_packet,\ + .flags= AVFMT_NOTIMESTAMPS,\ +}; + +PCMDEF(f64be, "PCM 64 bit floating-point big-endian format", + NULL, CODEC_ID_PCM_F64BE) + +PCMDEF(f64le, "PCM 64 bit floating-point little-endian format", + NULL, CODEC_ID_PCM_F64LE) + +PCMDEF(f32be, "PCM 32 bit floating-point big-endian format", + NULL, CODEC_ID_PCM_F32BE) + +PCMDEF(f32le, "PCM 32 bit floating-point little-endian format", + NULL, CODEC_ID_PCM_F32LE) + +PCMDEF(s32be, "PCM signed 32 bit big-endian format", + NULL, CODEC_ID_PCM_S32BE) + +PCMDEF(s32le, "PCM signed 32 bit little-endian format", + NULL, CODEC_ID_PCM_S32LE) + +PCMDEF(s24be, "PCM signed 24 bit big-endian format", + NULL, CODEC_ID_PCM_S24BE) + +PCMDEF(s24le, "PCM signed 24 bit little-endian format", + NULL, CODEC_ID_PCM_S24LE) + +PCMDEF(s16be, "PCM signed 16 bit big-endian format", + AV_NE("sw", NULL), CODEC_ID_PCM_S16BE) + +PCMDEF(s16le, "PCM signed 16 bit little-endian format", + AV_NE(NULL, "sw"), CODEC_ID_PCM_S16LE) + +PCMDEF(s8, "PCM signed 8 bit format", + "sb", CODEC_ID_PCM_S8) + +PCMDEF(u32be, "PCM unsigned 32 bit big-endian format", + NULL, CODEC_ID_PCM_U32BE) + +PCMDEF(u32le, "PCM unsigned 32 bit little-endian format", + NULL, CODEC_ID_PCM_U32LE) + +PCMDEF(u24be, "PCM unsigned 24 bit big-endian format", + NULL, CODEC_ID_PCM_U24BE) + +PCMDEF(u24le, "PCM unsigned 24 bit little-endian format", + NULL, CODEC_ID_PCM_U24LE) + +PCMDEF(u16be, "PCM unsigned 16 bit big-endian format", + AV_NE("uw", NULL), CODEC_ID_PCM_U16BE) + +PCMDEF(u16le, "PCM unsigned 16 bit little-endian format", + AV_NE(NULL, "uw"), CODEC_ID_PCM_U16LE) + +PCMDEF(u8, "PCM unsigned 8 bit format", + "ub", CODEC_ID_PCM_U8) + +PCMDEF(alaw, "PCM A-law format", + "al", CODEC_ID_PCM_ALAW) + +PCMDEF(mulaw, "PCM mu-law format", + "ul", CODEC_ID_PCM_MULAW)
--- a/raw.c Mon Aug 30 21:17:34 2010 +0000 +++ b/raw.c Mon Aug 30 22:42:25 2010 +0000 @@ -524,87 +524,3 @@ .value = CODEC_ID_VC1, }; #endif - -/* PCM formats */ - -#define PCMOUTPUTDEF(name, long_name, ext, codec) \ -AVOutputFormat pcm_ ## name ## _muxer = {\ - #name,\ - NULL_IF_CONFIG_SMALL(long_name),\ - NULL,\ - ext,\ - 0,\ - codec,\ - CODEC_ID_NONE,\ - NULL,\ - ff_raw_write_packet,\ - .flags= AVFMT_NOTIMESTAMPS,\ -}; - - -#if CONFIG_MUXERS -#define PCMDEF(name, long_name, ext, codec) \ - PCMOUTPUTDEF(name, long_name, ext, codec) -#else -#define PCMDEF(name, long_name, ext, codec) -#endif - -PCMDEF(f64be, "PCM 64 bit floating-point big-endian format", - NULL, CODEC_ID_PCM_F64BE) - -PCMDEF(f64le, "PCM 64 bit floating-point little-endian format", - NULL, CODEC_ID_PCM_F64LE) - -PCMDEF(f32be, "PCM 32 bit floating-point big-endian format", - NULL, CODEC_ID_PCM_F32BE) - -PCMDEF(f32le, "PCM 32 bit floating-point little-endian format", - NULL, CODEC_ID_PCM_F32LE) - -PCMDEF(s32be, "PCM signed 32 bit big-endian format", - NULL, CODEC_ID_PCM_S32BE) - -PCMDEF(s32le, "PCM signed 32 bit little-endian format", - NULL, CODEC_ID_PCM_S32LE) - -PCMDEF(s24be, "PCM signed 24 bit big-endian format", - NULL, CODEC_ID_PCM_S24BE) - -PCMDEF(s24le, "PCM signed 24 bit little-endian format", - NULL, CODEC_ID_PCM_S24LE) - -PCMDEF(s16be, "PCM signed 16 bit big-endian format", - AV_NE("sw", NULL), CODEC_ID_PCM_S16BE) - -PCMDEF(s16le, "PCM signed 16 bit little-endian format", - AV_NE(NULL, "sw"), CODEC_ID_PCM_S16LE) - -PCMDEF(s8, "PCM signed 8 bit format", - "sb", CODEC_ID_PCM_S8) - -PCMDEF(u32be, "PCM unsigned 32 bit big-endian format", - NULL, CODEC_ID_PCM_U32BE) - -PCMDEF(u32le, "PCM unsigned 32 bit little-endian format", - NULL, CODEC_ID_PCM_U32LE) - -PCMDEF(u24be, "PCM unsigned 24 bit big-endian format", - NULL, CODEC_ID_PCM_U24BE) - -PCMDEF(u24le, "PCM unsigned 24 bit little-endian format", - NULL, CODEC_ID_PCM_U24LE) - -PCMDEF(u16be, "PCM unsigned 16 bit big-endian format", - AV_NE("uw", NULL), CODEC_ID_PCM_U16BE) - -PCMDEF(u16le, "PCM unsigned 16 bit little-endian format", - AV_NE(NULL, "uw"), CODEC_ID_PCM_U16LE) - -PCMDEF(u8, "PCM unsigned 8 bit format", - "ub", CODEC_ID_PCM_U8) - -PCMDEF(alaw, "PCM A-law format", - "al", CODEC_ID_PCM_ALAW) - -PCMDEF(mulaw, "PCM mu-law format", - "ul", CODEC_ID_PCM_MULAW)