[FFmpeg-devel] [PATCH 1/4] lavf/demux: use avg_frame_rate for packet durations for notimestamps formats

[FFmpeg-devel] [PATCH 1/4] lavf/demux: use avg_frame_rate for packet durations for notimestamps formats

[Anton Khirnov]

avg_frame_rate, if set, should be more reliable than stream timebase in
this case.
---
 libavformat/demux.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libavformat/demux.c b/libavformat/demux.c
index 06de71cd6e..45e5f5c4c2 100644
--- a/libavformat/demux.c
+++ b/libavformat/demux.c
@@ -668,6 +668,11 @@ static void compute_frame_duration(AVFormatContext *s, int *pnum, int *pden,
         if (st->r_frame_rate.num && (!pc || !codec_framerate.num)) {
             *pnum = st->r_frame_rate.den;
             *pden = st->r_frame_rate.num;
+        } else if ((s->iformat->flags & AVFMT_NOTIMESTAMPS) &&
+                   !codec_framerate.num &&
+                   st->avg_frame_rate.num && st->avg_frame_rate.den) {
+            *pnum = st->avg_frame_rate.den;
+            *pden = st->avg_frame_rate.num;
         } else if (st->time_base.num * 1000LL > st->time_base.den) {
             *pnum = st->time_base.num;
             *pden = st->time_base.den;
-- 
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".

[FFmpeg-devel] [PATCH 2/4] lavf/rawdec: stop setting codec context framerate

[Anton Khirnov]

Demuxers are not supposed to do this.
---
 libavformat/rawdec.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/libavformat/rawdec.c b/libavformat/rawdec.c
index 9126a9e53b..6b623d366e 100644
--- a/libavformat/rawdec.c
+++ b/libavformat/rawdec.c
@@ -87,7 +87,6 @@ int ff_raw_video_read_header(AVFormatContext *s)
     sti->need_parsing = AVSTREAM_PARSE_FULL_RAW;
 
     st->avg_frame_rate = s1->framerate;
-    sti->avctx->framerate = s1->framerate;
     avpriv_set_pts_info(st, 64, 1, 1200000);
 
 fail:
-- 
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".

[FFmpeg-devel] [PATCH 3/4] lavf/av1dec: mark as notimestamps

[Anton Khirnov]

---
 libavformat/av1dec.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavformat/av1dec.c b/libavformat/av1dec.c
index d4b430af7e..ba7fee60cd 100644
--- a/libavformat/av1dec.c
+++ b/libavformat/av1dec.c
@@ -287,7 +287,7 @@ const AVInputFormat ff_av1_demuxer = {
     .read_packet    = annexb_read_packet,
     .read_close     = av1_read_close,
     .extensions     = "obu",
-    .flags          = AVFMT_GENERIC_INDEX,
+    .flags          = AVFMT_GENERIC_INDEX | AVFMT_NOTIMESTAMPS,
     .priv_class     = &av1_demuxer_class,
 };
 #endif
@@ -432,7 +432,7 @@ const AVInputFormat ff_obu_demuxer = {
     .read_packet    = obu_read_packet,
     .read_close     = av1_read_close,
     .extensions     = "obu",
-    .flags          = AVFMT_GENERIC_INDEX | AVFMT_NO_BYTE_SEEK,
+    .flags          = AVFMT_GENERIC_INDEX | AVFMT_NO_BYTE_SEEK | AVFMT_NOTIMESTAMPS,
     .priv_class     = &av1_demuxer_class,
 };
 #endif
-- 
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".

[FFmpeg-devel] [PATCH 4/4] lavf/av1dec: stop setting codec context framerate

[Anton Khirnov]

Demuxers are not supposed to do this.
---
 libavformat/av1dec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/av1dec.c b/libavformat/av1dec.c
index ba7fee60cd..216d4e2298 100644
--- a/libavformat/av1dec.c
+++ b/libavformat/av1dec.c
@@ -80,7 +80,7 @@ static int av1_read_header(AVFormatContext *s)
     st->codecpar->codec_id = AV_CODEC_ID_AV1;
     sti->need_parsing = AVSTREAM_PARSE_HEADERS;
 
-    sti->avctx->framerate = c->framerate;
+    st->avg_frame_rate = c->framerate;
     // taken from rawvideo demuxers
     avpriv_set_pts_info(st, 64, 1, 1200000);
 
-- 
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".