RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

equalizer reworked 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6781 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
alex 2002-07-24 18:14:21 +00:00
parent ee5c104bd4
commit 2de7e08811
4 changed files with 48 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
libmpcodecs/dec_video.c
View File

@ -76,53 +76,23 @@ void set_video_quality(sh_video_t *sh_video,int quality){
int set_video_colors(sh_video_t *sh_video,char *item,int value)
{
if(vo_vaa.get_video_eq)
{
vidix_video_eq_t veq;
if(vo_vaa.get_video_eq(&veq) == 0)
{
int v_hw_equ_cap = veq.cap;
if(v_hw_equ_cap != 0)
{
if(vo_vaa.set_video_eq)
{
veq.flags = VEQ_FLG_ITU_R_BT_601; /* Fixme please !!! */
if(strcmp(item,"Brightness") == 0)
{
if(!(v_hw_equ_cap & VEQ_CAP_BRIGHTNESS)) goto try_sw_control;
veq.brightness = value*10;
veq.cap = VEQ_CAP_BRIGHTNESS;
}
else
if(strcmp(item,"Contrast") == 0)
{
if(!(v_hw_equ_cap & VEQ_CAP_CONTRAST)) goto try_sw_control;
veq.contrast = value*10;
veq.cap = VEQ_CAP_CONTRAST;
}
else
if(strcmp(item,"Saturation") == 0)
{
if(!(v_hw_equ_cap & VEQ_CAP_SATURATION)) goto try_sw_control;
veq.saturation = value*10;
veq.cap = VEQ_CAP_SATURATION;
}
else
if(strcmp(item,"Hue") == 0)
{
if(!(v_hw_equ_cap & VEQ_CAP_HUE)) goto try_sw_control;
veq.hue = value*10;
veq.cap = VEQ_CAP_HUE;
}
else goto try_sw_control;;
vo_vaa.set_video_eq(&veq);
}
return 1;
}
}
}
try_sw_control:
if(mpvdec) return mpvdec->control(sh_video,VDCTRL_SET_EQUALIZER,item,(int)value);
vf_instance_t* vf=sh_video->vfilter;
if (vf->control(vf, VFCTRL_SET_EQUALIZER, item, (int *)value) == CONTROL_TRUE)
return 1;
/* try software control */
if(mpvdec) return mpvdec->control(sh_video,VDCTRL_SET_EQUALIZER, item, (int *)value);
return 0;
}
int get_video_colors(sh_video_t *sh_video,char *item,int *value)
{
vf_instance_t* vf=sh_video->vfilter;
if (vf->control(vf, VFCTRL_GET_EQUALIZER, item, value) == CONTROL_TRUE)
return 1;
/* try software control */
if(mpvdec) return mpvdec->control(sh_video,VDCTRL_GET_EQUALIZER, item, value);
return 0;
}
@ -201,7 +171,7 @@ mpi=mpvdec->decode(sh_video, start, in_size, drop_frame);
//------------------------ frame decoded. --------------------
#ifdef ARCH_X86
// some codecs is broken, and doesn't restore MMX state :(
// some codecs are broken, and doesn't restore MMX state :(
// it happens usually with broken/damaged files.
if(gCpuCaps.has3DNow){
__asm __volatile ("femms\n\t":::"memory");

1
libmpcodecs/vd.h
View File

@ -21,6 +21,7 @@ extern int vd_use_slices;
#define VDCTRL_QUERY_MAX_PP_LEVEL 4 /* test for postprocessing support (max level) */
#define VDCTRL_SET_PP_LEVEL 5 /* set postprocessing level */
#define VDCTRL_SET_EQUALIZER 6 /* set color options (brightness,contrast etc) */
#define VDCTRL_GET_EQUALIZER 7 /* get color options (brightness,contrast etc) */
// callbacks:
int mpcodecs_config_vo(sh_video_t *sh, int w, int h, unsigned int preferred_outfmt);

4
libmpcodecs/vf.h
View File

@ -24,7 +24,7 @@ typedef struct vf_instance_s {
int width, int height, int d_width, int d_height,
unsigned int flags, unsigned int outfmt);
int (*control)(struct vf_instance_s* vf,
int request, void* data);
int request, void* data, ...);
int (*query_format)(struct vf_instance_s* vf,
unsigned int fmt);
void (*get_image)(struct vf_instance_s* vf,
@ -49,7 +49,7 @@ typedef struct vf_instance_s {
#define VFCTRL_QUERY_MAX_PP_LEVEL 4 /* test for postprocessing support (max level) */
#define VFCTRL_SET_PP_LEVEL 5 /* set postprocessing level */
#define VFCTRL_SET_EQUALIZER 6 /* set color options (brightness,contrast etc) */
#define VFCTRL_GET_EQUALIZER 8 /* gset color options (brightness,contrast etc) */
#define VFCTRL_DRAW_OSD 7
#include "vfcap.h"

29
libmpcodecs/vf_vo.c
View File

@ -1,6 +1,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stdarg.h>
#include "../config.h"
#include "../mp_msg.h"
@ -46,13 +47,37 @@ static int config(struct vf_instance_s* vf,
return 1;
}
static int control(struct vf_instance_s* vf,
int request, void* data){
static int control(struct vf_instance_s* vf, int request, void* data, ...)
{
switch(request){
#ifdef USE_OSD
case VFCTRL_DRAW_OSD:
if(!vo_config_count) return CONTROL_FALSE; // vo not configured?
video_out->draw_osd();
return CONTROL_TRUE;
#endif
case VFCTRL_SET_EQUALIZER:
{
va_list ap;
int value;
if(!vo_config_count) return CONTROL_FALSE; // vo not configured?
va_start(ap, data);
value = va_arg(ap, int);
va_end(ap);
return((video_out->control(VOCTRL_SET_EQUALIZER, data, (int *)value) == VO_TRUE) ? CONTROL_TRUE : CONTROL_FALSE);
}
case VFCTRL_GET_EQUALIZER:
{
va_list ap;
int value;
if(!vo_config_count) return CONTROL_FALSE; // vo not configured?
va_start(ap, data);
value = va_arg(ap, int);
va_end(ap);
return((video_out->control(VOCTRL_GET_EQUALIZER, data, (int *)value) == VO_TRUE) ? CONTROL_TRUE : CONTROL_FALSE);
}
}
// return video_out->control(request,data);
return CONTROL_UNKNOWN;