From 5e64850517fc73daa5ccc205b4815b8e9ec47190 Mon Sep 17 00:00:00 2001 From: alex Date: Fri, 25 Apr 2003 20:37:26 +0000 Subject: Spring cleanup: supporting only RGB24 as input (native jpeg lib supports only that, maybe we could later add nativ YCbCr (YUV) support, but not swscale ones) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9990 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libvo/vo_jpeg.c | 123 ++++---------------------------------------------------- 1 file changed, 8 insertions(+), 115 deletions(-) (limited to 'libvo') diff --git a/libvo/vo_jpeg.c b/libvo/vo_jpeg.c index 78823b572a..5c7e4907c9 100644 --- a/libvo/vo_jpeg.c +++ b/libvo/vo_jpeg.c @@ -1,9 +1,8 @@ -#define DISP - /* * vo_jpeg.c, JPEG Renderer for Mplayer * * Copyright 2002 by Pontscho (pontscho@makacs.poliod.hu) + * 25/04/2003: Spring cleanup -- alex * */ @@ -17,10 +16,6 @@ #include "config.h" #include "video_out.h" #include "video_out_internal.h" -#include "sub.h" - -#include "../postproc/swscale.h" -#include "../postproc/rgb2rgb.h" static vo_info_t info= { @@ -32,15 +27,8 @@ static vo_info_t info= LIBVO_EXTERN (jpeg) -#define RGB 0 -#define BGR 1 - -extern int verbose; static int image_width; static int image_height; -static int image_format; -static uint8_t *image_data=NULL; -static unsigned int scale_srcW=0, scale_srcH=0; int jpeg_baseline = 1; int jpeg_progressive_mode = 0; @@ -49,57 +37,12 @@ int jpeg_smooth = 0; int jpeg_quality = 75; char * jpeg_outdir = "."; -#define bpp 24 - -static int cspace=RGB; static int framenum=0; -static void draw_alpha(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride) -{ - vo_draw_alpha_rgb24(w, h, src, srca, stride, image_data + 3 * (y0 * image_width + x0), 3 * image_width); -} - static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format) { - if ( fullscreen&0x04 && ( width != d_width || height != d_height )&&( ( format == IMGFMT_YV12 ) ) ) - { - // software scaling - image_width=(d_width + 7) & ~7; - image_height=d_height; - scale_srcW=width; - scale_srcH=height; - SwScale_Init(); - } - else - { image_height=height; image_width=width; - } - - image_format=format; - switch(format) - { - case IMGFMT_BGR32: - cspace=BGR; - image_data=malloc( image_width * image_height * 3 ); - break; - case IMGFMT_BGR24: - cspace=BGR; - image_data=malloc( image_width * image_height * 3 ); - break; - case IMGFMT_RGB24: - cspace=RGB; - break; - case IMGFMT_IYUV: - case IMGFMT_I420: - case IMGFMT_YV12: - cspace=BGR; - yuv2rgb_init( bpp,MODE_BGR ); - image_data=malloc( image_width * image_height * 3 ); - break; - default: - return 1; - } return 0; } @@ -119,10 +62,9 @@ static uint32_t jpeg_write( uint8_t * name,uint8_t * buffer ) jpeg_create_compress(&cinfo); jpeg_stdio_dest( &cinfo,o ); - cinfo.image_width=image_width; cinfo.image_height=image_height; - cinfo.input_components=bpp / 8; + cinfo.input_components=3; cinfo.in_color_space=JCS_RGB; jpeg_set_defaults( &cinfo ); @@ -133,7 +75,7 @@ static uint32_t jpeg_write( uint8_t * name,uint8_t * buffer ) if ( jpeg_progressive_mode ) jpeg_simple_progression( &cinfo ); jpeg_start_compress( &cinfo,TRUE ); - row_stride = image_width * ( bpp / 8 ); + row_stride = image_width * 3; while ( cinfo.next_scanline < cinfo.image_height ) { row_pointer[0]=&buffer[ cinfo.next_scanline * row_stride ]; @@ -154,76 +96,32 @@ static uint32_t draw_frame(uint8_t * src[]) snprintf (buf, 256, "%s/%08d.jpg", jpeg_outdir, ++framenum); - if ( image_format == IMGFMT_BGR32 ) - { - rgb32to24( src[0],image_data,image_width * image_height * 4 ); - rgb24tobgr24( image_data,image_data,image_width * image_height * 3 ); - dst=image_data; - } - if ( image_format == IMGFMT_BGR24 ) - { - rgb24tobgr24( src[0],image_data,image_width * image_height * 3 ); - dst=image_data; - } - return jpeg_write( buf,dst ); + return jpeg_write( buf,src[0] ); } static void draw_osd(void) { - vo_draw_text(image_width, image_height, draw_alpha); } static void flip_page (void) { - char buf[256]; - - if((image_format == IMGFMT_YV12) || (image_format == IMGFMT_IYUV) || (image_format == IMGFMT_I420)) - { - snprintf (buf, 256, "%s/%08d.jpg", jpeg_outdir, ++framenum); - jpeg_write( buf,image_data ); - } } static uint32_t draw_slice( uint8_t *src[],int stride[],int w,int h,int x,int y ) { - if (scale_srcW) - { - uint8_t *dst[3]={image_data, NULL, NULL}; - SwScale_YV12slice(src,stride,y,h, - dst, image_width*((bpp+7)/8), bpp, - scale_srcW, scale_srcH, image_width, image_height); - } - else - { - uint8_t *dst=image_data + (image_width * y + x) * (bpp/8); - yuv2rgb(dst,src[0],src[1],src[2],w,h,image_width*(bpp/8),stride[0],stride[1]); - } return 0; } static uint32_t query_format(uint32_t format) { - switch( format ) - { - case IMGFMT_IYUV: - case IMGFMT_I420: - case IMGFMT_YV12: - case IMGFMT_BGR|24: - case IMGFMT_BGR|32: - return VFCAP_CSP_SUPPORTED; - case IMGFMT_RGB|24: - return VFCAP_CSP_SUPPORTED|VFCAP_CSP_SUPPORTED_BY_HW|VFCAP_OSD; - } - return 0; + if (format == IMGFMT_RGB24) + return VFCAP_CSP_SUPPORTED|VFCAP_CSP_SUPPORTED_BY_HW; + + return 0; } static void uninit(void) { - if ( image_data ) - { - free( image_data ); - image_data=NULL; - } } static void check_events(void) @@ -232,11 +130,6 @@ static void check_events(void) static uint32_t preinit(const char *arg) { - if(arg) - { - printf("JPEG Unknown subdevice: %s\n",arg); - return ENOSYS; - } return 0; } -- cgit v1.2.3