Signed-off-by: softworkz <[email protected]>
---
libavfilter/qsvvpp.c | 5 +++++
libavfilter/vf_overlay_qsv.c | 19 +++++++++++++++----
2 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/libavfilter/qsvvpp.c b/libavfilter/qsvvpp.c
index d1218355c7..b291216292 100644
--- a/libavfilter/qsvvpp.c
+++ b/libavfilter/qsvvpp.c
@@ -849,6 +849,11 @@ int ff_qsvvpp_filter_frame(QSVVPPContext *s, AVFilterLink
*inlink, AVFrame *picr
return AVERROR(EAGAIN);
break;
}
+
+ ret = av_frame_copy_side_data(out_frame->frame, in_frame->frame, 0);
+ if (ret < 0)
+ return ret;
+
out_frame->frame->pts = av_rescale_q(out_frame->surface.Data.TimeStamp,
default_tb, outlink->time_base);
diff --git a/libavfilter/vf_overlay_qsv.c b/libavfilter/vf_overlay_qsv.c
index 7e76b39aa9..02518e020c 100644
--- a/libavfilter/vf_overlay_qsv.c
+++ b/libavfilter/vf_overlay_qsv.c
@@ -231,13 +231,24 @@ static int process_frame(FFFrameSync *fs)
{
AVFilterContext *ctx = fs->parent;
QSVOverlayContext *s = fs->opaque;
+ AVFrame *frame0 = NULL;
AVFrame *frame = NULL;
- int ret = 0, i;
+ int ret = 0;
- for (i = 0; i < ctx->nb_inputs; i++) {
+ for (unsigned i = 0; i < ctx->nb_inputs; i++) {
ret = ff_framesync_get_frame(fs, i, &frame, 0);
- if (ret == 0)
- ret = ff_qsvvpp_filter_frame(s->qsv, ctx->inputs[i], frame);
+
+ if (ret == 0) {
+ AVFrame *temp;
+
+ if (i == 0)
+ frame0 = frame;
+ else
+ ret = av_frame_copy_side_data(frame, frame0, 0);
+
+ ret = ret < 0 ? ret : ff_qsvvpp_filter_frame(s->qsv,
ctx->inputs[i], frame);
+ }
+
if (ret < 0 && ret != AVERROR(EAGAIN))
break;
}
--
2.30.2.windows.1
_______________________________________________
ffmpeg-devel mailing list
[email protected]
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
[email protected] with subject "unsubscribe".
