videolan
/
vlc
mirror of https://code.videolan.org/videolan/vlc
1
Fork 0
Code Releases Activity

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.
This commit is contained in:
Steve Lhomme 2024-04-10 07:26:24 +02:00
parent 4ab62d06f8
commit 0c10d95148
22 changed files with 1 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/vlc_vout_display.h
View File

@ -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

5
modules/hw/mmal/vout.c
View File

@ -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;

2
modules/video_output/android/display.c
View File

@ -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;

1
modules/video_output/apple/VLCSampleBufferDisplay.m
View File

@ -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:

1
modules/video_output/caca.c
View File

@ -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:

1
modules/video_output/caopengllayer.m
View File

@ -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:

1
modules/video_output/decklink.cpp
View File

@ -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:

1
modules/video_output/drm/display.c
View File

@ -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:

1
modules/video_output/flaschen.c
View File

@ -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:

1
modules/video_output/kva.c
View File

@ -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:
{

1
modules/video_output/libplacebo/display.c
View File

@ -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;

1
modules/video_output/macosx.m
View File

@ -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:

1
modules/video_output/opengl/display.c
View File

@ -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:

1
modules/video_output/splitter.c
View File

@ -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:

1
modules/video_output/vdummy.c
View File

@ -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:

1
modules/video_output/vmem.c
View File

@ -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:

1
modules/video_output/wayland/shm.c
View File

@ -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:

1
modules/video_output/win32/common.c
View File

@ -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:

1
modules/video_output/xcb/render.c
View File

@ -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:

1
modules/video_output/xcb/x11.c
View File

@ -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:

1
modules/video_output/yuv.c
View File

@ -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:

9
src/video_output/display.c
View File

@ -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)