From patchwork Sun Apr 5 15:59:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 18667 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 767AD44BE3F for ; Sun, 5 Apr 2020 19:00:10 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5B4F268B366; Sun, 5 Apr 2020 19:00:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7178768B213 for ; Sun, 5 Apr 2020 19:00:02 +0300 (EEST) Received: by mail-wr1-f68.google.com with SMTP id s8so12282508wrt.7 for ; Sun, 05 Apr 2020 09:00:02 -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=7C97MRB9M/nR+brk//umK2OrDV45oainxlR1I53Otcw=; b=nzsfxksn5JrTzycWBJdpyfv5sROcK+Tx4tTzkTJ76pEcnPsDMidaa/cbC063NgN59+ SOj9/Gv8xGnzAp7pGgUEcfiQLb5K0OBCHxPzqDKrSlFaz/2ujfu3YPcAf/nQvuMXymOh Nwy0bWdYC6jcbRt4kzSPy9+ShWx6YtNIO+2YCGN7fvX5ASe3FwNOdA+SfewugUqwF/BG VoGVOzPV7cI7jhz5kJRb9O4YPNiXtemlBtPo+Blk/PlJsafmpo3OlPEWhfFN2JaoBDmr HgsuWuZJgFji14T1hVop0b5ASsoYI5fJQ+Cu4YcuPrOU/3/QjUDSkM6nZOkG4AB+2AiW rWUw== 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=7C97MRB9M/nR+brk//umK2OrDV45oainxlR1I53Otcw=; b=Ts1gPAcOTpnNyr7u1vq1MWTT2x9WEmV3tkKcQ2s71KZ+SF8gfxvg9Hz2Gdr8YCML6B voR5ozD/4DBrKsOIpz7HslAh7T8Vi5144kx8JrLGBkKQj3q9rBvnZM2O6giOj0IJbott 1/+cFXcIczII/+RoTaKUFgl8Uz9CEFnRcekSwlzqEr80p44yj+zmchIaq+HPiviCLeiK FcDhK+koggd+9+33yHIg8hy86wG7vO8ioEP2SGIPAW04SME5PHO+Izw/AE+W3D8ogjSy afB/MeGGjzOqvAGj4hJeYeCHEnBhZWw6/7q1sEZhXYYXkHRUMfsNpKYPuWp7GQMegcke 7MNQ== X-Gm-Message-State: AGi0PuaCP0t5EMjk4G9RP5yRqwXPF/EYbEEzZElu3IlB7K6Pj8nAlbTO xswqfbC3CrsrHn3qoCKaPgm52SC2 X-Google-Smtp-Source: APiQypLTrJeBp4J+9iJxJrng7qx3vYSamUWaGSJqu3EY2bEYtnIImC2fqiOY05K/pCL8H6WD59Ua9A== X-Received: by 2002:a5d:414f:: with SMTP id c15mr21200515wrq.60.1586102401477; Sun, 05 Apr 2020 09:00:01 -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.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Apr 2020 09:00:00 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 5 Apr 2020 17:59:12 +0200 Message-Id: <20200405155928.9323-5-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 04/20] avformat/matroskaenc: Reuse random seed 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" This commit reuses the random seed generated in mkv_init() (to determine the TrackUIDs) for the SegmentUID in order to avoid a potentially expensive call to av_get_random_seed(). Signed-off-by: Andreas Rheinhardt --- libavformat/matroskaenc.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index d2046193ee..b93c50cb01 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -161,6 +161,8 @@ typedef struct MatroskaMuxContext { int wrote_chapters; int allow_raw_vfw; + + uint32_t segment_uid[4]; } MatroskaMuxContext; /** 2 bytes * 7 for EBML IDs, 7 1-byte EBML lengths, 6 1-byte uint, @@ -1821,15 +1823,7 @@ static int mkv_write_header(AVFormatContext *s) put_ebml_string(pb, MATROSKA_ID_WRITINGAPP, LIBAVFORMAT_IDENT); if (mkv->mode != MODE_WEBM) { - uint32_t segment_uid[4]; - AVLFG lfg; - - av_lfg_init(&lfg, av_get_random_seed()); - - for (i = 0; i < 4; i++) - segment_uid[i] = av_lfg_get(&lfg); - - put_ebml_binary(pb, MATROSKA_ID_SEGMENTUID, segment_uid, 16); + put_ebml_binary(pb, MATROSKA_ID_SEGMENTUID, mkv->segment_uid, 16); } } else { const char *ident = "Lavf"; @@ -2661,9 +2655,14 @@ static int mkv_init(struct AVFormatContext *s) return AVERROR(ENOMEM); } - if (!(s->flags & AVFMT_FLAG_BITEXACT)) + if (!(s->flags & AVFMT_FLAG_BITEXACT)) { av_lfg_init(&c, av_get_random_seed()); + // Calculate the SegmentUID now in order not to waste our random seed. + for (i = 0; i < 4; i++) + mkv->segment_uid[i] = av_lfg_get(&c); + } + for (i = 0; i < s->nb_streams; i++) { mkv_track *track = &mkv->tracks[i];