From patchwork Fri Apr 19 23:40:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 12838 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 1957D4494CF for ; Sat, 20 Apr 2019 02:50:22 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 07A9668AABA; Sat, 20 Apr 2019 02:50:22 +0300 (EEST) 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 BF59A68AAA5 for ; Sat, 20 Apr 2019 02:50:14 +0300 (EEST) Received: by mail-wr1-f65.google.com with SMTP id k1so7323929wrw.0 for ; Fri, 19 Apr 2019 16:50:14 -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=skx2fLePaVnD3K4GRR1VNs4m9vwE3IHhOXrdfOlWKdk=; b=TjaOOGutkZytdbTEm+evu3QwMcLgzjHqI8nzwxS1ajMkASo3PC4mL4nhOSIFpERv1z mWnGHKrYw/0RdPA52o3QkHDACX1SfaL43i0wC/pTWkSdToUBeiVUhQWhmHclLwoqHios m/Aol7x0C0zq0TnswB2Dz8Se2mq8k5Tj4zFZd6cVZd7LQXdnVjJLQmbi9KphAqAO2Odl YR80eOTZuLsFuW4BdYRG66uUmZXq2zp56iMw3UBs5nMdXkGpzhTCT2XvFcjU0vgeLt/C N53sGsmFbPYqaYtXsoNgdQD310Qrzcfqr3x4BNmU6pzh6MMh8/iiUlHqfMI6O2ZfDCQb NLtA== 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=skx2fLePaVnD3K4GRR1VNs4m9vwE3IHhOXrdfOlWKdk=; b=ECO+2gEpuEa2fW4LWEYDxqAWsooZ/Mc8Ln91hF49zP7Du2FNeV33xRlNATd2GxF/lL 0SV6/dqACzZPxYf+c1rwnogqUSGSPKfFSdnk0OfWAE8l8za/+XT35KWmXKkjjD8KSrBq NYZbbITuLeUR1XnTTCDMxwPNb26nuPdBn1HdaKNWfUvuP7FLewRv1zM936I07D9GqS5y pvCzX/G2+EJEdUq7eVRHuvf1alUpvg+yLmYdrH+aXQ9shVN4R8c5whOmUdxSi8XRNll+ CliDUzeeCpy2VIKBN3yMOOFCCKcpNqeHVvXUkc1BH6npYFDlLFtwIF+0oJV7A1l/pubk 4Bmw== X-Gm-Message-State: APjAAAWgQoad/mTxVc0QtkACbAC49GfECPs2livbomZeV8sZXCG4V2et aFaO8a9UDyz7XoCjiWPvlF94EYjF X-Google-Smtp-Source: APXvYqxdZq4jyWXZmRsILyRPK9HzPkQMRBNdv8ef9pu2dLqogaMxNdwkkodPAemU8XoXcXCKTdH9qg== X-Received: by 2002:adf:cf0e:: with SMTP id o14mr3389416wrj.182.1555717814167; Fri, 19 Apr 2019 16:50:14 -0700 (PDT) Received: from localhost.localdomain (ipbcc08c44.dynamic.kabel-deutschland.de. [188.192.140.68]) by smtp.gmail.com with ESMTPSA id t14sm6002395wmi.16.2019.04.19.16.50.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 19 Apr 2019 16:50:13 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 20 Apr 2019 01:40:58 +0200 Message-Id: <20190419234110.32980-3-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190419234110.32980-1-andreas.rheinhardt@gmail.com> References: <20190402133305.3328-1-andreas.rheinhardt@googlemail.com> <20190419234110.32980-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 03/15] avformat/matroskaenc: Slightly improve size bounds for cues 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 upper bounds currently used for determining the size of a CuePoint's length field can be improved somewhat; as a result, a CuePoint containing three CueTrackPositions will now only need a size field with one byte length. Signed-off-by: Andreas Rheinhardt --- libavformat/matroskaenc.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 1849ae3333..0448253a77 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -169,12 +169,12 @@ typedef struct MatroskaMuxContext { * offset, 4 bytes for target EBML ID */ #define MAX_SEEKENTRY_SIZE 21 -/** per-cuepoint-track - 5 1-byte EBML IDs, 5 1-byte EBML sizes, 4 - * 8-byte uint max */ -#define MAX_CUETRACKPOS_SIZE 42 +/** per-cuepoint-track - 5 1-byte EBML IDs, 5 1-byte EBML sizes, 3 8-byte uint max + * and one 1-byte uint for the track number (this assumes MAX_TRACKS to be <= 255) */ +#define MAX_CUETRACKPOS_SIZE 35 -/** per-cuepoint - 2 1-byte EBML IDs, 2 1-byte EBML sizes, 8-byte uint max */ -#define MAX_CUEPOINT_SIZE(num_tracks) 12 + MAX_CUETRACKPOS_SIZE * num_tracks +/** per-cuepoint - 1 1-byte EBML ID, 1 1-byte EBML size, 8-byte uint max */ +#define MAX_CUEPOINT_CONTENT_SIZE(num_tracks) 10 + MAX_CUETRACKPOS_SIZE * num_tracks /** Seek preroll value for opus */ #define OPUS_SEEK_PREROLL 80000000 @@ -605,7 +605,7 @@ static int64_t mkv_write_cues(AVFormatContext *s, mkv_cues *cues, mkv_track *tra ctp_nb ++; } - cuepoint = start_ebml_master(dyn_cp, MATROSKA_ID_POINTENTRY, MAX_CUEPOINT_SIZE(ctp_nb)); + cuepoint = start_ebml_master(dyn_cp, MATROSKA_ID_POINTENTRY, MAX_CUEPOINT_CONTENT_SIZE(ctp_nb)); put_ebml_uint(dyn_cp, MATROSKA_ID_CUETIME, pts); // put all the entries from different tracks that have the exact same