From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <ffmpeg-devel-bounces@ffmpeg.org>
Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100])
by master.gitmailbox.com (Postfix) with ESMTP id A87BF43547
for <ffmpegdev@gitmailbox.com>; Thu, 16 Jun 2022 20:06:39 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 22C4F68B8B9;
Thu, 16 Jun 2022 23:03:59 +0300 (EEST)
Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D822768B80F
for <ffmpeg-devel@ffmpeg.org>; Thu, 16 Jun 2022 23:03:40 +0300 (EEST)
Received: from localhost (localhost [IPv6:::1])
by mail0.khirnov.net (Postfix) with ESMTP id 10069240511
for <ffmpeg-devel@ffmpeg.org>; Thu, 16 Jun 2022 22:03:39 +0200 (CEST)
Received: from mail0.khirnov.net ([IPv6:::1])
by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024)
with ESMTP id IE3v6Z79i9I8 for <ffmpeg-devel@ffmpeg.org>;
Thu, 16 Jun 2022 22:03:38 +0200 (CEST)
Received: from libav.khirnov.net (libav.khirnov.net
[IPv6:2a00:c500:561:201::7])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256
client-signature RSA-PSS (2048 bits) client-digest SHA256)
(Client CN "libav.khirnov.net",
Issuer "smtp.khirnov.net SMTP CA" (verified OK))
by mail0.khirnov.net (Postfix) with ESMTPS id EDB48240555
for <ffmpeg-devel@ffmpeg.org>; Thu, 16 Jun 2022 22:03:33 +0200 (CEST)
Received: by libav.khirnov.net (Postfix, from userid 1000)
id 9D3533A141E; Thu, 16 Jun 2022 22:03:30 +0200 (CEST)
From: Anton Khirnov <anton@khirnov.net>
To: ffmpeg-devel@ffmpeg.org
Date: Thu, 16 Jun 2022 21:55:08 +0200
Message-Id: <20220616195534.5278-9-anton@khirnov.net>
X-Mailer: git-send-email 2.34.1
In-Reply-To: <20220616195534.5278-1-anton@khirnov.net>
References: <20220616195534.5278-1-anton@khirnov.net>
MIME-Version: 1.0
Subject: [FFmpeg-devel] [PATCH 09/35] fftools/ffmpeg: access output file
chapters through a wrapper
X-BeenThere: ffmpeg-devel@ffmpeg.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org>
List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe>
List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel>
List-Post: <mailto:ffmpeg-devel@ffmpeg.org>
List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help>
List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe>
Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: ffmpeg-devel-bounces@ffmpeg.org
Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>
Archived-At: <https://master.gitmailbox.com/ffmpegdev/20220616195534.5278-9-anton@khirnov.net/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
Avoid accessing the muxer context directly, as this will become
forbidden in future commits.
---
fftools/ffmpeg.c | 15 +++++++++------
fftools/ffmpeg.h | 2 ++
fftools/ffmpeg_mux.c | 7 +++++++
3 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c
index 75c2322091..d8ab0ffb9c 100644
--- a/fftools/ffmpeg.c
+++ b/fftools/ffmpeg.c
@@ -2860,12 +2860,15 @@ static void parse_forced_key_frames(char *kf, OutputStream *ost,
*next++ = 0;
if (!memcmp(p, "chapters", 8)) {
-
- AVFormatContext *avf = output_files[ost->file_index]->ctx;
+ OutputFile *of = output_files[ost->file_index];
+ AVChapter * const *ch;
+ unsigned int nb_ch;
int j;
- if (avf->nb_chapters > INT_MAX - size ||
- !(pts = av_realloc_f(pts, size += avf->nb_chapters - 1,
+ ch = of_get_chapters(of, &nb_ch);
+
+ if (nb_ch > INT_MAX - size ||
+ !(pts = av_realloc_f(pts, size += nb_ch - 1,
sizeof(*pts)))) {
av_log(NULL, AV_LOG_FATAL,
"Could not allocate forced key frames array.\n");
@@ -2874,8 +2877,8 @@ static void parse_forced_key_frames(char *kf, OutputStream *ost,
t = p[8] ? parse_time_or_die("force_key_frames", p + 8, 1) : 0;
t = av_rescale_q(t, AV_TIME_BASE_Q, avctx->time_base);
- for (j = 0; j < avf->nb_chapters; j++) {
- AVChapter *c = avf->chapters[j];
+ for (j = 0; j < nb_ch; j++) {
+ const AVChapter *c = ch[j];
av_assert1(index < size);
pts[index++] = av_rescale_q(c->start, c->time_base,
avctx->time_base) + t;
diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h
index ea226eb901..7bc5d2ce2e 100644
--- a/fftools/ffmpeg.h
+++ b/fftools/ffmpeg.h
@@ -705,5 +705,7 @@ void of_write_packet(OutputFile *of, AVPacket *pkt, OutputStream *ost,
int unqueue);
int of_finished(OutputFile *of);
int64_t of_filesize(OutputFile *of);
+AVChapter * const *
+of_get_chapters(OutputFile *of, unsigned int *nb_chapters);
#endif /* FFTOOLS_FFMPEG_H */
diff --git a/fftools/ffmpeg_mux.c b/fftools/ffmpeg_mux.c
index 78395bebb4..19519052fe 100644
--- a/fftools/ffmpeg_mux.c
+++ b/fftools/ffmpeg_mux.c
@@ -382,3 +382,10 @@ int64_t of_filesize(OutputFile *of)
return ret;
}
+
+AVChapter * const *
+of_get_chapters(OutputFile *of, unsigned int *nb_chapters)
+{
+ *nb_chapters = of->ctx->nb_chapters;
+ return of->ctx->chapters;
+}
--
2.34.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".