X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fpva.c;h=55883d7e9d65c9f32f0564699c18106116ca5d5c;hb=6149485f6c6c2e600987a2759d97c546d4cf5da0;hp=4255f8a71c52e9651ee267c4ea360f19ea47fd87;hpb=6125d8659712d27dbc5459b54a84876981a7af3a;p=ffmpeg diff --git a/libavformat/pva.c b/libavformat/pva.c index 4255f8a71c5..55883d7e9d6 100644 --- a/libavformat/pva.c +++ b/libavformat/pva.c @@ -2,20 +2,20 @@ * TechnoTrend PVA (.pva) demuxer * Copyright (c) 2007, 2008 Ivo van Poorten * - * 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 */ @@ -43,17 +43,17 @@ static int pva_probe(AVProbeData * pd) { static int pva_read_header(AVFormatContext *s, AVFormatParameters *ap) { AVStream *st; - if (!(st = av_new_stream(s, 0))) + if (!(st = avformat_new_stream(s, NULL))) return AVERROR(ENOMEM); - st->codec->codec_type = CODEC_TYPE_VIDEO; + st->codec->codec_type = AVMEDIA_TYPE_VIDEO; st->codec->codec_id = CODEC_ID_MPEG2VIDEO; st->need_parsing = AVSTREAM_PARSE_FULL; av_set_pts_info(st, 32, 1, 90000); av_add_index_entry(st, 0, 0, 0, 0, AVINDEX_KEYFRAME); - if (!(st = av_new_stream(s, 1))) + if (!(st = avformat_new_stream(s, NULL))) return AVERROR(ENOMEM); - st->codec->codec_type = CODEC_TYPE_AUDIO; + st->codec->codec_type = AVMEDIA_TYPE_AUDIO; st->codec->codec_id = CODEC_ID_MP2; st->need_parsing = AVSTREAM_PARSE_FULL; av_set_pts_info(st, 33, 1, 90000); @@ -67,20 +67,20 @@ static int pva_read_header(AVFormatContext *s, AVFormatParameters *ap) { static int read_part_of_packet(AVFormatContext *s, int64_t *pts, int *len, int *strid, int read_packet) { - ByteIOContext *pb = s->pb; + AVIOContext *pb = s->pb; PVAContext *pvactx = s->priv_data; int syncword, streamid, reserved, flags, length, pts_flag; int64_t pva_pts = AV_NOPTS_VALUE, startpos; recover: - startpos = url_ftell(pb); + startpos = avio_tell(pb); - syncword = get_be16(pb); - streamid = get_byte(pb); - get_byte(pb); /* counter not used */ - reserved = get_byte(pb); - flags = get_byte(pb); - length = get_be16(pb); + syncword = avio_rb16(pb); + streamid = avio_r8(pb); + avio_r8(pb); /* counter not used */ + reserved = avio_r8(pb); + flags = avio_r8(pb); + length = avio_rb16(pb); pts_flag = flags & 0x10; @@ -101,7 +101,7 @@ recover: } if (streamid == PVA_VIDEO_PAYLOAD && pts_flag) { - pva_pts = get_be32(pb); + pva_pts = avio_rb32(pb); length -= 4; } else if (streamid == PVA_AUDIO_PAYLOAD) { /* PVA Audio Packets either start with a signaled PES packet or @@ -113,22 +113,22 @@ recover: pes_flags; unsigned char pes_header_data[256]; - pes_signal = get_be24(pb); - get_byte(pb); - pes_packet_length = get_be16(pb); - pes_flags = get_be16(pb); - pes_header_data_length = get_byte(pb); + pes_signal = avio_rb24(pb); + avio_r8(pb); + pes_packet_length = avio_rb16(pb); + pes_flags = avio_rb16(pb); + pes_header_data_length = avio_r8(pb); if (pes_signal != 1) { pva_log(s, AV_LOG_WARNING, "expected signaled PES packet, " "trying to recover\n"); - url_fskip(pb, length - 9); + avio_skip(pb, length - 9); if (!read_packet) return AVERROR(EIO); goto recover; } - get_buffer(pb, pes_header_data, pes_header_data_length); + avio_read(pb, pes_header_data, pes_header_data_length); length -= 9 + pes_header_data_length; pes_packet_length -= 3 + pes_header_data_length; @@ -157,7 +157,7 @@ recover: } static int pva_read_packet(AVFormatContext *s, AVPacket *pkt) { - ByteIOContext *pb = s->pb; + AVIOContext *pb = s->pb; int64_t pva_pts; int ret, length, streamid; @@ -173,7 +173,7 @@ static int pva_read_packet(AVFormatContext *s, AVPacket *pkt) { static int64_t pva_read_timestamp(struct AVFormatContext *s, int stream_index, int64_t *pos, int64_t pos_limit) { - ByteIOContext *pb = s->pb; + AVIOContext *pb = s->pb; PVAContext *pvactx = s->priv_data; int length, streamid; int64_t res = AV_NOPTS_VALUE; @@ -182,7 +182,7 @@ static int64_t pva_read_timestamp(struct AVFormatContext *s, int stream_index, while (*pos < pos_limit) { res = AV_NOPTS_VALUE; - url_fseek(pb, *pos, SEEK_SET); + avio_seek(pb, *pos, SEEK_SET); pvactx->continue_pes = 0; if (read_part_of_packet(s, &res, &length, &streamid, 0)) { @@ -190,7 +190,7 @@ static int64_t pva_read_timestamp(struct AVFormatContext *s, int stream_index, continue; } if (streamid - 1 != stream_index || res == AV_NOPTS_VALUE) { - *pos = url_ftell(pb) + length; + *pos = avio_tell(pb) + length; continue; } break; @@ -200,12 +200,12 @@ static int64_t pva_read_timestamp(struct AVFormatContext *s, int stream_index, return res; } -AVInputFormat pva_demuxer = { - "pva", - NULL_IF_CONFIG_SMALL("TechnoTrend PVA file and stream format"), - sizeof(PVAContext), - pva_probe, - pva_read_header, - pva_read_packet, +AVInputFormat ff_pva_demuxer = { + .name = "pva", + .long_name = NULL_IF_CONFIG_SMALL("TechnoTrend PVA file and stream format"), + .priv_data_size = sizeof(PVAContext), + .read_probe = pva_probe, + .read_header = pva_read_header, + .read_packet = pva_read_packet, .read_timestamp = pva_read_timestamp };