From patchwork Tue Apr 28 08:36:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 19302 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 E110844B819 for ; Tue, 28 Apr 2020 11:40:16 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CE7C868BE29; Tue, 28 Apr 2020 11:40:16 +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 8847168BE09 for ; Tue, 28 Apr 2020 11:40:08 +0300 (EEST) Received: by mail-wr1-f66.google.com with SMTP id k13so23643495wrw.7 for ; Tue, 28 Apr 2020 01:40:08 -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=GBRMxTwFDLcdeqrc5dOzmlLpfeGy/V2cbOZ2Qqdz/74=; b=WmbfgS5uO8vMdFEkiGXOoGfBtBxVVjjUpqGoPMDIVUl8hjedIW5uzxgq9T984pEoY8 ofrKCfLpy86Ny4cEjt7tQYp0UEZSB0ntd4cPShCBeZcnF65qJGFYlQyefUKtngtJjT2g EI7VdNQDzWOjOWC8P2hHWJjIE1L+J+kxzK9KjrCEgP04rD7T9mt9A64K7+4wHwBybYdT Cn++PC5mCdqC6fXyOFnngyxxXoMoacWpExzECalLsa63PqyrpLHd1dlPFq96uhGlm9ca gwrPAiObPaAOAXlNpa9Sv3CFsAEu+jYsuRCSlwp5H8t80CmIVwwxzHlrr+Jb67fn96+q DMOg== 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=GBRMxTwFDLcdeqrc5dOzmlLpfeGy/V2cbOZ2Qqdz/74=; b=En6/VIjfOSAgvSo+QTNnDTZszz4KYS5oTXaW0y01BcLKj7D+kTpdTUOQ2pTVukNyRB 6JMewvYGLHOMl79LQe+CNSqSiVLnA1usjnFaxHWqALKUj/ow8SgaHgjkiFKNHM2HkRfB 735s7NECekphsD27kCmTf9RXrgdN0TYSwUtoVv3Baa1un2IjM+9vk9ovvNEAC/R0MrLG 0V2DcKjGX40dZYM1WS0JtmWJlvlIC8/G5uTd+WvKsy1wt0V22x06ghu/3cdW2kIMN/cp AzcZWfxX2iiXj3TMraqGK0x6tmEoOS2vgIM2lJYdSeZDQvJ5sRyPPqJBDYXQ9oA4DGhg hJsQ== X-Gm-Message-State: AGi0PuZlXfYw6DqfxrGDN6f8bC7KuZxSoV/qr0C4A8sEvtrwuhAOVwaz b+VohUVS+J3W7dxClq1TNF8nlxr9 X-Google-Smtp-Source: APiQypJt6nb9ktAPpuM+39nD7G+ucQMP2i4YN0A6GcXXhZ5274/U3G1bnBFrqWyIN1SjQZQCVZAqTQ== X-Received: by 2002:a5d:5273:: with SMTP id l19mr31971982wrc.42.1588063207630; Tue, 28 Apr 2020 01:40:07 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id w11sm2258351wmi.32.2020.04.28.01.40.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Apr 2020 01:40:06 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 28 Apr 2020 10:36:43 +0200 Message-Id: <20200428083645.4909-5-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200428083645.4909-1-andreas.rheinhardt@gmail.com> References: <20200428083645.4909-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/7] avformat/matroskaenc: Make sure UIDs of delayed chapters are != 0 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 has previously only been checked if the chapters were initially available, but not if they were only written in the trailer. Signed-off-by: Andreas Rheinhardt --- Any Tags pertaining to Chapters added late are currently ignored/lost, too. The Matroska specifications allow multiple Tags elements (our demuxer doesn't ...), so one could write a second Tags element at the end. I'm working on it. libavformat/matroskaenc.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 3513a1697a..668b18e9ee 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1437,6 +1437,12 @@ static int mkv_write_chapters(AVFormatContext *s) if (!s->nb_chapters || mkv->wrote_chapters) return 0; + for (i = 0; i < s->nb_chapters; i++) + if (!s->chapters[i]->id) { + mkv->chapter_id_offset = 1; + break; + } + mkv_add_seekhead_entry(mkv, MATROSKA_ID_CHAPTERS, avio_tell(pb)); ret = start_ebml_master_crc32(&dyn_cp, mkv); @@ -1863,12 +1869,6 @@ static int mkv_write_header(AVFormatContext *s) if (ret < 0) return ret; - for (i = 0; i < s->nb_chapters; i++) - if (!s->chapters[i]->id) { - mkv->chapter_id_offset = 1; - break; - } - ret = mkv_write_chapters(s); if (ret < 0) return ret; @@ -1879,6 +1879,7 @@ static int mkv_write_header(AVFormatContext *s) return ret; } + /* Must come after mkv_write_chapters() because of chapter_id_offset */ ret = mkv_write_tags(s); if (ret < 0) return ret;