From patchwork Fri Dec 31 19:50:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John-Paul Stewart X-Patchwork-Id: 32974 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp14213988iog; Fri, 31 Dec 2021 11:50:52 -0800 (PST) X-Google-Smtp-Source: ABdhPJzDh2W/ky1lSvugl9ai1ICZWBlRG7cu4xIX9qYic/7ZBcoQMStHGiNpaPTvw4pAgMTBfWS9 X-Received: by 2002:a05:6402:f0f:: with SMTP id i15mr5120473eda.97.1640980252273; Fri, 31 Dec 2021 11:50:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1640980252; cv=none; d=google.com; s=arc-20160816; b=eAVUdxrT5NiP5Osxkz28m4BSCwRqQQwpD95lZQXkDSjwiHQqmKtktGdgEwMdasQvRx vpZf4OUlEYakIVVfmpGSMrQJo51A/3KkgA6ckcYiqwHTgE7UJmwBDYth5LEYROz+Flvo 6Qr3/PfOk88cu4tHES3rDVne8aBw2e0LQEklYEoiga8t/hVrnkqP9rgdWHhclKXwCDiH 8oWv6SdNkzYP+bukPncsn4KEONXJX7mLjQG0DtQhh8fDiSZh+dkx6rCmXrvKEI8cWs9j oUMae6Vw2ykb4GwOl6dw1Od4Sh7nehzh/bM0k1AjqWoWSnaU9GC7jxDnkq3JR1BBJy3h U0YQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=p7EiTdE9/aYeOwk2HvAWvBPLOlQA7MjmZwf1ULSaLhg=; b=evxJR8/8ejNw0ch1s6na8jaEHaTWYKCLpqzXgH+5AFDE0SZO2F1jKNEbay+AYK59iJ onmEsorUTi/137c365Bthc3ze/eYz2XHgQvFrWN6mchcDGq9Ed4Sqn+8a2ts/LZOWxbG UKxPphEN1pNuOV2Yudn3yX4UmfKtv8+yCANc6Bco9AEMxziucmeBQdTMbfVDpp/769hu C9I/ssCmdNfJLr+2ommfiuSrdXZJfhTfjO4Cv/k+IV1quoK4Ptfkr+2Qa8Voi8E7RoMp qwjgnkbXcJPFmgQi+2dV0/WTz3dTZLzSXwjSmt/ljPp+aEtciRAlwALBO3OvlJ71G8Us aj7w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@personalprojects.net header.s=20211201 header.b=jA5fDorm; 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 hg7si15592684ejc.321.2021.12.31.11.50.52; Fri, 31 Dec 2021 11:50:52 -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; dkim=neutral (body hash did not verify) header.i=@personalprojects.net header.s=20211201 header.b=jA5fDorm; 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 D093268B050; Fri, 31 Dec 2021 21:50:42 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail.personalprojects.net (mail.personalprojects.net [51.79.67.80]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0783568B07D for ; Fri, 31 Dec 2021 21:50:36 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=personalprojects.net; s=20211201; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=FPLm775FzecavwjTYkgDdjEbMVWgbXIujJ1DCY/FHN8=; b=jA5fDormEKUwBf8qkPX9MiK6xl pr76viMAa4+saHkTB3FEjVaUZCQ8ijxjNaAOpRAltPLSdic6J+meYYBG/zA1C1peTF0oyU3D1bbJy GO8j+6njhq7N72IzYrhJjsLEY+aDKY5+B9vxB0fOBBc6euljv6X/XqyHZlfCfTktI5og=; Received: from bras-base-simcon3012w-grc-05-64-231-188-105.dsl.bell.ca ([64.231.188.105] helo=courtney.binaryfoundry.ca) by mail.personalprojects.net with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1n3Nv8-0006Oe-Rb for ffmpeg-devel@ffmpeg.org; Fri, 31 Dec 2021 14:50:34 -0500 From: John-Paul Stewart To: ffmpeg-devel@ffmpeg.org Date: Fri, 31 Dec 2021 14:50:18 -0500 Message-Id: <20211231195019.16191-2-jpstewart@personalprojects.net> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20211231195019.16191-1-jpstewart@personalprojects.net> References: <20211231195019.16191-1-jpstewart@personalprojects.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avformat/mvdec: make audio stream conditional 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: tCY84Y/wI3B/ Only allocate an audio stream if there is one in the data. Silicon Graphics movie format will contain default values (16 bit samples, 2 audio channels, 22050 Hz sample rate) even when no audio is present in the file. This confuses FFmpeg into thinking such an audio stream is present with 0 samples in it. There is a flag value in the format to indicate whether or not audio is present. This patch checks that and behaves accordingly. Signed-off-by: John-Paul Stewart --- libavformat/mvdec.c | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/libavformat/mvdec.c b/libavformat/mvdec.c index ea955d2b11..7493bcc762 100644 --- a/libavformat/mvdec.c +++ b/libavformat/mvdec.c @@ -45,6 +45,10 @@ typedef struct MvContext { int aformat; ///< audio format } MvContext; +/* these magic numbers are defined in moviefile.h on Silicon Grahpics IRIX */ +#define MOVIE_SOUND 1 +#define MOVIE_SILENT 2 + #define AUDIO_FORMAT_SIGNED 401 static int mv_probe(const AVProbeData *p) @@ -305,20 +309,27 @@ static int mv_read_header(AVFormatContext *avctx) avio_skip(pb, 10); - /* allocate audio track first to prevent unnecessary seeking - * (audio packet always precede video packet for a given frame) */ - ast = avformat_new_stream(avctx, NULL); - if (!ast) - return AVERROR(ENOMEM); - vst = avformat_new_stream(avctx, NULL); if (!vst) return AVERROR(ENOMEM); fps = av_d2q(av_int2double(avio_rb64(pb)), INT_MAX); avpriv_set_pts_info(vst, 64, fps.den, fps.num); - avio_skip(pb, 4); vst->codecpar->codec_type = AVMEDIA_TYPE_VIDEO; vst->avg_frame_rate = fps; + + v = avio_rb16(pb); + if (v == MOVIE_SOUND) { + /* movie has sound, so allocate an audio stream */ + ast = avformat_new_stream(avctx, NULL); + if (!ast) + return AVERROR(ENOMEM); + + ast->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; + } else if (v != MOVIE_SILENT) + return AVERROR_INVALIDDATA; + + avio_skip(pb, 2); + vst->duration = vst->nb_frames = avio_rb32(pb); v = avio_rb32(pb); switch (v) { @@ -338,7 +349,7 @@ static int mv_read_header(AVFormatContext *avctx) vst->codecpar->height = avio_rb32(pb); avio_skip(pb, 12); - ast->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; + if (ast) { ast->nb_frames = vst->nb_frames; ast->codecpar->sample_rate = avio_rb32(pb); if (ast->codecpar->sample_rate <= 0) { @@ -373,6 +384,8 @@ static int mv_read_header(AVFormatContext *avctx) return AVERROR_INVALIDDATA; avio_skip(pb, 8); + } else + avio_skip(pb, 24); /* skip meaningless audio metadata */ var_read_metadata(avctx, "title", 0x80); var_read_metadata(avctx, "comment", 0x100); @@ -386,9 +399,11 @@ static int mv_read_header(AVFormatContext *avctx) if (avio_feof(pb)) return AVERROR_INVALIDDATA; avio_skip(pb, 8); + if (ast) { av_add_index_entry(ast, pos, timestamp, asize, 0, AVINDEX_KEYFRAME); - av_add_index_entry(vst, pos + asize, i, vsize, 0, AVINDEX_KEYFRAME); timestamp += asize / (ast->codecpar->channels * (uint64_t)bytes_per_sample); + } + av_add_index_entry(vst, pos + asize, i, vsize, 0, AVINDEX_KEYFRAME); } } else if (!version && avio_rb16(pb) == 3) { avio_skip(pb, 4); From patchwork Fri Dec 31 19:50:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John-Paul Stewart X-Patchwork-Id: 32975 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp14214049iog; Fri, 31 Dec 2021 11:51:01 -0800 (PST) X-Google-Smtp-Source: ABdhPJy0Pt3uJ7gH3wTk5qvfc2kPCF/lY1hKRMrd6h9Q3CiUausl3X7m9oEhrcHYQGqhjZJczieq X-Received: by 2002:aa7:cc10:: with SMTP id q16mr9528129edt.60.1640980260847; Fri, 31 Dec 2021 11:51:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1640980260; cv=none; d=google.com; s=arc-20160816; b=mcynHY23VVSFiCHwfkYyYE6LvesYb3NADbw4b8OUll+AawyxaoKlLWwLwc3jkMTbj4 tqxxlZ1jqhCqUc5h7LujH9JX+0XcOWYXqpDXKL1E0FsMzPG9DDzNV407o/8ZPpS68B1q wpjmddNaxiF13Jz8RdeZH10jCZTE8eGWNws7HB9z2uyFLT9mntB5FVaO6RPiaSEoHx6f GHqrDKr1ifyEyCHOfzc/ynCfzkpsx9zyq23a8ZdB3qEuSIrmVWrHjnFwxjBmuZtCXqo8 OcimrLQzlV39nU+SmRQj0iAwDNJ6434Tjwo8sX9vGYt8JhwhYQnsP3okmZ+NBVzsXCMK lubw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=ivJ70EI4N0eEJIUaVLP28DefdsYpTUu3GUP33l384cY=; b=D2R56d4p+FcA+TxPwbbeu9wC3wn0/rozZ342Ks1hHhLlfTRUB7XZx4EMgSZk42VoR3 AxsB/4otqcKIHD4jQsuEA89D3m7bLUSt3uH8ZKyFNaElKbPweTVncKo/06Lprhyq2FuS 0jeL1fNkxnL4VUG5oUZOJr+DrbAUQK3wr9yz8j+ybbzhsCZnLH76cMK3LvPKbxi9kR4H 9OwmxUkMQIsQpgDmReNXBHb77AZyjMp54qmJG0acLIR95InwzAYGwfyEReyyTdzEfjFy xYWLJgu+ZuIbdV+PL0jX4IGVwderKlFPvOgmmVnbdxib8Ep6V3AC+k90yMdZtLiPR7Am 5koQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@personalprojects.net header.s=20211201 header.b=uh5OExFU; 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 v18si363007edt.259.2021.12.31.11.51.00; Fri, 31 Dec 2021 11:51:00 -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; dkim=neutral (body hash did not verify) header.i=@personalprojects.net header.s=20211201 header.b=uh5OExFU; 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 F266668B091; Fri, 31 Dec 2021 21:50:44 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail.personalprojects.net (mail.personalprojects.net [51.79.67.80]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 15B2168B084 for ; Fri, 31 Dec 2021 21:50:38 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=personalprojects.net; s=20211201; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=81OecCl7m/fWPb7JLzk6gifugAs3opkn0J5Dvysyuts=; b=uh5OExFU4/eG5t0Qyn/1AvrskT JexCu5FLbfhiiTmcaCddDyxHXOjQwwuqap8G9PHTx5rEmSMC3wDKO4RHUMi08/kfA0bYadOxWJWkY f4sXOHtq/sWGKLG7vgn2QlcmSMwPIcAtpgcf0E6TuzJfsxUhb0XWJ2Czi6ZB1VjB3A0s=; Received: from bras-base-simcon3012w-grc-05-64-231-188-105.dsl.bell.ca ([64.231.188.105] helo=courtney.binaryfoundry.ca) by mail.personalprojects.net with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1n3NvA-0006Oe-QA for ffmpeg-devel@ffmpeg.org; Fri, 31 Dec 2021 14:50:36 -0500 From: John-Paul Stewart To: ffmpeg-devel@ffmpeg.org Date: Fri, 31 Dec 2021 14:50:19 -0500 Message-Id: <20211231195019.16191-3-jpstewart@personalprojects.net> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20211231195019.16191-1-jpstewart@personalprojects.net> References: <20211231195019.16191-1-jpstewart@personalprojects.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avformat/mvdec: re-indent after last commit 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: lRSUHvHf1T5v Signed-off-by: John-Paul Stewart --- libavformat/mvdec.c | 64 ++++++++++++++++++++++----------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/libavformat/mvdec.c b/libavformat/mvdec.c index 7493bcc762..469ac32092 100644 --- a/libavformat/mvdec.c +++ b/libavformat/mvdec.c @@ -350,40 +350,40 @@ static int mv_read_header(AVFormatContext *avctx) avio_skip(pb, 12); if (ast) { - ast->nb_frames = vst->nb_frames; - ast->codecpar->sample_rate = avio_rb32(pb); - if (ast->codecpar->sample_rate <= 0) { - av_log(avctx, AV_LOG_ERROR, "Invalid sample rate %d\n", ast->codecpar->sample_rate); - return AVERROR_INVALIDDATA; - } - avpriv_set_pts_info(ast, 33, 1, ast->codecpar->sample_rate); - - bytes_per_sample = avio_rb32(pb); - - v = avio_rb32(pb); - if (v == AUDIO_FORMAT_SIGNED) { - switch (bytes_per_sample) { - case 1: - ast->codecpar->codec_id = AV_CODEC_ID_PCM_S8; - break; - case 2: - ast->codecpar->codec_id = AV_CODEC_ID_PCM_S16BE; - break; - default: - avpriv_request_sample(avctx, "Audio sample size %i bytes", bytes_per_sample); - break; + ast->nb_frames = vst->nb_frames; + ast->codecpar->sample_rate = avio_rb32(pb); + if (ast->codecpar->sample_rate <= 0) { + av_log(avctx, AV_LOG_ERROR, "Invalid sample rate %d\n", ast->codecpar->sample_rate); + return AVERROR_INVALIDDATA; + } + avpriv_set_pts_info(ast, 33, 1, ast->codecpar->sample_rate); + + bytes_per_sample = avio_rb32(pb); + + v = avio_rb32(pb); + if (v == AUDIO_FORMAT_SIGNED) { + switch (bytes_per_sample) { + case 1: + ast->codecpar->codec_id = AV_CODEC_ID_PCM_S8; + break; + case 2: + ast->codecpar->codec_id = AV_CODEC_ID_PCM_S16BE; + break; + default: + avpriv_request_sample(avctx, "Audio sample size %i bytes", bytes_per_sample); + break; + } + } else { + avpriv_request_sample(avctx, "Audio compression (format %i)", v); } - } else { - avpriv_request_sample(avctx, "Audio compression (format %i)", v); - } - if (bytes_per_sample == 0) - return AVERROR_INVALIDDATA; + if (bytes_per_sample == 0) + return AVERROR_INVALIDDATA; - if (set_channels(avctx, ast, avio_rb32(pb)) < 0) - return AVERROR_INVALIDDATA; + if (set_channels(avctx, ast, avio_rb32(pb)) < 0) + return AVERROR_INVALIDDATA; - avio_skip(pb, 8); + avio_skip(pb, 8); } else avio_skip(pb, 24); /* skip meaningless audio metadata */ @@ -400,8 +400,8 @@ static int mv_read_header(AVFormatContext *avctx) return AVERROR_INVALIDDATA; avio_skip(pb, 8); if (ast) { - av_add_index_entry(ast, pos, timestamp, asize, 0, AVINDEX_KEYFRAME); - timestamp += asize / (ast->codecpar->channels * (uint64_t)bytes_per_sample); + av_add_index_entry(ast, pos, timestamp, asize, 0, AVINDEX_KEYFRAME); + timestamp += asize / (ast->codecpar->channels * (uint64_t)bytes_per_sample); } av_add_index_entry(vst, pos + asize, i, vsize, 0, AVINDEX_KEYFRAME); }