From patchwork Wed Nov 6 02:49:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 16138 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 D0C8A4496BF for ; Wed, 6 Nov 2019 04:59:17 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B865C68B0DF; Wed, 6 Nov 2019 04:59:17 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7DC1168AF7C for ; Wed, 6 Nov 2019 04:59:16 +0200 (EET) Received: by mail-wr1-f65.google.com with SMTP id n1so23931160wra.10 for ; Tue, 05 Nov 2019 18:59:16 -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=Zb9tckv6bF9RugVB1zPPiy7vPPEuMYE0MtD9ccKvBwk=; b=lpGkW0KCep9P8xC529yoNw4BH5YClgP2CAC5nWVv+uvrFZNb02o6MNiW1av5ZG7fZk sAJEeaQoHbaX/jOyOMDQUqKCF/HMTQ0453zlnaMnHpRFZefLEyEHqIywopR6Qh1AdN7q O+KMKh6jqAUgPz0KY2yml7LCypcqi2tJkt8j7P3sYkeHgNr4+EifYlBEbhamxgJ6fYWf h8smBion2Fk1BOspOk++YJgjLda0Z5K8gJLhStZFrH0VU1OpSd5uOueoe4finyodksB0 Y1PEBYBDHSlPQrNWbGYbVpTgxpE4UOxjc8V6WnG+hFcT2h7z2aZIZhUSCjKDPW9O7YcX bZcA== 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=Zb9tckv6bF9RugVB1zPPiy7vPPEuMYE0MtD9ccKvBwk=; b=o+VTnlQjGMPke5vuearXO4VypXuaK2FyJxoexqNREm89A+UT+yQ/Dtt1pkgMqGVkFn eo9RKzYwSqT1T+rOpDP7dR85EmCOGeqUxvX02hau2A7O9ngHHLttAMvDwROxH/bedTP1 i7uOe6nJF2TYLs/unkVsyrJ2rL0gRdSlAIZvbXPdN39GAjH3lh67SYx5i7tn8rZay2Ay 4622KXtW6s9ofmubdnPa66onGkima8XF2f6AKivME8RApBfmysy43hmo5GpNk1QFBDpO qA5bBvkXg8pgpneLWLUzAecJDF9Wp13/VVpCz0sxE4UMKaHbjoZxFY3qX7qXh1t2/qOr Cuhg== X-Gm-Message-State: APjAAAVGoiMgjuXJ+KmCuyf9a9jdT9e94NfWqXpOQYMJps5NS8mC7keM JQ0UFLIKi1PgcL9XIlDkZxoUymE4 X-Google-Smtp-Source: APXvYqwTyKwTb1poiXGRT2aYoDLiWm/GGFada7MJmmuEodn9qHOmVp5+J5Oi9f8c2+JkYskv/quDgQ== X-Received: by 2002:a5d:424a:: with SMTP id s10mr403364wrr.108.1573008656757; 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.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Nov 2019 18:50:56 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 6 Nov 2019 03:49:20 +0100 Message-Id: <20191106024922.19228-21-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 21/23] 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 attachments. 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 | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 1effe209b4..df13d05dab 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -134,7 +134,7 @@ typedef struct MatroskaMuxContext { AVPacket cur_audio_pkt; - int have_attachments; + int nb_attachments; int have_video; int reserve_cues_space; @@ -1112,7 +1112,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; } @@ -1374,6 +1373,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(pb, &mkv->tracks_bc, mkv, MATROSKA_ID_TRACKS); @@ -1631,7 +1633,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]; @@ -1678,7 +1680,7 @@ static int mkv_write_attachments(AVFormatContext *s) AVIOContext *dyn_cp, *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)); @@ -2487,9 +2489,11 @@ static int mkv_write_trailer(AVFormatContext *s) avio_seek(pb, mkv->info_pos, SEEK_SET); end_ebml_master_crc32(pb, &mkv->info_bc, mkv); - // write tracks master - avio_seek(pb, mkv->tracks_pos, SEEK_SET); - end_ebml_master_crc32(pb, &mkv->tracks_bc, mkv); + if (mkv->tracks_bc) { + // write tracks master + avio_seek(pb, mkv->tracks_pos, SEEK_SET); + end_ebml_master_crc32(pb, &mkv->tracks_bc, mkv); + } // update stream durations if (mkv->tags_bc) { @@ -2650,6 +2654,7 @@ static int mkv_init(struct AVFormatContext *s) "it cannot be deduced from the codec id.\n", i); return AVERROR(EINVAL); } + mkv->nb_attachments++; continue; }