From 0c10d95148a2104b1c1cc31ad236cda7de365e1d Mon Sep 17 00:00:00 2001 From: Steve Lhomme Date: Wed, 10 Apr 2024 07:26:24 +0200 Subject: [PATCH] display: remove redundant VOUT_DISPLAY_CHANGE_ZOOM If the zoom of the video changed, the video placement has changed as well. Display modules don't actually care about the aspect ratio, just where they're supposed to stretch the video. --- include/vlc_vout_display.h | 10 ---------- modules/hw/mmal/vout.c | 5 ----- modules/video_output/android/display.c | 2 -- modules/video_output/apple/VLCSampleBufferDisplay.m | 1 - modules/video_output/caca.c | 1 - modules/video_output/caopengllayer.m | 1 - modules/video_output/decklink.cpp | 1 - modules/video_output/drm/display.c | 1 - modules/video_output/flaschen.c | 1 - modules/video_output/kva.c | 1 - modules/video_output/libplacebo/display.c | 1 - modules/video_output/macosx.m | 1 - modules/video_output/opengl/display.c | 1 - modules/video_output/splitter.c | 1 - modules/video_output/vdummy.c | 1 - modules/video_output/vmem.c | 1 - modules/video_output/wayland/shm.c | 1 - modules/video_output/win32/common.c | 1 - modules/video_output/xcb/render.c | 1 - modules/video_output/xcb/x11.c | 1 - modules/video_output/yuv.c | 1 - src/video_output/display.c | 9 +-------- 22 files changed, 1 insertion(+), 43 deletions(-) diff --git a/include/vlc_vout_display.h b/include/vlc_vout_display.h index 0df3fbdbab..3cd128b2d3 100644 --- a/include/vlc_vout_display.h +++ b/include/vlc_vout_display.h @@ -155,15 +155,6 @@ enum vout_display_query { */ VOUT_DISPLAY_CHANGE_DISPLAY_FILLED, - /** - * Notifies a change of the user zoom factor. - * - * \retval VLC_SUCCESS if the display handled the change - * \retval VLC_EGENERIC if a \ref vlc_display_operations::reset_pictures - * request is necessary - */ - VOUT_DISPLAY_CHANGE_ZOOM, - /** * Notifies a change of the sample aspect ratio. * @@ -304,7 +295,6 @@ struct vlc_display_operations * This occurs after a * \ref VOUT_DISPLAY_CHANGE_DISPLAY_SIZE, * \ref VOUT_DISPLAY_CHANGE_DISPLAY_FILLED, - * \ref VOUT_DISPLAY_CHANGE_ZOOM, * \ref VOUT_DISPLAY_CHANGE_SOURCE_ASPECT, * \ref VOUT_DISPLAY_CHANGE_SOURCE_CROP or * \ref VOUT_DISPLAY_CHANGE_SOURCE_PLACE diff --git a/modules/hw/mmal/vout.c b/modules/hw/mmal/vout.c index df143b96d6..ec5ba8aca9 100644 --- a/modules/hw/mmal/vout.c +++ b/modules/hw/mmal/vout.c @@ -696,11 +696,6 @@ static int vd_control(vout_display_t *vd, int query) break; } - case VOUT_DISPLAY_CHANGE_ZOOM: - msg_Warn(vd, "Unsupported control query %d", query); - ret = VLC_SUCCESS; - break; - default: msg_Warn(vd, "Unknown control query %d", query); break; diff --git a/modules/video_output/android/display.c b/modules/video_output/android/display.c index d373637a9b..2e1f7015dd 100644 --- a/modules/video_output/android/display.c +++ b/modules/video_output/android/display.c @@ -78,7 +78,6 @@ static int subpicture_Control(vout_display_t *vd, int query) vlc_gl_Resize(sub->gl, vd->cfg->display.width, vd->cfg->display.height); // fallthrough case VOUT_DISPLAY_CHANGE_DISPLAY_FILLED: - case VOUT_DISPLAY_CHANGE_ZOOM: case VOUT_DISPLAY_CHANGE_SOURCE_PLACE: { sub->place_changed = true; @@ -423,7 +422,6 @@ static int Control(vout_display_t *vd, int query) vd->cfg->display.height); return VLC_SUCCESS; } - case VOUT_DISPLAY_CHANGE_ZOOM: case VOUT_DISPLAY_CHANGE_DISPLAY_FILLED: case VOUT_DISPLAY_CHANGE_SOURCE_PLACE: return VLC_SUCCESS; diff --git a/modules/video_output/apple/VLCSampleBufferDisplay.m b/modules/video_output/apple/VLCSampleBufferDisplay.m index 1192ac614b..9b38ce1c2f 100644 --- a/modules/video_output/apple/VLCSampleBufferDisplay.m +++ b/modules/video_output/apple/VLCSampleBufferDisplay.m @@ -600,7 +600,6 @@ static int Control (vout_display_t *vd, int query) { case VOUT_DISPLAY_CHANGE_DISPLAY_SIZE: case VOUT_DISPLAY_CHANGE_DISPLAY_FILLED: - case VOUT_DISPLAY_CHANGE_ZOOM: case VOUT_DISPLAY_CHANGE_SOURCE_ASPECT: case VOUT_DISPLAY_CHANGE_SOURCE_CROP: case VOUT_DISPLAY_CHANGE_SOURCE_PLACE: diff --git a/modules/video_output/caca.c b/modules/video_output/caca.c index 073aedb98a..00799165cc 100644 --- a/modules/video_output/caca.c +++ b/modules/video_output/caca.c @@ -187,7 +187,6 @@ static int Control(vout_display_t *vd, int query) sys->dither = NULL; /* fall through */ case VOUT_DISPLAY_CHANGE_DISPLAY_SIZE: - case VOUT_DISPLAY_CHANGE_ZOOM: case VOUT_DISPLAY_CHANGE_DISPLAY_FILLED: case VOUT_DISPLAY_CHANGE_SOURCE_ASPECT: case VOUT_DISPLAY_CHANGE_SOURCE_PLACE: diff --git a/modules/video_output/caopengllayer.m b/modules/video_output/caopengllayer.m index e925c5a481..632c7447fa 100644 --- a/modules/video_output/caopengllayer.m +++ b/modules/video_output/caopengllayer.m @@ -555,7 +555,6 @@ static int Control (vout_display_t *vd, int query) return VLC_SUCCESS; case VOUT_DISPLAY_CHANGE_DISPLAY_FILLED: - case VOUT_DISPLAY_CHANGE_ZOOM: case VOUT_DISPLAY_CHANGE_SOURCE_ASPECT: case VOUT_DISPLAY_CHANGE_SOURCE_CROP: case VOUT_DISPLAY_CHANGE_SOURCE_PLACE: diff --git a/modules/video_output/decklink.cpp b/modules/video_output/decklink.cpp index 78a9fe19db..687cf9cb70 100644 --- a/modules/video_output/decklink.cpp +++ b/modules/video_output/decklink.cpp @@ -766,7 +766,6 @@ static int ControlVideo(vout_display_t *vd, int query) switch (query) { case VOUT_DISPLAY_CHANGE_DISPLAY_SIZE: case VOUT_DISPLAY_CHANGE_DISPLAY_FILLED: - case VOUT_DISPLAY_CHANGE_ZOOM: case VOUT_DISPLAY_CHANGE_SOURCE_ASPECT: case VOUT_DISPLAY_CHANGE_SOURCE_CROP: case VOUT_DISPLAY_CHANGE_SOURCE_PLACE: diff --git a/modules/video_output/drm/display.c b/modules/video_output/drm/display.c index 1a490d64a9..615923140a 100644 --- a/modules/video_output/drm/display.c +++ b/modules/video_output/drm/display.c @@ -78,7 +78,6 @@ static int Control(vout_display_t *vd, int query) switch (query) { case VOUT_DISPLAY_CHANGE_DISPLAY_SIZE: case VOUT_DISPLAY_CHANGE_DISPLAY_FILLED: - case VOUT_DISPLAY_CHANGE_ZOOM: case VOUT_DISPLAY_CHANGE_SOURCE_ASPECT: case VOUT_DISPLAY_CHANGE_SOURCE_CROP: case VOUT_DISPLAY_CHANGE_SOURCE_PLACE: diff --git a/modules/video_output/flaschen.c b/modules/video_output/flaschen.c index 46c3b47c55..7611cc213f 100644 --- a/modules/video_output/flaschen.c +++ b/modules/video_output/flaschen.c @@ -233,7 +233,6 @@ static int Control(vout_display_t *vd, int query) { switch (query) { case VOUT_DISPLAY_CHANGE_DISPLAY_SIZE: - case VOUT_DISPLAY_CHANGE_ZOOM: case VOUT_DISPLAY_CHANGE_DISPLAY_FILLED: case VOUT_DISPLAY_CHANGE_SOURCE_ASPECT: case VOUT_DISPLAY_CHANGE_SOURCE_CROP: diff --git a/modules/video_output/kva.c b/modules/video_output/kva.c index 4bc6e93c8c..88670f55e0 100644 --- a/modules/video_output/kva.c +++ b/modules/video_output/kva.c @@ -407,7 +407,6 @@ static int Control( vout_display_t *vd, int query ) } case VOUT_DISPLAY_CHANGE_DISPLAY_FILLED: - case VOUT_DISPLAY_CHANGE_ZOOM: case VOUT_DISPLAY_CHANGE_SOURCE_ASPECT: case VOUT_DISPLAY_CHANGE_SOURCE_PLACE: { diff --git a/modules/video_output/libplacebo/display.c b/modules/video_output/libplacebo/display.c index 79e2d9ff0e..79e5a5af44 100644 --- a/modules/video_output/libplacebo/display.c +++ b/modules/video_output/libplacebo/display.c @@ -549,7 +549,6 @@ static int Control(vout_display_t *vd, int query) case VOUT_DISPLAY_CHANGE_DISPLAY_FILLED: case VOUT_DISPLAY_CHANGE_SOURCE_ASPECT: case VOUT_DISPLAY_CHANGE_SOURCE_CROP: - case VOUT_DISPLAY_CHANGE_ZOOM: case VOUT_DISPLAY_CHANGE_SOURCE_PLACE: return VLC_SUCCESS; diff --git a/modules/video_output/macosx.m b/modules/video_output/macosx.m index 1aeb73eefc..75cb61bda4 100644 --- a/modules/video_output/macosx.m +++ b/modules/video_output/macosx.m @@ -353,7 +353,6 @@ static int Control (vout_display_t *vd, int query) return VLC_SUCCESS; case VOUT_DISPLAY_CHANGE_DISPLAY_FILLED: - case VOUT_DISPLAY_CHANGE_ZOOM: case VOUT_DISPLAY_CHANGE_SOURCE_ASPECT: case VOUT_DISPLAY_CHANGE_SOURCE_CROP: case VOUT_DISPLAY_CHANGE_SOURCE_PLACE: diff --git a/modules/video_output/opengl/display.c b/modules/video_output/opengl/display.c index b411eccda0..d419ab2802 100644 --- a/modules/video_output/opengl/display.c +++ b/modules/video_output/opengl/display.c @@ -325,7 +325,6 @@ static int Control (vout_display_t *vd, int query) vlc_gl_Resize (sys->gl, vd->cfg->display.width, vd->cfg->display.height); // fallthrough case VOUT_DISPLAY_CHANGE_DISPLAY_FILLED: - case VOUT_DISPLAY_CHANGE_ZOOM: case VOUT_DISPLAY_CHANGE_SOURCE_ASPECT: case VOUT_DISPLAY_CHANGE_SOURCE_CROP: case VOUT_DISPLAY_CHANGE_SOURCE_PLACE: diff --git a/modules/video_output/splitter.c b/modules/video_output/splitter.c index c2211bf0c0..39194bc1aa 100644 --- a/modules/video_output/splitter.c +++ b/modules/video_output/splitter.c @@ -103,7 +103,6 @@ static int vlc_vidsplit_Control(vout_display_t *vd, int query) switch (query) { case VOUT_DISPLAY_CHANGE_DISPLAY_SIZE: case VOUT_DISPLAY_CHANGE_DISPLAY_FILLED: - case VOUT_DISPLAY_CHANGE_ZOOM: case VOUT_DISPLAY_CHANGE_SOURCE_ASPECT: case VOUT_DISPLAY_CHANGE_SOURCE_CROP: case VOUT_DISPLAY_CHANGE_SOURCE_PLACE: diff --git a/modules/video_output/vdummy.c b/modules/video_output/vdummy.c index c6afcd856f..f7b3022cb8 100644 --- a/modules/video_output/vdummy.c +++ b/modules/video_output/vdummy.c @@ -140,7 +140,6 @@ static int Control(vout_display_t *vd, int query) switch (query) { case VOUT_DISPLAY_CHANGE_DISPLAY_SIZE: case VOUT_DISPLAY_CHANGE_DISPLAY_FILLED: - case VOUT_DISPLAY_CHANGE_ZOOM: case VOUT_DISPLAY_CHANGE_SOURCE_ASPECT: case VOUT_DISPLAY_CHANGE_SOURCE_CROP: case VOUT_DISPLAY_CHANGE_SOURCE_PLACE: diff --git a/modules/video_output/vmem.c b/modules/video_output/vmem.c index b59f08c7c6..6efb86a8e1 100644 --- a/modules/video_output/vmem.c +++ b/modules/video_output/vmem.c @@ -253,7 +253,6 @@ static int Control(vout_display_t *vd, int query) switch (query) { case VOUT_DISPLAY_CHANGE_DISPLAY_SIZE: case VOUT_DISPLAY_CHANGE_DISPLAY_FILLED: - case VOUT_DISPLAY_CHANGE_ZOOM: case VOUT_DISPLAY_CHANGE_SOURCE_ASPECT: case VOUT_DISPLAY_CHANGE_SOURCE_CROP: case VOUT_DISPLAY_CHANGE_SOURCE_PLACE: diff --git a/modules/video_output/wayland/shm.c b/modules/video_output/wayland/shm.c index aede9c1e2d..28f942cb4b 100644 --- a/modules/video_output/wayland/shm.c +++ b/modules/video_output/wayland/shm.c @@ -181,7 +181,6 @@ static int Control(vout_display_t *vd, int query) { case VOUT_DISPLAY_CHANGE_DISPLAY_SIZE: case VOUT_DISPLAY_CHANGE_DISPLAY_FILLED: - case VOUT_DISPLAY_CHANGE_ZOOM: case VOUT_DISPLAY_CHANGE_SOURCE_ASPECT: case VOUT_DISPLAY_CHANGE_SOURCE_CROP: case VOUT_DISPLAY_CHANGE_SOURCE_PLACE: diff --git a/modules/video_output/win32/common.c b/modules/video_output/win32/common.c index dc40b82eb2..3b209f63d9 100644 --- a/modules/video_output/win32/common.c +++ b/modules/video_output/win32/common.c @@ -122,7 +122,6 @@ void CommonControl(vout_display_t *vd, display_win32_area_t *area, int query) #endif /* WINAPI_PARTITION_DESKTOP */ // fallthrough case VOUT_DISPLAY_CHANGE_DISPLAY_FILLED: - case VOUT_DISPLAY_CHANGE_ZOOM: case VOUT_DISPLAY_CHANGE_SOURCE_ASPECT: case VOUT_DISPLAY_CHANGE_SOURCE_CROP: case VOUT_DISPLAY_CHANGE_SOURCE_PLACE: diff --git a/modules/video_output/xcb/render.c b/modules/video_output/xcb/render.c index c5464e521c..5aa693071b 100644 --- a/modules/video_output/xcb/render.c +++ b/modules/video_output/xcb/render.c @@ -395,7 +395,6 @@ static int Control(vout_display_t *vd, int query) switch (query) { case VOUT_DISPLAY_CHANGE_DISPLAY_SIZE: case VOUT_DISPLAY_CHANGE_DISPLAY_FILLED: - case VOUT_DISPLAY_CHANGE_ZOOM: case VOUT_DISPLAY_CHANGE_SOURCE_ASPECT: case VOUT_DISPLAY_CHANGE_SOURCE_CROP: case VOUT_DISPLAY_CHANGE_SOURCE_PLACE: diff --git a/modules/video_output/xcb/x11.c b/modules/video_output/xcb/x11.c index 3dd1e51ddf..ddb652763b 100644 --- a/modules/video_output/xcb/x11.c +++ b/modules/video_output/xcb/x11.c @@ -222,7 +222,6 @@ static int Control(vout_display_t *vd, int query) xcb_configure_window(sys->conn, sys->window, mask, values); } /* fall through */ - case VOUT_DISPLAY_CHANGE_ZOOM: case VOUT_DISPLAY_CHANGE_DISPLAY_FILLED: case VOUT_DISPLAY_CHANGE_SOURCE_ASPECT: case VOUT_DISPLAY_CHANGE_SOURCE_CROP: diff --git a/modules/video_output/yuv.c b/modules/video_output/yuv.c index 76f8ed979b..550385d601 100644 --- a/modules/video_output/yuv.c +++ b/modules/video_output/yuv.c @@ -254,7 +254,6 @@ static int Control(vout_display_t *vd, int query) switch (query) { case VOUT_DISPLAY_CHANGE_DISPLAY_SIZE: case VOUT_DISPLAY_CHANGE_DISPLAY_FILLED: - case VOUT_DISPLAY_CHANGE_ZOOM: case VOUT_DISPLAY_CHANGE_SOURCE_ASPECT: case VOUT_DISPLAY_CHANGE_SOURCE_CROP: case VOUT_DISPLAY_CHANGE_SOURCE_PLACE: diff --git a/src/video_output/display.c b/src/video_output/display.c index 7adf2cd6c7..ca191d31d2 100644 --- a/src/video_output/display.c +++ b/src/video_output/display.c @@ -652,19 +652,12 @@ void vout_SetDisplayZoom(vout_display_t *vd, unsigned num, unsigned den) return; /* zoom has not changed */ bool place_changed = PlaceVideoInDisplay(osys); - - int res1 = vout_display_Control(vd, VOUT_DISPLAY_CHANGE_ZOOM); - vout_display_Reset(vd); - if (place_changed) { int res2 = vout_display_Control(vd, VOUT_DISPLAY_CHANGE_SOURCE_PLACE); if (res2 != VLC_SUCCESS) - res1 = res2; + vout_display_Reset(vd); } - - if (res1 != VLC_SUCCESS) - vout_display_Reset(vd); } void vout_SetDisplayAspect(vout_display_t *vd, unsigned dar_num, unsigned dar_den)