mirror of
https://github.com/mpv-player/mpv
synced 2024-12-20 22:02:59 +00:00
5b0d96c6b4
Based on a patch by Sebastian Hegler <s_hegler at gmx dot de>. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13788 b3059339-0415-0410-9bf9-f77b7e298cf2
134 lines
3.4 KiB
C
134 lines
3.4 KiB
C
/* Stuff for correct aspect scaling. */
|
|
#include "aspect.h"
|
|
#include "geometry.h"
|
|
#ifndef ASPECT_TEST
|
|
#include "mp_msg.h"
|
|
#endif
|
|
|
|
//#define ASPECT_DEBUG
|
|
|
|
#if defined(ASPECT_DEBUG) || defined(ASPECT_TEST)
|
|
#include <stdio.h>
|
|
#endif
|
|
|
|
int vo_panscan_x = 0;
|
|
int vo_panscan_y = 0;
|
|
float vo_panscan_amount = 0;
|
|
|
|
#include "video_out.h"
|
|
|
|
float monitor_aspect=4.0/3.0;
|
|
extern float movie_aspect;
|
|
|
|
static struct {
|
|
int orgw; // real width
|
|
int orgh; // real height
|
|
int prew; // prescaled width
|
|
int preh; // prescaled height
|
|
int scrw; // horizontal resolution
|
|
int scrh; // vertical resolution
|
|
float asp;
|
|
} aspdat;
|
|
|
|
void aspect_save_orig(int orgw, int orgh){
|
|
#ifdef ASPECT_DEBUG
|
|
printf("aspect_save_orig %dx%d \n",orgw,orgh);
|
|
#endif
|
|
aspdat.orgw = orgw;
|
|
aspdat.orgh = orgh;
|
|
}
|
|
|
|
void aspect_save_prescale(int prew, int preh){
|
|
#ifdef ASPECT_DEBUG
|
|
printf("aspect_save_prescale %dx%d \n",prew,preh);
|
|
#endif
|
|
aspdat.prew = prew;
|
|
aspdat.preh = preh;
|
|
}
|
|
|
|
void aspect_save_screenres(int scrw, int scrh){
|
|
#ifdef ASPECT_DEBUG
|
|
printf("aspect_save_screenres %dx%d \n",scrw,scrh);
|
|
#endif
|
|
aspdat.scrw = scrw;
|
|
aspdat.scrh = scrh;
|
|
}
|
|
|
|
/* aspect is called with the source resolution and the
|
|
* resolution, that the scaled image should fit into
|
|
*/
|
|
|
|
void aspect(int *srcw, int *srch, int zoom){
|
|
int tmpw;
|
|
|
|
if( !zoom && geometry_wh_changed ) {
|
|
#ifdef ASPECT_DEBUG
|
|
printf("aspect(0) no aspect forced!\n");
|
|
#endif
|
|
return; // the user doesn't want to fix aspect
|
|
}
|
|
|
|
#ifdef ASPECT_DEBUG
|
|
printf("aspect(0) fitin: %dx%d zoom: %d screenaspect: %.2f\n",aspdat.scrw,aspdat.scrh,
|
|
zoom,monitor_aspect);
|
|
printf("aspect(1) wh: %dx%d (org: %dx%d)\n",*srcw,*srch,aspdat.prew,aspdat.preh);
|
|
#endif
|
|
if(zoom){
|
|
*srcw = aspdat.scrw;
|
|
*srch = (int)(((float)aspdat.scrw / (float)aspdat.prew * (float)aspdat.preh)
|
|
* ((float)aspdat.scrh / ((float)aspdat.scrw / monitor_aspect)));
|
|
}else{
|
|
*srcw = aspdat.prew;
|
|
*srch = (int)((float)aspdat.preh
|
|
* ((float)aspdat.scrh / ((float)aspdat.scrw / monitor_aspect)));
|
|
}
|
|
*srch+= *srch%2; // round
|
|
#ifdef ASPECT_DEBUG
|
|
printf("aspect(2) wh: %dx%d (org: %dx%d)\n",*srcw,*srch,aspdat.prew,aspdat.preh);
|
|
#endif
|
|
if(*srch>aspdat.scrh || *srch<aspdat.orgh){
|
|
if(zoom)
|
|
tmpw = (int)(((float)aspdat.scrh / (float)aspdat.preh * (float)aspdat.prew)
|
|
* ((float)aspdat.scrw / ((float)aspdat.scrh / (1.0/monitor_aspect))));
|
|
else
|
|
tmpw = (int)((float)aspdat.prew
|
|
* ((float)aspdat.scrw / ((float)aspdat.scrh / (1.0/monitor_aspect))));
|
|
tmpw+= tmpw%2; // round
|
|
if(tmpw<=aspdat.scrw /*&& tmpw>=aspdat.orgw*/){
|
|
*srch = zoom?aspdat.scrh:aspdat.preh;
|
|
*srcw = tmpw;
|
|
}else{
|
|
#ifndef ASPECT_TEST
|
|
mp_msg(MSGT_VO,MSGL_WARN,"aspect: Warning: no suitable new res found!\n");
|
|
#else
|
|
printf("error: no new size found that fits into res!\n");
|
|
#endif
|
|
}
|
|
}
|
|
aspdat.asp=*srcw / (float)*srch;
|
|
#ifdef ASPECT_DEBUG
|
|
printf("aspect(3) wh: %dx%d (org: %dx%d)\n",*srcw,*srch,aspdat.prew,aspdat.preh);
|
|
#endif
|
|
}
|
|
|
|
void panscan_init( void )
|
|
{
|
|
vo_panscan_x=0;
|
|
vo_panscan_y=0;
|
|
vo_panscan_amount=0.0f;
|
|
}
|
|
|
|
void panscan_calc( void )
|
|
{
|
|
int fwidth,fheight;
|
|
int vo_panscan_area;
|
|
|
|
aspect(&fwidth,&fheight,A_ZOOM);
|
|
vo_panscan_area = (aspdat.scrh-fheight);
|
|
|
|
vo_panscan_amount = vo_fs ? vo_panscan : 0;
|
|
vo_panscan_x = vo_panscan_area * vo_panscan_amount * aspdat.asp;
|
|
vo_panscan_y = vo_panscan_area * vo_panscan_amount;
|
|
}
|
|
|