From patchwork Sun Apr 5 15:59:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 18671 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 0956F44BE3F for ; Sun, 5 Apr 2020 19:00:15 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E31A868B47A; Sun, 5 Apr 2020 19:00:14 +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 A9E2E68B319 for ; Sun, 5 Apr 2020 19:00:09 +0300 (EEST) Received: by mail-wr1-f66.google.com with SMTP id 65so14443667wrl.1 for ; Sun, 05 Apr 2020 09:00:09 -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=G/49ayKSkP9C1UTKvO7MZGGJ77fJFZaj7Djy1DlrVmY=; b=o3IenFOSD/bJBC1JqqSdgm+0gILQvPHjSEvGE1N3g7Kw0NgtLyudHLq67s3Vx5O34r lWOTOlPtwc29YdvF/7+Z8z8gR0V4nDKYq8aKkA6kz9JcvXLtr/3O6E+oFqXNq3OWf0zv i1QyuliH1t0dW4NCIZWDQ8lHdUqQbqCyyaQ0TV7rmnOwVDvLm2Pa40PSfgRe6a7bP2wk jCPvw938rreCVwHiF/xDJEtqRFyYuSogMWXksQGQTF12QaYwWnRDO2X2CWChnKBZFm/X OYgEyLBFJiz7HwaSFLfnVYbX+lFkXM/FwyuVA8S0psmuCneMX6PFr+WHAtGtE6q7td8Y 4Ahw== 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=G/49ayKSkP9C1UTKvO7MZGGJ77fJFZaj7Djy1DlrVmY=; b=PVVeJTyUiRy21GvK8et5j5CfLdbkV9bAPNnnXZ9RPSWbL+GZW30lhv3NsDXEPkkViS eHqSo4vgmGhlyBAb99QQfzHvF0GQp7cJdNdliRgc1wTJUqFb/uGilCEqFQtGPjE6eiML BujplD6wqFA2zPetcZ1INY8tC6hXRyO0MwpfgqF7mWnSOAPwPYVudhwuqZ40jzIRpbpJ npiN2EKQ2B73f8pR3TCnacsnyN6p4EIU4AaTzfp4/w5w0BDrCp2Cm/CNjPRXV0B/m0ZA gWIBRm5N8dYvzENRnbCt1jz+EXunS4B4Ii82WWrRED1tQ4JHjYaYsFrkCEIU9UyBdsZ9 GmhQ== X-Gm-Message-State: AGi0PuY5proCxOEMHdr9PlVTeIPldlM6aC+sC3bucgzhtiMHjJme/prv jqNTSVERoYb1uVeEtlOep7+i7R18 X-Google-Smtp-Source: APiQypJ4DEcNpYid6ekDUzTWvkKBjXJjBctVzDDNm7naTelO++LJVi60lGZqrbOJ7QCzV28zxddtGg== X-Received: by 2002:adf:e744:: with SMTP id c4mr18585625wrn.133.1586102408763; Sun, 05 Apr 2020 09:00:08 -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.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Apr 2020 09:00:08 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 5 Apr 2020 17:59:19 +0200 Message-Id: <20200405155928.9323-12-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 11/20] avformat/matroskaenc: Add check for using explicit TrackNumber 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" When creating DASH streams, the TrackNumber is externally prescribed and not derived from the number of streams in the AVFormatContext. Up until now, a TrackNumber of zero was allowed, although this is invalid. Furthermore, it was not checked whether the number of tracks for a file using an explicit TrackNumber was more than one, as such a file would be invalid (it would be impossible to tell to which track a Block belongs if different tracks share the same TrackNumber). Besides that, use the MAX_TRACKS macro for the maximum of dash_track_number. Signed-off-by: Andreas Rheinhardt --- libavformat/matroskaenc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 27c419954b..b9bfd34756 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -2642,6 +2642,9 @@ static int mkv_init(struct AVFormatContext *s) track->track_num = mkv->is_dash ? mkv->dash_track_number : nb_tracks; } + if (mkv->is_dash && nb_tracks != 1) + return AVERROR(EINVAL); + if (nb_tracks > MAX_TRACKS) { av_log(s, AV_LOG_ERROR, "%u > "AV_STRINGIFY(MAX_TRACKS)" tracks (excluding attachments)" @@ -2704,7 +2707,7 @@ static const AVOption options[] = { { "cluster_size_limit", "Store at most the provided amount of bytes in a cluster. ", OFFSET(cluster_size_limit), AV_OPT_TYPE_INT , { .i64 = -1 }, -1, INT_MAX, FLAGS }, { "cluster_time_limit", "Store at most the provided number of milliseconds in a cluster.", OFFSET(cluster_time_limit), AV_OPT_TYPE_INT64, { .i64 = -1 }, -1, INT64_MAX, FLAGS }, { "dash", "Create a WebM file conforming to WebM DASH specification", OFFSET(is_dash), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, FLAGS }, - { "dash_track_number", "Track number for the DASH stream", OFFSET(dash_track_number), AV_OPT_TYPE_INT, { .i64 = 1 }, 0, 127, FLAGS }, + { "dash_track_number", "Track number for the DASH stream", OFFSET(dash_track_number), AV_OPT_TYPE_INT, { .i64 = 1 }, 1, MAX_TRACKS, FLAGS }, { "live", "Write files assuming it is a live stream.", OFFSET(is_live), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, FLAGS }, { "allow_raw_vfw", "allow RAW VFW mode", OFFSET(allow_raw_vfw), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, FLAGS }, { "write_crc32", "write a CRC32 element inside every Level 1 element", OFFSET(write_crc), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, FLAGS },