X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fdsicin.c;h=6a7c8b948acc41ba305f2fb6e4bfad77ad292e4e;hb=50dbe6b3544fa64d5611e16553bf542fd71276b8;hp=b00bfd29b35a8b8f609653dd04fde731eb7dd42f;hpb=6f3e0b21748b53fd7b0471196bbda1d7e561f4fe;p=ffmpeg diff --git a/libavformat/dsicin.c b/libavformat/dsicin.c index b00bfd29b35..6a7c8b948ac 100644 --- a/libavformat/dsicin.c +++ b/libavformat/dsicin.c @@ -2,29 +2,32 @@ * Delphine Software International CIN File Demuxer * Copyright (c) 2006 Gregory Montoir (cyx@users.sourceforge.net) * - * This file is part of FFmpeg. + * This file is part of Libav. * - * FFmpeg is free software; you can redistribute it and/or + * Libav 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, + * Libav 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 + * License along with Libav; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ /** - * @file dsicin.c + * @file * Delphine Software International CIN file demuxer */ +#include "libavutil/channel_layout.h" +#include "libavutil/intreadwrite.h" #include "avformat.h" +#include "internal.h" typedef struct CinFileHeader { @@ -69,19 +72,19 @@ static int cin_probe(AVProbeData *p) return AVPROBE_SCORE_MAX; } -static int cin_read_file_header(CinDemuxContext *cin, ByteIOContext *pb) { +static int cin_read_file_header(CinDemuxContext *cin, AVIOContext *pb) { CinFileHeader *hdr = &cin->file_header; - if (get_le32(pb) != 0x55AA0000) + if (avio_rl32(pb) != 0x55AA0000) return AVERROR_INVALIDDATA; - hdr->video_frame_size = get_le32(pb); - hdr->video_frame_width = get_le16(pb); - hdr->video_frame_height = get_le16(pb); - hdr->audio_frequency = get_le32(pb); - hdr->audio_bits = get_byte(pb); - hdr->audio_stereo = get_byte(pb); - hdr->audio_frame_size = get_le16(pb); + hdr->video_frame_size = avio_rl32(pb); + hdr->video_frame_width = avio_rl16(pb); + hdr->video_frame_height = avio_rl16(pb); + hdr->audio_frequency = avio_rl32(pb); + hdr->audio_bits = avio_r8(pb); + hdr->audio_stereo = avio_r8(pb); + hdr->audio_frame_size = avio_rl16(pb); if (hdr->audio_frequency != 22050 || hdr->audio_bits != 16 || hdr->audio_stereo != 0) return AVERROR_INVALIDDATA; @@ -89,12 +92,12 @@ static int cin_read_file_header(CinDemuxContext *cin, ByteIOContext *pb) { return 0; } -static int cin_read_header(AVFormatContext *s, AVFormatParameters *ap) +static int cin_read_header(AVFormatContext *s) { int rc; CinDemuxContext *cin = s->priv_data; CinFileHeader *hdr = &cin->file_header; - ByteIOContext *pb = &s->pb; + AVIOContext *pb = s->pb; AVStream *st; rc = cin_read_file_header(cin, pb); @@ -106,50 +109,52 @@ static int cin_read_header(AVFormatContext *s, AVFormatParameters *ap) cin->audio_buffer_size = 0; /* initialize the video decoder stream */ - st = av_new_stream(s, 0); + st = avformat_new_stream(s, NULL); if (!st) return AVERROR(ENOMEM); - av_set_pts_info(st, 32, 1, 12); + avpriv_set_pts_info(st, 32, 1, 12); cin->video_stream_index = st->index; - st->codec->codec_type = CODEC_TYPE_VIDEO; - st->codec->codec_id = CODEC_ID_DSICINVIDEO; + st->codec->codec_type = AVMEDIA_TYPE_VIDEO; + st->codec->codec_id = AV_CODEC_ID_DSICINVIDEO; st->codec->codec_tag = 0; /* no fourcc */ st->codec->width = hdr->video_frame_width; st->codec->height = hdr->video_frame_height; /* initialize the audio decoder stream */ - st = av_new_stream(s, 0); + st = avformat_new_stream(s, NULL); if (!st) return AVERROR(ENOMEM); - av_set_pts_info(st, 32, 1, 22050); + avpriv_set_pts_info(st, 32, 1, 22050); cin->audio_stream_index = st->index; - st->codec->codec_type = CODEC_TYPE_AUDIO; - st->codec->codec_id = CODEC_ID_DSICINAUDIO; + st->codec->codec_type = AVMEDIA_TYPE_AUDIO; + st->codec->codec_id = AV_CODEC_ID_DSICINAUDIO; st->codec->codec_tag = 0; /* no tag */ st->codec->channels = 1; + st->codec->channel_layout = AV_CH_LAYOUT_MONO; st->codec->sample_rate = 22050; - st->codec->bits_per_sample = 16; - st->codec->bit_rate = st->codec->sample_rate * st->codec->bits_per_sample * st->codec->channels; - st->codec->block_align = st->codec->channels * st->codec->bits_per_sample; + st->codec->bits_per_coded_sample = 8; + st->codec->bit_rate = st->codec->sample_rate * st->codec->bits_per_coded_sample * st->codec->channels; return 0; } -static int cin_read_frame_header(CinDemuxContext *cin, ByteIOContext *pb) { +static int cin_read_frame_header(CinDemuxContext *cin, AVIOContext *pb) { CinFrameHeader *hdr = &cin->frame_header; - hdr->video_frame_type = get_byte(pb); - hdr->audio_frame_type = get_byte(pb); - hdr->pal_colors_count = get_le16(pb); - hdr->video_frame_size = get_le32(pb); - hdr->audio_frame_size = get_le32(pb); + hdr->video_frame_type = avio_r8(pb); + hdr->audio_frame_type = avio_r8(pb); + hdr->pal_colors_count = avio_rl16(pb); + hdr->video_frame_size = avio_rl32(pb); + hdr->audio_frame_size = avio_rl32(pb); - if (url_feof(pb) || url_ferror(pb)) + if (pb->eof_reached || pb->error) return AVERROR(EIO); - if (get_le32(pb) != 0xAA55AA55) + if (avio_rl32(pb) != 0xAA55AA55) + return AVERROR_INVALIDDATA; + if (hdr->video_frame_size < 0 || hdr->audio_frame_size < 0) return AVERROR_INVALIDDATA; return 0; @@ -158,9 +163,10 @@ static int cin_read_frame_header(CinDemuxContext *cin, ByteIOContext *pb) { static int cin_read_packet(AVFormatContext *s, AVPacket *pkt) { CinDemuxContext *cin = s->priv_data; - ByteIOContext *pb = &s->pb; + AVIOContext *pb = s->pb; CinFrameHeader *hdr = &cin->frame_header; int rc, palette_type, pkt_size; + int ret; if (cin->audio_buffer_size == 0) { rc = cin_read_frame_header(cin, pb); @@ -177,8 +183,9 @@ static int cin_read_packet(AVFormatContext *s, AVPacket *pkt) /* palette and video packet */ pkt_size = (palette_type + 3) * hdr->pal_colors_count + hdr->video_frame_size; - if (av_new_packet(pkt, 4 + pkt_size)) - return AVERROR(ENOMEM); + ret = av_new_packet(pkt, 4 + pkt_size); + if (ret < 0) + return ret; pkt->stream_index = cin->video_stream_index; pkt->pts = cin->video_stream_pts++; @@ -188,8 +195,13 @@ static int cin_read_packet(AVFormatContext *s, AVPacket *pkt) pkt->data[2] = hdr->pal_colors_count >> 8; pkt->data[3] = hdr->video_frame_type; - if (get_buffer(pb, &pkt->data[4], pkt_size) != pkt_size) - return AVERROR(EIO); + ret = avio_read(pb, &pkt->data[4], pkt_size); + if (ret < 0) { + av_free_packet(pkt); + return ret; + } + if (ret < pkt_size) + av_shrink_packet(pkt, 4 + ret); /* sound buffer will be processed on next read_packet() call */ cin->audio_buffer_size = hdr->audio_frame_size; @@ -197,25 +209,23 @@ static int cin_read_packet(AVFormatContext *s, AVPacket *pkt) } /* audio packet */ - if (av_new_packet(pkt, cin->audio_buffer_size)) - return AVERROR(ENOMEM); + ret = av_get_packet(pb, pkt, cin->audio_buffer_size); + if (ret < 0) + return ret; pkt->stream_index = cin->audio_stream_index; pkt->pts = cin->audio_stream_pts; - cin->audio_stream_pts += cin->audio_buffer_size * 2 / cin->file_header.audio_frame_size; - - if (get_buffer(pb, pkt->data, cin->audio_buffer_size) != cin->audio_buffer_size) - return AVERROR(EIO); - + pkt->duration = cin->audio_buffer_size - (pkt->pts == 0); + cin->audio_stream_pts += pkt->duration; cin->audio_buffer_size = 0; return 0; } -AVInputFormat dsicin_demuxer = { - "dsicin", - "Delphine Software International CIN format", - sizeof(CinDemuxContext), - cin_probe, - cin_read_header, - cin_read_packet, +AVInputFormat ff_dsicin_demuxer = { + .name = "dsicin", + .long_name = NULL_IF_CONFIG_SMALL("Delphine Software International CIN"), + .priv_data_size = sizeof(CinDemuxContext), + .read_probe = cin_probe, + .read_header = cin_read_header, + .read_packet = cin_read_packet, };