History

vo: hwdec: add AVHWDeviceType property to hwdecs

As the first step towards handling scenarios where the are multiple hwdecs for a given image format but backed by different AVHWDeviceTypes, let us annotate the hwdecs with their corresponding device types. From this, we can also see how all the existing hwdecs which match the same image format also match the same device type.

Philip Langdale committed 2 years ago

Commit 7bbf1321 parent 70fad1d16 files · +34 −1Browse files

Unified · Split

16 files
  1. osdep/mac/meson.build +2 −1
  2. video/out/d3d11/hwdec_d3d11va.c +1 −0
  3. video/out/d3d11/hwdec_dxva2dxgi.c +1 −0
  4. video/out/gpu/hwdec.c +10 −0
  5. video/out/gpu/hwdec.h +9 −0
  6. video/out/hwdec/hwdec_aimagereader.c +1 −0
  7. video/out/hwdec/hwdec_cuda.c +1 −0
  8. video/out/hwdec/hwdec_drmprime.c +1 −0
  9. video/out/hwdec/hwdec_drmprime_overlay.c +1 −0
  10. video/out/hwdec/hwdec_vaapi.c +1 −0
  11. video/out/hwdec/hwdec_vt.c +1 −0
  12. video/out/hwdec/hwdec_vulkan.c +1 −0
  13. video/out/opengl/hwdec_d3d11egl.c +1 −0
  14. video/out/opengl/hwdec_dxva2egl.c +1 −0
  15. video/out/opengl/hwdec_dxva2gldx.c +1 −0
  16. video/out/opengl/hwdec_vdpau.c +1 −0
