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 08A4F410D5
for <ffmpegdev@gitmailbox.com>; Sun, 14 May 2023 19:39:29 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 47B3168BF06;
Sun, 14 May 2023 22:39:26 +0300 (EEST)
Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E882B68B04A
for <ffmpeg-devel@ffmpeg.org>; Sun, 14 May 2023 22:39:19 +0300 (EEST)
Received: from localhost (localhost [IPv6:::1])
by mail0.khirnov.net (Postfix) with ESMTP id 6CC502404EC
for <ffmpeg-devel@ffmpeg.org>; Sun, 14 May 2023 21:39:19 +0200 (CEST)
Received: from mail0.khirnov.net ([IPv6:::1])
by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024)
with ESMTP id mQAG0i6unVim for <ffmpeg-devel@ffmpeg.org>;
Sun, 14 May 2023 21:39:18 +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 8464B240177
for <ffmpeg-devel@ffmpeg.org>; Sun, 14 May 2023 21:39:18 +0200 (CEST)
Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1])
by libav.khirnov.net (Postfix) with ESMTP id 2EDA23A01C0
for <ffmpeg-devel@ffmpeg.org>; Sun, 14 May 2023 21:39:12 +0200 (CEST)
From: Anton Khirnov <anton@khirnov.net>
To: ffmpeg-devel@ffmpeg.org
Date: Sun, 14 May 2023 21:39:00 +0200
Message-Id: <20230514193900.10254-1-anton@khirnov.net>
X-Mailer: git-send-email 2.39.2
In-Reply-To: <aefc137d-3a2d-265f-c842-c5a051900ec8@gmail.com>
References: <aefc137d-3a2d-265f-c842-c5a051900ec8@gmail.com>
MIME-Version: 1.0
Subject: [FFmpeg-devel] [PATCH] lavc/av1*: fix exporting framerate
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/20230514193900.10254-1-anton@khirnov.net/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
* take num_ticks_per_picture_minus_1 into account, since that is a part
of the framerate computation
* stop exporting num_ticks_per_picture_minus_1 into
AVCodecContext.ticks_per_frame, as that field is used for other
purposes (in conjunction with repeat_pict, which is not used at all by
av1)
---
libavcodec/Makefile | 2 +-
libavcodec/av1_parse.c | 14 ++++++++++++++
libavcodec/av1_parse.h | 3 +++
libavcodec/av1_parser.c | 13 +++++++++----
libavcodec/av1dec.c | 16 ++++++++--------
5 files changed, 35 insertions(+), 13 deletions(-)
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 3cf4444b7e..9587e56493 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -1143,7 +1143,7 @@ OBJS-$(CONFIG_AC3_PARSER) += aac_ac3_parser.o ac3tab.o \
ac3_channel_layout_tab.o
OBJS-$(CONFIG_ADX_PARSER) += adx_parser.o
OBJS-$(CONFIG_AMR_PARSER) += amr_parser.o
-OBJS-$(CONFIG_AV1_PARSER) += av1_parser.o
+OBJS-$(CONFIG_AV1_PARSER) += av1_parser.o av1_parse.o
OBJS-$(CONFIG_AVS2_PARSER) += avs2.o avs2_parser.o
OBJS-$(CONFIG_AVS3_PARSER) += avs3_parser.o
OBJS-$(CONFIG_BMP_PARSER) += bmp_parser.o
diff --git a/libavcodec/av1_parse.c b/libavcodec/av1_parse.c
index 59ea0bc6e7..26b70845f2 100644
--- a/libavcodec/av1_parse.c
+++ b/libavcodec/av1_parse.c
@@ -108,3 +108,17 @@ void ff_av1_packet_uninit(AV1Packet *pkt)
av_freep(&pkt->obus);
pkt->obus_allocated = pkt->obus_allocated_size = 0;
}
+
+AVRational ff_av1_framerate(int ticks_per_frame, int units_per_tick,
+ int time_scale)
+{
+ AVRational fr = (AVRational){ 0, 1 };
+
+ if (ticks_per_frame && units_per_tick && time_scale &&
+ ticks_per_frame < INT_MAX / units_per_tick) {
+ av_reduce(&fr.den, &fr.num, units_per_tick * ticks_per_frame,
+ time_scale, INT_MAX);
+ }
+
+ return fr;
+}
diff --git a/libavcodec/av1_parse.h b/libavcodec/av1_parse.h
index f4a5d2830e..11f9c77de4 100644
--- a/libavcodec/av1_parse.h
+++ b/libavcodec/av1_parse.h
@@ -181,4 +181,7 @@ static inline int get_obu_bit_length(const uint8_t *buf, int size, int type)
return size;
}
+AVRational ff_av1_framerate(int ticks_per_frame, int units_per_tick,
+ int time_scale);
+
#endif /* AVCODEC_AV1_PARSE_H */
diff --git a/libavcodec/av1_parser.c b/libavcodec/av1_parser.c
index 14dae92fe9..0d81c29e63 100644
--- a/libavcodec/av1_parser.c
+++ b/libavcodec/av1_parser.c
@@ -21,6 +21,8 @@
*/
#include "libavutil/avassert.h"
+
+#include "av1_parse.h"
#include "cbs.h"
#include "cbs_av1.h"
#include "parser.h"
@@ -162,10 +164,13 @@ static int av1_parser_parse(AVCodecParserContext *ctx,
avctx->color_trc = (enum AVColorTransferCharacteristic) color->transfer_characteristics;
avctx->color_range = color->color_range ? AVCOL_RANGE_JPEG : AVCOL_RANGE_MPEG;
- if (seq->timing_info_present_flag) {
- const AV1RawTimingInfo *timing = &seq->timing_info;
- av_reduce(&avctx->framerate.den, &avctx->framerate.num,
- timing->num_units_in_display_tick, timing->time_scale, INT_MAX);
+ if (seq->timing_info_present_flag &&
+ seq->timing_info.num_ticks_per_picture_minus_1 < INT_MAX - 1 &&
+ seq->timing_info.num_units_in_display_tick < INT_MAX &&
+ seq->timing_info.time_scale < INT_MAX) {
+ avctx->framerate = ff_av1_framerate(seq->timing_info.num_ticks_per_picture_minus_1 + 1,
+ seq->timing_info.num_units_in_display_tick,
+ seq->timing_info.time_scale);
}
end:
diff --git a/libavcodec/av1dec.c b/libavcodec/av1dec.c
index c90c9c1a69..dae1d8e8da 100644
--- a/libavcodec/av1dec.c
+++ b/libavcodec/av1dec.c
@@ -26,6 +26,7 @@
#include "libavutil/pixdesc.h"
#include "libavutil/opt.h"
#include "avcodec.h"
+#include "av1_parse.h"
#include "av1dec.h"
#include "atsc_a53.h"
#include "bytestream.h"
@@ -709,14 +710,13 @@ static int set_context_with_sequence(AVCodecContext *avctx,
}
avctx->sample_aspect_ratio = (AVRational) { 1, 1 };
- if (seq->timing_info.num_units_in_display_tick &&
- seq->timing_info.time_scale) {
- av_reduce(&avctx->framerate.den, &avctx->framerate.num,
- seq->timing_info.num_units_in_display_tick,
- seq->timing_info.time_scale,
- INT_MAX);
- if (seq->timing_info.equal_picture_interval)
- avctx->ticks_per_frame = seq->timing_info.num_ticks_per_picture_minus_1 + 1;
+ if (seq->timing_info_present_flag &&
+ seq->timing_info.num_ticks_per_picture_minus_1 < INT_MAX - 1 &&
+ seq->timing_info.num_units_in_display_tick < INT_MAX &&
+ seq->timing_info.time_scale < INT_MAX) {
+ avctx->framerate = ff_av1_framerate(seq->timing_info.num_ticks_per_picture_minus_1 + 1,
+ seq->timing_info.num_units_in_display_tick,
+ seq->timing_info.time_scale);
}
return 0;
--
2.39.2
_______________________________________________
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".