diff options
| -rw-r--r-- | libmpcodecs/vd.c | 23 | ||||
| -rw-r--r-- | mplayer.c | 24 |
2 files changed, 28 insertions, 19 deletions
diff --git a/libmpcodecs/vd.c b/libmpcodecs/vd.c index 467532f684..19bb49e7e4 100644 --- a/libmpcodecs/vd.c +++ b/libmpcodecs/vd.c @@ -126,6 +126,17 @@ float movie_aspect=-1.0; int vo_flags=0; int vd_use_slices=1; +/** global variables for gamma, brightness, contrast, saturation and hue + modified by mplayer.c and Gui/mplayer/gtk/eq.c: + ranges -100 - 100 + 1000 if the vo default should be used +*/ +int vo_gamma_gamma = 1000; +int vo_gamma_brightness = 1000; +int vo_gamma_contrast = 1000; +int vo_gamma_saturation = 1000; +int vo_gamma_hue = 1000; + extern vd_functions_t* mpvdec; // FIXME! extern int divx_quality; @@ -306,6 +317,18 @@ csp_again: } sh->vf_inited=1; + + if (vo_gamma_gamma != 1000) + set_video_colors(sh, "gamma", vo_gamma_gamma); + if (vo_gamma_brightness != 1000) + set_video_colors(sh, "brightness", vo_gamma_brightness); + if (vo_gamma_contrast != 1000) + set_video_colors(sh, "contrast", vo_gamma_contrast); + if (vo_gamma_saturation != 1000) + set_video_colors(sh, "saturation", vo_gamma_saturation); + if (vo_gamma_hue != 1000) + set_video_colors(sh, "hue", vo_gamma_hue); + return 1; } @@ -318,12 +318,11 @@ static sh_video_t *sh_video=NULL; char* current_module=NULL; // for debugging -// also modified by Gui/mplayer/gtk/eq.c: -int vo_gamma_gamma = 1000; -int vo_gamma_brightness = 1000; -int vo_gamma_contrast = 1000; -int vo_gamma_saturation = 1000; -int vo_gamma_hue = 1000; +extern int vo_gamma_gamma; +extern int vo_gamma_brightness; +extern int vo_gamma_contrast; +extern int vo_gamma_saturation; +extern int vo_gamma_hue; // --- @@ -1755,19 +1754,6 @@ if(auto_quality>0){ // ========== Init display (sh_video->disp_w*sh_video->disp_h/out_fmt) ============ current_module="init_vo"; - if (sh_video) - { - if (vo_gamma_gamma != 1000) - set_video_colors (sh_video, "gamma", vo_gamma_gamma); - if (vo_gamma_brightness != 1000) - set_video_colors(sh_video, "brightness", vo_gamma_brightness); - if (vo_gamma_contrast != 1000) - set_video_colors(sh_video, "contrast", vo_gamma_contrast); - if (vo_gamma_saturation != 1000) - set_video_colors(sh_video, "saturation", vo_gamma_saturation); - if (vo_gamma_hue != 1000) - set_video_colors(sh_video, "hue", vo_gamma_hue); - } if(vo_flags & 0x08 && vo_spudec) spudec_set_hw_spu(vo_spudec,video_out); |