* [FFmpeg-devel] [PATCH] libavformat/concatdev.c: Add unified_time_base opt
@ 2022-03-01 12:14 Ye Chuan
2022-03-01 12:18 ` Nicolas George
0 siblings, 1 reply; 9+ messages in thread
From: Ye Chuan @ 2022-03-01 12:14 UTC (permalink / raw)
To: ffmpeg-devel
In some case, the input files have different time base even though
they share the same codec and codec parameters,
While processing the packet, it will adjust the pts/dts by its own
time base instead of the unified one of the output stream, which may
lead to wrong pts/dts or unexpected speed change.
So this patch add the "unified_time_base" opt, which could be setted by
"-unified_time_base 1"
With the option, it will concatenate the input streams whose time base
are different , and won't course speed change issue.
Signed-off-by: Chuan Ye <yechuan0102@hotmail.com>
---
libavformat/concatdec.c | 31 ++++++++++++++++++++++++-------
1 file changed, 24 insertions(+), 7 deletions(-)
diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c
index 0603c6e254..2cb656d87e 100644
--- a/libavformat/concatdec.c
+++ b/libavformat/concatdec.c
@@ -69,6 +69,7 @@ typedef struct {
ConcatMatchMode stream_match_mode;
unsigned auto_convert;
int segment_time_metadata;
+ int unified_time_base;
} ConcatContext;
static int concat_probe(const AVProbeData *probe)
@@ -782,13 +783,27 @@ static int concat_read_packet(AVFormatContext *avf, AVPacket *pkt)
av_ts2str(pkt->pts), av_ts2timestr(pkt->pts, &st->time_base),
av_ts2str(pkt->dts), av_ts2timestr(pkt->dts, &st->time_base));
- delta = av_rescale_q(cat->cur_file->start_time - cat->cur_file->file_inpoint,
- AV_TIME_BASE_Q,
- cat->avf->streams[pkt->stream_index]->time_base);
- if (pkt->pts != AV_NOPTS_VALUE)
- pkt->pts += delta;
- if (pkt->dts != AV_NOPTS_VALUE)
- pkt->dts += delta;
+ if (cat->unified_time_base) {
+ /* replace the pkt base on the time base of target output stream */
+ AVRational output_tb;
+ output_tb = avf->streams[cs->out_stream_index]->time_base;
+ delta = av_rescale_q(cat->cur_file->start_time - cat->cur_file->file_inpoint,
+ AV_TIME_BASE_Q,
+ output_tb);
+ if (pkt->pts != AV_NOPTS_VALUE)
+ pkt->pts = av_rescale_q(pkt->pts, st->time_base, output_tb) + delta;
+ if (pkt->dts != AV_NOPTS_VALUE)
+ pkt->dts = av_rescale_q(pkt->dts, st->time_base, output_tb) + delta;
+ } else {
+ delta = av_rescale_q(cat->cur_file->start_time - cat->cur_file->file_inpoint,
+ AV_TIME_BASE_Q,
+ cat->avf->streams[pkt->stream_index]->time_base);
+ if (pkt->pts != AV_NOPTS_VALUE)
+ pkt->pts += delta;
+ if (pkt->dts != AV_NOPTS_VALUE)
+ pkt->dts += delta;
+ }
+
av_log(avf, AV_LOG_DEBUG, " -> pts:%s pts_time:%s dts:%s dts_time:%s\n",
av_ts2str(pkt->pts), av_ts2timestr(pkt->pts, &st->time_base),
av_ts2str(pkt->dts), av_ts2timestr(pkt->dts, &st->time_base));
@@ -931,6 +946,8 @@ static const AVOption options[] = {
OFFSET(auto_convert), AV_OPT_TYPE_BOOL, {.i64 = 1}, 0, 1, DEC },
{ "segment_time_metadata", "output file segment start time and duration as packet metadata",
OFFSET(segment_time_metadata), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DEC },
+ { "unified_time_base", "adjust to the same time base (from the first stream) while processing packets",
+ OFFSET(unified_time_base), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DEC },
{ NULL }
};
--
2.30.1 (Apple Git-130)
_______________________________________________
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".
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [FFmpeg-devel] [PATCH] libavformat/concatdev.c: Add unified_time_base opt
2022-03-01 12:14 [FFmpeg-devel] [PATCH] libavformat/concatdev.c: Add unified_time_base opt Ye Chuan
@ 2022-03-01 12:18 ` Nicolas George
2022-03-01 12:33 ` Ye Chuan
0 siblings, 1 reply; 9+ messages in thread
From: Nicolas George @ 2022-03-01 12:18 UTC (permalink / raw)
To: FFmpeg development discussions and patches
[-- Attachment #1.1: Type: text/plain, Size: 1180 bytes --]
Ye Chuan (12022-03-01):
> In some case, the input files have different time base even though
> they share the same codec and codec parameters,
> While processing the packet, it will adjust the pts/dts by its own
> time base instead of the unified one of the output stream, which may
> lead to wrong pts/dts or unexpected speed change.
>
> So this patch add the "unified_time_base" opt, which could be setted by
> "-unified_time_base 1"
> With the option, it will concatenate the input streams whose time base
> are different , and won't course speed change issue.
>
> Signed-off-by: Chuan Ye <yechuan0102@hotmail.com>
> ---
> libavformat/concatdec.c | 31 ++++++++++++++++++++++++-------
> 1 file changed, 24 insertions(+), 7 deletions(-)
Thanks for the patch. I need to examine exactly what it does.
In the meantime, I do not know why you keep posting new versions of this
patch every few minutes. Please take your time. And before next time:
> int segment_time_metadata;
> + int unified_time_base;
Mangled indentation.
Missing documentation.
Spelling mistake in the title of the commit message.
Regards,
--
Nicolas George
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
[-- Attachment #2: Type: text/plain, Size: 251 bytes --]
_______________________________________________
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".
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [FFmpeg-devel] [PATCH] libavformat/concatdev.c: Add unified_time_base opt
2022-03-01 12:18 ` Nicolas George
@ 2022-03-01 12:33 ` Ye Chuan
0 siblings, 0 replies; 9+ messages in thread
From: Ye Chuan @ 2022-03-01 12:33 UTC (permalink / raw)
To: FFmpeg development discussions and patches
There is some bug on my mail application , when it open the .eml file , the space may be erase by the application, so the patch will not pass the test online
From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> on behalf of Nicolas George <george@nsup.org>
Date: Tuesday, March 1, 2022 at 8:18 PM
To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Subject: Re: [FFmpeg-devel] [PATCH] libavformat/concatdev.c: Add unified_time_base opt
Ye Chuan (12022-03-01):
> In some case, the input files have different time base even though
> they share the same codec and codec parameters,
> While processing the packet, it will adjust the pts/dts by its own
> time base instead of the unified one of the output stream, which may
> lead to wrong pts/dts or unexpected speed change.
>
> So this patch add the "unified_time_base" opt, which could be setted by
> "-unified_time_base 1"
> With the option, it will concatenate the input streams whose time base
> are different , and won't course speed change issue.
>
> Signed-off-by: Chuan Ye <yechuan0102@hotmail.com>
> ---
> libavformat/concatdec.c | 31 ++++++++++++++++++++++++-------
> 1 file changed, 24 insertions(+), 7 deletions(-)
Thanks for the patch. I need to examine exactly what it does.
In the meantime, I do not know why you keep posting new versions of this
patch every few minutes. Please take your time. And before next time:
> int segment_time_metadata;
> + int unified_time_base;
Mangled indentation.
Missing documentation.
Spelling mistake in the title of the commit message.
Regards,
--
Nicolas George
_______________________________________________
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".
^ permalink raw reply [flat|nested] 9+ messages in thread
* [FFmpeg-devel] [PATCH] libavformat/concatdev.c: Add unified_time_base opt
@ 2022-03-01 12:26 Ye Chuan
0 siblings, 0 replies; 9+ messages in thread
From: Ye Chuan @ 2022-03-01 12:26 UTC (permalink / raw)
To: ffmpeg-devel
In some case, the input files have different time base even though
they share the same codec and codec parameters,
While processing the packet, it will adjust the pts/dts by its own
time base instead of the unified one of the output stream, which may
lead to wrong pts/dts or unexpected speed change.
So this patch add the "unified_time_base" opt, which could be setted by
"-unified_time_base 1"
With the option, it will concatenate the input streams whose time base
are different , and won't course speed change issue.
Signed-off-by: Chuan Ye <yechuan0102@hotmail.com<mailto:yechuan0102@hotmail.com>>
---
libavformat/concatdec.c | 31 ++++++++++++++++++++++++-------
1 file changed, 24 insertions(+), 7 deletions(-)
diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c
index 0603c6e254..2cb656d87e 100644
--- a/libavformat/concatdec.c
+++ b/libavformat/concatdec.c
@@ -69,6 +69,7 @@ typedef struct {
ConcatMatchMode stream_match_mode;
unsigned auto_convert;
int segment_time_metadata;
+ int unified_time_base;
} ConcatContext;
static int concat_probe(const AVProbeData *probe)
@@ -782,13 +783,27 @@ static int concat_read_packet(AVFormatContext *avf, AVPacket *pkt)
av_ts2str(pkt->pts), av_ts2timestr(pkt->pts, &st->time_base),
av_ts2str(pkt->dts), av_ts2timestr(pkt->dts, &st->time_base));
- delta = av_rescale_q(cat->cur_file->start_time - cat->cur_file->file_inpoint,
- AV_TIME_BASE_Q,
- cat->avf->streams[pkt->stream_index]->time_base);
- if (pkt->pts != AV_NOPTS_VALUE)
- pkt->pts += delta;
- if (pkt->dts != AV_NOPTS_VALUE)
- pkt->dts += delta;
+ if (cat->unified_time_base) {
+ /* replace the pkt base on the time base of target output stream */
+ AVRational output_tb;
+ output_tb = avf->streams[cs->out_stream_index]->time_base;
+ delta = av_rescale_q(cat->cur_file->start_time - cat->cur_file->file_inpoint,
+ AV_TIME_BASE_Q,
+ output_tb);
+ if (pkt->pts != AV_NOPTS_VALUE)
+ pkt->pts = av_rescale_q(pkt->pts, st->time_base, output_tb) + delta;
+ if (pkt->dts != AV_NOPTS_VALUE)
+ pkt->dts = av_rescale_q(pkt->dts, st->time_base, output_tb) + delta;
+ } else {
+ delta = av_rescale_q(cat->cur_file->start_time - cat->cur_file->file_inpoint,
+ AV_TIME_BASE_Q,
+ cat->avf->streams[pkt->stream_index]->time_base);
+ if (pkt->pts != AV_NOPTS_VALUE)
+ pkt->pts += delta;
+ if (pkt->dts != AV_NOPTS_VALUE)
+ pkt->dts += delta;
+ }
+
av_log(avf, AV_LOG_DEBUG, " -> pts:%s pts_time:%s dts:%s dts_time:%s\n",
av_ts2str(pkt->pts), av_ts2timestr(pkt->pts, &st->time_base),
av_ts2str(pkt->dts), av_ts2timestr(pkt->dts, &st->time_base));
@@ -931,6 +946,8 @@ static const AVOption options[] = {
OFFSET(auto_convert), AV_OPT_TYPE_BOOL, {.i64 = 1}, 0, 1, DEC },
{ "segment_time_metadata", "output file segment start time and duration as packet metadata",
OFFSET(segment_time_metadata), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DEC },
+ { "unified_time_base", "adjust to the same time base (from the first stream) while processing packets",
+ OFFSET(unified_time_base), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DEC },
{ NULL }
};
--
2.30.1 (Apple Git-130)
_______________________________________________
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".
^ permalink raw reply [flat|nested] 9+ messages in thread* [FFmpeg-devel] [PATCH] libavformat/concatdev.c: Add unified_time_base opt
@ 2022-03-01 12:18 Ye Chuan
0 siblings, 0 replies; 9+ messages in thread
From: Ye Chuan @ 2022-03-01 12:18 UTC (permalink / raw)
To: ffmpeg-devel
In some case, the input files have different time base even though
they share the same codec and codec parameters,
While processing the packet, it will adjust the pts/dts by its own
time base instead of the unified one of the output stream, which may
lead to wrong pts/dts or unexpected speed change.
So this patch add the "unified_time_base" opt, which could be setted by
"-unified_time_base 1"
With the option, it will concatenate the input streams whose time base
are different , and won't course speed change issue.
Signed-off-by: Chuan Ye <yechuan0102@hotmail.com>
---
libavformat/concatdec.c | 31 ++++++++++++++++++++++++-------
1 file changed, 24 insertions(+), 7 deletions(-)
diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c
index 0603c6e254..2cb656d87e 100644
--- a/libavformat/concatdec.c
+++ b/libavformat/concatdec.c
@@ -69,6 +69,7 @@ typedef struct {
ConcatMatchMode stream_match_mode;
unsigned auto_convert;
int segment_time_metadata;
+ int unified_time_base;
} ConcatContext;
static int concat_probe(const AVProbeData *probe)
@@ -782,13 +783,27 @@ static int concat_read_packet(AVFormatContext *avf, AVPacket *pkt)
av_ts2str(pkt->pts), av_ts2timestr(pkt->pts, &st->time_base),
av_ts2str(pkt->dts), av_ts2timestr(pkt->dts, &st->time_base));
- delta = av_rescale_q(cat->cur_file->start_time - cat->cur_file->file_inpoint,
- AV_TIME_BASE_Q,
- cat->avf->streams[pkt->stream_index]->time_base);
- if (pkt->pts != AV_NOPTS_VALUE)
- pkt->pts += delta;
- if (pkt->dts != AV_NOPTS_VALUE)
- pkt->dts += delta;
+ if (cat->unified_time_base) {
+ /* replace the pkt base on the time base of target output stream */
+ AVRational output_tb;
+ output_tb = avf->streams[cs->out_stream_index]->time_base;
+ delta = av_rescale_q(cat->cur_file->start_time - cat->cur_file->file_inpoint,
+ AV_TIME_BASE_Q,
+ output_tb);
+ if (pkt->pts != AV_NOPTS_VALUE)
+ pkt->pts = av_rescale_q(pkt->pts, st->time_base, output_tb) + delta;
+ if (pkt->dts != AV_NOPTS_VALUE)
+ pkt->dts = av_rescale_q(pkt->dts, st->time_base, output_tb) + delta;
+ } else {
+ delta = av_rescale_q(cat->cur_file->start_time - cat->cur_file->file_inpoint,
+ AV_TIME_BASE_Q,
+ cat->avf->streams[pkt->stream_index]->time_base);
+ if (pkt->pts != AV_NOPTS_VALUE)
+ pkt->pts += delta;
+ if (pkt->dts != AV_NOPTS_VALUE)
+ pkt->dts += delta;
+ }
+
av_log(avf, AV_LOG_DEBUG, " -> pts:%s pts_time:%s dts:%s dts_time:%s\n",
av_ts2str(pkt->pts), av_ts2timestr(pkt->pts, &st->time_base),
av_ts2str(pkt->dts), av_ts2timestr(pkt->dts, &st->time_base));
@@ -931,6 +946,8 @@ static const AVOption options[] = {
OFFSET(auto_convert), AV_OPT_TYPE_BOOL, {.i64 = 1}, 0, 1, DEC },
{ "segment_time_metadata", "output file segment start time and duration as packet metadata",
OFFSET(segment_time_metadata), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DEC },
+ { "unified_time_base", "adjust to the same time base (from the first stream) while processing packets",
+ OFFSET(unified_time_base), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DEC },
{ NULL }
};
--
2.30.1 (Apple Git-130)
_______________________________________________
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".
^ permalink raw reply [flat|nested] 9+ messages in thread* [FFmpeg-devel] [PATCH] libavformat/concatdev.c: add unified_time_base opt
@ 2022-03-01 11:45 Ye Chuan
0 siblings, 0 replies; 9+ messages in thread
From: Ye Chuan @ 2022-03-01 11:45 UTC (permalink / raw)
To: ffmpeg-devel
In some case, the input files have different time base even though
they share the same codec and codec parameters,
While processing the packet, it will adjust the pts/dts by its own
time base instead of the unified one of the output stream, which may
lead to wrong pts/dts or unexpected speed change.
So this patch add the "unified_time_base" opt, which could be setted by
"-unified_time_base 1"
With the option, it will concatenate the input streams whose time base
are different , and won't course speed change issue.
Signed-off-by: Chuan Ye <yechuan0102@hotmail.com>
---
libavformat/concatdec.c | 31 ++++++++++++++++++++++++-------
1 file changed, 24 insertions(+), 7 deletions(-)
diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c
index 0603c6e254..2cb656d87e 100644
--- a/libavformat/concatdec.c
+++ b/libavformat/concatdec.c
@@ -69,6 +69,7 @@ typedef struct {
ConcatMatchMode stream_match_mode;
unsigned auto_convert;
int segment_time_metadata;
+ int unified_time_base;
} ConcatContext;
static int concat_probe(const AVProbeData *probe)
@@ -782,13 +783,27 @@ static int concat_read_packet(AVFormatContext *avf, AVPacket *pkt)
av_ts2str(pkt->pts), av_ts2timestr(pkt->pts, &st->time_base),
av_ts2str(pkt->dts), av_ts2timestr(pkt->dts, &st->time_base));
- delta = av_rescale_q(cat->cur_file->start_time - cat->cur_file->file_inpoint,
- AV_TIME_BASE_Q,
- cat->avf->streams[pkt->stream_index]->time_base);
- if (pkt->pts != AV_NOPTS_VALUE)
- pkt->pts += delta;
- if (pkt->dts != AV_NOPTS_VALUE)
- pkt->dts += delta;
+ if (cat->unified_time_base) {
+ /* replace the pkt base on the time base of target output stream */
+ AVRational output_tb;
+ output_tb = avf->streams[cs->out_stream_index]->time_base;
+ delta = av_rescale_q(cat->cur_file->start_time - cat->cur_file->file_inpoint,
+ AV_TIME_BASE_Q,
+ output_tb);
+ if (pkt->pts != AV_NOPTS_VALUE)
+ pkt->pts = av_rescale_q(pkt->pts, st->time_base, output_tb) + delta;
+ if (pkt->dts != AV_NOPTS_VALUE)
+ pkt->dts = av_rescale_q(pkt->dts, st->time_base, output_tb) + delta;
+ } else {
+ delta = av_rescale_q(cat->cur_file->start_time - cat->cur_file->file_inpoint,
+ AV_TIME_BASE_Q,
+ cat->avf->streams[pkt->stream_index]->time_base);
+ if (pkt->pts != AV_NOPTS_VALUE)
+ pkt->pts += delta;
+ if (pkt->dts != AV_NOPTS_VALUE)
+ pkt->dts += delta;
+ }
+
av_log(avf, AV_LOG_DEBUG, " -> pts:%s pts_time:%s dts:%s dts_time:%s\n",
av_ts2str(pkt->pts), av_ts2timestr(pkt->pts, &st->time_base),
av_ts2str(pkt->dts), av_ts2timestr(pkt->dts, &st->time_base));
@@ -931,6 +946,8 @@ static const AVOption options[] = {
OFFSET(auto_convert), AV_OPT_TYPE_BOOL, {.i64 = 1}, 0, 1, DEC },
{ "segment_time_metadata", "output file segment start time and duration as packet metadata",
OFFSET(segment_time_metadata), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DEC },
+ { "unified_time_base", "adjust to the same time base (from the first stream) while processing packets",
+ OFFSET(unified_time_base), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DEC },
{ NULL }
};
--
2.30.1 (Apple Git-130)
_______________________________________________
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".
^ permalink raw reply [flat|nested] 9+ messages in thread* [FFmpeg-devel] [PATCH] libavformat/concatdev.c: add unified_time_base opt
@ 2022-03-01 11:26 Ye Chuan
0 siblings, 0 replies; 9+ messages in thread
From: Ye Chuan @ 2022-03-01 11:26 UTC (permalink / raw)
To: ffmpeg-devel
In some case, the input files have different time base even though
they share the same codec and codec parameters,
While processing the packet, it will adjust the pts/dts by its own
time base instead of the unified one of the output stream, which may
lead to wrong pts/dts or unexpected speed change.
So this patch add the "unified_time_base" opt, which could be setted by
"-unified_time_base 1"
With the option, it will concatenate the input streams whose time base
are different , and won't course speed change issue.
Signed-off-by: Chuan Ye <yechuan0102@hotmail.com>
diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c
index 0603c6e254..2cb656d87e 100644
--- a/libavformat/concatdec.c
+++ b/libavformat/concatdec.c
@@ -69,6 +69,7 @@ typedef struct {
ConcatMatchMode stream_match_mode;
unsigned auto_convert;
int segment_time_metadata;
+ int unified_time_base;
} ConcatContext;
static int concat_probe(const AVProbeData *probe)
@@ -782,13 +783,27 @@ static int concat_read_packet(AVFormatContext *avf, AVPacket *pkt)
av_ts2str(pkt->pts), av_ts2timestr(pkt->pts, &st->time_base),
av_ts2str(pkt->dts), av_ts2timestr(pkt->dts, &st->time_base));
- delta = av_rescale_q(cat->cur_file->start_time - cat->cur_file->file_inpoint,
- AV_TIME_BASE_Q,
- cat->avf->streams[pkt->stream_index]->time_base);
- if (pkt->pts != AV_NOPTS_VALUE)
- pkt->pts += delta;
- if (pkt->dts != AV_NOPTS_VALUE)
- pkt->dts += delta;
+ if (cat->unified_time_base) {
+ /* replace the pkt base on the time base of target output stream */
+ AVRational output_tb;
+ output_tb = avf->streams[cs->out_stream_index]->time_base;
+ delta = av_rescale_q(cat->cur_file->start_time - cat->cur_file->file_inpoint,
+ AV_TIME_BASE_Q,
+ output_tb);
+ if (pkt->pts != AV_NOPTS_VALUE)
+ pkt->pts = av_rescale_q(pkt->pts, st->time_base, output_tb) + delta;
+ if (pkt->dts != AV_NOPTS_VALUE)
+ pkt->dts = av_rescale_q(pkt->dts, st->time_base, output_tb) + delta;
+ } else {
+ delta = av_rescale_q(cat->cur_file->start_time - cat->cur_file->file_inpoint,
+ AV_TIME_BASE_Q,
+ cat->avf->streams[pkt->stream_index]->time_base);
+ if (pkt->pts != AV_NOPTS_VALUE)
+ pkt->pts += delta;
+ if (pkt->dts != AV_NOPTS_VALUE)
+ pkt->dts += delta;
+ }
+
av_log(avf, AV_LOG_DEBUG, " -> pts:%s pts_time:%s dts:%s dts_time:%s\n",
av_ts2str(pkt->pts), av_ts2timestr(pkt->pts, &st->time_base),
av_ts2str(pkt->dts), av_ts2timestr(pkt->dts, &st->time_base));
@@ -931,6 +946,8 @@ static const AVOption options[] = {
OFFSET(auto_convert), AV_OPT_TYPE_BOOL, {.i64 = 1}, 0, 1, DEC },
{ "segment_time_metadata", "output file segment start time and duration as packet metadata",
OFFSET(segment_time_metadata), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DEC },
+ { "unified_time_base", "adjust to the same time base (from the first stream) while processing packets",
+ OFFSET(unified_time_base), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DEC },
{ NULL }
};
--
2.30.1 (Apple Git-130)
_______________________________________________
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".
^ permalink raw reply [flat|nested] 9+ messages in thread* [FFmpeg-devel] [PATCH] libavformat/concatdev.c: add unified_time_base opt
@ 2022-03-01 11:17 Ye Chuan
0 siblings, 0 replies; 9+ messages in thread
From: Ye Chuan @ 2022-03-01 11:17 UTC (permalink / raw)
To: ffmpeg-devel
In some case, the input files have different time base even though
they share the same codec and codec parameters,
While processing the packet, it will adjust the pts/dts by its own
time base instead of the unified one of the output stream, which may
lead to wrong pts/dts or unexpected speed change.
So this patch add the "unified_time_base" opt, which could be setted by
"-unified_time_base 1"
With the option, it will concatenate the input streams whose time base
are different , and won't course speed change issue.
Signed-off-by: Chuan Ye <yechuan0102@hotmail.com>
---
libavformat/concatdec.c | 31 ++++++++++++++++++++++++-------
1 file changed, 24 insertions(+), 7 deletions(-)
diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c
index 0603c6e254..2cb656d87e 100644
--- a/libavformat/concatdec.c
+++ b/libavformat/concatdec.c
@@ -69,6 +69,7 @@ typedef struct {
ConcatMatchMode stream_match_mode;
unsigned auto_convert;
int segment_time_metadata;
+ int unified_time_base;
} ConcatContext;
static int concat_probe(const AVProbeData *probe)
@@ -782,13 +783,27 @@ static int concat_read_packet(AVFormatContext *avf, AVPacket *pkt)
av_ts2str(pkt->pts), av_ts2timestr(pkt->pts, &st->time_base),
av_ts2str(pkt->dts), av_ts2timestr(pkt->dts, &st->time_base));
- delta = av_rescale_q(cat->cur_file->start_time - cat->cur_file->file_inpoint,
- AV_TIME_BASE_Q,
- cat->avf->streams[pkt->stream_index]->time_base);
- if (pkt->pts != AV_NOPTS_VALUE)
- pkt->pts += delta;
- if (pkt->dts != AV_NOPTS_VALUE)
- pkt->dts += delta;
+ if (cat->unified_time_base) {
+ /* replace the pkt base on the time base of target output stream */
+ AVRational output_tb;
+ output_tb = avf->streams[cs->out_stream_index]->time_base;
+ delta = av_rescale_q(cat->cur_file->start_time - cat->cur_file->file_inpoint,
+ AV_TIME_BASE_Q,
+ output_tb);
+ if (pkt->pts != AV_NOPTS_VALUE)
+ pkt->pts = av_rescale_q(pkt->pts, st->time_base, output_tb) + delta;
+ if (pkt->dts != AV_NOPTS_VALUE)
+ pkt->dts = av_rescale_q(pkt->dts, st->time_base, output_tb) + delta;
+ } else {
+ delta = av_rescale_q(cat->cur_file->start_time - cat->cur_file->file_inpoint,
+ AV_TIME_BASE_Q,
+ cat->avf->streams[pkt->stream_index]->time_base);
+ if (pkt->pts != AV_NOPTS_VALUE)
+ pkt->pts += delta;
+ if (pkt->dts != AV_NOPTS_VALUE)
+ pkt->dts += delta;
+ }
+
av_log(avf, AV_LOG_DEBUG, " -> pts:%s pts_time:%s dts:%s dts_time:%s\n",
av_ts2str(pkt->pts), av_ts2timestr(pkt->pts, &st->time_base),
av_ts2str(pkt->dts), av_ts2timestr(pkt->dts, &st->time_base));
@@ -931,6 +946,8 @@ static const AVOption options[] = {
OFFSET(auto_convert), AV_OPT_TYPE_BOOL, {.i64 = 1}, 0, 1, DEC },
{ "segment_time_metadata", "output file segment start time and duration as packet metadata",
OFFSET(segment_time_metadata), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DEC },
+ { "unified_time_base", "adjust to the same time base (from the first stream) while processing packets",
+ OFFSET(unified_time_base), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DEC },
{ NULL }
};
--
2.30.1 (Apple Git-130)
_______________________________________________
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".
^ permalink raw reply [flat|nested] 9+ messages in thread* [FFmpeg-devel] [PATCH] libavformat/concatdev.c: add unified_time_base opt
@ 2022-03-01 10:04 Ye Chuan
0 siblings, 0 replies; 9+ messages in thread
From: Ye Chuan @ 2022-03-01 10:04 UTC (permalink / raw)
To: ffmpeg-devel
In some case, the input files have different time base even though
they share the same codec and codec parameters,
while processing the packet, it will adjust the pts/dts by its own
time base instead of the unified one of the output stream, which may
lead to wrong pts/dts or unexpected speed change.
So this patch add the "unified_time_base" opt, which could be setted by
"-unified_time_base 1"
With the option, it will concatenate the input streams whose time base
are different , and won't course speed change issue.
Signed-off-by: Chuan Ye <yechuan0102@hotmail.com>
---
libavformat/concatdec.c | 31 ++++++++++++++++++++++++-------
1 file changed, 24 insertions(+), 7 deletions(-)
diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c
index 0603c6e254..2cb656d87e 100644
--- a/libavformat/concatdec.c
+++ b/libavformat/concatdec.c
@@ -69,6 +69,7 @@ typedef struct {
ConcatMatchMode stream_match_mode;
unsigned auto_convert;
int segment_time_metadata;
+ int unified_time_base;
} ConcatContext;
static int concat_probe(const AVProbeData *probe)
@@ -782,13 +783,27 @@ static int concat_read_packet(AVFormatContext *avf, AVPacket *pkt)
av_ts2str(pkt->pts), av_ts2timestr(pkt->pts, &st->time_base),
av_ts2str(pkt->dts), av_ts2timestr(pkt->dts, &st->time_base));
- delta = av_rescale_q(cat->cur_file->start_time - cat->cur_file->file_inpoint,
- AV_TIME_BASE_Q,
- cat->avf->streams[pkt->stream_index]->time_base);
- if (pkt->pts != AV_NOPTS_VALUE)
- pkt->pts += delta;
- if (pkt->dts != AV_NOPTS_VALUE)
- pkt->dts += delta;
+ if (cat->unified_time_base) {
+ /* replace the pkt base on the time base of target output stream */
+ AVRational output_tb;
+ output_tb = avf->streams[cs->out_stream_index]->time_base;
+ delta = av_rescale_q(cat->cur_file->start_time - cat->cur_file->file_inpoint,
+ AV_TIME_BASE_Q,
+ output_tb);
+ if (pkt->pts != AV_NOPTS_VALUE)
+ pkt->pts = av_rescale_q(pkt->pts, st->time_base, output_tb) + delta;
+ if (pkt->dts != AV_NOPTS_VALUE)
+ pkt->dts = av_rescale_q(pkt->dts, st->time_base, output_tb) + delta;
+ } else {
+ delta = av_rescale_q(cat->cur_file->start_time - cat->cur_file->file_inpoint,
+ AV_TIME_BASE_Q,
+ cat->avf->streams[pkt->stream_index]->time_base);
+ if (pkt->pts != AV_NOPTS_VALUE)
+ pkt->pts += delta;
+ if (pkt->dts != AV_NOPTS_VALUE)
+ pkt->dts += delta;
+ }
+
av_log(avf, AV_LOG_DEBUG, " -> pts:%s pts_time:%s dts:%s dts_time:%s\n",
av_ts2str(pkt->pts), av_ts2timestr(pkt->pts, &st->time_base),
av_ts2str(pkt->dts), av_ts2timestr(pkt->dts, &st->time_base));
@@ -931,6 +946,8 @@ static const AVOption options[] = {
OFFSET(auto_convert), AV_OPT_TYPE_BOOL, {.i64 = 1}, 0, 1, DEC },
{ "segment_time_metadata", "output file segment start time and duration as packet metadata",
OFFSET(segment_time_metadata), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DEC },
+ { "unified_time_base", "adjust to the same time base (from the first stream) while processing packets",
+ OFFSET(unified_time_base), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DEC },
{ NULL }
};
--
2.30.1 (Apple Git-130)
_______________________________________________
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".
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2022-03-01 12:33 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-01 12:14 [FFmpeg-devel] [PATCH] libavformat/concatdev.c: Add unified_time_base opt Ye Chuan
2022-03-01 12:18 ` Nicolas George
2022-03-01 12:33 ` Ye Chuan
-- strict thread matches above, loose matches on Subject: below --
2022-03-01 12:26 Ye Chuan
2022-03-01 12:18 Ye Chuan
2022-03-01 11:45 [FFmpeg-devel] [PATCH] libavformat/concatdev.c: add " Ye Chuan
2022-03-01 11:26 Ye Chuan
2022-03-01 11:17 Ye Chuan
2022-03-01 10:04 Ye Chuan
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git