diff -Naur orig/libmpcodecs/Makefile modif/libmpcodecs/Makefile --- orig/libmpcodecs/Makefile 2003-01-29 16:53:25.000000000 +0100 +++ modif/libmpcodecs/Makefile 2003-01-29 17:01:11.000000000 +0100 @@ -14,7 +14,7 @@ VIDEO_SRCS_OPT=vd_realvid.c vd_ffmpeg.c vd_dshow.c vd_dmo.c vd_vfw.c vd_vfwex.c vd_odivx.c vd_divx4.c vd_xanim.c vd_xvid.c vd_libdv.c vd_qtvideo.c VIDEO_SRCS=dec_video.c vd.c $(VIDEO_SRCS_NAT) $(VIDEO_SRCS_LIB) $(VIDEO_SRCS_OPT) -VFILTER_SRCS=vf.c vf_vo.c vf_crop.c vf_expand.c vf_pp.c vf_scale.c vf_format.c vf_yuy2.c vf_flip.c vf_rgb2bgr.c vf_rotate.c vf_mirror.c vf_palette.c vf_lavc.c vf_dvbscale.c vf_cropdetect.c vf_test.c vf_noise.c vf_yvu9.c vf_rectangle.c vf_lavcdeint.c vf_eq.c vf_eq2.c vf_halfpack.c vf_dint.c vf_1bpp.c vf_bmovl.c vf_2xsai.c vf_unsharp.c vf_swapuv.c vf_il.c vf_boxblur.c vf_sab.c vf_smartblur.c vf_perspective.c vf_field.c +VFILTER_SRCS=vf.c vf_vo.c vf_crop.c vf_expand.c vf_pp.c vf_scale.c vf_format.c vf_yuy2.c vf_flip.c vf_rgb2bgr.c vf_rotate.c vf_mirror.c vf_palette.c vf_lavc.c vf_dvbscale.c vf_cropdetect.c vf_test.c vf_noise.c vf_yvu9.c vf_rectangle.c vf_lavcdeint.c vf_eq.c vf_eq2.c vf_halfpack.c vf_dint.c vf_1bpp.c vf_bmovl.c vf_2xsai.c vf_unsharp.c vf_swapuv.c vf_il.c vf_boxblur.c vf_sab.c vf_smartblur.c vf_perspective.c vf_field.c vf_gamma.c ENCODER_SRCS=ve.c ve_divx4.c ve_lavc.c ve_vfw.c ve_rawrgb.c ve_libdv.c ve_xvid.c ve_qtvideo.c NATIVE_SRCS=native/RTjpegN.c native/cinepak.c native/cyuv.c native/fli.c native/minilzo.c native/msvidc.c native/nuppelvideo.c native/qtrle.c native/qtrpza.c native/qtsmc.c native/roqav.c native/xa_gsm.c native/svq1.c diff -Naur orig/libmpcodecs/vf.c modif/libmpcodecs/vf.c --- orig/libmpcodecs/vf.c 2003-01-29 16:53:25.000000000 +0100 +++ modif/libmpcodecs/vf.c 2003-01-29 17:01:27.000000000 +0100 @@ -53,6 +53,7 @@ extern vf_info_t vf_info_smartblur; extern vf_info_t vf_info_perspective; extern vf_info_t vf_info_field; +extern vf_info_t vf_info_gamma; char** vo_plugin_args=(char**) NULL; @@ -99,6 +100,7 @@ &vf_info_smartblur, &vf_info_perspective, &vf_info_field, + &vf_info_gamma, NULL }; diff -Naur orig/libmpcodecs/vf_gamma.c modif/libmpcodecs/vf_gamma.c --- orig/libmpcodecs/vf_gamma.c 1970-01-01 01:00:00.000000000 +0100 +++ modif/libmpcodecs/vf_gamma.c 2003-01-29 17:02:06.000000000 +0100 @@ -0,0 +1,174 @@ +/* + Copyright (C) 2003 Daniel Moreno + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + + +#include +#include +#include +#include +#include +#include + +#include "../config.h" +#include "../mp_msg.h" + +#ifdef HAVE_MALLOC_H +#include +#endif + +#include "img_format.h" +#include "mp_image.h" +#include "vf.h" +#include "../libvo/fastmemcpy.h" + + +//===========================================================================// + + +struct vf_priv_s { + int Gamma[3][256]; +}; + + +static int config(struct vf_instance_s* vf, + int width, int height, int d_width, int d_height, + unsigned int flags, unsigned int outfmt){ + + return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt); +} + + +static void Gamma(unsigned char *I[],unsigned char *O[], + int *Gamma0, int *Gamma1, int *Gamma2, + int W, int H, int cXs, int cYs) +{ + int X, Y, X2, Y2; + int W2 = W >> cXs, H2 = H >> cYs; + int Sz1 = W*H, Sz2 = W2*H2; + int i; + + for (i = 0; i < Sz1; i++) + { + O[0][i] = Gamma0[I[0][i]]; + } + + for (i = 0; i < Sz2; i++) + { + O[1][i] = Gamma1[I[1][i]]; + } + + for (i = 0; i < Sz2; i++) + { + O[2][i] = Gamma2[I[2][i]]; + } +} + + + +static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ + int cw= mpi->w >> mpi->chroma_x_shift; + int ch= mpi->h >> mpi->chroma_y_shift; + int W = mpi->w, H = mpi->h; + static unsigned char *Line = NULL; + + mp_image_t *dmpi=vf_get_image(vf->next,mpi->imgfmt, + MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE, + mpi->w,mpi->h); + + Gamma(mpi->planes, dmpi->planes, + vf->priv->Gamma[0], vf->priv->Gamma[1], vf->priv->Gamma[2], + W, H, mpi->chroma_x_shift, mpi->chroma_y_shift); + + return vf_next_put_image(vf,dmpi); +} + +//===========================================================================// + +static int query_format(struct vf_instance_s* vf, unsigned int fmt){ + switch(fmt) + { + case IMGFMT_YV12: + case IMGFMT_I420: + case IMGFMT_IYUV: + case IMGFMT_YVU9: + case IMGFMT_444P: + case IMGFMT_422P: + case IMGFMT_411P: + return vf_next_query_format(vf, fmt); + } + return 0; +} + + +static void InitFilter(double R, double G, double B, struct vf_priv_s *S) +{ + int i; + + for (i = 0; i < 256; i++) + { + S->Gamma[0][i] = pow(i / 255.0, 1.0 / R)*255.0; + S->Gamma[1][i] = pow(i / 255.0, 1.0 / G)*255.0; + S->Gamma[2][i] = pow(i / 255.0, 1.0 / B)*255.0; + } +} + + +static int open(vf_instance_t *vf, char* args){ + double Param; + double Red = 1.464, Green = 1.194, Blue = 1.527; + + vf->config=config; + vf->put_image=put_image; + vf->query_format=query_format; + vf->priv=malloc(sizeof(struct vf_priv_s)); + memset(vf->priv, 0, sizeof(struct vf_priv_s)); + + if (args) + { + switch(sscanf(args, "%lf:%lf:%lf", + &Red, &Green, &Blue + )) + { + case 1: + Green = Red; + Blue = Red; + break; + + default: + } + } + + /* Global, Blue, Red */ + /* fG = Global + * fR = Global*RedČ ; Red = sqrt(fR / Global) = sqrt(fR / fG) + * fB = Global*BlueČ ; Blue = sqrt(fB / Global) = sqrt(fB / fG) + */ + InitFilter(Green, sqrt(Blue/Green), sqrt(Red/Green), vf->priv); + + return 1; +} + +vf_info_t vf_info_gamma = { + "RGB-Gamma control", + "gamma", + "Daniel Moreno", + "", + open +}; + +//===========================================================================//