X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fr3d.c;h=7f0e8de0e462bdb1497798d579cb822587fbd372;hb=effe3b9575bf5770b228df37675a976a68e8a5e3;hp=39f97ff9aaf843a7ca234e407ac5ff3c39b8338f;hpb=76aa876e69cf78a40821e66dec0a1006e4eb23ec;p=ffmpeg diff --git a/libavformat/r3d.c b/libavformat/r3d.c index 39f97ff9aaf..7f0e8de0e46 100644 --- a/libavformat/r3d.c +++ b/libavformat/r3d.c @@ -2,27 +2,30 @@ * R3D REDCODE demuxer * Copyright (c) 2008 Baptiste Coudurier * - * 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 */ //#define DEBUG #include "libavutil/intreadwrite.h" +#include "libavutil/dict.h" +#include "libavutil/mathematics.h" #include "avformat.h" +#include "internal.h" typedef struct { unsigned video_offsets_count; @@ -43,16 +46,17 @@ static int read_atom(AVFormatContext *s, Atom *atom) if (atom->size < 8) return -1; atom->tag = avio_rl32(s->pb); - av_dlog(s, "atom %d %.4s offset %#llx\n", + av_dlog(s, "atom %u %.4s offset %#"PRIx64"\n", atom->size, (char*)&atom->tag, atom->offset); return atom->size; } static int r3d_read_red1(AVFormatContext *s) { - AVStream *st = av_new_stream(s, 0); + AVStream *st = avformat_new_stream(s, NULL); char filename[258]; - int tmp, tmp2; + int tmp; + int av_unused tmp2; if (!st) return AVERROR(ENOMEM); @@ -67,12 +71,12 @@ static int r3d_read_red1(AVFormatContext *s) av_dlog(s, "unknown1 %d\n", tmp); tmp = avio_rb32(s->pb); - av_set_pts_info(st, 32, 1, tmp); + avpriv_set_pts_info(st, 32, 1, tmp); tmp = avio_rb32(s->pb); // filenum av_dlog(s, "filenum %d\n", tmp); - avio_seek(s->pb, 32, SEEK_CUR); // unknown + avio_skip(s->pb, 32); // unknown st->codec->width = avio_rb32(s->pb); st->codec->height = avio_rb32(s->pb); @@ -86,18 +90,18 @@ static int r3d_read_red1(AVFormatContext *s) tmp = avio_r8(s->pb); // audio channels av_dlog(s, "audio channels %d\n", tmp); if (tmp > 0) { - AVStream *ast = av_new_stream(s, 1); + AVStream *ast = avformat_new_stream(s, NULL); if (!ast) return AVERROR(ENOMEM); ast->codec->codec_type = AVMEDIA_TYPE_AUDIO; ast->codec->codec_id = CODEC_ID_PCM_S32BE; ast->codec->channels = tmp; - av_set_pts_info(ast, 32, 1, st->time_base.den); + avpriv_set_pts_info(ast, 32, 1, st->time_base.den); } avio_read(s->pb, filename, 257); filename[sizeof(filename)-1] = 0; - av_metadata_set2(&st->metadata, "filename", filename, 0); + av_dict_set(&st->metadata, "filename", filename, 0); av_dlog(s, "filename %s\n", filename); av_dlog(s, "resolution %dx%d\n", st->codec->width, st->codec->height); @@ -131,7 +135,7 @@ static int r3d_read_rdvo(AVFormatContext *s, Atom *atom) if (st->codec->time_base.den) st->duration = (uint64_t)r3d->video_offsets_count* st->time_base.den*st->codec->time_base.num/st->codec->time_base.den; - av_dlog(s, "duration %lld\n", st->duration); + av_dlog(s, "duration %"PRId64"\n", st->duration); return 0; } @@ -139,7 +143,7 @@ static int r3d_read_rdvo(AVFormatContext *s, Atom *atom) static void r3d_read_reos(AVFormatContext *s) { R3DContext *r3d = s->priv_data; - int tmp; + int av_unused tmp; r3d->rdvo_offset = avio_rb32(s->pb); avio_rb32(s->pb); // rdvs offset @@ -152,10 +156,10 @@ static void r3d_read_reos(AVFormatContext *s) tmp = avio_rb32(s->pb); av_dlog(s, "num audio chunks %d\n", tmp); - avio_seek(s->pb, 6*4, SEEK_CUR); + avio_skip(s->pb, 6*4); } -static int r3d_read_header(AVFormatContext *s, AVFormatParameters *ap) +static int r3d_read_header(AVFormatContext *s) { R3DContext *r3d = s->priv_data; Atom atom; @@ -176,8 +180,8 @@ static int r3d_read_header(AVFormatContext *s, AVFormatParameters *ap) } s->data_offset = avio_tell(s->pb); - av_dlog(s, "data offset %#llx\n", s->data_offset); - if (url_is_streamed(s->pb)) + av_dlog(s, "data offset %#"PRIx64"\n", s->data_offset); + if (!s->pb->seekable) return 0; // find REOB/REOF/REOS to load index avio_seek(s->pb, avio_size(s->pb)-48-8, SEEK_SET); @@ -209,7 +213,8 @@ static int r3d_read_header(AVFormatContext *s, AVFormatParameters *ap) static int r3d_read_redv(AVFormatContext *s, AVPacket *pkt, Atom *atom) { AVStream *st = s->streams[0]; - int tmp, tmp2; + int tmp; + int av_unused tmp2; uint64_t pos = avio_tell(s->pb); unsigned dts; int ret; @@ -255,7 +260,7 @@ static int r3d_read_redv(AVFormatContext *s, AVPacket *pkt, Atom *atom) if (st->codec->time_base.den) pkt->duration = (uint64_t)st->time_base.den* st->codec->time_base.num/st->codec->time_base.den; - av_dlog(s, "pkt dts %lld duration %d\n", pkt->dts, pkt->duration); + av_dlog(s, "pkt dts %"PRId64" duration %d\n", pkt->dts, pkt->duration); return 0; } @@ -263,7 +268,8 @@ static int r3d_read_redv(AVFormatContext *s, AVPacket *pkt, Atom *atom) static int r3d_read_reda(AVFormatContext *s, AVPacket *pkt, Atom *atom) { AVStream *st = s->streams[1]; - int tmp, tmp2, samples, size; + int av_unused tmp, tmp2; + int samples, size; uint64_t pos = avio_tell(s->pb); unsigned dts; int ret; @@ -299,7 +305,7 @@ static int r3d_read_reda(AVFormatContext *s, AVPacket *pkt, Atom *atom) pkt->stream_index = 1; pkt->dts = dts; pkt->duration = av_rescale(samples, st->time_base.den, st->codec->sample_rate); - av_dlog(s, "pkt dts %lld duration %d samples %d sample rate %d\n", + av_dlog(s, "pkt dts %"PRId64" duration %d samples %d sample rate %d\n", pkt->dts, pkt->duration, samples, st->codec->sample_rate); return 0; @@ -332,7 +338,7 @@ static int r3d_read_packet(AVFormatContext *s, AVPacket *pkt) break; default: skip: - avio_seek(s->pb, atom.size-8, SEEK_CUR); + avio_skip(s->pb, atom.size-8); } } return err; @@ -356,7 +362,8 @@ static int r3d_seek(AVFormatContext *s, int stream_index, int64_t sample_time, i frame_num = sample_time*st->codec->time_base.den/ ((int64_t)st->codec->time_base.num*st->time_base.den); - av_dlog(s, "seek frame num %d timestamp %lld\n", frame_num, sample_time); + av_dlog(s, "seek frame num %d timestamp %"PRId64"\n", + frame_num, sample_time); if (frame_num < r3d->video_offsets_count) { avio_seek(s->pb, r3d->video_offsets_count, SEEK_SET); @@ -378,12 +385,12 @@ static int r3d_close(AVFormatContext *s) } AVInputFormat ff_r3d_demuxer = { - "r3d", - NULL_IF_CONFIG_SMALL("REDCODE R3D format"), - sizeof(R3DContext), - r3d_probe, - r3d_read_header, - r3d_read_packet, - r3d_close, - r3d_seek, + .name = "r3d", + .long_name = NULL_IF_CONFIG_SMALL("REDCODE R3D format"), + .priv_data_size = sizeof(R3DContext), + .read_probe = r3d_probe, + .read_header = r3d_read_header, + .read_packet = r3d_read_packet, + .read_close = r3d_close, + .read_seek = r3d_seek, };