[vlc-devel] [PATCH v2 15/19] vout: vulkan: use the placed picture dimensions from the core
Steve Lhomme
robux4 at ycbcr.xyz
Tue Aug 25 16:20:28 CEST 2020
---
modules/video_output/vulkan/display.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/modules/video_output/vulkan/display.c b/modules/video_output/vulkan/display.c
index d49d14f343b..fea90eed82d 100644
--- a/modules/video_output/vulkan/display.c
+++ b/modules/video_output/vulkan/display.c
@@ -51,7 +51,6 @@ struct vout_display_sys_t
int num_overlays;
// Dynamic during rendering
- vout_display_place_t place;
uint64_t counter;
// Storage for rendering parameters
@@ -225,10 +224,10 @@ static void PictureRender(vout_display_t *vd, picture_t *pic,
struct pl_render_target target;
pl_render_target_from_swapchain(&target, &frame);
- target.dst_rect.x0 = sys->place.x;
- target.dst_rect.y0 = sys->place.y;
- target.dst_rect.x1 = sys->place.x + sys->place.width;
- target.dst_rect.y1 = sys->place.y + sys->place.height;
+ target.dst_rect.x0 = vd->place->x;
+ target.dst_rect.y0 = vd->place->y;
+ target.dst_rect.x1 = vd->place->x + vd->place->width;
+ target.dst_rect.y1 = vd->place->y + vd->place->height;
// Override the target colorimetry only if the user requests it
if (sys->target.primaries)
@@ -348,7 +347,6 @@ static int Control(vout_display_t *vd, int query, va_list ap)
case VOUT_DISPLAY_CHANGE_SOURCE_ASPECT:
case VOUT_DISPLAY_CHANGE_SOURCE_CROP:
case VOUT_DISPLAY_CHANGE_ZOOM: {
- vout_display_PlacePicture(&sys->place, &vd->source, vd->cfg, VOUT_ORIGIN_TOP_LEFT);
return VLC_SUCCESS;
}
--
2.26.2
More information about the vlc-devel
mailing list