From patchwork Wed Nov 6 02:49:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 16131 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 3F4CA447DB1 for ; Wed, 6 Nov 2019 04:51:01 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2D2DD68B0D2; Wed, 6 Nov 2019 04:51:01 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C900F68B0AD for ; Wed, 6 Nov 2019 04:50:56 +0200 (EET) Received: by mail-wr1-f67.google.com with SMTP id a15so23900236wrf.9 for ; Tue, 05 Nov 2019 18:50:56 -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=/vVbLxA5ZXy1dl/YEdL2YwOfLSxvlQOHDMmIrtNg+Wk=; b=NvRuqyKZWhhwByqzkTgU3Y5C2RtKH0LgWuQeeZG6yOBxim/t3Ebw6Q0tulgM6ZXtWp +cZEuP+vgBsmo307fROypBT1DvTGTrlq92Ped9AIsk1FIDns2X9gpLBLKTGasYLH4ehU LxHE85WL/xHkW+Qmndkxt2wDgHahVqGVlhmPPzLk2vir0xn+anA2+FpJ8rkOGSnjq++G oT5avHyGnOOPZBN76mhLQw1Dgv2VYjs7wLCiKZFhBDaerQ8rArH1U3xuuTGhTKuijUiD sTyF1nGfzrlcqTVSYXpBCHmMePFHa9RogAYFElH2itZmWHScXagF/2qMauRlyyMELGaS u7cQ== 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=/vVbLxA5ZXy1dl/YEdL2YwOfLSxvlQOHDMmIrtNg+Wk=; b=iDQORl6nTiTMtxbg3BDci4iMpJiP3CbhqxBXzO4QBr7Y3v9ADXhuWsHl3GtIE6snpV dBrtAiplVPUyHQe9UhNounV7XNzvK5lpyMNDXs4ArVdaCSpQk1exvYvlkwUMB6rbLAJX pk2bA4S6p+UT79oOKr69HOa6q+gp5uOTLKSbWYSCaiuvFpEwPq3tbuDo/v/vEJy0EFBz WP+LfGsVoX0VcS21mC2xqm2Js4YEdiXIfQZYcX7INQo5Ei9TgO4EZg+zoq/A1ZhRj9GV YvZE0SqR+XsB4QbRnsMVjaBhDSOhHDrPo1CsKl/mMORsYt24XAn/bPZOa91t74Ftotwr 0DVQ== X-Gm-Message-State: APjAAAVbC3U5qhnSkvltQdlDN0A8YY36OUWPfthYALl0y1wX57WYF5zT N/Se3HWolBKIpUArSXAJFh5lho0V X-Google-Smtp-Source: APXvYqwY0rUpurcGCOHGc4Aw2qHqd2+pwFq4EJYFbbfm3zrKvgrOXY4wHqVUohb535Id+ySLsRTk3Q== X-Received: by 2002:a5d:6b0e:: with SMTP id v14mr403994wrw.280.1573008656011; Tue, 05 Nov 2019 18:50:56 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc08937.dynamic.kabel-deutschland.de. [188.192.137.55]) by smtp.gmail.com with ESMTPSA id l13sm1281710wmh.12.2019.11.05.18.50.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Nov 2019 18:50:55 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 6 Nov 2019 03:49:19 +0100 Message-Id: <20191106024922.19228-20-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191106024922.19228-1-andreas.rheinhardt@gmail.com> References: <20191106024922.19228-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 20/23] 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 --- libavformat/matroskaenc.c | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index f2c8a66a03..1effe209b4 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1657,6 +1657,21 @@ static int mkv_write_tags(AVFormatContext *s) return 0; } +static const char *get_mimetype(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; @@ -1676,7 +1691,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) @@ -1691,18 +1706,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); @@ -2640,6 +2645,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; }