vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Tue Jun 4 18:51:09 2019 +0300| [356e928b6c92fe2aa0cf0acf9b1a3e93dafb9cba] | committer: Rémi Denis-Courmont
vout: fix function name This function sets the DAR, not the SAR - altough it does effectively adjust the SAR to match the requested DAR with the actual resolution. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=356e928b6c92fe2aa0cf0acf9b1a3e93dafb9cba --- src/video_output/video_output.c | 10 +++++----- src/video_output/vout_internal.h | 2 +- src/video_output/vout_intf.c | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c index 8017c7684c..88b458e878 100644 --- a/src/video_output/video_output.c +++ b/src/video_output/video_output.c @@ -468,21 +468,21 @@ void vout_ChangeZoom(vout_thread_t *vout, unsigned num, unsigned den) num, den); } -void vout_ChangeSampleAspectRatio(vout_thread_t *vout, - unsigned num, unsigned den) +void vout_ChangeDisplayAspectRatio(vout_thread_t *vout, + unsigned dar_num, unsigned dar_den) { vout_thread_sys_t *sys = vout->p; assert(!sys->dummy); vlc_mutex_lock(&sys->window_lock); - sys->source.dar.num = num; - sys->source.dar.den = den; + sys->source.dar.num = dar_num; + sys->source.dar.den = dar_den; vout_UpdateWindowSizeLocked(vout); vlc_mutex_unlock(&sys->window_lock); vout_control_PushPair(&vout->p->control, VOUT_CONTROL_ASPECT_RATIO, - num, den); + dar_num, dar_den); } void vout_ChangeCropRatio(vout_thread_t *vout, unsigned num, unsigned den) diff --git a/src/video_output/vout_internal.h b/src/video_output/vout_internal.h index 939f33faba..e0d29553dc 100644 --- a/src/video_output/vout_internal.h +++ b/src/video_output/vout_internal.h @@ -240,7 +240,7 @@ void vout_ChangeWindowState(vout_thread_t *, unsigned state); void vout_ChangeDisplaySize(vout_thread_t *, unsigned width, unsigned height); void vout_ChangeDisplayFilled(vout_thread_t *, bool is_filled); void vout_ChangeZoom(vout_thread_t *, unsigned num, unsigned den); -void vout_ChangeSampleAspectRatio(vout_thread_t *, unsigned num, unsigned den); +void vout_ChangeDisplayAspectRatio(vout_thread_t *, unsigned num, unsigned den); void vout_ChangeCropRatio(vout_thread_t *, unsigned num, unsigned den); void vout_ChangeCropWindow(vout_thread_t *, int x, int y, int width, int height); void vout_ChangeCropBorder(vout_thread_t *, int left, int top, int right, int bottom); diff --git a/src/video_output/vout_intf.c b/src/video_output/vout_intf.c index 238e0c44da..55e9c8cb88 100644 --- a/src/video_output/vout_intf.c +++ b/src/video_output/vout_intf.c @@ -495,9 +495,9 @@ static int AspectCallback( vlc_object_t *object, char const *cmd, if (sscanf(newval.psz_string, "%u:%u", &num, &den) == 2 && (num != 0) == (den != 0)) - vout_ChangeSampleAspectRatio(vout, num, den); + vout_ChangeDisplayAspectRatio(vout, num, den); else if (*newval.psz_string == '\0') - vout_ChangeSampleAspectRatio(vout, 0, 0); + vout_ChangeDisplayAspectRatio(vout, 0, 0); return VLC_SUCCESS; } _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
