* qatar/master: ffmpeg: fix some indentation ffmpeg: fix operation with --disable-avfilter simple_idct: remove disabled code motion_est: remove disabled code vc1: remove disabled code fate: separate lavf-mxf_d10 test from lavf-mxf cabac: Move code only used in the cabac test program to cabac.c. ffplay: warn that -pix_fmt is no longer working, suggest alternative ffplay: warn that -s is no longer working, suggest alternative lavf: rename enc variable in utils.c:has_codec_parameters() lavf: use designated initialisers for all (de)muxers. wav: remove a use of deprecated AV_METADATA_ macro rmdec: remove useless ap parameter from rm_read_header_old() dct-test: remove write-only variable des: fix #if conditional around P_shuffle Use LOCAL_ALIGNED in ff_check_alignment() Conflicts: ffmpeg.c libavformat/avidec.c libavformat/matroskaenc.c libavformat/mp3enc.c libavformat/oggenc.c libavformat/utils.c tests/ref/lavf/mxf Merged-by: Michael Niedermayer <michaelni@gmx.at>
		
			
				
	
	
		
			97 lines
		
	
	
		
			2.7 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			97 lines
		
	
	
		
			2.7 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * D-Cinema audio demuxer
 | 
						|
 * Copyright (c) 2005 Reimar Döffinger
 | 
						|
 *
 | 
						|
 * 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"
 | 
						|
 | 
						|
static int daud_header(AVFormatContext *s, AVFormatParameters *ap) {
 | 
						|
    AVStream *st = av_new_stream(s, 0);
 | 
						|
    if (!st)
 | 
						|
        return AVERROR(ENOMEM);
 | 
						|
    st->codec->codec_type = AVMEDIA_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_coded_sample = 24;
 | 
						|
    return 0;
 | 
						|
}
 | 
						|
 | 
						|
static int daud_packet(AVFormatContext *s, AVPacket *pkt) {
 | 
						|
    AVIOContext *pb = s->pb;
 | 
						|
    int ret, size;
 | 
						|
    if (url_feof(pb))
 | 
						|
        return AVERROR(EIO);
 | 
						|
    size = avio_rb16(pb);
 | 
						|
    avio_rb16(pb); // unknown
 | 
						|
    ret = av_get_packet(pb, pkt, size);
 | 
						|
    pkt->stream_index = 0;
 | 
						|
    return ret;
 | 
						|
}
 | 
						|
 | 
						|
static int daud_write_header(struct AVFormatContext *s)
 | 
						|
{
 | 
						|
    AVCodecContext *codec = s->streams[0]->codec;
 | 
						|
    if (codec->channels!=6 || codec->sample_rate!=96000)
 | 
						|
        return -1;
 | 
						|
    return 0;
 | 
						|
}
 | 
						|
 | 
						|
static int daud_write_packet(struct AVFormatContext *s, AVPacket *pkt)
 | 
						|
{
 | 
						|
    if (pkt->size > 65535) {
 | 
						|
        av_log(s, AV_LOG_ERROR,
 | 
						|
               "Packet size too large for s302m. (%d > 65535)\n", pkt->size);
 | 
						|
        return -1;
 | 
						|
    }
 | 
						|
    avio_wb16(s->pb, pkt->size);
 | 
						|
    avio_wb16(s->pb, 0x8010); // unknown
 | 
						|
    avio_write(s->pb, pkt->data, pkt->size);
 | 
						|
    avio_flush(s->pb);
 | 
						|
    return 0;
 | 
						|
}
 | 
						|
 | 
						|
#if CONFIG_DAUD_DEMUXER
 | 
						|
AVInputFormat ff_daud_demuxer = {
 | 
						|
    .name           = "daud",
 | 
						|
    .long_name      = NULL_IF_CONFIG_SMALL("D-Cinema audio format"),
 | 
						|
    .read_header    = daud_header,
 | 
						|
    .read_packet    = daud_packet,
 | 
						|
    .extensions = "302",
 | 
						|
};
 | 
						|
#endif
 | 
						|
 | 
						|
#if CONFIG_DAUD_MUXER
 | 
						|
AVOutputFormat ff_daud_muxer =
 | 
						|
{
 | 
						|
    "daud",
 | 
						|
    NULL_IF_CONFIG_SMALL("D-Cinema audio format"),
 | 
						|
    NULL,
 | 
						|
    "302",
 | 
						|
    0,
 | 
						|
    CODEC_ID_PCM_S24DAUD,
 | 
						|
    CODEC_ID_NONE,
 | 
						|
    daud_write_header,
 | 
						|
    daud_write_packet,
 | 
						|
    .flags= AVFMT_NOTIMESTAMPS,
 | 
						|
};
 | 
						|
#endif
 |