X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Flxfdec.c;h=bc95a0820e03dca541d4d626d4ad35a9eb646c60;hb=f02edc4c06388bcd7b21130fac5ad8ef3fc8e948;hp=a4dc6d9c655e9aa49cdade09481e56b39df5fe23;hpb=ae628ec1fd7f54c102bf9e667a3edd404b9b9128;p=ffmpeg diff --git a/libavformat/lxfdec.c b/libavformat/lxfdec.c index a4dc6d9c655..bc95a0820e0 100644 --- a/libavformat/lxfdec.c +++ b/libavformat/lxfdec.c @@ -2,25 +2,26 @@ * LXF demuxer * Copyright (c) 2010 Tomas Härdin * - * 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 */ #include "libavutil/intreadwrite.h" #include "avformat.h" +#include "internal.h" #include "riff.h" #define LXF_PACKET_HEADER_SIZE 60 @@ -86,15 +87,15 @@ static int sync(AVFormatContext *s, uint8_t *header) uint8_t buf[LXF_IDENT_LENGTH]; int ret; - if ((ret = get_buffer(s->pb, buf, LXF_IDENT_LENGTH)) != LXF_IDENT_LENGTH) + if ((ret = avio_read(s->pb, buf, LXF_IDENT_LENGTH)) != LXF_IDENT_LENGTH) return ret < 0 ? ret : AVERROR_EOF; while (memcmp(buf, LXF_IDENT, LXF_IDENT_LENGTH)) { - if (url_feof(s->pb)) + if (s->pb->eof_reached) return AVERROR_EOF; memmove(buf, &buf[1], LXF_IDENT_LENGTH-1); - buf[LXF_IDENT_LENGTH-1] = get_byte(s->pb); + buf[LXF_IDENT_LENGTH-1] = avio_r8(s->pb); } memcpy(header, LXF_IDENT, LXF_IDENT_LENGTH); @@ -120,7 +121,7 @@ static int get_packet_header(AVFormatContext *s, uint8_t *header, uint32_t *form return ret; //read the rest of the packet header - if ((ret = get_buffer(pb, header + LXF_IDENT_LENGTH, + if ((ret = avio_read(pb, header + LXF_IDENT_LENGTH, LXF_PACKET_HEADER_SIZE - LXF_IDENT_LENGTH)) != LXF_PACKET_HEADER_SIZE - LXF_IDENT_LENGTH) { return ret < 0 ? ret : AVERROR_EOF; @@ -137,7 +138,7 @@ static int get_packet_header(AVFormatContext *s, uint8_t *header, uint32_t *form case 0: //video //skip VBI data and metadata - url_fskip(pb, (int64_t)(uint32_t)AV_RL32(&header[44]) + + avio_skip(pb, (int64_t)(uint32_t)AV_RL32(&header[44]) + (int64_t)(uint32_t)AV_RL32(&header[52])); break; case 1: @@ -174,14 +175,14 @@ static int get_packet_header(AVFormatContext *s, uint8_t *header, uint32_t *form //use audio packet size to determine video standard //for NTSC we have one 8008-sample audio frame per five video frames if (samples == LXF_SAMPLERATE * 5005 / 30000) { - av_set_pts_info(s->streams[0], 64, 1001, 30000); + avpriv_set_pts_info(s->streams[0], 64, 1001, 30000); } else { //assume PAL, but warn if we don't have 1920 samples if (samples != LXF_SAMPLERATE / 25) av_log(s, AV_LOG_WARNING, "video doesn't seem to be PAL or NTSC. guessing PAL\n"); - av_set_pts_info(s->streams[0], 64, 1, 25); + avpriv_set_pts_info(s->streams[0], 64, 1, 25); } //TODO: warning if track mask != (1 << channels) - 1? @@ -195,7 +196,7 @@ static int get_packet_header(AVFormatContext *s, uint8_t *header, uint32_t *form return ret; } -static int lxf_read_header(AVFormatContext *s, AVFormatParameters *ap) +static int lxf_read_header(AVFormatContext *s) { LXFDemuxContext *lxf = s->priv_data; AVIOContext *pb = s->pb; @@ -214,11 +215,11 @@ static int lxf_read_header(AVFormatContext *s, AVFormatParameters *ap) return AVERROR_INVALIDDATA; } - if ((ret = get_buffer(pb, header_data, LXF_HEADER_DATA_SIZE)) != LXF_HEADER_DATA_SIZE) + if ((ret = avio_read(pb, header_data, LXF_HEADER_DATA_SIZE)) != LXF_HEADER_DATA_SIZE) return ret < 0 ? ret : AVERROR_EOF; - if (!(st = av_new_stream(s, 0))) - return AVERROR_NOMEM; + if (!(st = avformat_new_stream(s, NULL))) + return AVERROR(ENOMEM); st->duration = AV_RL32(&header_data[32]); video_params = AV_RL32(&header_data[40]); @@ -243,19 +244,19 @@ static int lxf_read_header(AVFormatContext *s, AVFormatParameters *ap) av_log(s, AV_LOG_WARNING, "VBI data not yet supported\n"); if ((lxf->channels = (disk_params >> 2) & 0xF)) { - if (!(st = av_new_stream(s, 1))) - return AVERROR_NOMEM; + if (!(st = avformat_new_stream(s, NULL))) + return AVERROR(ENOMEM); st->codec->codec_type = AVMEDIA_TYPE_AUDIO; st->codec->sample_rate = LXF_SAMPLERATE; st->codec->channels = lxf->channels; - av_set_pts_info(st, 64, 1, st->codec->sample_rate); + avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate); } if (format == 1) { //skip extended field data - url_fskip(s->pb, (uint32_t)AV_RL32(&header[40])); + avio_skip(s->pb, (uint32_t)AV_RL32(&header[40])); } return 0; @@ -315,7 +316,7 @@ static int lxf_read_packet(AVFormatContext *s, AVPacket *pkt) //read non-20-bit audio data into lxf->temp so we can deplanarize it buf = ast && ast->codec->codec_id != CODEC_ID_PCM_LXF ? lxf->temp : pkt->data; - if ((ret2 = get_buffer(pb, buf, ret)) != ret) { + if ((ret2 = avio_read(pb, buf, ret)) != ret) { av_free_packet(pkt); return ret2 < 0 ? ret2 : AVERROR_EOF; } @@ -345,4 +346,3 @@ AVInputFormat ff_lxf_demuxer = { .read_packet = lxf_read_packet, .codec_tag = (const AVCodecTag* const []){lxf_tags, 0}, }; -