From patchwork Sat Jan 1 01:11:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John-Paul Stewart X-Patchwork-Id: 32977 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp14375120iog; Fri, 31 Dec 2021 17:12:17 -0800 (PST) X-Google-Smtp-Source: ABdhPJyeCdx2j52JykY0rkcifZRHckFACEU9BrV4kMYH5aPg2vlWON9W0C8utLk4w236mxkghHNf X-Received: by 2002:a17:906:2659:: with SMTP id i25mr29823927ejc.531.1640999536796; Fri, 31 Dec 2021 17:12:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1640999536; cv=none; d=google.com; s=arc-20160816; b=EO23Rr6nfQVqX2NHXIXQTndcAZzsb1Tus9/kp7X9R9SuTl8QaVcGUZj6PaGkqOw2cJ ebDkf3P/CsMMpycvhd/BFIQgO2x9ALjJj0RlSAGviIiYOH4hO1ipSxWqjuD4cxBPRCj2 wSwJKwldEUpvHNeTHcM/Tqy4p1H/QkcPFUD8pIfMsW+hYkB69FsqAjnGezX30meGxRWQ E5j+40WLgHwu87jJ0WhcRSAidSQMsApiUTFlpv0CmOS+5kjH6w68dn0H0UfsqsHw/rMa dWsZPRfVywJxeQvcDH5FtUVxAZ2RJDtwRh3/Bg/dGzWxgGbH5s21Sd2ZrFdwd3rADGx2 J4pg== 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=LN0vb0aWOCJHV+S+a6/zcy8QynPdt5Z5kNd+w1LJ1Hg=; b=C9hnE+TTqZYfctEE8ZnhPMfHbWWt4LBBUxBLHI22JY4zrHROkeww/3TkpQqkQHUtRa 362bU+RErn0n3Pd7kFNFelBSbNzSI3nYOMzUnDkbOV9lsFek2MKuWQuRXpMuDxBjhxmz LlDzfPUb5lJAi9X1NBXII9NQX58jp5WuOvJaqNsce/pHSQoaLn3Y+vlPq2TJHH2ACAeQ oW3Ml4zl4Si79foQ7goXFhy0IyumI7LPh2+jbgc5oQ1pSAON1Eg80iJoPkp5/iH+1dy2 shgxnVDtq4dD+LwgMlnN6QDbpb8rTHaIcSVlEdDZPOBPwiquyDBFxAIkNDkAvZdAm8DR 8prQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@personalprojects.net header.s=20211201 header.b=AXz4OYo3; 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 v1si13903504ejd.981.2021.12.31.17.12.16; Fri, 31 Dec 2021 17:12:16 -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=AXz4OYo3; 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 E51F768A516; Sat, 1 Jan 2022 03:12:02 +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 1A7D6689BEA for ; Sat, 1 Jan 2022 03:11:56 +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=91T4lQE/Tcl1/jDI5kHHDuDJtFHiupADpUrn6t1/GAw=; b=AXz4OYo3Qzog4YJWGl+JeIk3yL CcuPpLLDI9TTkW4+M8doO21ckCVSVYUDHQKon+VgtAXAy7KV4e4p7LWIpqO2Vx+itxPES4dgL2gDD Dm8e4TJe3MS8iL2MG/iLXgBN9CH0wDGIaltflWw8Eetny3jaBU1YBcqi/fZYxI0i3tM4=; 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 1n3Sw6-0006lA-Hl for ffmpeg-devel@ffmpeg.org; Fri, 31 Dec 2021 20:11:54 -0500 From: John-Paul Stewart To: ffmpeg-devel@ffmpeg.org Date: Fri, 31 Dec 2021 20:11:47 -0500 Message-Id: <20220101011148.13921-2-jpstewart@personalprojects.net> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220101011148.13921-1-jpstewart@personalprojects.net> References: <20220101011148.13921-1-jpstewart@personalprojects.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 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: JuzcB6hxGZ+f 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 | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/libavformat/mvdec.c b/libavformat/mvdec.c index ea955d2b11..0f0474141b 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,18 +309,25 @@ static int mv_read_header(AVFormatContext *avctx) avio_skip(pb, 10); + fps = av_d2q(av_int2double(avio_rb64(pb)), INT_MAX); + /* allocate audio track first to prevent unnecessary seeking * (audio packet always precede video packet for a given frame) */ + 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); + } else if (v != MOVIE_SILENT) + return AVERROR_INVALIDDATA; + + avio_skip(pb, 2); 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; vst->duration = vst->nb_frames = avio_rb32(pb); @@ -338,6 +349,7 @@ static int mv_read_header(AVFormatContext *avctx) vst->codecpar->height = avio_rb32(pb); avio_skip(pb, 12); + if (ast) { ast->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; ast->nb_frames = vst->nb_frames; ast->codecpar->sample_rate = avio_rb32(pb); @@ -373,6 +385,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 +400,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 Sat Jan 1 01:11:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John-Paul Stewart X-Patchwork-Id: 32978 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp14375195iog; Fri, 31 Dec 2021 17:12:25 -0800 (PST) X-Google-Smtp-Source: ABdhPJx8YqluSvLiiK8UWLa4vPGa3BN5JpL3XE3izXOD0K6faUFw2ouZaD/AA2uRwyzl42KCQ93s X-Received: by 2002:a05:6402:1906:: with SMTP id e6mr36075506edz.225.1640999545748; Fri, 31 Dec 2021 17:12:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1640999545; cv=none; d=google.com; s=arc-20160816; b=jqxPsAGVOwcEZTJNmGWimf5Y53VM+e2DVnBCGB9RNqxhhjmJb7KQvbt98yiyHeV0No 0TsJoeLjKXjDEFIYHu+By3Vzawon/Ve9HM3CuHEdrBba0P3LGHzDQXBXt07RPOUXO9zA g+MEaziXzv2Ix0tCBLt+giawJZ4/AEk15eRtCu0ASm/GzWmxSQ+DXVY6M2mBF8W8aN/l NLJan+cwrPlZv/CrhSWZJTurUdIM4lpkxXWnkoxmv+QHIl28etFFNp81RraoumhPhAQU uy5FBzo8UnpFQyh+1plUKZiDQHVDl9JZRfvg3adRhABvZ5y1KXAPYP+eEFyCeQeNAeGS sezw== 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=ce+sXlZRYeqHHs2+QAsVFuf2bQ7+XwHX7Mw2PeIJu0g=; b=B8MOUigFMBSVfkR6/OZeSbBGB0XSCSGG3cGjNpS6/8JSW9igNHt/2Gt58zIiYlpAle DIfk9RFP1kt19jSCWu9kuAJzHyNl97R8oN/P7oW35osL/PCzufe+vuBxA3Tpmep+e+sP mpBqhwpTlmLm71z9gR1A7k13zyvSjMC7epqNcUeyuOzCcWuVgtVUqC4Xkje/oqgMBgXh y6YLpP0yUHXep6aBfPGE5A9fT/ftBt0eZAC2f8nN7HW3ByFRcCG0bIkyYGaW6l+oTjAl BxDjtieo3BcpRAe4Dfr+Q3VsLpEwWLWJf0AWTb1mpOg2S0NZR32QhSAwM0FrxB/CaJq9 jB4g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@personalprojects.net header.s=20211201 header.b=sAqRz0LU; 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 22si14296368eji.916.2021.12.31.17.12.25; Fri, 31 Dec 2021 17:12:25 -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=sAqRz0LU; 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 027D568A940; Sat, 1 Jan 2022 03:12:04 +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 A861768A516 for ; Sat, 1 Jan 2022 03:11:56 +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=wPPOwMXXl/EntRhKLQzGdL4LvAiSqc63asSRspDQB7A=; b=sAqRz0LUTNXWYoKOvao9WRT5ey 1gslHzXl0hY9vQnqRnCu7zD+WYZ+IY/myF5oV3LNtJMTRtTNKqwagVLjffCMVAR6jOoPUozOONs/U Mc1je1QXn2fmZrc4T6uq57pcOY+79CHQBjzsSjzjHjL/WYpMUFJeYPXUJMklpKaipBgg=; 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 1n3Sw7-0006lA-Gi for ffmpeg-devel@ffmpeg.org; Fri, 31 Dec 2021 20:11:55 -0500 From: John-Paul Stewart To: ffmpeg-devel@ffmpeg.org Date: Fri, 31 Dec 2021 20:11:48 -0500 Message-Id: <20220101011148.13921-3-jpstewart@personalprojects.net> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220101011148.13921-1-jpstewart@personalprojects.net> References: <20220101011148.13921-1-jpstewart@personalprojects.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 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: C6xAVpDqymNl Signed-off-by: John-Paul Stewart --- libavformat/mvdec.c | 72 ++++++++++++++++++++++----------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/libavformat/mvdec.c b/libavformat/mvdec.c index 0f0474141b..4f233aff5f 100644 --- a/libavformat/mvdec.c +++ b/libavformat/mvdec.c @@ -316,9 +316,9 @@ static int mv_read_header(AVFormatContext *avctx) 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 = avformat_new_stream(avctx, NULL); + if (!ast) + return AVERROR(ENOMEM); } else if (v != MOVIE_SILENT) return AVERROR_INVALIDDATA; @@ -350,41 +350,41 @@ static int mv_read_header(AVFormatContext *avctx) avio_skip(pb, 12); if (ast) { - ast->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; - 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->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; + 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 */ @@ -401,8 +401,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); }