From patchwork Sat Mar 2 23:36:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Ross X-Patchwork-Id: 46712 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a919:b0:19e:cdac:8cce with SMTP id cd25csp2072719pzb; Sat, 2 Mar 2024 15:37:06 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWU0IYjnhyM5u4UJcxSWh1+ij6NtdxTnb+OH0poybqCyUjZrPHZToz9WRq/ri6OqXg+5SwU+mQcfheOz4kIAowzj64AqRYG//akzA== X-Google-Smtp-Source: AGHT+IEizsXNQa17WF3oYJ5E9sRFsAvJjb46GxD29XpO1jgDCVK9TJrRpZkQhJEHkL27Tm/K1hPc X-Received: by 2002:a17:906:b845:b0:a44:e3ec:6fcb with SMTP id ga5-20020a170906b84500b00a44e3ec6fcbmr1396662ejb.41.1709422626534; Sat, 02 Mar 2024 15:37:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709422626; cv=none; d=google.com; s=arc-20160816; b=bqBiCcMEKRBWkbUcsdnzyjyiZciLzLwsOV7BZTH/Vr1qfZLRfJoquzu705JjvFHSxH M/yesRP4ziNoeL0bPtekySRWXd0TVZplJ5VdUVhA2jEooaQUeP7PA7GY3nx7V3f5bgd0 lC6AczDpqd9ju5/6OMgwApLeAGGrRTeAjaHJSPQ3njHwW65SqRgixDW0VDPqKlv9zXeo Jyf4iz96ZTRYUdPDKj76hph2r1ObzQOE+OtBO4ACU5EaCkBsqJ2neIQ9D94SHjH4db9/ WaGpQUmUcoOxJPkYLv0NFBM/16zqnyWgyRavFRKmFwiP3vGbfRsNauHK0t4ihNMHYB2i 7jSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:message-id:to:from:date:delivered-to; bh=IXwd8azgPogYhDZBr777uoVsD617JBkLVvW0Zt0JGlM=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=wYW7WEVnQ6rfGqOsAAOnzKetjdz2U/5AkvA9Rnu4Hurdh4TDnx0SvsUcF6Nk7KSrNN pn9wWkU3E9BIdso4LtIBJqq99gGZYVSMBohh8S8UZrWNL+IYBFNHtv1k0BgCKIAPQqgV EKhW4LRZ//4o8vhcvotNdiB/5X1VNfodCnqZrnghX2ZP8h8vCJx4nCiJeD8r79kHWJkn barHnA2gaZ6GJTge4cnqd70BrsfUJ9QoQsZe3H42LKj1gYa1WIsqYFCCeK1xyB1fNLqI lAdgSTG7S1eTJjXa0S9vQkn9kZE8VXFNpYjSicZFgsVok8k2AuXmD2zIv7TjxkyEo5ll zqCQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id w7-20020a170906480700b00a43f6ebbb4fsi2656087ejq.283.2024.03.02.15.37.06; Sat, 02 Mar 2024 15:37:06 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3ED0268D322; Sun, 3 Mar 2024 01:37:03 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mx.sdf.org (mx.sdf.org [205.166.94.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 893A868D13E for ; Sun, 3 Mar 2024 01:36:55 +0200 (EET) Received: from 39591f7afd128dc79d9aaff2e0abc776 ([1.145.170.249]) (authenticated (0 bits)) by mx.sdf.org (8.16.1/8.14.3) with ESMTPSA id 422NamqM022581 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits) verified NO) for ; Sat, 2 Mar 2024 23:36:52 GMT Date: Sun, 3 Mar 2024 10:36:42 +1100 From: Peter Ross To: ffmpeg-devel@ffmpeg.org Message-ID: <85a99241dc108fad30290ffc7524541227c7dfdd.1709422402.git.pross@xvid.org> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] avformat/rmdec: support RMHD file format X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: lBEEObpz3zHF Signed-off-by: Peter Ross --- libavformat/rmdec.c | 43 ++++++++++++++++++++++++++++++------------- 1 file changed, 30 insertions(+), 13 deletions(-) diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c index 0f1534b582..e7f2480464 100644 --- a/libavformat/rmdec.c +++ b/libavformat/rmdec.c @@ -428,7 +428,8 @@ skip: static int rm_read_index(AVFormatContext *s) { AVIOContext *pb = s->pb; - unsigned int size, n_pkts, str_id, next_off, n, pos, pts; + unsigned int size, ver, n_pkts, str_id, next_off, n, pts; + uint64_t pos; AVStream *st; do { @@ -437,10 +438,14 @@ static int rm_read_index(AVFormatContext *s) size = avio_rb32(pb); if (size < 20) return -1; - avio_skip(pb, 2); + ver = avio_rb16(pb); + if (ver != 0 && ver != 2) + return AVERROR_INVALIDDATA; n_pkts = avio_rb32(pb); str_id = avio_rb16(pb); next_off = avio_rb32(pb); + if (ver == 2) + avio_skip(pb, 4); for (n = 0; n < s->nb_streams; n++) if (s->streams[n]->id == str_id) { st = s->streams[n]; @@ -465,7 +470,7 @@ static int rm_read_index(AVFormatContext *s) return AVERROR_INVALIDDATA; avio_skip(pb, 2); pts = avio_rb32(pb); - pos = avio_rb32(pb); + pos = (ver == 0) ? avio_rb32(pb) : avio_rb64(pb); avio_skip(pb, 4); /* packet no. */ av_add_index_entry(st, pos, pts, 0, 0, AVINDEX_KEYFRAME); @@ -546,8 +551,10 @@ static int rm_read_header(AVFormatContext *s) AVIOContext *pb = s->pb; unsigned int tag; int tag_size; + int ver; unsigned int start_time, duration; - unsigned int data_off = 0, indx_off = 0; + unsigned int data_off = 0; + uint64_t indx_off = 0; char buf[128], mime[128]; int flags = 0; int ret; @@ -558,7 +565,7 @@ static int rm_read_header(AVFormatContext *s) if (tag == MKTAG('.', 'r', 'a', 0xfd)) { /* very old .ra format */ return rm_read_header_old(s); - } else if (tag != MKTAG('.', 'R', 'M', 'F')) { + } else if (tag != MKTAG('.', 'R', 'M', 'F') && tag != MKTAG('.', 'R', 'M', 'P')) { return AVERROR(EIO); } @@ -572,10 +579,11 @@ static int rm_read_header(AVFormatContext *s) return AVERROR_INVALIDDATA; tag = avio_rl32(pb); tag_size = avio_rb32(pb); - avio_rb16(pb); + ver = avio_rb16(pb); av_log(s, AV_LOG_TRACE, "tag=%s size=%d\n", av_fourcc2str(tag), tag_size); - if (tag_size < 10 && tag != MKTAG('D', 'A', 'T', 'A')) + if ((tag_size < 10 && tag != MKTAG('D', 'A', 'T', 'A')) || + (ver != 0 && ver != 2)) return AVERROR_INVALIDDATA; switch(tag) { case MKTAG('P', 'R', 'O', 'P'): @@ -588,7 +596,7 @@ static int rm_read_header(AVFormatContext *s) duration = avio_rb32(pb); /* duration */ s->duration = av_rescale(duration, AV_TIME_BASE, 1000); avio_rb32(pb); /* preroll */ - indx_off = avio_rb32(pb); /* index offset */ + indx_off = (ver == 0) ? avio_rb32(pb) : avio_rb64(pb); /* index offset */ data_off = avio_rb32(pb); /* data offset */ avio_rb16(pb); /* nb streams */ flags = avio_rb16(pb); /* flags */ @@ -650,15 +658,17 @@ static int rm_read_header(AVFormatContext *s) rm->nb_packets = avio_rb32(pb); /* number of packets */ if (!rm->nb_packets && (flags & 4)) rm->nb_packets = 3600 * 25; + if (ver == 2) + avio_skip(pb, 12); avio_rb32(pb); /* next data header */ if (!data_off) - data_off = avio_tell(pb) - 18; + data_off = avio_tell(pb) - (ver == 0 ? 18 : 30); if (indx_off && (pb->seekable & AVIO_SEEKABLE_NORMAL) && !(s->flags & AVFMT_FLAG_IGNIDX) && avio_seek(pb, indx_off, SEEK_SET) >= 0) { rm_read_index(s); - avio_seek(pb, data_off + 18, SEEK_SET); + avio_seek(pb, data_off + (ver == 0 ? 18 : 30), SEEK_SET); } return 0; @@ -703,12 +713,19 @@ static int rm_sync(AVFormatContext *s, int64_t *timestamp, int *flags, int *stre state= (state<<8) + avio_r8(pb); if(state == MKBETAG('I', 'N', 'D', 'X')){ + int ver; int n_pkts; int64_t expected_len; len = avio_rb32(pb); - avio_skip(pb, 2); + ver = avio_rb16(pb); + if (ver != 0 && ver != 2) + return AVERROR_INVALIDDATA; n_pkts = avio_rb32(pb); - expected_len = 20 + n_pkts * 14LL; + + if (ver == 0) + expected_len = 20 + n_pkts * 14LL; + else if (ver == 2) + expected_len = 24 + n_pkts * 18LL; if (len == 20 && expected_len <= INT_MAX) /* some files don't add index entries to chunk size... */ @@ -1078,7 +1095,7 @@ static int rm_probe(const AVProbeData *p) { /* check file header */ if ((p->buf[0] == '.' && p->buf[1] == 'R' && - p->buf[2] == 'M' && p->buf[3] == 'F' && + p->buf[2] == 'M' && (p->buf[3] == 'F' || p->buf[3] == 'P') && p->buf[4] == 0 && p->buf[5] == 0) || (p->buf[0] == '.' && p->buf[1] == 'r' && p->buf[2] == 'a' && p->buf[3] == 0xfd))