osdep/mac/meson.build+2−1
@@ -51,7 +51,8 @@ swift_compile = [swift_prog, swift_flags, '-module-name', 'swift', · 50 unmodified lines
5151 '-emit-objc-header-path', '@OUTPUT1@', '-o', '@OUTPUT2@',
5252 '@INPUT@', '-I.', '-I' + source_root,
5353 '-I' + libplacebo.get_variable('includedir',
54− default_value: source_root / 'subprojects' / 'libplacebo' / 'src' / 'include')]
54+ default_value: source_root / 'subprojects' / 'libplacebo' / 'src' / 'include'),
55+ '-I' + libavutil.get_variable('includedir')]
5556
5657 swift_targets = custom_target('swift_targets',
5758 input: swift_sources,
video/out/d3d11/hwdec_d3d11va.c+1−0
@@ -246,6 +246,7 @@ const struct ra_hwdec_driver ra_hwdec_d3d11va = { · 245 unmodified lines
246246 .name = "d3d11va",
247247 .priv_size = sizeof(struct priv_owner),
248248 .imgfmts = {IMGFMT_D3D11, 0},
249+ .device_type = AV_HWDEVICE_TYPE_D3D11VA,
249250 .init = init,
250251 .uninit = uninit,
251252 .mapper = &(const struct ra_hwdec_mapper_driver){
video/out/d3d11/hwdec_dxva2dxgi.c+1−0
@@ -466,6 +466,7 @@ const struct ra_hwdec_driver ra_hwdec_dxva2dxgi = { · 465 unmodified lines
466466 .name = "dxva2-dxgi",
467467 .priv_size = sizeof(struct priv_owner),
468468 .imgfmts = {IMGFMT_DXVA2, 0},
469+ .device_type = AV_HWDEVICE_TYPE_DXVA2,
469470 .init = init,
470471 .uninit = uninit,
471472 .mapper = &(const struct ra_hwdec_mapper_driver){
video/out/gpu/hwdec.c+10−0
@@ -352,3 +352,13 @@ int ra_hwdec_driver_get_imgfmt_for_name(const char *name) · 351 unmodified lines
352352 }
353353 return IMGFMT_NONE;
354354 }
355+
356+enum AVHWDeviceType ra_hwdec_driver_get_device_type_for_name(const char *name)
357+{
358+ for (int i = 0; ra_hwdec_drivers[i]; i++) {
359+ if (!strcmp(ra_hwdec_drivers[i]->name, name)) {
360+ return ra_hwdec_drivers[i]->device_type;
361+ }
362+ }
363+ return AV_HWDEVICE_TYPE_NONE;
364+}
video/out/gpu/hwdec.h+9−0
@@ -1,6 +1,8 @@
11 #ifndef MPGL_HWDEC_H_
22 #define MPGL_HWDEC_H_
33
4+#include <libavutil/hwcontext.h>
5+
46 #include "video/mp_image.h"
57 #include "context.h"
68 #include "ra.h"
@@ -106,6 +108,9 @@ struct ra_hwdec_driver { · 99 unmodified lines
106108 // Terminated with a 0 entry. (Extend the array size as needed.)
107109 const int imgfmts[3];
108110
111+ // The underlying ffmpeg hw device type this hwdec corresponds to.
112+ enum AVHWDeviceType device_type;
113+
109114 // Create the hwdec device. It must add it to hw->devs, if applicable.
110115 int (*init)(struct ra_hwdec *hw);
111116 void (*uninit)(struct ra_hwdec *hw);
@@ -149,4 +154,8 @@ int ra_hwdec_mapper_map(struct ra_hwdec_mapper *mapper, struct mp_image *img); · 37 unmodified lines
149154 // Returns IMGFMT_NONE if the name doesn't get matched.
150155 int ra_hwdec_driver_get_imgfmt_for_name(const char *name);
151156
157+// Get the primary hw device type for the given driver name.
158+// Returns AV_HWDEVICE_TYPE_NONE if the name doesn't get matched.
159+enum AVHWDeviceType ra_hwdec_driver_get_device_type_for_name(const char *name);
160+
152161 #endif
video/out/hwdec/hwdec_aimagereader.c+1−0
@@ -392,6 +392,7 @@ const struct ra_hwdec_driver ra_hwdec_aimagereader = { · 391 unmodified lines
392392 .name = "aimagereader",
393393 .priv_size = sizeof(struct priv_owner),
394394 .imgfmts = {IMGFMT_MEDIACODEC, 0},
395+ .device_type = AV_HWDEVICE_TYPE_MEDIACODEC,
395396 .init = init,
396397 .uninit = uninit,
397398 .mapper = &(const struct ra_hwdec_mapper_driver){
video/out/hwdec/hwdec_cuda.c+1−0
@@ -284,6 +284,7 @@ static int mapper_map(struct ra_hwdec_mapper *mapper) · 283 unmodified lines
284284 const struct ra_hwdec_driver ra_hwdec_cuda = {
285285 .name = "cuda",
286286 .imgfmts = {IMGFMT_CUDA, 0},
287+ .device_type = AV_HWDEVICE_TYPE_CUDA,
287288 .priv_size = sizeof(struct cuda_hw_priv),
288289 .init = cuda_init,
289290 .uninit = cuda_uninit,
video/out/hwdec/hwdec_drmprime.c+1−0
@@ -307,6 +307,7 @@ const struct ra_hwdec_driver ra_hwdec_drmprime = { · 306 unmodified lines
307307 .name = "drmprime",
308308 .priv_size = sizeof(struct priv_owner),
309309 .imgfmts = {IMGFMT_DRMPRIME, 0},
310+ .device_type = AV_HWDEVICE_TYPE_DRM,
310311 .init = init,
311312 .uninit = uninit,
312313 .mapper = &(const struct ra_hwdec_mapper_driver){
video/out/hwdec/hwdec_drmprime_overlay.c+1−0
@@ -328,6 +328,7 @@ const struct ra_hwdec_driver ra_hwdec_drmprime_overlay = { · 327 unmodified lines
328328 .name = "drmprime-overlay",
329329 .priv_size = sizeof(struct priv),
330330 .imgfmts = {IMGFMT_DRMPRIME, 0},
331+ .device_type = AV_HWDEVICE_TYPE_DRM,
331332 .init = init,
332333 .overlay_frame = overlay_frame,
333334 .uninit = uninit,
video/out/hwdec/hwdec_vaapi.c+1−0
@@ -546,6 +546,7 @@ const struct ra_hwdec_driver ra_hwdec_vaapi = { · 545 unmodified lines
546546 .name = "vaapi",
547547 .priv_size = sizeof(struct priv_owner),
548548 .imgfmts = {IMGFMT_VAAPI, 0},
549+ .device_type = AV_HWDEVICE_TYPE_VAAPI,
549550 .init = init,
550551 .uninit = uninit,
551552 .mapper = &(const struct ra_hwdec_mapper_driver){
video/out/hwdec/hwdec_vt.c+1−0
@@ -129,6 +129,7 @@ const struct ra_hwdec_driver ra_hwdec_videotoolbox = { · 128 unmodified lines
129129 .name = "videotoolbox",
130130 .priv_size = sizeof(struct priv_owner),
131131 .imgfmts = {IMGFMT_VIDEOTOOLBOX, 0},
132+ .device_type = AV_HWDEVICE_TYPE_VIDEOTOOLBOX,
132133 .init = init,
133134 .uninit = uninit,
134135 .mapper = &(const struct ra_hwdec_mapper_driver){
video/out/hwdec/hwdec_vulkan.c+1−0
@@ -320,6 +320,7 @@ static int mapper_map(struct ra_hwdec_mapper *mapper) · 319 unmodified lines
320320 const struct ra_hwdec_driver ra_hwdec_vulkan = {
321321 .name = "vulkan",
322322 .imgfmts = {IMGFMT_VULKAN, 0},
323+ .device_type = AV_HWDEVICE_TYPE_VULKAN,
323324 .priv_size = sizeof(struct vulkan_hw_priv),
324325 .init = vulkan_init,
325326 .uninit = vulkan_uninit,
video/out/opengl/hwdec_d3d11egl.c+1−0
@@ -351,6 +351,7 @@ const struct ra_hwdec_driver ra_hwdec_d3d11egl = { · 350 unmodified lines
351351 .name = "d3d11-egl",
352352 .priv_size = sizeof(struct priv_owner),
353353 .imgfmts = {IMGFMT_D3D11, 0},
354+ .device_type = AV_HWDEVICE_TYPE_D3D11VA,
354355 .init = init,
355356 .uninit = uninit,
356357 .mapper = &(const struct ra_hwdec_mapper_driver){
video/out/opengl/hwdec_dxva2egl.c+1−0
@@ -373,6 +373,7 @@ const struct ra_hwdec_driver ra_hwdec_dxva2egl = { · 372 unmodified lines
373373 .name = "dxva2-egl",
374374 .priv_size = sizeof(struct priv_owner),
375375 .imgfmts = {IMGFMT_DXVA2, 0},
376+ .device_type = AV_HWDEVICE_TYPE_DXVA2,
376377 .init = init,
377378 .uninit = uninit,
378379 .mapper = &(const struct ra_hwdec_mapper_driver){
video/out/opengl/hwdec_dxva2gldx.c+1−0
@@ -236,6 +236,7 @@ const struct ra_hwdec_driver ra_hwdec_dxva2gldx = { · 235 unmodified lines
236236 .name = "dxva2-dxinterop",
237237 .priv_size = sizeof(struct priv_owner),
238238 .imgfmts = {IMGFMT_DXVA2, 0},
239+ .device_type = AV_HWDEVICE_TYPE_DXVA2,
239240 .init = init,
240241 .uninit = uninit,
241242 .mapper = &(const struct ra_hwdec_mapper_driver){
video/out/opengl/hwdec_vdpau.c+1−0
@@ -239,6 +239,7 @@ const struct ra_hwdec_driver ra_hwdec_vdpau = { · 238 unmodified lines
239239 .name = "vdpau-gl",
240240 .priv_size = sizeof(struct priv_owner),
241241 .imgfmts = {IMGFMT_VDPAU, 0},
242+ .device_type = AV_HWDEVICE_TYPE_VDPAU,
242243 .init = init,
243244 .uninit = uninit,
244245 .mapper = &(const struct ra_hwdec_mapper_driver){

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t