From patchwork Mon Aug 27 19:57:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stebbins X-Patchwork-Id: 10153 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:12c4:0:0:0:0:0 with SMTP id 65-v6csp6809708jap; Mon, 27 Aug 2018 12:57:56 -0700 (PDT) X-Google-Smtp-Source: ANB0VdYYrTl2uBXUZP73Vi+1RTY6eR6l5b4h1xkBiuSmwSJd8bcHlG7Bz8CEMSdEYl87ZLysIpzN X-Received: by 2002:adf:f391:: with SMTP id m17-v6mr9829659wro.279.1535399876725; Mon, 27 Aug 2018 12:57:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1535399876; cv=none; d=google.com; s=arc-20160816; b=z6ryOWESq1WcfDVMccr+C/OhxNJSHoCtk+N83fLXarebceu77krJmltzZoY011ZwH4 TFtLXkx4pP6PTlqAmEIChGSINZV6nX/wLHzZ1lWtuQB6M/vvZ8l8W/mWiJYNtBiwk8vw v7zNdC2YKD/FkR/ZjY/+X+64cHAzl7j1zFtLvbeJY/VAq9xk6nw6X+lnAFNLm7pBomqK JYihuzgvgkEaGMZCEKZfq0DLkZMx7BjCz+DecSMxS3NtzFP5Yk2IXEIzt0QHwvFARDYj XFAb4ctieXcEtylU3n/03e4nwkin3JAVHiPNp15C3YGLtu3Xs5t5NrxQuziCoCXPnoyj r6yw== 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:delivered-to:arc-authentication-results; bh=CAdz4Cw2aqoVB02mKcnkgItBFuZAmeezu7RB1kBDKR4=; b=Qdzl7vqpTej8z3Hgd86GBZmS9Cr62G3ok1JP1CyMAVk3yG/+C7ih2X+guYjsVr9uL7 NGs5GtT1tDgFV1gOK6p0lkQOAODmkStemNScaUqXdMSSAuRUsOrz769/K2SIJWer0hER uHjr1XepHVsPMSvJBZTlMgldjWQ3ewYfH+IEFJ2Pr9vKZMopj92N6skYR3TxVy0/JF7J HxJPqrvYIAQnRR9r8IIQdIoZiTB85wu8aa3OBcCaf6cG1qvrFA8SmY2LTj67UpcjALjs tC9S63wjW47/B3grSyB+J2LNzkltb4b/GrQB/ggl4v07f/5nxzn04/R8h5ftgyc0yr7v 1mYA== 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 s207-v6si51904wme.133.2018.08.27.12.57.56; Mon, 27 Aug 2018 12:57:56 -0700 (PDT) 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 E1C3C689B34; Mon, 27 Aug 2018 22:57:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail.jetheaddev.com (mail.jetheaddev.com [70.164.99.34]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8949E680626 for ; Mon, 27 Aug 2018 22:57:44 +0300 (EEST) Received: from dionysus.jetheaddev.com (10.13.12.63) by cas.jetheaddev.com (192.168.13.27) with Microsoft SMTP Server (TLS) id 14.3.351.0; Mon, 27 Aug 2018 12:57:46 -0700 Received: from dionysus.jetheaddev.com (localhost [127.0.0.1]) by dionysus.jetheaddev.com (8.15.2/8.14.7) with ESMTP id w7RJvkMW025465 for ; Mon, 27 Aug 2018 12:57:46 -0700 Received: (from jstebbins@localhost) by dionysus.jetheaddev.com (8.15.2/8.15.2/Submit) id w7RJvkoX025464 for ffmpeg-devel@ffmpeg.org; Mon, 27 Aug 2018 12:57:46 -0700 From: John Stebbins To: Date: Mon, 27 Aug 2018 12:57:09 -0700 Message-ID: <20180827195709.25396-3-jstebbins@jetheaddev.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180827195709.25396-1-jstebbins@jetheaddev.com> References: <20180827195709.25396-1-jstebbins@jetheaddev.com> MIME-Version: 1.0 X-Originating-IP: [10.13.12.63] Subject: [FFmpeg-devel] [PATCH 3/4] lavf/movenc: Fail when codec tag is invalid for format X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" Fixes ticket #6897 --- libavformat/movenc.c | 40 +++++++++++++++++++++++++++++----------- 1 file changed, 29 insertions(+), 11 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 8a3b651514..dd6281d210 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -1589,6 +1589,26 @@ static const AVCodecTag codec_cover_image_tags[] = { { AV_CODEC_ID_NONE, 0 }, }; +static int validate_codec_tag(const AVCodecTag *const *tags, + unsigned int tag, int codec_id) +{ + int i; + + /** + * Check that tag + id is in the table + */ + for (i = 0; tags && tags[i]; i++) { + const AVCodecTag *codec_tags = tags[i]; + while (codec_tags->id != AV_CODEC_ID_NONE) { + if (codec_tags->tag == tag && codec_tags->id == codec_id) { + return 1; + } + codec_tags++; + } + } + return 0; +} + static int mov_find_codec_tag(AVFormatContext *s, MOVTrack *track) { int tag; @@ -1596,23 +1616,21 @@ static int mov_find_codec_tag(AVFormatContext *s, MOVTrack *track) if (is_cover_image(track->st)) return ff_codec_get_tag(codec_cover_image_tags, track->par->codec_id); - if (track->mode == MODE_MP4 || track->mode == MODE_PSP) - tag = track->par->codec_tag; - else if (track->mode == MODE_ISM) - tag = track->par->codec_tag; - else if (track->mode == MODE_IPOD) { + if (track->mode == MODE_IPOD) if (!av_match_ext(s->url, "m4a") && !av_match_ext(s->url, "m4v") && !av_match_ext(s->url, "m4b")) av_log(s, AV_LOG_WARNING, "Warning, extension is not .m4a nor .m4v " "Quicktime/Ipod might not play the file\n"); - tag = track->par->codec_tag; - } else if (track->mode & MODE_3GP) - tag = track->par->codec_tag; - else if (track->mode == MODE_F4V) - tag = track->par->codec_tag; - else + + if (track->mode == MODE_MOV) tag = mov_get_codec_tag(s, track); + else + if (!validate_codec_tag(s->oformat->codec_tag, track->par->codec_tag, + track->par->codec_id)) + tag = 0; + else + tag = track->par->codec_tag; return tag; }