mirror of
https://github.com/mpv-player/mpv
synced 2025-03-11 08:37:59 +00:00
98f74335d5
This fixes that vo_xv didn't display text subtitles correctly when using anamorphic video. It didn't pass the aspect information to the subtitle renderer. Also, try to render OSD correctly with respect to aspect ratio settings: on vo_xv, the OSD is rendered into the video, and needs to be "stretched" too when playing anamorphic video. When the -monitorpixelaspect option is used, even with VOs such as vo_opengl the OSD has to be rendered with that aspect ratio. As preparation for future commits, replace the weird vsfilter_scale value with a somewhat more sensible video_par member. Also, struct mp_eosd_res is a better place for the aspect ratio parameters, as OSD needs this too. Use osd_draw_on_image() directly in vo_lavc, which fixes aspect ratio issues as well.
38 lines
1.3 KiB
C
38 lines
1.3 KiB
C
/*
|
|
* This file is part of MPlayer.
|
|
*
|
|
* MPlayer is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* MPlayer is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along
|
|
* with MPlayer; if not, write to the Free Software Foundation, Inc.,
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
*/
|
|
|
|
#ifndef MPLAYER_ASPECT_H
|
|
#define MPLAYER_ASPECT_H
|
|
/* Stuff for correct aspect scaling. */
|
|
|
|
struct vo;
|
|
void panscan_init(struct vo *vo);
|
|
void panscan_calc_windowed(struct vo *vo);
|
|
|
|
void aspect_save_videores(struct vo *vo, int w, int h, int d_w, int d_h);
|
|
void aspect_save_screenres(struct vo *vo, int scrw, int scrh);
|
|
|
|
#define A_WINZOOM 2 ///< zoom to fill window size
|
|
#define A_ZOOM 1
|
|
#define A_NOZOOM 0
|
|
|
|
void aspect(struct vo *vo, int *srcw, int *srch, int zoom);
|
|
void aspect_fit(struct vo *vo, int *srcw, int *srch, int fitw, int fith);
|
|
|
|
#endif /* MPLAYER_ASPECT_H */
|