diff options
author | nick <nick@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-01-28 07:29:17 +0000 |
---|---|---|
committer | nick <nick@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-01-28 07:29:17 +0000 |
commit | 92c5c2746441a5adc883bc14c6896f02de026def (patch) | |
tree | 393d09cd1e301eb9741402d551fe177a5abe2202 /mplayer.c | |
parent | fe6143b5926d90fca30cb3bc8ee5b0d12a13d267 (diff) | |
download | mpv-92c5c2746441a5adc883bc14c6896f02de026def.tar.bz2 mpv-92c5c2746441a5adc883bc14c6896f02de026def.tar.xz |
New logic of HW equalizing:
1) Check HW capability.
2) If HW equalizer is capable control value then use it.
In this case value of control is in range -100 : +100 (10x)
3) If not then try use SW equalizing (currently only divxds).
Use old range (0 : +100) for that.
Well, you shouldn't watch OSD bar if neighter HW nor SW equalizers
are not capable control value.
TODO: find out keys (maybe Rr Bb Gg) or 'on screen menu' for RGB intensity
and OEM effects (fx).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4396 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
-rw-r--r-- | mplayer.c | 26 |
1 files changed, 13 insertions, 13 deletions
@@ -114,11 +114,6 @@ m_config_t* mconfig; Video accelerated architecture **************************************************************************/ vo_vaa_t vo_vaa; -int v_hw_equ_cap=0; -int v_bright=50; -int v_cont=50; -int v_hue=50; -int v_saturation=50; //**************************************************************************// // Config file @@ -446,6 +441,11 @@ int osd_last_pts=-303; int osd_show_av_delay = 0; int osd_show_sub_delay = 0; +int v_hw_equ_cap=0; +int v_bright=50; +int v_cont=50; +int v_hue=50; +int v_saturation=50; /* For future: int v_red_intensity=0; @@ -1327,10 +1327,10 @@ current_module="init_libvo"; if(vo_vaa.get_video_eq(&veq) == 0) { v_hw_equ_cap = veq.cap; - v_bright = veq.brightness/10; - v_cont = veq.contrast/10; - v_hue = veq.hue/10; - v_saturation=veq.saturation/10; + if(veq.cap & VEQ_CAP_BRIGHTNESS) v_bright = veq.brightness/10; + if(veq.cap & VEQ_CAP_CONTRAST) v_cont = veq.contrast/10; + if(veq.cap & VEQ_CAP_HUE) v_hue = veq.hue/10; + if(veq.cap & VEQ_CAP_SATURATION) v_saturation=veq.saturation/10; /* v_red_intensity=veq.red_intensity/10; v_green_intensity=veq.green_intensity/10; @@ -2097,7 +2097,7 @@ if(step_sec>0) { if ( ++v_cont > 100 ) v_cont = 100; } else { --v_cont; - if(v_hw_equ_cap) + if(v_hw_equ_cap & VEQ_CAP_CONTRAST) { if(v_cont < -100) v_cont = -100; } @@ -2125,7 +2125,7 @@ if(step_sec>0) { if ( ++v_bright > 100 ) v_bright = 100; } else { --v_bright; - if(v_hw_equ_cap) + if(v_hw_equ_cap & VEQ_CAP_BRIGHTNESS) { if(v_bright < -100) v_bright = -100; } @@ -2153,7 +2153,7 @@ if(step_sec>0) { if ( ++v_hue > 100 ) v_hue = 100; } else { --v_hue; - if(v_hw_equ_cap) + if(v_hw_equ_cap & VEQ_CAP_HUE) { if(v_hue < -100) v_hue = -100; } @@ -2181,7 +2181,7 @@ if(step_sec>0) { if ( ++v_saturation > 100 ) v_saturation = 100; } else { --v_saturation; - if(v_hw_equ_cap) + if(v_hw_equ_cap & VEQ_CAP_SATURATION) { if(v_saturation < -100) v_saturation = -100; } |