From patchwork Tue Nov 26 11:47:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 16421 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 0CC8D4478DD for ; Tue, 26 Nov 2019 13:54:00 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E358E68AF1F; Tue, 26 Nov 2019 13:53:59 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 45C11689A24 for ; Tue, 26 Nov 2019 13:53:53 +0200 (EET) Received: by mail-wm1-f66.google.com with SMTP id t26so2959879wmi.4 for ; Tue, 26 Nov 2019 03:53:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SeVxEtomeyMg7+l8Eu+3l2uLtnqVzMoQs1hgPIUa9bY=; b=tWcTqWwJ9DFA1l6S46Lx9SjVGn2LZ0smgCDVoC5McHNYcyDH9R2tGM4LQ8owEt5Eil Djc4k51xrBtZ0XbyqbRZIU692wtvhN/sKmM1K64m2eYTjRf+RF9dDuY+Dd9fsuLOKzrh BlYjDp9jdLvlCI0ImBhjv8q/miB3r/R+zAF8xdHK2h7GHbclw+ts8Ey5e9ODazITDohi F8FnpBmHnv2gfixHW+bNL5M/Vji3Psbl0C116ptOzBg/QzEMdn9r2vNazSVHw1duj4Yl pGD6xlci02e1aUqzHK+nvyiYripfUwIr979GtKF4lnnJbJuUx/cGJiRKryhUy4+Ii5h5 Rk3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SeVxEtomeyMg7+l8Eu+3l2uLtnqVzMoQs1hgPIUa9bY=; b=qn4v9sn5ToLJabCyg8fD/399u8xCwFeRsrpHy+0yol3sV8QkzEucOwL5uNy2qRfIyl Zx87F4kpeSMEH4MPY/SWqlOWVIEyxYtuDIZ5qwa/KsMvZgV/104/fiKpwo7yL99rGkjS Bln7CxdN2hcxaoGwR7o8aiJ9ga5O4KKxetPpE2t4Nu/ra86gX1AVFi3cHBqbBZEcH1XG Aq9U/T+AXkENMBcBNHxfM0gOVMV7h1oZDJNgS5KHDTt15VzL/nxe8oW+cdevWitRZXhG faxuxgogPhyf5+SapambBeFrQ4LB3rApi7VSqptawZR3v0mBYgGglLz8W/MPse2vJGT5 cKKA== X-Gm-Message-State: APjAAAUpjBLgQiRjY8NipX+rjaYA+JrbcPFcUmX/5EaFdBsuFny4URvl W3O+aktXbzkAE7LxkWbgXiEBWuiJ X-Google-Smtp-Source: APXvYqzEWg8VHoFF8reHMUwX54OQTtU1onb3S6PwucL3t3AUGm07IDi38W2L0c7XcZzhIB3RhNThwA== X-Received: by 2002:a1c:9c82:: with SMTP id f124mr4124891wme.25.1574768877604; Tue, 26 Nov 2019 03:47:57 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc08e23.dynamic.kabel-deutschland.de. [188.192.142.35]) by smtp.gmail.com with ESMTPSA id a15sm15394952wrx.81.2019.11.26.03.47.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Nov 2019 03:47:57 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 26 Nov 2019 12:47:50 +0100 Message-Id: <20191126114750.21213-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191106024922.19228-20-andreas.rheinhardt@gmail.com> References: <20191106024922.19228-20-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] avformat/matroskaenc: Check mimetypes earlier 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This avoids errors lateron after the file header has already been partially written. Signed-off-by: Andreas Rheinhardt --- get_mimetype() doesn't change st, so it can be const. I forgot that in the first version. libavformat/matroskaenc.c | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 4ca262a706..ecd3dc9f9f 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1659,6 +1659,21 @@ static int mkv_write_tags(AVFormatContext *s) return 0; } +static const char *get_mimetype(const AVStream *st) +{ + AVDictionaryEntry *t; + + if (t = av_dict_get(st->metadata, "mimetype", NULL, 0)) + return t->value; + if (st->codecpar->codec_id != AV_CODEC_ID_NONE) { + const AVCodecDescriptor *desc = avcodec_descriptor_get(st->codecpar->codec_id); + if (desc && desc->mime_types) + return desc->mime_types[0]; + } + + return NULL; +} + static int mkv_write_attachments(AVFormatContext *s) { MatroskaMuxContext *mkv = s->priv_data; @@ -1678,7 +1693,7 @@ static int mkv_write_attachments(AVFormatContext *s) mkv_track *track = &mkv->tracks[i]; ebml_master attached_file; AVDictionaryEntry *t; - const char *mimetype = NULL; + const char *mimetype; const char *filename; if (st->codecpar->codec_type != AVMEDIA_TYPE_ATTACHMENT) @@ -1693,18 +1708,8 @@ static int mkv_write_attachments(AVFormatContext *s) } else filename = ""; put_ebml_string(dyn_cp, MATROSKA_ID_FILENAME, filename); - if (t = av_dict_get(st->metadata, "mimetype", NULL, 0)) - mimetype = t->value; - else if (st->codecpar->codec_id != AV_CODEC_ID_NONE ) { - const AVCodecDescriptor *desc = avcodec_descriptor_get(st->codecpar->codec_id); - if (desc && desc->mime_types) - mimetype = desc->mime_types[0]; - } - if (!mimetype) { - av_log(s, AV_LOG_ERROR, "Attachment stream %d has no mimetype tag and " - "it cannot be deduced from the codec id.\n", i); - return AVERROR(EINVAL); - } + mimetype = get_mimetype(st); + av_assert0(mimetype); put_ebml_string(dyn_cp, MATROSKA_ID_FILEMIMETYPE, mimetype); put_ebml_binary(dyn_cp, MATROSKA_ID_FILEDATA, st->codecpar->extradata, st->codecpar->extradata_size); @@ -2638,6 +2643,10 @@ static int mkv_init(struct AVFormatContext *s) if (mkv->mode == MODE_WEBM) { av_log(s, AV_LOG_WARNING, "Stream %d will be ignored " "as WebM doesn't support attachments.\n", i); + } else if (!get_mimetype(st)) { + av_log(s, AV_LOG_ERROR, "Attachment stream %d has no mimetype tag and " + "it cannot be deduced from the codec id.\n", i); + return AVERROR(EINVAL); } continue; }