ffmpeg: fix 1N transcoding errors with vp (trac-10261, trac-10262)

Issue: https://trac.ffmpeg.org/ticket/10261 Issue: https://trac.ffmpeg.org/ticket/10262 Cherry-picking a3c93c03 commit from release/6.0 ffmpeg branch to fix above 2 issues. Once n6.0.1 will be released, we will update to this release. Reviewed-on: intel-media-ci/ffmpeg#637 Commit (master): FFmpeg/FFmpeg@57afccc Commit (release/6.0): FFmpeg/FFmpeg@a3c93c0 Signed-off-by: Dmitry Rogozhkin <[email protected]>
intel · Apr 6, 2023 · 357e580 · 357e580
1 parent d8e90d5
commit 357e580
Showing 1 changed file with 30 additions and 0 deletions.
diff --git a/patches/ffmpeg/0001-lavfi-vf_vpp_qsv-set-the-right-timestamp-for-AVERROR.patch b/patches/ffmpeg/0001-lavfi-vf_vpp_qsv-set-the-right-timestamp-for-AVERROR.patch
@@ -0,0 +1,30 @@
+From a3c93c03adf3ba5eaf17a5acf85b9a324c8cabe7 Mon Sep 17 00:00:00 2001
+From: Haihao Xiang <[email protected]>
+Date: Thu, 16 Mar 2023 10:20:52 +0800
+Subject: [PATCH] lavfi/vf_vpp_qsv: set the right timestamp for AVERROR_EOF
+
+Rescale the timestamp for AVERROR_EOF. This can fix tickets 10261 and
+10262.
+
+Tested-by: Dmitry Rogozhkin <[email protected]>
+Signed-off-by: Haihao Xiang <[email protected]>
+(cherry picked from commit 57afccc0ef8d3024ffb2d1b2d25c9670b9501248)
+---
+ libavfilter/vf_vpp_qsv.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libavfilter/vf_vpp_qsv.c b/libavfilter/vf_vpp_qsv.c
+index ac77f7b..b4dd7a4 100644
+--- a/libavfilter/vf_vpp_qsv.c
++++ b/libavfilter/vf_vpp_qsv.c
+@@ -602,6 +602,7 @@ not_ready:
+     return FFERROR_NOT_READY;
+
+ eof:
++    pts = av_rescale_q(pts, inlink->time_base, outlink->time_base);
+     ff_outlink_set_status(outlink, status, pts);
+     return 0;
+ }
+-- 
+1.8.3.1
+