* qatar/master: (71 commits) movenc: Allow writing to a non-seekable output if using empty moov movenc: Support adding isml (smooth streaming live) metadata libavcodec: Don't crash in avcodec_encode_audio if time_base isn't set sunrast: Document the different Sun Raster file format types. sunrast: Add a check for experimental type. libspeexenc: use AVSampleFormat instead of deprecated/removed SampleFormat lavf: remove disabled FF_API_SET_PTS_INFO cruft lavf: remove disabled FF_API_OLD_INTERRUPT_CB cruft lavf: remove disabled FF_API_REORDER_PRIVATE cruft lavf: remove disabled FF_API_SEEK_PUBLIC cruft lavf: remove disabled FF_API_STREAM_COPY cruft lavf: remove disabled FF_API_PRELOAD cruft lavf: remove disabled FF_API_NEW_STREAM cruft lavf: remove disabled FF_API_RTSP_URL_OPTIONS cruft lavf: remove disabled FF_API_MUXRATE cruft lavf: remove disabled FF_API_FILESIZE cruft lavf: remove disabled FF_API_TIMESTAMP cruft lavf: remove disabled FF_API_LOOP_OUTPUT cruft lavf: remove disabled FF_API_LOOP_INPUT cruft lavf: remove disabled FF_API_AVSTREAM_QUALITY cruft ... Conflicts: doc/APIchanges libavcodec/8bps.c libavcodec/avcodec.h libavcodec/libx264.c libavcodec/mjpegbdec.c libavcodec/options.c libavcodec/sunrast.c libavcodec/utils.c libavcodec/version.h libavcodec/x86/h264_deblock.asm libavdevice/libdc1394.c libavdevice/v4l2.c libavformat/avformat.h libavformat/avio.c libavformat/avio.h libavformat/aviobuf.c libavformat/dv.c libavformat/mov.c libavformat/utils.c libavformat/version.h libavformat/wtv.c libavutil/Makefile libavutil/file.c libswscale/x86/input.asm libswscale/x86/swscale_mmx.c libswscale/x86/swscale_template.c tests/ref/lavf/ffm Merged-by: Michael Niedermayer <michaelni@gmx.at>
		
			
				
	
	
		
			94 lines
		
	
	
		
			2.8 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			94 lines
		
	
	
		
			2.8 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) {
 | 
						|
    AVStream *st = avformat_new_stream(s, NULL);
 | 
						|
    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 = {
 | 
						|
    .name         = "daud",
 | 
						|
    .long_name    = NULL_IF_CONFIG_SMALL("D-Cinema audio format"),
 | 
						|
    .extensions   = "302",
 | 
						|
    .audio_codec  = CODEC_ID_PCM_S24DAUD,
 | 
						|
    .video_codec  = CODEC_ID_NONE,
 | 
						|
    .write_header = daud_write_header,
 | 
						|
    .write_packet = daud_write_packet,
 | 
						|
    .flags        = AVFMT_NOTIMESTAMPS,
 | 
						|
};
 | 
						|
#endif
 |