diff options
| author | U. Artie Eoff <ullysses.a.eoff-at-intel.com@ffmpeg.org> | 2023-03-24 12:14:58 -0400 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2023-03-27 17:14:31 +0200 |
| commit | 9bf1848acfb7cbdb7f8dcaa07649467dfb3cec7b (patch) | |
| tree | 98810f1202d43c3eaf9deb9f1abb6e40336cf24a /libavfilter | |
| parent | 3f4c41839d5d3d02a12cc6a7407e6586996040e7 (diff) | |
| download | ffmpeg-9bf1848acfb7cbdb7f8dcaa07649467dfb3cec7b.tar.gz | |
lavfi: add hwdevice flag to hwupload/hwmap
This fixes a regression introduced by:
commit 3f63685c3554aea7f72bab1fdbde440820816d37
and
commit 632c34993195f716e9fa575af3de80d07fd50991
...where command-lines like:
ffmpeg -v verbose -hwaccel qsv \
-init_hw_device qsv=qsv,child_device=/dev/dri/renderD128 \
-hwaccel_output_format qsv -f rawvideo -pix_fmt yuv420p \
-s:v 352x288 -r:v 25 -i input.yuv \
-vf 'format=nv12,hwupload=extra_hw_frames=120' \
-an -c:v h264_qsv -y output.h264
ffmpeg -v verbose -hwaccel qsv \
-init_hw_device qsv=qsv,child_device=/dev/dri/renderD128 \
-hwaccel_output_format qsv -f rawvideo -pix_fmt nv12 \
-s:v 352x288 -r:v 25 -i input.yuv \
-vf 'format=nv12|qsv,hwupload=extra_hw_frames=16,vpp_qsv=procamp=1:saturation=1.0,hwdownload,format=nv12' \
-pix_fmt nv12 -f rawvideo -fps_mode passthrough -an -y output.yuv
...produced errors like:
[hwupload @ 0x55b6171d0dc0] A hardware device reference is required to upload frames to.
[Parsed_hwupload_1 @ 0x55b6172053c0] Query format failed for 'Parsed_hwupload_1': Invalid argument
Error reinitializing filters!
Failed to inject frame into filter network: Invalid argument
Signed-off-by: U. Artie Eoff <ullysses.a.eoff@intel.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/vf_hwmap.c | 1 | ||||
| -rw-r--r-- | libavfilter/vf_hwupload.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/libavfilter/vf_hwmap.c b/libavfilter/vf_hwmap.c index 2e03dfc1fe..e246b22603 100644 --- a/libavfilter/vf_hwmap.c +++ b/libavfilter/vf_hwmap.c @@ -427,4 +427,5 @@ const AVFilter ff_vf_hwmap = { FILTER_OUTPUTS(hwmap_outputs), FILTER_QUERY_FUNC(hwmap_query_formats), .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE, + .flags = AVFILTER_FLAG_HWDEVICE, }; diff --git a/libavfilter/vf_hwupload.c b/libavfilter/vf_hwupload.c index dbc41734cc..ef61bb4137 100644 --- a/libavfilter/vf_hwupload.c +++ b/libavfilter/vf_hwupload.c @@ -258,4 +258,5 @@ const AVFilter ff_vf_hwupload = { FILTER_OUTPUTS(hwupload_outputs), FILTER_QUERY_FUNC(hwupload_query_formats), .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE, + .flags = AVFILTER_FLAG_HWDEVICE, }; |