From patchwork Sun Apr 5 15:59:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 18679 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 3113544BBAC for ; Sun, 5 Apr 2020 19:02:24 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BB82068B3C7; Sun, 5 Apr 2020 19:00:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 58A7E68B421 for ; Sun, 5 Apr 2020 19:00:14 +0300 (EEST) Received: by mail-wm1-f65.google.com with SMTP id z7so12128836wmk.1 for ; Sun, 05 Apr 2020 09:00:14 -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=eChqWe3CflXCJK25cmLOi3puhGffCLSf/UPWc6HLhNY=; b=Pu5S6XK64mp0jtNzxIjoL7xBKtaKEnzP7z7+sUUDi4a1yg/zKGO6W+M4i9iMOOr4KD crMcPjVYMxjjM+ZXUBcx/4bMyTkUHb+ueHcG3WkXaKoVMWDeSxXnWA+n1neTnS3rVxaQ 36Fzdj2Zp/bHLC61yWTIt/2hm9oOwvShkliRFtGXMQLzdXjKnfjPGXLAP1vkqjhkGum9 Eo7AccV+Ps9X8rqHtcdYAZ75ste0eNOSPyFR/PiaZlwWZXkOEJ6F6d15LPzo17yWlNaQ SdQaWf0LEYh3L58Etr56ksQKMZsvks+conPqwWiCnY4Ae/Df6oaxD00OTMv7GNmHGW5Q a7xw== 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=eChqWe3CflXCJK25cmLOi3puhGffCLSf/UPWc6HLhNY=; b=eE5KzKnRTCzDJ2KHTZk7paDA3CnEmx//vSNcqz46r8vGv0yetMIFsxU+LgC8BkNYH3 ODJPsyw/7HimlUhDvoSUiOpXFIPDju7N33I4Z3ZnfueOn2Hngw5mixZK/hGm+D/uqLlo Y5SW8J9mEXM4O4dLSL9SceKozR9BAtJT3WN4OphnU4RaxDpz+H7G8lWRgG2VaLYNGhCT SERdcxKBVNBCbXKlnDleGitoz87FTaDL2rR70pGdJXzpzmmFXAeh8VxMSMfnhrTfasZS 5nfKqHfA7VhrQ3p91z9KTph/yaeR8lKHMtVEMeM4phg9YTjFh7qd4GUqa6wLoOa3O3N8 P0TQ== X-Gm-Message-State: AGi0PuYnD30eqLe806tLV0BdfdHgAVV56RpAWIkPjpfuaKeam6rKZldS b9JGQdBIQGLeGZLJdRLDrcLGIL8Z X-Google-Smtp-Source: APiQypJ+FOHLW/HQmk7HsYHXsZXn4DBLTY7NfsoKX1aaOcxV61v5NfIQBB/rg0vnwGyMno/3OtTugQ== X-Received: by 2002:a1c:1942:: with SMTP id 63mr19289214wmz.133.1586102413425; Sun, 05 Apr 2020 09:00:13 -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.12 (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:23 +0200 Message-Id: <20200405155928.9323-16-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 15/20] avformat/matroskaenc: Only write Tracks if there is a track 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" The Matroska muxer does not write every stream as a Matroska track; some streams are written as AttachedFile. But should no stream be written as a Matroska track, the Matroska muxer would nevertheless write a Tracks element without a TrackEntry. This is against the spec. This commit changes this and only writes a Tracks if there is a Matroska track. Signed-off-by: Andreas Rheinhardt --- libavformat/matroskaenc.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 1b9ea45bc0..45a2341c22 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -133,7 +133,7 @@ typedef struct MatroskaMuxContext { AVPacket cur_audio_pkt; - int have_attachments; + unsigned nb_attachments; int have_video; int reserve_cues_space; @@ -1099,7 +1099,6 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv, AVDictionaryEntry *tag; if (par->codec_type == AVMEDIA_TYPE_ATTACHMENT) { - mkv->have_attachments = 1; return 0; } @@ -1356,6 +1355,9 @@ static int mkv_write_tracks(AVFormatContext *s) AVIOContext *pb = s->pb; int i, ret, default_stream_exists = 0; + if (mkv->nb_attachments == s->nb_streams) + return 0; + mkv_add_seekhead_entry(mkv, MATROSKA_ID_TRACKS, avio_tell(pb)); ret = start_ebml_master_crc32(&mkv->tracks_bc, mkv); @@ -1610,7 +1612,7 @@ static int mkv_write_tags(AVFormatContext *s) } } - if (mkv->have_attachments && mkv->mode != MODE_WEBM) { + if (mkv->nb_attachments && mkv->mode != MODE_WEBM) { for (i = 0; i < s->nb_streams; i++) { mkv_track *track = &mkv->tracks[i]; AVStream *st = s->streams[i]; @@ -1644,7 +1646,7 @@ static int mkv_write_attachments(AVFormatContext *s) AVIOContext *dyn_cp = NULL, *pb = s->pb; int i, ret; - if (!mkv->have_attachments) + if (!mkv->nb_attachments) return 0; mkv_add_seekhead_entry(mkv, MATROSKA_ID_ATTACHMENTS, avio_tell(pb)); @@ -2495,9 +2497,12 @@ static int mkv_write_trailer(AVFormatContext *s) put_ebml_float(mkv->info_bc, MATROSKA_ID_DURATION, mkv->duration); end_ebml_master_crc32(pb, &mkv->info_bc, mkv, MATROSKA_ID_INFO, 0, 0); - // write tracks master - avio_seek(pb, mkv->tracks_pos, SEEK_SET); - end_ebml_master_crc32(pb, &mkv->tracks_bc, mkv, MATROSKA_ID_TRACKS, 0, 0); + if (mkv->tracks_bc) { + // write Tracks master + avio_seek(pb, mkv->tracks_pos, SEEK_SET); + end_ebml_master_crc32(pb, &mkv->tracks_bc, mkv, + MATROSKA_ID_TRACKS, 0, 0); + } // update stream durations if (mkv->tags_bc) { @@ -2645,6 +2650,7 @@ static int mkv_init(struct AVFormatContext *s) av_log(s, AV_LOG_WARNING, "Stream %d will be ignored " "as WebM doesn't support attachments.\n", i); } + mkv->nb_attachments++; continue; }