ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-19 21:06:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support D-Cinema audio demuxing.

Browse Source 
Originally committed as revision 4549 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Reimar Döffinger 2005-09-02 19:18:59 +00:00
parent b461b3bc4a
commit b93f738fde
4 changed files with 68 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/Makefile
View File

@ -17,7 +17,7 @@ OBJS+=mpeg.o mpegts.o mpegtsenc.o ffm.o crc.o img.o img2.o raw.o rm.o \
yuv4mpeg.o 4xm.o flvenc.o flvdec.o movenc.o psxstr.o idroq.o ipmovie.o \
nut.o wc3movie.o mp3.o westwood.o segafilm.o idcin.o flic.o \
sierravmd.o matroska.o sol.o electronicarts.o nsvdec.o asf.o asf-enc.o \
ogg2.o oggparsevorbis.o oggparsetheora.o oggparseflac.o
ogg2.o oggparsevorbis.o oggparsetheora.o oggparseflac.o daud.o
AMROBJS=
ifeq ($(AMR_NB),yes)
AMROBJS= amr.o

1
libavformat/allformats.c
View File

@ -109,6 +109,7 @@ void av_register_all(void)
sol_init();
ea_init();
nsvdec_init();
daud_init();
#ifdef CONFIG_ENCODERS
/* image formats */

3
libavformat/avformat.h
View File

@ -546,6 +546,9 @@ int ea_init(void);
/* nsvdec.c */
int nsvdec_init(void);
/* daud.c */
int daud_init(void);
#include "rtp.h"
#include "rtsp.h"

63
libavformat/daud.c Normal file
View File

@ -0,0 +1,63 @@
/*
* D-Cinema audio decoder.
* Copyright (c) 2005 Reimar Döffinger.
*
* This library 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 of the License, or (at your option) any later version.
*
* This library 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 this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "avformat.h"
static int daud_header(AVFormatContext *s, AVFormatParameters *ap) {
AVStream *st = av_new_stream(s, 0);
st->codec->codec_type = CODEC_TYPE_AUDIO;
st->codec->codec_id = CODEC_ID_PCM_S24DAUD;
st->codec->codec_tag = MKTAG('d', 'a', 'u', 'd');
st->codec->channels = 6;
st->codec->sample_rate = 96000;
st->codec->bit_rate = 3 * 6 * 96000 * 8;
st->codec->block_align = 3 * 6;
st->codec->bits_per_sample = 24;
return 0;
}
static int daud_packet(AVFormatContext *s, AVPacket *pkt) {
ByteIOContext *pb = &s->pb;
int ret, size;
if (url_feof(pb))
return AVERROR_IO;
size = get_be16(pb);
get_be16(pb); // unknown
ret = av_get_packet(pb, pkt, size);
pkt->stream_index = 0;
return ret;
}
static AVInputFormat daud_iformat = {
"daud",
"D-Cinema audio format",
0,
NULL,
daud_header,
daud_packet,
NULL,
NULL,
.extensions = "302",
};
int daud_init(void)
{
av_register_input_format(&daud_iformat);
return 0;
}