This commit does for AVInputFormat what commit 59c9dc82f450638a3068deeb1db5c56f6d155752 did for AVOutputFormat: It adds a new type FFInputFormat, moves all the internals of AVInputFormat to it and adds a now reduced AVInputFormat as first member. This does not affect/improve extensibility of both public or private fields for demuxers (it is still a mess due to lavd). This is possible since 50f34172e0cca2cabc5836308ec66dbf93f5f2a3 (which removed the last usage of an internal field of AVInputFormat in fftools). (Hint: tools/probetest.c accesses the internals of FFInputFormat as well, but given that it is a testing tool this is not considered a problem.) Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
		
			
				
	
	
		
			64 lines
		
	
	
		
			2.1 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			64 lines
		
	
	
		
			2.1 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 "libavutil/channel_layout.h"
 | |
| #include "avformat.h"
 | |
| #include "demux.h"
 | |
| #include "internal.h"
 | |
| 
 | |
| static int daud_header(AVFormatContext *s) {
 | |
|     AVStream *st = avformat_new_stream(s, NULL);
 | |
|     if (!st)
 | |
|         return AVERROR(ENOMEM);
 | |
|     st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO;
 | |
|     st->codecpar->codec_id = AV_CODEC_ID_PCM_S24DAUD;
 | |
|     st->codecpar->codec_tag = MKTAG('d', 'a', 'u', 'd');
 | |
|     st->codecpar->ch_layout = (AVChannelLayout)AV_CHANNEL_LAYOUT_5POINT1;
 | |
|     st->codecpar->sample_rate = 96000;
 | |
|     st->codecpar->bit_rate = 3 * 6 * 96000 * 8;
 | |
|     st->codecpar->block_align = 3 * 6;
 | |
|     st->codecpar->bits_per_coded_sample = 24;
 | |
| 
 | |
|     avpriv_set_pts_info(st, 64, 1, st->codecpar->sample_rate);
 | |
| 
 | |
|     return 0;
 | |
| }
 | |
| 
 | |
| static int daud_packet(AVFormatContext *s, AVPacket *pkt) {
 | |
|     AVIOContext *pb = s->pb;
 | |
|     int ret, size;
 | |
|     if (avio_feof(pb))
 | |
|         return AVERROR_EOF;
 | |
|     size = avio_rb16(pb);
 | |
|     avio_rb16(pb); // unknown
 | |
|     ret = av_get_packet(pb, pkt, size);
 | |
|     pkt->stream_index = 0;
 | |
|     return ret;
 | |
| }
 | |
| 
 | |
| const FFInputFormat ff_daud_demuxer = {
 | |
|     .p.name         = "daud",
 | |
|     .p.long_name    = NULL_IF_CONFIG_SMALL("D-Cinema audio"),
 | |
|     .p.extensions   = "302,daud",
 | |
|     .read_header    = daud_header,
 | |
|     .read_packet    = daud_packet,
 | |
| };
 |