From patchwork Sun Apr 5 15:59:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 18666 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 69C3B44BE3F for ; Sun, 5 Apr 2020 19:00:09 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5569668B303; Sun, 5 Apr 2020 19:00:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4F00F68B1B3 for ; Sun, 5 Apr 2020 19:00:01 +0300 (EEST) Received: by mail-wm1-f68.google.com with SMTP id z7so12128350wmk.1 for ; Sun, 05 Apr 2020 09:00:01 -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=UWcaxdu9K4akJ+sWaH4xeegobRis5gP3mIQvcJe7RHs=; b=vPow1t+G8fK2KFjV2RRFL8JUrvZheXz2sHzdzPtiX7qQy9qELc6lIktxujYeW3zuWR FD6/Ecn5AOKAY5GZuJUErfLaUp9NcafbXssGEbuYaNsV655X+b3Y1mE8Nso3R3B9rZuw dUuyqIVRVDEhYyRGUb0HY6RDeY1EaeVx+3RZ1dNm/4q8UXoboOS2BHoDNdVYHgw5Yprf WbkjZMTe0JV8hVChZoQYp7uNllb6Vr3TMctivilJUhyne1B7qD1anVHLH94eeLjqgMBz cUWHuTvRphFNJWxfZpo2JXsNUAyCuGOcXjvzoBQ/bx9MILSSP/WUcG/4I8Km7IyM4FIt 0gDQ== 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=UWcaxdu9K4akJ+sWaH4xeegobRis5gP3mIQvcJe7RHs=; b=lPhDXB2yo6knoLH+T9kHXJiBNZ18OFz512/YBNQgPnBcrCyCOldU09DoTTssJpdsg5 sTOpb5haV5SKe1rFeD6UvbVPqn5R6dlPybqahOuEDTmZ5SFEUW/KEeqDzLodVB18f43S RGa6oHDVR0fh+o/pMo/0cd5ktawXJiTX0Mb9yRXjY6UzTIp5hi/3l/PyMCY8R7Xwo9Uf vI8mFSwZCnq5tv1CqKN01W73bz5egLej6spTezHR5OQxEJ4g3kL9sRFQZC7wmdUW6kEb /bWfoWyukP9/WBemlfpeoFCCEzdatL9NX8QRZWed6wLWxFrRxbl5Rf+9F3QCKeeZiG5k hoYA== X-Gm-Message-State: AGi0PuZI1ybU0ogiSdP8RMsngjE6wJLvATQleJV+rM350vyA0Ms4fV5X u015vv1jQOxibiZYLatRl4GJ2PJU X-Google-Smtp-Source: APiQypKSj9c/GzeOEnkzu8upaE0cob/5fTGc9ycXtxkTGsWF2mUVsAF0zML15NmiTikK8teYKANcYQ== X-Received: by 2002:a05:600c:204b:: with SMTP id p11mr8854577wmg.92.1586102400253; Sun, 05 Apr 2020 09:00:00 -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.08.59.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Apr 2020 08:59:59 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 5 Apr 2020 17:59:11 +0200 Message-Id: <20200405155928.9323-4-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 03/20] avformat/matroskaenc: Use random TrackUID 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" Up until now, the TrackUID of a Matroska track which is supposed to be random was not random at all: It always coincided with the TrackNumber which is usually the 1-based index of the corresponding stream in the array of AVStreams. This has been changed: It is now set via an AVLFG if AVFMT_FLAG_BITEXACT is not set. Otherwise it is set like it is set now (the only change happens if an explicit track number has been chosen via dash_track_number, because the system used in the normal situation is now used, too). In particular, no FATE tests need to be updated. This also fixes a bug in case the dash_track_number option was used: In this case the TrackUID was set to the provided number, but the tags were written with a TagTrackUID simply based upon the index, so that the tags didn't apply to the track they ought to apply to. Signed-off-by: Andreas Rheinhardt --- libavformat/matroskaenc.c | 47 +++++++++++++++++++++++++++++++++------ 1 file changed, 40 insertions(+), 7 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 96d8c012ad..d2046193ee 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -95,6 +95,7 @@ typedef struct mkv_cues { typedef struct mkv_track { int write_dts; int has_cue; + uint64_t uid; int sample_rate; int64_t sample_rate_offset; int64_t last_timestamp; @@ -1117,8 +1118,7 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv, track = start_ebml_master(pb, MATROSKA_ID_TRACKENTRY, 0); put_ebml_uint (pb, MATROSKA_ID_TRACKNUMBER, mkv->is_dash ? mkv->dash_track_number : i + 1); - put_ebml_uint (pb, MATROSKA_ID_TRACKUID, - mkv->is_dash ? mkv->dash_track_number : i + 1); + put_ebml_uint (pb, MATROSKA_ID_TRACKUID, mkv->tracks[i].uid); put_ebml_uint (pb, MATROSKA_ID_TRACKFLAGLACING , 0); // no lacing (yet) if ((tag = av_dict_get(st->metadata, "title", NULL, 0))) @@ -1571,6 +1571,7 @@ static int mkv_write_tags(AVFormatContext *s) tagp = (s->pb->seekable & AVIO_SEEKABLE_NORMAL) && !mkv->is_live ? &tag : NULL; for (i = 0; i < s->nb_streams; i++) { AVStream *st = s->streams[i]; + mkv_track *track = &mkv->tracks[i]; if (st->codecpar->codec_type == AVMEDIA_TYPE_ATTACHMENT) continue; @@ -1579,7 +1580,7 @@ static int mkv_write_tags(AVFormatContext *s) continue; ret = mkv_write_tag(s, st->metadata, MATROSKA_ID_TAGTARGETS_TRACKUID, - i + 1, tagp); + track->uid, tagp); if (ret < 0) return ret; if (tagp) { @@ -1785,10 +1786,6 @@ static int mkv_write_header(AVFormatContext *s) version = 4; } - mkv->tracks = av_mallocz_array(s->nb_streams, sizeof(*mkv->tracks)); - if (!mkv->tracks) { - return AVERROR(ENOMEM); - } ebml_header = start_ebml_master(pb, EBML_ID_HEADER, MAX_EBML_HEADER_SIZE); put_ebml_uint (pb, EBML_ID_EBMLVERSION , 1); put_ebml_uint (pb, EBML_ID_EBMLREADVERSION , 1); @@ -2609,8 +2606,28 @@ static int webm_query_codec(enum AVCodecID codec_id, int std_compliance) return 0; } +static uint64_t mkv_get_uid(const mkv_track *tracks, int i, AVLFG *c) +{ + while (1) { + uint64_t uid; + int k; + uid = (uint64_t)av_lfg_get(c) << 32; + uid |= av_lfg_get(c); + if (!uid) + continue; + for (k = 0; k < i; k++) { + if (tracks[k].uid == uid) + break; + } + if (k == i) + return uid; + } +} + static int mkv_init(struct AVFormatContext *s) { + MatroskaMuxContext *mkv = s->priv_data; + AVLFG c; int i; if (s->nb_streams > MAX_TRACKS) { @@ -2639,7 +2656,23 @@ static int mkv_init(struct AVFormatContext *s) s->internal->avoid_negative_ts_use_pts = 1; } + mkv->tracks = av_mallocz_array(s->nb_streams, sizeof(*mkv->tracks)); + if (!mkv->tracks) { + return AVERROR(ENOMEM); + } + + if (!(s->flags & AVFMT_FLAG_BITEXACT)) + av_lfg_init(&c, av_get_random_seed()); + for (i = 0; i < s->nb_streams; i++) { + mkv_track *track = &mkv->tracks[i]; + + if (s->flags & AVFMT_FLAG_BITEXACT) { + track->uid = i + 1; + } else { + track->uid = mkv_get_uid(mkv->tracks, i, &c); + } + // ms precision is the de-facto standard timescale for mkv files avpriv_set_pts_info(s->streams[i], 64, 1, 1000); }