xaymar/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

patches: Fix 45be7d3194 for 4.2

Browse Source
This commit is contained in:
Michael Fabian 'Xaymar' Dirks
2021-05-23 20:23:29 +02:00
parent 45be7d3194
commit 07af655f36
1 changed files with 30 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
patches/4.2/0001-avformat-matroskaenc-Allow-changing-the-time-stamp-p.patch
+18 -9
View File
@@ -1,6 +1,6 @@
From 3996cdc26aab55db5b4213bac039c8c353100ca5 Mon Sep 17 00:00:00 2001 From 0d97943b55946b590216e7e8421fac1900352b5b Mon Sep 17 00:00:00 2001
From: Michael Fabian 'Xaymar' Dirks <info@xaymar.com> From: Michael Fabian 'Xaymar' Dirks <info@xaymar.com>
Date: Sat, 22 May 2021 23:13:13 +0200 Date: Sun, 23 May 2021 20:17:00 +0200
Subject: [PATCH] avformat/matroskaenc: Allow changing the time stamp precision Subject: [PATCH] avformat/matroskaenc: Allow changing the time stamp precision
via option via option
@@ -10,10 +10,12 @@ time stamps in the Matroska container up to 1 nanosecond, which can aid
with the proper detection of constant and variable rate content. with the proper detection of constant and variable rate content.
Work-around fix for: 259, 6406, 7927, 8909 and 9124. Work-around fix for: 259, 6406, 7927, 8909 and 9124.
Signed-off-by: Michael Fabian 'Xaymar' Dirks <michael.dirks@xaymar.com>
--- ---
doc/muxers.texi | 9 +++++++++ doc/muxers.texi | 9 +++++++++
libavformat/matroskaenc.c | 33 ++++++++++++++++++++++++++------- libavformat/matroskaenc.c | 34 +++++++++++++++++++++++++++-------
2 files changed, 35 insertions(+), 7 deletions(-) 2 files changed, 36 insertions(+), 7 deletions(-)
diff --git a/doc/muxers.texi b/doc/muxers.texi diff --git a/doc/muxers.texi b/doc/muxers.texi
index b109297963..30fcd4df4a 100644 index b109297963..30fcd4df4a 100644
@@ -36,7 +38,7 @@ index b109297963..30fcd4df4a 100644
For example a 3D WebM clip can be created using the following command line: For example a 3D WebM clip can be created using the following command line:
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index ad7b0bf2c6..832a008930 100644 index ad7b0bf2c6..a057c735e8 100644
--- a/libavformat/matroskaenc.c --- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c
@@ -161,6 +161,8 @@ typedef struct MatroskaMuxContext { @@ -161,6 +161,8 @@ typedef struct MatroskaMuxContext {
@@ -112,14 +114,22 @@ index ad7b0bf2c6..832a008930 100644
if (mkv->cluster_size_limit < 0) if (mkv->cluster_size_limit < 0)
mkv->cluster_size_limit = 32 * 1024; mkv->cluster_size_limit = 32 * 1024;
} }
@@ -2752,10 +2766,14 @@ static int mkv_init(struct AVFormatContext *s) @@ -2723,6 +2737,7 @@ static int webm_query_codec(enum AVCodecID codec_id, int std_compliance)
static int mkv_init(struct AVFormatContext *s)
{
+ MatroskaMuxContext *mkv = s->priv_data;
int i;
if (s->nb_streams > MAX_TRACKS) {
@@ -2752,10 +2767,14 @@ static int mkv_init(struct AVFormatContext *s)
} }
for (i = 0; i < s->nb_streams; i++) { for (i = 0; i < s->nb_streams; i++) {
- // ms precision is the de-facto standard timescale for mkv files - // ms precision is the de-facto standard timescale for mkv files
- avpriv_set_pts_info(s->streams[i], 64, 1, 1000); - avpriv_set_pts_info(s->streams[i], 64, 1, 1000);
+ // Use user-defined timescale. + // Use user-defined timescale.
+ avpriv_set_pts_info(st, 64, mkv->time_base.num, mkv->time_base.den); + avpriv_set_pts_info(s->streams[i], 64, mkv->time_base.num, mkv->time_base.den);
} }
+ // Scale the configured cluster_time_limit. + // Scale the configured cluster_time_limit.
@@ -129,7 +139,7 @@ index ad7b0bf2c6..832a008930 100644
return 0; return 0;
} }
@@ -2815,6 +2833,7 @@ static const AVOption options[] = { @@ -2815,6 +2834,7 @@ static const AVOption options[] = {
{ "live", "Write files assuming it is a live stream.", OFFSET(is_live), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, FLAGS }, { "live", "Write files assuming it is a live stream.", OFFSET(is_live), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, FLAGS },
{ "allow_raw_vfw", "allow RAW VFW mode", OFFSET(allow_raw_vfw), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, FLAGS }, { "allow_raw_vfw", "allow RAW VFW mode", OFFSET(allow_raw_vfw), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, FLAGS },
{ "write_crc32", "write a CRC32 element inside every Level 1 element", OFFSET(write_crc), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, FLAGS }, { "write_crc32", "write a CRC32 element inside every Level 1 element", OFFSET(write_crc), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, FLAGS },
@@ -139,4 +149,3 @@ index ad7b0bf2c6..832a008930 100644
-- --
2.31.1.windows.1 2.31.1.windows.1