X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fnuv.c;h=4abe54fd6e48933a701a63eea018ec4791054609;hb=fb6a32c30f408d7c5fcbb484b08328f439c0da42;hp=995775dc393ec71491c36fc32176046817fc8da7;hpb=00496302d67141e4b4ff2349eeaf7e40b05c13a4;p=ffmpeg diff --git a/libavformat/nuv.c b/libavformat/nuv.c index 995775dc393..4abe54fd6e4 100644 --- a/libavformat/nuv.c +++ b/libavformat/nuv.c @@ -1,6 +1,6 @@ /* * NuppelVideo demuxer. - * Copyright (c) 2006 Reimar Doeffinger. + * Copyright (c) 2006 Reimar Doeffinger * * This file is part of FFmpeg. * @@ -18,6 +18,8 @@ * 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/intreadwrite.h" #include "avformat.h" #include "riff.h" @@ -33,7 +35,7 @@ typedef enum { NUV_AUDIO = 'A', NUV_SEEKP = 'R', NUV_MYTHEXT = 'X' -} frametype_t; +} nuv_frametype; static int nuv_probe(AVProbeData *p) { if (!memcmp(p->buf, "NuppelVideo", 12)) @@ -55,7 +57,7 @@ static int nuv_probe(AVProbeData *p) { */ static int get_codec_data(ByteIOContext *pb, AVStream *vst, AVStream *ast, int myth) { - frametype_t frametype; + nuv_frametype frametype; if (!vst && !myth) return 1; // no codec data needed while (!url_feof(pb)) { @@ -84,7 +86,7 @@ static int get_codec_data(ByteIOContext *pb, AVStream *vst, if (vst) { vst->codec->codec_tag = get_le32(pb); vst->codec->codec_id = - codec_get_id(codec_bmp_tags, vst->codec->codec_tag); + ff_codec_get_id(ff_codec_bmp_tags, vst->codec->codec_tag); if (vst->codec->codec_tag == MKTAG('R', 'J', 'P', 'G')) vst->codec->codec_id = CODEC_ID_NUV; } else @@ -93,11 +95,11 @@ static int get_codec_data(ByteIOContext *pb, AVStream *vst, if (ast) { ast->codec->codec_tag = get_le32(pb); ast->codec->sample_rate = get_le32(pb); - ast->codec->bits_per_sample = get_le32(pb); + ast->codec->bits_per_coded_sample = get_le32(pb); ast->codec->channels = get_le32(pb); ast->codec->codec_id = - wav_codec_get_id(ast->codec->codec_tag, - ast->codec->bits_per_sample); + ff_wav_codec_get_id(ast->codec->codec_tag, + ast->codec->bits_per_coded_sample); ast->need_parsing = AVSTREAM_PARSE_FULL; } else url_fskip(pb, 4 * 4); @@ -121,14 +123,14 @@ static int get_codec_data(ByteIOContext *pb, AVStream *vst, static int nuv_header(AVFormatContext *s, AVFormatParameters *ap) { NUVContext *ctx = s->priv_data; ByteIOContext *pb = s->pb; - char id_string[12], version_string[5]; + char id_string[12]; double aspect, fps; int is_mythtv, width, height, v_packs, a_packs; int stream_nr = 0; AVStream *vst = NULL, *ast = NULL; get_buffer(pb, id_string, 12); is_mythtv = !memcmp(id_string, "MythTVVideo", 12); - get_buffer(pb, version_string, 5); + url_fskip(pb, 5); // version string url_fskip(pb, 3); // padding width = get_le32(pb); height = get_le32(pb); @@ -137,6 +139,8 @@ static int nuv_header(AVFormatContext *s, AVFormatParameters *ap) { get_byte(pb); // 'P' == progressive, 'I' == interlaced url_fskip(pb, 3); // padding aspect = av_int2dbl(get_le64(pb)); + if (aspect > 0.9999 && aspect < 1.0001) + aspect = 4.0 / 3.0; fps = av_int2dbl(get_le64(pb)); // number of packets per stream type, -1 means unknown, e.g. streaming @@ -155,8 +159,8 @@ static int nuv_header(AVFormatContext *s, AVFormatParameters *ap) { vst->codec->codec_id = CODEC_ID_NUV; vst->codec->width = width; vst->codec->height = height; - vst->codec->bits_per_sample = 10; - vst->codec->sample_aspect_ratio = av_d2q(aspect, 10000); + vst->codec->bits_per_coded_sample = 10; + vst->sample_aspect_ratio = av_d2q(aspect * height / width, 10000); vst->r_frame_rate = av_d2q(fps, 60000); av_set_pts_info(vst, 32, 1, 1000); } else @@ -173,7 +177,7 @@ static int nuv_header(AVFormatContext *s, AVFormatParameters *ap) { ast->codec->sample_rate = 44100; ast->codec->bit_rate = 2 * 2 * 44100 * 8; ast->codec->block_align = 2 * 2; - ast->codec->bits_per_sample = 16; + ast->codec->bits_per_coded_sample = 16; av_set_pts_info(ast, 32, 1, 1000); } else ctx->a_id = -1; @@ -189,13 +193,14 @@ static int nuv_packet(AVFormatContext *s, AVPacket *pkt) { NUVContext *ctx = s->priv_data; ByteIOContext *pb = s->pb; uint8_t hdr[HDRSIZE]; - frametype_t frametype; + nuv_frametype frametype; int ret, size; while (!url_feof(pb)) { int copyhdrsize = ctx->rtjpg_video ? HDRSIZE : 0; + uint64_t pos = url_ftell(pb); ret = get_buffer(pb, hdr, HDRSIZE); - if (ret <= 0) - return ret ? ret : -1; + if (ret < HDRSIZE) + return ret < 0 ? ret : AVERROR(EIO); frametype = hdr[0]; size = PKTSIZE(AV_RL32(&hdr[8])); switch (frametype) { @@ -213,12 +218,21 @@ static int nuv_packet(AVFormatContext *s, AVPacket *pkt) { ret = av_new_packet(pkt, copyhdrsize + size); if (ret < 0) return ret; - pkt->pos = url_ftell(pb) - copyhdrsize; + // HACK: we have no idea if it is a keyframe, + // but if we mark none seeking will not work at all. + pkt->flags |= PKT_FLAG_KEY; + pkt->pos = pos; pkt->pts = AV_RL32(&hdr[4]); pkt->stream_index = ctx->v_id; memcpy(pkt->data, hdr, copyhdrsize); ret = get_buffer(pb, pkt->data + copyhdrsize, size); - return ret; + if (ret < 0) { + av_free_packet(pkt); + return ret; + } + if (ret < size) + av_shrink_packet(pkt, copyhdrsize + ret); + return 0; case NUV_AUDIO: if (ctx->a_id < 0) { av_log(s, AV_LOG_ERROR, "Audio packet in file without audio stream!\n"); @@ -226,9 +240,12 @@ static int nuv_packet(AVFormatContext *s, AVPacket *pkt) { break; } ret = av_get_packet(pb, pkt, size); + pkt->flags |= PKT_FLAG_KEY; + pkt->pos = pos; pkt->pts = AV_RL32(&hdr[4]); pkt->stream_index = ctx->a_id; - return ret; + if (ret < 0) return ret; + return 0; case NUV_SEEKP: // contains no data, size value is invalid break; @@ -249,4 +266,5 @@ AVInputFormat nuv_demuxer = { nuv_packet, NULL, NULL, + .flags = AVFMT_GENERIC_INDEX, };