From patchwork Wed Nov 6 02:49:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 16135 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 76B624494FC for ; Wed, 6 Nov 2019 04:58:40 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5DD7868B095; Wed, 6 Nov 2019 04:58:40 +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 8FFFC68B08C for ; Wed, 6 Nov 2019 04:58:34 +0200 (EET) Received: by mail-wr1-f67.google.com with SMTP id f2so15021620wrs.11 for ; Tue, 05 Nov 2019 18:58:34 -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=9bPXqF6pA1uKw0C5p2NrvP+5G7PFxHlCrz9c6iXk26s=; b=fmfRVFm+lQAl0uOOT1CRmhD/duZcG0/KdUwzKI2Io85uMaUfd5xTbUsogcC55bnsEy +u357xAQC0T4Bk9NVAEYWKK98AJChWeJkUgK53I9UKzPAPpMMuQTPepcNyLHpdfwuGP1 5fApcnNiNUBMwm0Nbw9dppL0CNrozKegQhX8B8NwQCopaT6o+3Vg2gOVxVsJQat9WnNq tcr+Dq7ceK+/Pe+JvULood+2prF/BmNLCWZcRnvedI3qFigc8LeP7+yLsX0rkBFIVP3M CrjPKwd5j1rQ7qNPNp6xc6En5opE6PoD0tphYhhj/4QrudKyI06K+ruQB6bqJKuUUJFt 4LhA== 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=9bPXqF6pA1uKw0C5p2NrvP+5G7PFxHlCrz9c6iXk26s=; b=JbzwSNzAJmV2lsIXu0v7oo5R86PzdFZYx5VGsSO2/dpgu2nP2klr6d5vN0K4Z6LOtZ s3mrGdO9aaCxMytXyMTi2Gw7NuQ6cNvKh1lAsR/os8GotwZt35iYTqhE62gvexUCbTWF N+iZirDEFgk7l8UDiDMuBVH+8FWPO66HkB3Hia0KmMxP8GJqxmcMiC4G5P/o4Nq5/Ehc v2zYM2aO2iGrN1tMrVqTUO+C+edICy2WU4JIHLw5XtbBAbDEmzJe1XN6kP75cAH0FjnB E0fGVLhIT3dygFuCEUZCftNINE1ClJUdBPgcRNoTkt4I7qvGzpwKHnX31UAxjE4Z8ylw EwOg== X-Gm-Message-State: APjAAAX2ybTRCSQ2E4EUL3ZibLsxYwC3bNr20liNtFxthY8lvRcb6fxy TSGb9aU0Dra8KmR5slUqAcufRukk X-Google-Smtp-Source: APXvYqyjS0TtixXXSG7MITRUXEfWXXD/8KtRK3TYsupN7sOKzem+AlNk6PD2nf+2dQDApv6cAQFhYQ== X-Received: by 2002:a5d:46c6:: with SMTP id g6mr356710wrs.331.1573008654366; Tue, 05 Nov 2019 18:50:54 -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.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Nov 2019 18:50:53 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 6 Nov 2019 03:49:17 +0100 Message-Id: <20191106024922.19228-18-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 18/23] 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 e64e1e1036..19d9b0bc66 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1755,12 +1755,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)) @@ -2623,6 +2617,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); @@ -2644,8 +2644,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;