[MPlayer-cvslog] r18749 - in trunk: libmpcodecs/vd_ijpg.c libmpcodecs/vd_mpng.c libmpcodecs/vd_mtga.c libmpcodecs/vf_1bpp.c libmpcodecs/vf_cropdetect.c libmpcodecs/vf_down3dright.c libmpcodecs/vf_eq.c libmpcodecs/vf_ilpack.c libmpcodecs/vf_mirror.c libmpcodecs/vf_rotate.c libmpcodecs/vf_screenshot.c libmpcodecs/vf_yvu9.c libvo/mga_common.c libvo/vo_x11.c
lucabe
subversion at mplayerhq.hu
Sun Jun 18 12:59:23 CEST 2006
Author: lucabe
Date: Sun Jun 18 12:59:23 2006
New Revision: 18749
Modified:
trunk/libmpcodecs/vd_ijpg.c
trunk/libmpcodecs/vd_mpng.c
trunk/libmpcodecs/vd_mtga.c
trunk/libmpcodecs/vf_1bpp.c
trunk/libmpcodecs/vf_cropdetect.c
trunk/libmpcodecs/vf_down3dright.c
trunk/libmpcodecs/vf_eq.c
trunk/libmpcodecs/vf_ilpack.c
trunk/libmpcodecs/vf_mirror.c
trunk/libmpcodecs/vf_rotate.c
trunk/libmpcodecs/vf_screenshot.c
trunk/libmpcodecs/vf_yvu9.c
trunk/libvo/mga_common.c
trunk/libvo/vo_x11.c
Log:
Software Scaler headers usage cleanup
Modified: trunk/libmpcodecs/vd_ijpg.c
==============================================================================
--- trunk/libmpcodecs/vd_ijpg.c (original)
+++ trunk/libmpcodecs/vd_ijpg.c Sun Jun 18 12:59:23 2006
@@ -12,7 +12,6 @@
#include <setjmp.h>
#include "bswap.h"
-#include "postproc/rgb2rgb.h"
#include "libvo/fastmemcpy.h"
#include "vd_internal.h"
Modified: trunk/libmpcodecs/vd_mpng.c
==============================================================================
--- trunk/libmpcodecs/vd_mpng.c (original)
+++ trunk/libmpcodecs/vd_mpng.c Sun Jun 18 12:59:23 2006
@@ -9,7 +9,6 @@
#include <png.h>
#include "bswap.h"
-#include "postproc/rgb2rgb.h"
#include "libvo/fastmemcpy.h"
#include "vd_internal.h"
Modified: trunk/libmpcodecs/vd_mtga.c
==============================================================================
--- trunk/libmpcodecs/vd_mtga.c (original)
+++ trunk/libmpcodecs/vd_mtga.c Sun Jun 18 12:59:23 2006
@@ -11,7 +11,6 @@
#include "mp_msg.h"
#include "bswap.h"
-#include "postproc/rgb2rgb.h"
#include "libvo/fastmemcpy.h"
#include "vd_internal.h"
Modified: trunk/libmpcodecs/vf_1bpp.c
==============================================================================
--- trunk/libmpcodecs/vf_1bpp.c (original)
+++ trunk/libmpcodecs/vf_1bpp.c Sun Jun 18 12:59:23 2006
@@ -10,8 +10,6 @@
#include "mp_image.h"
#include "vf.h"
-#include "postproc/rgb2rgb.h"
-
//===========================================================================//
static unsigned int bgr_list[]={
Modified: trunk/libmpcodecs/vf_cropdetect.c
==============================================================================
--- trunk/libmpcodecs/vf_cropdetect.c (original)
+++ trunk/libmpcodecs/vf_cropdetect.c Sun Jun 18 12:59:23 2006
@@ -12,7 +12,6 @@
#include "vf.h"
#include "libvo/fastmemcpy.h"
-#include "postproc/rgb2rgb.h"
struct vf_priv_s {
int x1,y1,x2,y2;
Modified: trunk/libmpcodecs/vf_down3dright.c
==============================================================================
--- trunk/libmpcodecs/vf_down3dright.c (original)
+++ trunk/libmpcodecs/vf_down3dright.c Sun Jun 18 12:59:23 2006
@@ -12,7 +12,6 @@
#include "vf.h"
#include "libvo/fastmemcpy.h"
-#include "postproc/rgb2rgb.h"
struct vf_priv_s {
int skipline;
Modified: trunk/libmpcodecs/vf_eq.c
==============================================================================
--- trunk/libmpcodecs/vf_eq.c (original)
+++ trunk/libmpcodecs/vf_eq.c Sun Jun 18 12:59:23 2006
@@ -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"
Modified: trunk/libmpcodecs/vf_ilpack.c
==============================================================================
--- trunk/libmpcodecs/vf_ilpack.c (original)
+++ trunk/libmpcodecs/vf_ilpack.c Sun Jun 18 12:59:23 2006
@@ -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);
Modified: trunk/libmpcodecs/vf_mirror.c
==============================================================================
--- trunk/libmpcodecs/vf_mirror.c (original)
+++ trunk/libmpcodecs/vf_mirror.c Sun Jun 18 12:59:23 2006
@@ -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){
Modified: trunk/libmpcodecs/vf_rotate.c
==============================================================================
--- trunk/libmpcodecs/vf_rotate.c (original)
+++ trunk/libmpcodecs/vf_rotate.c Sun Jun 18 12:59:23 2006
@@ -11,7 +11,6 @@
#include "vf.h"
#include "libvo/fastmemcpy.h"
-#include "postproc/rgb2rgb.h"
struct vf_priv_s {
int direction;
Modified: trunk/libmpcodecs/vf_screenshot.c
==============================================================================
--- trunk/libmpcodecs/vf_screenshot.c (original)
+++ trunk/libmpcodecs/vf_screenshot.c Sun Jun 18 12:59:23 2006
@@ -24,7 +24,6 @@
#include "libvo/fastmemcpy.h"
#include "postproc/swscale.h"
-#include "postproc/rgb2rgb.h"
struct vf_priv_s {
int frameno;
Modified: trunk/libmpcodecs/vf_yvu9.c
==============================================================================
--- trunk/libmpcodecs/vf_yvu9.c (original)
+++ trunk/libmpcodecs/vf_yvu9.c Sun Jun 18 12:59:23 2006
@@ -12,7 +12,6 @@
#include "vf.h"
#include "libvo/fastmemcpy.h"
-#include "postproc/rgb2rgb.h"
//===========================================================================//
Modified: trunk/libvo/mga_common.c
==============================================================================
--- trunk/libvo/mga_common.c (original)
+++ trunk/libvo/mga_common.c Sun Jun 18 12:59:23 2006
@@ -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"
Modified: trunk/libvo/vo_x11.c
==============================================================================
--- trunk/libvo/vo_x11.c (original)
+++ trunk/libvo/vo_x11.c Sun Jun 18 12:59:23 2006
@@ -39,9 +39,9 @@
#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 SwsContext *swsContext = NULL;
+static struct SwsContext *swsContext = NULL;
+static int dst_width;
extern int sws_flags;
static XVisualInfo vinfo;
@@ -509,6 +510,7 @@
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 @@
{
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 @@
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 @@
{
swsContext = oldContext;
}
+ dst_width = newW;
}
dstStride[1] = dstStride[2] = 0;
dst[1] = dst[2] = NULL;
More information about the MPlayer-cvslog
mailing list