From patchwork Tue Jun 4 14:45:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 13412 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 F1A7344438B for ; Tue, 4 Jun 2019 17:51:32 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CDF8A68A16A; Tue, 4 Jun 2019 17:51:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4C470689DB2 for ; Tue, 4 Jun 2019 17:51:27 +0300 (EEST) Received: by mail-wm1-f65.google.com with SMTP id 16so353831wmg.5 for ; Tue, 04 Jun 2019 07:51:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=esj5QB2t5pUFQELL7jhbEWx5ajwGDrWmWIc+yMD+YbY=; b=XD+D1RcPbKCE6ofTzpzQ66nghcOoGgIabpBoC3lY5bjmlpr5/o7X1h6wIAGyPq3ceI tmkElfKKahk+KXhHrAMprmXDewIwqjlKAbm85+HF0O5x2sepqz24Cqq0RoED+hM9iEV9 yu3P+wz2NWPfihjpWa3cob20svc9j0xBb0Tp1Kd4rbgzXGPDraZfjupmsOP16T2swy8M 3mC+EilFb0l9L3C2wsFF7L/8qAnFDl+1Mpe0rkBpi0J2Kbtim8MrtyOsGFZ3MKcX1VOY cHNSnB36/LrO27zr4pZi6ao43ujBWetztgJI5vfL4idN9f3LCfZjZ7Vb6kkaU8Ph0/e7 Of2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=esj5QB2t5pUFQELL7jhbEWx5ajwGDrWmWIc+yMD+YbY=; b=uNcw9bOKLn2mUbUdjr0b8e5kdNuFh9cn4YysPGYb96q67cVLmDwRiwwoju5AJlY997 dR3ZNJBPWTsUDWsCzW3lK1CrgNSPMLQPTqaSlOC9vKu/Im4s7ORLdDfHNZAQekuf0wGP PjYA3Iida1oV6Z30gWRW0dmBX0vUiYfKrqwJMIJGSxjtfZ+y1uD1mTMcSWQQRKFeFvSn HnzGSaddRWTrcnzopX6Qfi+JxpdxaFGjhr3AQBMLPpiiJgtP9mEMBySGLXhcauRV2m3F n68XOUotzufjGt/UyBzLHCnycV8EwB3SmTSErR685YGvgNi1DNheyzJeSjY7yXivC5+i TbaA== X-Gm-Message-State: APjAAAUNc9kE4z+bpBzCSjl++AWGc5cbNv7yiGJuiTQodvWVxOz+duBx 1j+Ounf1rsgucgfLWkN9ts5VH76Z X-Google-Smtp-Source: APXvYqzpv6Z2fQ3tP0A1hbxH3N9yKHvOu5pxAlZRjKtOZcpMzYclGbqAbkhSjUies7fIoZwktAALhg== X-Received: by 2002:a1c:cc02:: with SMTP id h2mr18304582wmb.13.1559659548134; Tue, 04 Jun 2019 07:45:48 -0700 (PDT) Received: from localhost.localdomain ([37.244.240.194]) by smtp.gmail.com with ESMTPSA id e13sm21245511wra.16.2019.06.04.07.45.47 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 04 Jun 2019 07:45:47 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Tue, 4 Jun 2019 16:45:38 +0200 Message-Id: <20190604144538.18166-1-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH] avformat/id3v2enc: write CTOC too 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Paul B Mahol --- libavformat/id3v2enc.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/libavformat/id3v2enc.c b/libavformat/id3v2enc.c index ffe358f019..9b72614447 100644 --- a/libavformat/id3v2enc.c +++ b/libavformat/id3v2enc.c @@ -255,6 +255,39 @@ static int write_metadata(AVIOContext *pb, AVDictionary **metadata, return 0; } +static int write_ctoc(AVFormatContext *s, ID3v2EncContext *id3, int enc) +{ + uint8_t *dyn_buf = NULL; + AVIOContext *dyn_bc = NULL; + char name[123]; + int len, ret; + + if ((ret = avio_open_dyn_buf(&dyn_bc)) < 0) + goto fail; + + id3->len += avio_put_str(dyn_bc, "toc"); + avio_wb16(dyn_bc, 0x03); + avio_w8(dyn_bc, s->nb_chapters); + for (int i = 0; i < s->nb_chapters; i++) { + snprintf(name, 122, "ch%d", i); + id3->len += avio_put_str(dyn_bc, name); + } + len = avio_close_dyn_buf(dyn_bc, &dyn_buf); + id3->len += 16 + ID3v2_HEADER_SIZE; + + avio_wb32(s->pb, MKBETAG('C', 'T', 'O', 'C')); + avio_wb32(s->pb, len); + avio_wb16(s->pb, 0); + avio_write(s->pb, dyn_buf, len); + +fail: + if (dyn_bc && !dyn_buf) + avio_close_dyn_buf(dyn_bc, &dyn_buf); + av_freep(&dyn_buf); + + return ret; +} + static int write_chapter(AVFormatContext *s, ID3v2EncContext *id3, int id, int enc) { const AVRational time_base = {1, 1000}; @@ -306,6 +339,9 @@ int ff_id3v2_write_metadata(AVFormatContext *s, ID3v2EncContext *id3) if ((ret = write_metadata(s->pb, &s->metadata, id3, enc)) < 0) return ret; + if ((ret = write_ctoc(s, id3, enc)) < 0) + return ret; + for (i = 0; i < s->nb_chapters; i++) { if ((ret = write_chapter(s, id3, i, enc)) < 0) return ret;