diff options
author | michael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-02-23 22:05:55 +0000 |
---|---|---|
committer | michael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-02-23 22:05:55 +0000 |
commit | 41b847f6a8af2013338a63c1b7311f804b2bf5b7 (patch) | |
tree | d4dfb5b969edcaf963f4ca68030a3e16650b2589 /libvo | |
parent | 4bd87c35eb568740b2ae8e6c636d4e63622aa067 (diff) | |
download | mpv-41b847f6a8af2013338a63c1b7311f804b2bf5b7.tar.bz2 mpv-41b847f6a8af2013338a63c1b7311f804b2bf5b7.tar.xz |
sws_ prefix, more seperation between internal & external swscaler API
sws_scale() returns the number of outputed lines
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9495 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
-rw-r--r-- | libvo/vo_vesa.c | 10 | ||||
-rw-r--r-- | libvo/vo_x11.c | 15 |
2 files changed, 13 insertions, 12 deletions
diff --git a/libvo/vo_vesa.c b/libvo/vo_vesa.c index 6d2c00886f..3e1ecf30df 100644 --- a/libvo/vo_vesa.c +++ b/libvo/vo_vesa.c @@ -95,7 +95,7 @@ static void (*cpy_blk_fnc)(unsigned long,uint8_t *,unsigned long) = NULL; static uint32_t srcW=0,srcH=0,srcBpp,srcFourcc; /* source image description */ static uint32_t dstBpp,dstW, dstH,dstFourcc; /* destinition image description */ -static SwsContext * sws = NULL; +static struct SwsContext * sws = NULL; static int32_t x_offset,y_offset; /* to center image on screen */ static unsigned init_mode=0; /* mode before run of mplayer */ @@ -161,7 +161,7 @@ static void vesa_term( void ) if(HAS_DGA()) vbeUnmapVideoBuffer((unsigned long)win.ptr,win.high); if(dga_buffer && !HAS_DGA()) free(dga_buffer); vbeDestroy(); - if(sws) freeSwsContext(sws); + if(sws) sws_freeContext(sws); sws=NULL; } @@ -278,7 +278,7 @@ static uint32_t draw_slice(uint8_t *image[], int stride[], int w,int h,int x,int dstStride[1]= dstStride[2]=dstStride[0]>>1; if(HAS_DGA()) dst[0] += y_offset*SCREEN_LINE_SIZE(PIXEL_SIZE())+x_offset*PIXEL_SIZE(); - sws->swScale(sws,image,stride,y,h,dst,dstStride); + sws_scale(sws,image,stride,y,h,dst,dstStride); flip_trigger = 1; return 0; } @@ -423,7 +423,7 @@ static uint32_t draw_frame(uint8_t *src[]) else srcStride[0] = srcW*2; if(HAS_DGA()) dst[0] += y_offset*SCREEN_LINE_SIZE(PIXEL_SIZE())+x_offset*PIXEL_SIZE(); - sws->swScale(sws,src,srcStride,0,srcH,dst,dstStride); + sws_scale(sws,src,srcStride,0,srcH,dst,dstStride); flip_trigger=1; } return 0; @@ -800,7 +800,7 @@ config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uin #endif ) { - sws = getSwsContextFromCmdLine(srcW,srcH,srcFourcc,dstW,dstH,dstFourcc); + sws = sws_getContextFromCmdLine(srcW,srcH,srcFourcc,dstW,dstH,dstFourcc); if(!sws) { printf("vo_vesa: Can't initialize SwScaler\n"); diff --git a/libvo/vo_x11.c b/libvo/vo_x11.c index 8be96d8531..0306f06f0d 100644 --- a/libvo/vo_x11.c +++ b/libvo/vo_x11.c @@ -23,6 +23,7 @@ #include "sub.h" #include "../postproc/swscale.h" +#include "../postproc/swscale_internal.h" //FIXME #include "../postproc/rgb2rgb.h" #include "../mp_msg.h" @@ -371,7 +372,7 @@ static uint32_t config( uint32_t width,uint32_t height,uint32_t d_width,uint32_t if ( myximage ) { freeMyXImage(); - freeSwsContext(swsContext); + sws_freeContext(swsContext); } getMyXImage(); @@ -397,7 +398,7 @@ static uint32_t config( uint32_t width,uint32_t height,uint32_t d_width,uint32_t } /* always allocate swsContext as size could change between frames */ - swsContext= getSwsContextFromCmdLine(width, height, in_format, width, height, out_format ); + swsContext= sws_getContextFromCmdLine(width, height, in_format, width, height, out_format ); //printf( "X11 bpp: %d color mask: R:%lX G:%lX B:%lX\n",bpp,myximage->red_mask,myximage->green_mask,myximage->blue_mask ); @@ -482,7 +483,7 @@ static uint32_t draw_slice( uint8_t *src[],int stride[],int w,int h,int x,int y if(sws_flags==0) newW&= (~31); // not needed but, if the user wants the FAST_BILINEAR SCALER, then its needed - swsContext= getSwsContextFromCmdLine(srcW, srcH, in_format, + swsContext= sws_getContextFromCmdLine(srcW, srcH, in_format, newW, newH, out_format); if(swsContext) { @@ -491,7 +492,7 @@ static uint32_t draw_slice( uint8_t *src[],int stride[],int w,int h,int x,int y freeMyXImage(); getMyXImage(); - freeSwsContext(oldContext); + sws_freeContext(oldContext); } else { @@ -507,13 +508,13 @@ static uint32_t draw_slice( uint8_t *src[],int stride[],int w,int h,int x,int y { dstStride[0]= -image_width*((bpp+7)/8); dst[0]=ImageData - dstStride[0]*(image_height-1); - swsContext->swScale(swsContext,src,stride,y,h,dst, dstStride); + sws_scale(swsContext,src,stride,y,h,dst, dstStride); } else { dstStride[0]=image_width*((bpp+7)/8); dst[0]=ImageData; - swsContext->swScale(swsContext,src,stride,y,h,dst, dstStride); + sws_scale(swsContext,src,stride,y,h,dst, dstStride); } return 0; } @@ -609,7 +610,7 @@ static void uninit(void) zoomFlag=0; vo_x11_uninit(); - freeSwsContext(swsContext); + sws_freeContext(swsContext); } static uint32_t preinit(const char *arg) |