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

Software Scaler headers usage cleanup 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18749 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
lucabe 2006-06-18 10:59:23 +00:00
parent d79d8b2ea4
commit f4091e4791
14 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libmpcodecs/vd_ijpg.c
View File

@ -12,7 +12,6 @@
#include <setjmp.h>
#include "bswap.h"
#include "postproc/rgb2rgb.h"
#include "libvo/fastmemcpy.h"
#include "vd_internal.h"

1
libmpcodecs/vd_mpng.c
View File

@ -9,7 +9,6 @@
#include <png.h>
#include "bswap.h"
#include "postproc/rgb2rgb.h"
#include "libvo/fastmemcpy.h"
#include "vd_internal.h"

1
libmpcodecs/vd_mtga.c
View File

@ -11,7 +11,6 @@
#include "mp_msg.h"
#include "bswap.h"
#include "postproc/rgb2rgb.h"
#include "libvo/fastmemcpy.h"
#include "vd_internal.h"

2
libmpcodecs/vf_1bpp.c
View File

@ -10,8 +10,6 @@
#include "mp_image.h"
#include "vf.h"
#include "postproc/rgb2rgb.h"
//===========================================================================//
static unsigned int bgr_list[]={

1
libmpcodecs/vf_cropdetect.c
View File

@ -12,7 +12,6 @@
#include "vf.h"
#include "libvo/fastmemcpy.h"
#include "postproc/rgb2rgb.h"
struct vf_priv_s {
int x1,y1,x2,y2;

1
libmpcodecs/vf_down3dright.c
View File

@ -12,7 +12,6 @@
#include "vf.h"
#include "libvo/fastmemcpy.h"
#include "postproc/rgb2rgb.h"
struct vf_priv_s {
int skipline;

1
libmpcodecs/vf_eq.c
View File

@ -14,7 +14,6 @@
#include "libvo/video_out.h"
#include "libvo/fastmemcpy.h"
#include "postproc/rgb2rgb.h"
#include "m_option.h"
#include "m_struct.h"

1
libmpcodecs/vf_ilpack.c
View File

@ -13,7 +13,6 @@
#include "vf.h"
#include "libvo/fastmemcpy.h"
#include "postproc/rgb2rgb.h"
typedef void (pack_func_t)(unsigned char *dst, unsigned char *y,
unsigned char *u, unsigned char *v, int w, int us, int vs);

1
libmpcodecs/vf_mirror.c
View File

@ -11,7 +11,6 @@
#include "vf.h"
#include "libvo/fastmemcpy.h"
#include "postproc/rgb2rgb.h"
static void mirror(unsigned char* dst,unsigned char* src,int dststride,int srcstride,int w,int h,int bpp,unsigned int fmt){

1
libmpcodecs/vf_rotate.c
View File

@ -11,7 +11,6 @@
#include "vf.h"
#include "libvo/fastmemcpy.h"
#include "postproc/rgb2rgb.h"
struct vf_priv_s {
int direction;

1
libmpcodecs/vf_screenshot.c
View File

@ -24,7 +24,6 @@
#include "libvo/fastmemcpy.h"
#include "postproc/swscale.h"
#include "postproc/rgb2rgb.h"
struct vf_priv_s {
int frameno;

1
libmpcodecs/vf_yvu9.c
View File

@ -12,7 +12,6 @@
#include "vf.h"
#include "libvo/fastmemcpy.h"
#include "postproc/rgb2rgb.h"
//===========================================================================//

1
libvo/mga_common.c
View File

@ -2,7 +2,6 @@
#include "fastmemcpy.h"
#include "cpudetect.h"
#include "postproc/swscale.h"
#include "postproc/rgb2rgb.h"
#include "libmpcodecs/vf_scale.h"
#include "mp_msg.h"
#include "help_mp.h"

19
libvo/vo_x11.c
View File

@ -39,9 +39,9 @@ int XShmGetEventBase(Display *);
#include "sub.h"
#include "postproc/swscale.h"
#include "postproc/swscale_internal.h" //FIXME
#include "postproc/rgb2rgb.h"
#include "libmpcodecs/vf_scale.h"
#define MODE_RGB 0x1
#define MODE_BGR 0x2
#include "mp_msg.h"
#include "help_mp.h"
@ -144,7 +144,8 @@ static void draw_alpha_null(int x0, int y0, int w, int h,
{
}
static SwsContext *swsContext = NULL;
static struct SwsContext *swsContext = NULL;
static int dst_width;
extern int sws_flags;
static XVisualInfo vinfo;
@ -509,6 +510,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width,
if (!swsContext)
return -1;
dst_width = width;
//printf( "X11 bpp: %d color mask: R:%lX G:%lX B:%lX\n",bpp,myximage->red_mask,myximage->green_mask,myximage->blue_mask );
// If we have blue in the lowest bit then obviously RGB
@ -553,16 +555,16 @@ static void Display_Image(XImage * myximage, uint8_t * ImageData)
{
XShmPutImage(mDisplay, vo_window, vo_gc, myximage,
0, 0,
(vo_dwidth - swsContext->dstW) / 2,
(vo_dheight - myximage->height) / 2, swsContext->dstW,
(vo_dwidth - dst_width) / 2,
(vo_dheight - myximage->height) / 2, dst_width,
myximage->height, True);
} else
#endif
{
XPutImage(mDisplay, vo_window, vo_gc, myximage,
0, 0,
(vo_dwidth - swsContext->dstW) / 2,
(vo_dheight - myximage->height) / 2, swsContext->dstW,
(vo_dwidth - dst_width) / 2,
(vo_dheight - myximage->height) / 2, dst_width,
myximage->height);
}
}
@ -590,7 +592,7 @@ static int draw_slice(uint8_t * src[], int stride[], int w, int h,
int newW = vo_dwidth;
int newH = vo_dheight;
int newAspect = (newW * (1 << 16) + (newH >> 1)) / newH;
SwsContext *oldContext = swsContext;
struct SwsContext *oldContext = swsContext;
if (newAspect > aspect)
newW = (newH * aspect + (1 << 15)) >> 16;
@ -617,6 +619,7 @@ static int draw_slice(uint8_t * src[], int stride[], int w, int h,
{
swsContext = oldContext;
}
dst_width = newW;
}
dstStride[1] = dstStride[2] = 0;
dst[1] = dst[2] = NULL;