From patchwork Wed Nov 27 05:38:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 16427 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 6F6914495CE for ; Wed, 27 Nov 2019 07:39:14 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5C1C168B042; Wed, 27 Nov 2019 07:39:14 +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 47929689B7F for ; Wed, 27 Nov 2019 07:39:13 +0200 (EET) Received: by mail-wr1-f67.google.com with SMTP id s5so25124906wrw.2 for ; Tue, 26 Nov 2019 21:39:13 -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=CW0yV1GFmfJB2u8upXOEmd6SIDRG5zO6fLaXIOQETPw=; b=C7G1QvkyMFLXRT562wC6AOQX91St3ITcZiIS0iwqOU6jBZYlq7tvMhhZ8phS/GRSrN igqFvA6ayBNsT74xFSh13llSmtr7K6sqJWtnflO8Y3G40asJWrV/CpARNxvzyTzcTd2L EhG0LFASqbCH7pKv6T0xhYiALnovbXZCoJgEE/f6e5IB23IkerJCBw3kfHM+ZgUqMcTM pzAc9LqdnAh1UG6NkjmfIveVrRQXjeSUoaeQycoWFFzNRySHBeHkkmajzIzUK2dxohNw bW4GjZYuHoM4JX+devNQHI67UgtLYPVVhCbtNeLT7ODU9EhrMVris81EyqYhYep2GRQv s9kA== 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=CW0yV1GFmfJB2u8upXOEmd6SIDRG5zO6fLaXIOQETPw=; b=GORb45ZLXOyyMvHg3bGv73EH6oLo/MUtq85Bs5TAbg8c8zEmtEInBfXeY1Y5mHBoiT PyXuPXF1kAoI5QVwqEbR+vh2n+LFJa+sV+PUXQyaLZZQQc85HtPvp83kL1LN0nb/z2A7 aObamoCbEMljzeD/LEG1kIL3qxIv7EbWF1B4pJpMuicQT/6y+nsLbsJ/vjAbuJoyirYD E+SZwEcH0HycbeALgp5Lls+VFS2PqVWNIKsmNMkWCPno5SEjXkX6wdVGDIV289FcjH3p 4xBcxtx3DyL9X1QiJEXg90m43JbE9H92G+LboJeftlXthpBYIf4/g6B2eiS2rzXlGKXT n06g== X-Gm-Message-State: APjAAAUP+ZRRSQy6/Iilaguxx/Y/0IeOfG5PGXdsANJzDwxKSb5qNl7x pxCYEXzIyNQQZ7rj0+gbnRPBJn21 X-Google-Smtp-Source: APXvYqxgwVxbQY1wOACjRV/xxGbsK3p1wFlbyQWc2JmIi0iimeao7xOXmBiKyW1ArNbmlAxSOa6vgw== X-Received: by 2002:adf:dc4b:: with SMTP id m11mr26201155wrj.344.1574833152366; Tue, 26 Nov 2019 21:39:12 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc08e23.dynamic.kabel-deutschland.de. [188.192.142.35]) by smtp.gmail.com with ESMTPSA id n9sm3372511wrt.93.2019.11.26.21.39.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Nov 2019 21:39:11 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 27 Nov 2019 06:38:39 +0100 Message-Id: <20191127053842.19481-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191127053842.19481-1-andreas.rheinhardt@gmail.com> References: <20191106024922.19228-3-andreas.rheinhardt@gmail.com> <20191127053842.19481-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 2/5] 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 track 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 --- Changed the UID to 64bit and also removed the possibility to call av_get_random_seed() more than once during init. Furthermore improved the choice of UID a bit more in case of collisions. libavformat/matroskaenc.c | 65 ++++++++++++++++++++++++++++++++++----- 1 file changed, 57 insertions(+), 8 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 1d3203c969..98be7f7a2f 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -94,6 +94,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; @@ -1199,8 +1200,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))) @@ -1651,7 +1651,8 @@ static int mkv_write_tags(AVFormatContext *s) if (!mkv_check_tag(st->metadata, MATROSKA_ID_TAGTARGETS_TRACKUID)) continue; - ret = mkv_write_tag(s, st->metadata, MATROSKA_ID_TAGTARGETS_TRACKUID, i + 1); + ret = mkv_write_tag(s, st->metadata, MATROSKA_ID_TAGTARGETS_TRACKUID, + mkv->tracks[i].uid); if (ret < 0) return ret; } @@ -1659,13 +1660,15 @@ static int mkv_write_tags(AVFormatContext *s) for (i = 0; i < s->nb_streams; i++) { AVIOContext *pb; AVStream *st = s->streams[i]; + mkv_track *track = &mkv->tracks[i]; ebml_master tag_target; ebml_master tag; if (st->codecpar->codec_type == AVMEDIA_TYPE_ATTACHMENT) continue; - mkv_write_tag_targets(s, MATROSKA_ID_TAGTARGETS_TRACKUID, i + 1, &tag_target); + mkv_write_tag_targets(s, MATROSKA_ID_TAGTARGETS_TRACKUID, + track->uid, &tag_target); pb = mkv->tags_bc; tag = start_ebml_master(pb, MATROSKA_ID_SIMPLETAG, 0); @@ -1865,10 +1868,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); @@ -2670,8 +2669,42 @@ 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) +{ + uint64_t uid; + + for (int j = 0, k; j < 5; j++) { + 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; + } + + /* Make the uid odd so that it is invertible mod 2^n. + * This implies that the multiples of uid below are all distinct. */ + uid |= 1; + for (int j = 1, k; j < i + 1; j++) { + for (k = 0; k < i; k++) { + if (tracks[k].uid == j * uid) + break; + } + if (k == i) + return j * uid; + } + /* Return (i + 1) * uid. It can't coincide with another uid. */ + return (i + 1) * uid; +} + static int mkv_init(struct AVFormatContext *s) { + MatroskaMuxContext *mkv = s->priv_data; + AVLFG c; int i; if (s->nb_streams > MAX_TRACKS) { @@ -2700,7 +2733,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); }