diff options
| author | nick <nick@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-12-08 08:06:11 +0000 |
|---|---|---|
| committer | nick <nick@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-12-08 08:06:11 +0000 |
| commit | 6132bd15406cf025ec3a647db7ee3ee6584daab6 (patch) | |
| tree | b02bd5bd58d1c6ed01c052ad3d98a9a1d47c7ab8 /drivers | |
| parent | 51cbca7f787df0e01fdcbc92e477e0e7dad54965 (diff) | |
| download | mpv-6132bd15406cf025ec3a647db7ee3ee6584daab6.tar.bz2 mpv-6132bd15406cf025ec3a647db7ee3ee6584daab6.tar.xz | |
Fixed scaling in doublescan & interlaced modes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3381 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/radeon/radeon_vid.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/radeon/radeon_vid.c b/drivers/radeon/radeon_vid.c index a697d329d8..511761e72c 100644 --- a/drivers/radeon/radeon_vid.c +++ b/drivers/radeon/radeon_vid.c @@ -24,7 +24,7 @@ mknod /dev/radeon_vid c 178 0 or mknod /dev/rage128_vid c 178 0 - for Rage128/Rage128Pro chips (althrough it doesn't matter) + for Rage128/Rage128Pro chips (although it doesn't matter) +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ TESTED and WORKING formats: YUY2, UYVY, IYUV, I420, YV12 ----------------------------------------------------------- @@ -331,6 +331,10 @@ static int radeon_is_dbl_scan( void ) return (INREG(CRTC_GEN_CNTL))&CRTC_DBL_SCAN_EN; } +static int radeon_is_interlace( void ) +{ + return (INREG(CRTC_GEN_CNTL))&CRTC_INTERLACE_EN; +} static void __init radeon_vid_save_state( void ) { @@ -496,8 +500,6 @@ RTRACE(RVID_MSG"usr_config: version = %x format=%x card=%x ram=%u src(%ux%u) des radeon_vid_stop_video(); left = XXX_SRC_X << 16; top = XXX_SRC_Y << 16; -/* FIXME !!! interlace? */ - if(radeon_is_dbl_scan()) config->dest_height *= 2; src_h = config->src_height; src_w = config->src_width; switch(config->format) @@ -551,7 +553,9 @@ RTRACE(RVID_MSG"usr_config: version = %x format=%x card=%x ram=%u src(%ux%u) des case IMGFMT_RGB32: case IMGFMT_BGR32: pitch = ((src_w*4) + 15) & ~15; break; } - + if(radeon_is_dbl_scan()) config->dest_height *= 2; + else + if(radeon_is_interlace()) config->dest_height /= 2; besr.dest_bpp = radeon_vid_get_dbpp(); besr.fourcc = config->format; besr.v_inc = (src_h << 20) / config->dest_height; |