MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

move common voc muxer and demuxer data to voc.c

Browse Source 
Originally committed as revision 7146 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Aurelien Jacobs 2006-11-21 13:18:21 +00:00
parent 5d244b2932
commit e9f36c5c4d
5 changed files with 42 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/Makefile
View File

@ -25,7 +25,7 @@ OBJS-$(CONFIG_AU_MUXER) += au.o riff.o
OBJS-$(CONFIG_AVI_DEMUXER) += avidec.o riff.o
OBJS-$(CONFIG_AVI_MUXER) += avienc.o riff.o
OBJS-$(CONFIG_AVISYNTH) += avisynth.o
OBJS-$(CONFIG_AVS_DEMUXER) += avs.o vocdec.o riff.o
OBJS-$(CONFIG_AVS_DEMUXER) += avs.o vocdec.o voc.o riff.o
OBJS-$(CONFIG_CRC_MUXER) += crc.o
OBJS-$(CONFIG_FRAMECRC_MUXER) += crc.o
OBJS-$(CONFIG_DAUD_DEMUXER) += daud.o
@ -115,8 +115,8 @@ OBJS-$(CONFIG_SWF_DEMUXER) += swf.o
OBJS-$(CONFIG_SWF_MUXER) += swf.o
OBJS-$(CONFIG_TIERTEXSEQ_DEMUXER) += tiertexseq.o
OBJS-$(CONFIG_TTA_DEMUXER) += tta.o
OBJS-$(CONFIG_VOC_DEMUXER) += vocdec.o riff.o
OBJS-$(CONFIG_VOC_MUXER) += vocenc.o riff.o
OBJS-$(CONFIG_VOC_DEMUXER) += vocdec.o voc.o riff.o
OBJS-$(CONFIG_VOC_MUXER) += vocenc.o voc.o riff.o
OBJS-$(CONFIG_WAV_DEMUXER) += wav.o riff.o
OBJS-$(CONFIG_WAV_MUXER) += wav.o riff.o
OBJS-$(CONFIG_WC3_DEMUXER) += wc3movie.o

36
libavformat/voc.c Normal file
View File

@ -0,0 +1,36 @@
/*
* Creative Voice File common data.
* Copyright (c) 2006 Aurelien Jacobs <aurel@gnuage.org>
*
* 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 St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "voc.h"
const unsigned char voc_magic[21] = "Creative Voice File\x1A";
const CodecTag voc_codec_tags[] = {
{CODEC_ID_PCM_U8, 0x00},
{CODEC_ID_ADPCM_SBPRO_4, 0x01},
{CODEC_ID_ADPCM_SBPRO_3, 0x02},
{CODEC_ID_ADPCM_SBPRO_2, 0x03},
{CODEC_ID_PCM_S16LE, 0x04},
{CODEC_ID_PCM_ALAW, 0x06},
{CODEC_ID_PCM_MULAW, 0x07},
{CODEC_ID_ADPCM_CT, 0x0200},
{0, 0},
};

3
libavformat/voc.h
View File

@ -23,6 +23,7 @@
#define VOC_H
#include "avformat.h"
#include "riff.h" /* for CodecTag */
typedef struct voc_dec_context {
int remaining_size;
@ -41,6 +42,8 @@ typedef enum voc_type {
VOC_TYPE_NEW_VOICE_DATA = 0x09,
} voc_type_t;
extern const unsigned char voc_magic[21];
extern const CodecTag voc_codec_tags[];
int voc_get_packet(AVFormatContext *s, AVPacket *pkt,
AVStream *st, int max_size);

15
libavformat/vocdec.c
View File

@ -19,25 +19,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "avformat.h"
#include "riff.h" /* for CodecTag */
#include "voc.h"
static const int voc_max_pkt_size = 2048;
static const unsigned char voc_magic[] = "Creative Voice File\x1A";
static const CodecTag voc_codec_tags[] = {
{CODEC_ID_PCM_U8, 0x00},
{CODEC_ID_ADPCM_SBPRO_4, 0x01},
{CODEC_ID_ADPCM_SBPRO_3, 0x02},
{CODEC_ID_ADPCM_SBPRO_2, 0x03},
{CODEC_ID_PCM_S16LE, 0x04},
{CODEC_ID_PCM_ALAW, 0x06},
{CODEC_ID_PCM_MULAW, 0x07},
{CODEC_ID_ADPCM_CT, 0x0200},
{0, 0},
};
static int voc_probe(AVProbeData *p)

17
libavformat/vocenc.c
View File

@ -19,26 +19,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "avformat.h"
#include "riff.h" /* for CodecTag */
#include "voc.h"
static const unsigned char voc_magic[] = "Creative Voice File\x1A";
static const CodecTag voc_codec_tags[] = {
{CODEC_ID_PCM_U8, 0x00},
{CODEC_ID_ADPCM_SBPRO_4, 0x01},
{CODEC_ID_ADPCM_SBPRO_3, 0x02},
{CODEC_ID_ADPCM_SBPRO_2, 0x03},
{CODEC_ID_PCM_S16LE, 0x04},
{CODEC_ID_PCM_ALAW, 0x06},
{CODEC_ID_PCM_MULAW, 0x07},
{CODEC_ID_ADPCM_CT, 0x0200},
{0, 0},
};
typedef struct voc_enc_context {
int param_written;
} voc_enc_context_t;