From patchwork Sun Apr 5 15:59:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 18677 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 1740444BE3F for ; Sun, 5 Apr 2020 19:00:21 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E9BE368B502; Sun, 5 Apr 2020 19:00:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7540468B1E0 for ; Sun, 5 Apr 2020 19:00:13 +0300 (EEST) Received: by mail-wr1-f66.google.com with SMTP id a25so14463961wrd.0 for ; Sun, 05 Apr 2020 09:00:13 -0700 (PDT) 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=AmaNpIdIc2PnVIStNP0zqeIXzTFfz6h6BHUF/649FaQ=; b=BfZ0R32sHUSrul4wQZu2eQGwwYQuIxowCwo53LLajTsTTbOLl0AiAB7xbnIE9ZKUB7 rs0XQtCzwVvpTgoCTgUgdHVtjYO7fpam6E8MLhosi84iDqQ1Yjrh9g66hm2lV/5x5Sm3 DxhTcmfGdq+x4zlxdfqE7EbYte3JWHB2sJpfWcTbpDG+tApqsok7YKHKqdWMeWKE0FMx /yPUPK89MXRqZ5w9J2oBG1QYvpo9njZkR/WpW00vjS5edHLZN+NHbKoHB3CUNyv8lNCW 7lTMsBmY5DkeOKFi7RsP79PQBF0vXPEnEQyipJjMU3K3JLCYgQ7w5BTYpfbbLkkdE9PH TW4g== 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=AmaNpIdIc2PnVIStNP0zqeIXzTFfz6h6BHUF/649FaQ=; b=Fdpg/kOm+3rSmYzFyFcAKjFk61wrag9CySBf/2Huf4swItEW3gfw+RCffxtNKLZ9iV xfzlbFYZ+fymFb+QM4d9oZ3i09LhAR8i+Y2kG0ZLtkblE4kvxA2tw8iOz6DJPQXxlYt+ pZmtA7Ju0Wiz9xrr2K66Qfi1++NsvxjFIt9YBZGETeZel1BUkEFmWHudQHn0HpjNcMFF 2ebzMMkZqMbRx7EPZse9qGU3554DHiLsmV254TLJFrdUk+8AUMf9oDMtbS/cvePpy4hs 44mUjKZVE7HqNgd0XcQ56lo+s2KHmhAWgHMP+DYa7IQmxW0reivPQbEdFTripwqUdYBY qcVQ== X-Gm-Message-State: AGi0PubYaYWq3FSvPLeb7j77/0UBC8vr6M3AguzVr5ee100AxY8aFpXt w9WRbk8eV6/Yp36yTwvzVVrBGcla X-Google-Smtp-Source: APiQypLOpWKVFfa5Ui4FWSzt9V4aV+SzK0ACNM0UAztb9Cn3wQGNH/vzjMR83nbg4IWrybkpTpcaCg== X-Received: by 2002:adf:8b8e:: with SMTP id o14mr14309756wra.392.1586102412533; Sun, 05 Apr 2020 09:00:12 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id v21sm20014567wmh.26.2020.04.05.09.00.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Apr 2020 09:00:12 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 5 Apr 2020 17:59:22 +0200 Message-Id: <20200405155928.9323-15-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200405155928.9323-1-andreas.rheinhardt@gmail.com> References: <20200405155928.9323-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 14/20] avformat/matroskaenc: Warn that WebM doesn't support Attachments 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" As WebM doesn't support Attachments, the Matroska muxer drops them when in WebM mode. This happened silently until this commit which adds a warning for this. Signed-off-by: Andreas Rheinhardt --- libavformat/matroskaenc.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index acac3828f2..1b9ea45bc0 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1735,12 +1735,6 @@ static int mkv_write_header(AVFormatContext *s) int ret, i, version = 2; int64_t creation_time; - if (!strcmp(s->oformat->name, "webm")) { - mkv->mode = MODE_WEBM; - mkv->write_crc = 0; - } else - mkv->mode = MODE_MATROSKAv2; - if (mkv->mode != MODE_WEBM || av_dict_get(s->metadata, "stereo_mode", NULL, 0) || av_dict_get(s->metadata, "alpha_mode", NULL, 0)) @@ -2614,6 +2608,12 @@ static int mkv_init(struct AVFormatContext *s) s->internal->avoid_negative_ts_use_pts = 1; } + if (!strcmp(s->oformat->name, "webm")) { + mkv->mode = MODE_WEBM; + mkv->write_crc = 0; + } else + mkv->mode = MODE_MATROSKAv2; + mkv->tracks = av_mallocz_array(s->nb_streams, sizeof(*mkv->tracks)); if (!mkv->tracks) { return AVERROR(ENOMEM); @@ -2640,8 +2640,13 @@ static int mkv_init(struct AVFormatContext *s) // ms precision is the de-facto standard timescale for mkv files avpriv_set_pts_info(s->streams[i], 64, 1, 1000); - if (st->codecpar->codec_type == AVMEDIA_TYPE_ATTACHMENT) + if (st->codecpar->codec_type == AVMEDIA_TYPE_ATTACHMENT) { + if (mkv->mode == MODE_WEBM) { + av_log(s, AV_LOG_WARNING, "Stream %d will be ignored " + "as WebM doesn't support attachments.\n", i); + } continue; + } nb_tracks++; track->track_num = mkv->is_dash ? mkv->dash_track_number : nb_tracks;