November 2001 - MPlayer-cvslog - lists.mplayerhq.hu

CVS: main/TOOLS menc2pass,NONE,1.1
by Atmosfear 20 Nov '01

20 Nov '01

Update of /cvsroot/mplayer/main/TOOLS In directory mplayer:/var/tmp.root/cvs-serv15009 Added Files: menc2pass Log Message: Small two pass mencoder helper script in perl. --- NEW FILE --- #!/usr/bin/perl -w # Helper script to ease MEncoder two pass encoding # Copyleft 2001 by Felix Buenemann <atmosfear(a)users.sourceforge.net> # This files comes udner GPL, see http://www.gnu.org/copyleft/gpl.html for more # information on it's licensing. use strict; my $mencoder="mencoder"; # Path to MEncoder (including binary name) die <<"EOF" unless @ARGV; Menc2Pass: No arguments given! Please give all usual encoding parameters you would give to mencoder, but leave away the -pass switch. EOF for(my $i=1; $i<=2; $i++) { system($mencoder,@ARGV," -pass $i") and die "MEncoder pass $i failed!\n" }

1 0

CVS: main .cvsignore,1.7,1.8
by Atmosfear 20 Nov '01

20 Nov '01

Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv12728 Modified Files: .cvsignore Log Message: Bring into alphabetical order and add mencoder. Index: .cvsignore =================================================================== RCS file: /cvsroot/mplayer/main/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 18 Nov 2001 21:48:00 -0000 1.7 +++ .cvsignore 20 Nov 2001 12:51:57 -0000 1.8 @@ -1,8 +1,9 @@ +.depend +.developer config.h config.mak +configure.log +help_mp.h +mencoder mplayer -.depend version.h -help_mp.h -.developer -configure.log

1 0

CVS: main configure,1.278,1.279
by pl 20 Nov '01

20 Nov '01

Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv8194 Modified Files: configure Log Message: _ld_x11 patch by Anders Johansson <ajh(a)atri.curtin.edu.au> reset content of $TMPO before cc_check to avoid incorrect ldd reports Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.278 retrieving revision 1.279 diff -u -r1.278 -r1.279 --- configure 20 Nov 2001 11:59:32 -0000 1.278 +++ configure 20 Nov 2001 12:31:35 -0000 1.279 @@ -30,6 +30,7 @@ cat "$TMPC" >> "$TMPLOG" echo >> "$TMPLOG" echo "$_cc $_inc_extra $_ld_static $_ld_extra $TMPC -o $TMPO $@" >> "$TMPLOG" + > "$TMPO" ( "$_cc" $_inc_extra $_ld_static $_ld_extra "$TMPC" -o "$TMPO" "$@" ) >> "$TMPLOG" 2>&1 TMP="$?" echo >> "$TMPLOG" @@ -1321,7 +1322,7 @@ echores "using xdpms4" elif test "$_xdpms3" = yes ; then _def_xdpms='#define HAVE_XDPMS 1' - _ld_x11='$_ld_x11 -lXdpms' + _ld_x11="$_ld_x11 -lXdpms" echores "using xdpms3" else _def_xdpms='#undef HAVE_XDPMS'

1 0

CVS: main configure,1.277,1.278
by pl 20 Nov '01

20 Nov '01

Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv1384 Modified Files: configure Log Message: still GL problem Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.277 retrieving revision 1.278 diff -u -r1.277 -r1.278 --- configure 20 Nov 2001 09:26:44 -0000 1.277 +++ configure 20 Nov 2001 11:59:32 -0000 1.278 @@ -1451,9 +1451,6 @@ elif cc_check $_inc_x11 $_ld_x11 -lGL -lm $_ld_pthread ; then _gl=yes _ld_gl="-lGL -lm $_ld_pthread" - else - _gl=no - cc_check $_inc_x11 $_ld_x11 -lGL -lm && _gl=yes fi else _gl=no

1 0

CVS: main/libvo vesa_lvo.c,1.8,1.9
by Nick Kurshev 20 Nov '01

20 Nov '01

Update of /cvsroot/mplayer/main/libvo In directory mplayer:/var/tmp.root/cvs-serv22553/main/libvo Modified Files: vesa_lvo.c Log Message: Minor fixes with the same results Index: vesa_lvo.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vesa_lvo.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- vesa_lvo.c 20 Nov 2001 10:00:58 -0000 1.8 +++ vesa_lvo.c 20 Nov 2001 10:34:00 -0000 1.9 @@ -26,7 +26,7 @@ #include "../mmx_defs.h" #include "../postproc/rgb2rgb.h" -#define WIDTH_ALIGN 32 /* should be 16 for radeons */ +#define WIDTH_ALIGN 16 /* should be 16 for radeons */ #define NUM_FRAMES 2 static uint8_t *frames[NUM_FRAMES]; @@ -144,56 +144,11 @@ if(lvo_handler != -1) close(lvo_handler); } -static void -CopyData420( - unsigned char *src1, - unsigned char *src2, - unsigned char *src3, - unsigned char *dst1, - unsigned char *dst2, - unsigned char *dst3, - int srcPitch, - int srcPitch2, - int dstPitch, - int h, - int w -){ - int count; - - count = h; - while(count--) { - memcpy(dst1, src1, w); - src1 += srcPitch; - dst1 += dstPitch; - } - - w >>= 1; - h >>= 1; - dstPitch >>= 1; - - count = h; - while(count--) { - memcpy(dst2, src2, w); - src2 += srcPitch2; - dst2 += dstPitch; - } - - count = h; - while(count--) { - memcpy(dst3, src3, w); - src3 += srcPitch2; - dst3 += dstPitch; - } -} - - -uint32_t vlvo_draw_slice(uint8_t *image[], int stride[], int w,int h,int x,int y) +uint32_t vlvo_draw_slice_mga(uint8_t *image[], int stride[], int w,int h,int x,int y) { -#if 0 -/* original vo_mga stuff */ uint8_t *src; uint8_t *dest; - uint32_t bespitch,bespitch2,srcpitch; + uint32_t bespitch,bespitch2; int i; bespitch = (mga_vid_config.src_width + (WIDTH_ALIGN-1)) & ~(WIDTH_ALIGN-1); @@ -226,41 +181,27 @@ src+=stride[2]; dest += bespitch2; } -#else + return 0; +} + +uint32_t vlvo_draw_slice(uint8_t *image[], int stride[], int w,int h,int x,int y) +{ uint8_t *dst; uint8_t bytpp; + if(verbose > 1) printf("vesa_lvo: vlvo_draw_slice() was called\n"); bytpp = (image_bpp+7)/8; dst = lvo_mem + (image_width * y + x)*bytpp; #ifdef HAVE_RADEON if(src_format == IMGFMT_YV12) - { yv12toyuy2(image[0],image[1],image[2],dst ,w,h,stride[0],stride[1],w*2); - } else #else if(src_format == IMGFMT_YV12) - { - uint32_t dstPitch,d1line,d2line,d3line,d1offset,d2offset,d3offset; - dstPitch = (mga_vid_config.src_width + 15) & ~15; /* of luma */ - d1line = y * dstPitch; - d2line = (mga_vid_config.src_height * dstPitch) + ((y >> 1) * (dstPitch >> 1)); - d3line = d2line + ((mga_vid_config.src_height >> 1) * (dstPitch >> 1)); - - y &= ~1; - - d1offset = (y * dstPitch) + x; - d2offset = d2line + (x >> 1); - d3offset = d3line + (x >> 1); - CopyData420(image[0],image[1],image[2], - dst+d1offset,dst+d2offset,dst+d3offset, - stride[0],stride[1],dstPitch,h,w); - } + vlvo_draw_slice_mga(image,stride,w,h,x,y); else #endif memcpy(dst,image[0],mga_vid_config.frame_size); -#endif - if(verbose > 1) printf("vesa_lvo: vlvo_draw_slice() was called\n"); return 0; }

1 0

CVS: main/drivers/radeon radeon_vid.c,1.7,1.8
by Nick Kurshev 20 Nov '01

20 Nov '01

Update of /cvsroot/mplayer/main/drivers/radeon In directory mplayer:/var/tmp.root/cvs-serv22553/main/drivers/radeon Modified Files: radeon_vid.c Log Message: Minor fixes with the same results Index: radeon_vid.c =================================================================== RCS file: /cvsroot/mplayer/main/drivers/radeon/radeon_vid.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- radeon_vid.c 20 Nov 2001 10:00:58 -0000 1.7 +++ radeon_vid.c 20 Nov 2001 10:34:00 -0000 1.8 @@ -381,7 +381,7 @@ besr.fourcc = config->format; - besr.v_inc = (config->src_height << 20) / XXX_DRW_H; /*9c0e0 -> 9c528*/ + besr.v_inc = (config->src_height << 20) / XXX_DRW_H; h_inc = (config->src_width << 12) / XXX_DRW_W; step_by = 1; @@ -395,7 +395,7 @@ if(is_420) { uint32_t dstPitch,d1line,d2line,d3line; - dstPitch = (XXX_WIDTH + 31) & ~31; /* of luma */ + dstPitch = (XXX_WIDTH + 15) & ~15; /* of luma */ d1line = top * dstPitch; d2line = (XXX_HEIGHT * dstPitch) + ((top >> 1) * (dstPitch >> 1)); d3line = d2line + ((XXX_HEIGHT >> 1) * (dstPitch >> 1)); @@ -439,7 +439,7 @@ left = (left >> 16) & 7; besr.h_inc = h_inc | ((h_inc >> 1) << 16); besr.step_by = step_by | (step_by << 8); - besr.y_x_start = (config->x_org+8) | (config->y_org << 16); /*5c008->5d009*/ + besr.y_x_start = (config->x_org+8) | (config->y_org << 16); besr.y_x_end = (config->x_org + config->dest_width+8) | ((config->y_org + config->dest_height) << 16); besr.p1_blank_lines_at_top = 0x00000fff | ((config->src_height - 1) << 16); besr.p23_blank_lines_at_top = is_420 ? 0x000007ff | ((((config->src_height+1)>>1) - 1) << 16) : 0;

1 0

CVS: main/drivers/radeon radeon_vid.c,1.6,1.7
by Nick Kurshev 20 Nov '01

20 Nov '01

Update of /cvsroot/mplayer/main/drivers/radeon In directory mplayer:/var/tmp.root/cvs-serv17574/main/drivers/radeon Modified Files: radeon_vid.c Log Message: Bad attempt of YV12 direct support Index: radeon_vid.c =================================================================== RCS file: /cvsroot/mplayer/main/drivers/radeon/radeon_vid.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- radeon_vid.c 18 Nov 2001 09:45:49 -0000 1.6 +++ radeon_vid.c 20 Nov 2001 10:00:58 -0000 1.7 @@ -84,6 +84,7 @@ uint32_t y_x_end; uint32_t v_inc; uint32_t p1_blank_lines_at_top; + uint32_t p23_blank_lines_at_top; uint32_t vid_buf_pitch0_value; uint32_t vid_buf_pitch1_value; uint32_t p1_x_start_end; @@ -99,6 +100,7 @@ uint32_t p1_v_accum_init; uint32_t p1_h_accum_init; + uint32_t p23_v_accum_init; uint32_t p23_h_accum_init; uint32_t scale_cntl; uint32_t exclusive_horz; @@ -127,6 +129,7 @@ { OV0_Y_X_END, 0 }, { OV0_V_INC, 0 }, { OV0_P1_BLANK_LINES_AT_TOP, 0 }, + { OV0_P23_BLANK_LINES_AT_TOP, 0 }, { OV0_VID_BUF_PITCH0_VALUE, 0 }, { OV0_VID_BUF_PITCH1_VALUE, 0 }, { OV0_P1_X_START_END, 0 }, @@ -140,6 +143,7 @@ { OV0_VID_BUF5_BASE_ADRS, 0 }, { OV0_P1_V_ACCUM_INIT, 0 }, { OV0_P1_H_ACCUM_INIT, 0 }, + { OV0_P23_V_ACCUM_INIT, 0 }, { OV0_P23_H_ACCUM_INIT, 0 }, { OV0_SCALE_CNTL, 0 }, { OV0_EXCLUSIVE_HORZ, 0 }, @@ -156,7 +160,7 @@ static uint8_t *radeon_mmio_base = 0; static uint32_t radeon_mem_base = 0; -#define RADEON_SRC_BASE 0x1000000ULL /* this driver uses all video memory */ +static int32_t radeon_overlay_off = 0; static uint32_t radeon_ram_size = 0; @@ -273,8 +277,11 @@ case IMGFMT_YVU9: bes_flags |= SCALER_SOURCE_YUV9; break; case IMGFMT_IYUV: bes_flags |= SCALER_SOURCE_YUV12; break; - case IMGFMT_YV12: case IMGFMT_I420: + case IMGFMT_YV12: bes_flags |= SCALER_SOURCE_YUV12 | + SCALER_PIX_EXPAND | + SCALER_Y2R_TEMP; + break; case IMGFMT_YUY2: default: bes_flags |= SCALER_SOURCE_VYUY422; break; } @@ -309,8 +316,8 @@ static int radeon_vid_init_video( mga_vid_config_t *config ) { - uint32_t tmp,src_w,pitch,h_inc,step_by,left,top; - + uint32_t tmp,src_w,pitch,h_inc,step_by,left,leftUV,top; + int is_420; RTRACE("radeon_vid: usr_config: version = %x format=%x card=%x ram=%u src(%ux%u) dest(%u:%ux%u:%u) frame_size=%u num_frames=%u\n" ,(uint32_t)config->version ,(uint32_t)config->format @@ -348,6 +355,8 @@ printk( "radeon_vid: Unsupported pixel format: 0x%X\n",config->format); return -1; } + is_420 = 0; + if(config->format == IMGFMT_YV12 || config->format == IMGFMT_I420) is_420 = 1; switch(config->format) { default: @@ -366,7 +375,6 @@ case IMGFMT_RGB32: case IMGFMT_BGR32: pitch = ((XXX_WIDTH*4) + 15) & ~15; break; } - /*pitch 9c0 ->4e0 */ left = XXX_SRC_X << 16; top = XXX_SRC_Y << 16; @@ -384,13 +392,33 @@ /* keep everything in 16.16 */ - besr.vid_buf0_base_adrs = RADEON_SRC_BASE; /* I guess that offset 0 is o'k */ - besr.vid_buf0_base_adrs += ((left & ~7) << 1)&0xfffffff0; - besr.vid_buf1_base_adrs = besr.vid_buf0_base_adrs + config->frame_size; - besr.vid_buf2_base_adrs = besr.vid_buf0_base_adrs; - besr.vid_buf3_base_adrs = besr.vid_buf0_base_adrs + config->frame_size; - besr.vid_buf4_base_adrs = besr.vid_buf0_base_adrs; - besr.vid_buf5_base_adrs = besr.vid_buf0_base_adrs + config->frame_size; + if(is_420) + { + uint32_t dstPitch,d1line,d2line,d3line; + dstPitch = (XXX_WIDTH + 31) & ~31; /* of luma */ + d1line = top * dstPitch; + d2line = (XXX_HEIGHT * dstPitch) + ((top >> 1) * (dstPitch >> 1)); + d3line = d2line + ((XXX_HEIGHT >> 1) * (dstPitch >> 1)); + d1line += (left >> 16) & ~15; + d2line += (left >> 17) & ~15; + d3line += (left >> 17) & ~15; + besr.vid_buf0_base_adrs = (radeon_overlay_off + d1line) & 0xfffffff0; + besr.vid_buf1_base_adrs = ((radeon_overlay_off + d2line) & 0xfffffff0) | 0x00000001; + besr.vid_buf2_base_adrs = ((radeon_overlay_off + d3line) & 0xfffffff0) | 0x00000001; + besr.vid_buf3_base_adrs = besr.vid_buf0_base_adrs; + besr.vid_buf4_base_adrs = besr.vid_buf1_base_adrs; + besr.vid_buf5_base_adrs = besr.vid_buf2_base_adrs; + } + else + { + besr.vid_buf0_base_adrs = radeon_overlay_off; + besr.vid_buf0_base_adrs += ((left & ~7) << 1)&0xfffffff0; + besr.vid_buf1_base_adrs = besr.vid_buf0_base_adrs + config->frame_size; + besr.vid_buf2_base_adrs = besr.vid_buf0_base_adrs; + besr.vid_buf3_base_adrs = besr.vid_buf0_base_adrs + config->frame_size; + besr.vid_buf4_base_adrs = besr.vid_buf0_base_adrs; + besr.vid_buf5_base_adrs = besr.vid_buf0_base_adrs + config->frame_size; + } tmp = (left & 0x0003ffff) + 0x00028000 + (h_inc << 3); besr.p1_h_accum_init = ((tmp << 4) & 0x000f8000) | @@ -403,21 +431,27 @@ tmp = (top & 0x0000ffff) + 0x00018000; besr.p1_v_accum_init = ((tmp << 4) & 0x03ff8000) | 0x00000001; + + tmp = ((top >> 1) & 0x0000ffff) + 0x00018000; + besr.p23_v_accum_init = is_420 ? ((tmp << 4) & 0x01ff8000) | 0x00000001 : 0; + + leftUV = (left >> 17) & 7; left = (left >> 16) & 7; besr.h_inc = h_inc | ((h_inc >> 1) << 16); besr.step_by = step_by | (step_by << 8); besr.y_x_start = (config->x_org+8) | (config->y_org << 16); /*5c008->5d009*/ besr.y_x_end = (config->x_org + config->dest_width+8) | ((config->y_org + config->dest_height) << 16); besr.p1_blank_lines_at_top = 0x00000fff | ((config->src_height - 1) << 16); + besr.p23_blank_lines_at_top = is_420 ? 0x000007ff | ((((config->src_height+1)>>1) - 1) << 16) : 0; besr.vid_buf_pitch0_value = pitch; - besr.vid_buf_pitch1_value = pitch; + besr.vid_buf_pitch1_value = is_420 ? pitch/2 : pitch; RTRACE("radeon_vid: BES: v_inc=%x h_inc=%x step_by=%x\n",besr.v_inc,besr.h_inc,besr.step_by); RTRACE("radeon_vid: BES: vid_buf0_basey=%x\n",besr.vid_buf0_base_adrs); RTRACE("radeon_vid: BES: y_x_start=%x y_x_end=%x blank_at_top=%x pitch0_value=%x\n" ,besr.y_x_start,besr.y_x_end,besr.p1_blank_lines_at_top,besr.vid_buf_pitch0_value); besr.p1_x_start_end = (config->src_width + left - 1) | (left << 16); - left >>= 1; src_w=config->src_width >> 1; - besr.p2_x_start_end = (src_w + left - 1) | (left << 16); + src_w=config->src_width >> 1; + besr.p2_x_start_end = (src_w + left - 1) | (leftUV << 16); besr.p3_x_start_end = besr.p2_x_start_end; return 0; } @@ -429,17 +463,16 @@ { default: case 0: off = besr.vid_buf0_base_adrs; break; - case 1: off = besr.vid_buf1_base_adrs; break; - case 2: off = besr.vid_buf2_base_adrs; break; + case 1: off = besr.vid_buf3_base_adrs; break; + case 2: off = besr.vid_buf0_base_adrs; break; case 3: off = besr.vid_buf3_base_adrs; break; - case 4: off = besr.vid_buf4_base_adrs; break; - case 5: off = besr.vid_buf5_base_adrs; break; + case 4: off = besr.vid_buf0_base_adrs; break; + case 5: off = besr.vid_buf3_base_adrs; break; } OUTREG(OV0_REG_LOAD_CNTL, REG_LD_CTL_LOCK); while(!(INREG(OV0_REG_LOAD_CNTL)&REG_LD_CTL_LOCK_READBACK)); OUTREG(OV0_VID_BUF0_BASE_ADRS, off); OUTREG(OV0_REG_LOAD_CNTL, 0); - } static int video_on = 0; @@ -458,31 +491,37 @@ if(copy_from_user(&radeon_config,(mga_vid_config_t*) arg,sizeof(mga_vid_config_t))) { printk( "radeon_vid: failed copy from userspace\n"); - return(-EFAULT); + return -EFAULT; } if(radeon_config.version != MGA_VID_VERSION){ printk( "radeon_vid: incompatible version! driver: %X requested: %X\n",MGA_VID_VERSION,radeon_config.version); - return(-EFAULT); + return -EFAULT; } if(radeon_config.frame_size==0 || radeon_config.frame_size>1024*768*2){ printk( "radeon_vid: illegal frame_size: %d\n",radeon_config.frame_size); - return(-EFAULT); + return -EFAULT; } if(radeon_config.num_frames<1 || radeon_config.num_frames>4){ printk( "radeon_vid: illegal num_frames: %d\n",radeon_config.num_frames); - return(-EFAULT); + return -EFAULT; } /* FIXME: Fake of G400 ;) or would be better G200 ??? */ radeon_config.card_type = 0; radeon_config.ram_size = radeon_ram_size; - + radeon_overlay_off = radeon_ram_size*0x100000 - radeon_config.frame_size*radeon_config.num_frames; + radeon_overlay_off &= 0xffff0000; + if(radeon_overlay_off < 0){ + printk("radeon_vid: not enough video memory. Need: %u has: %u\n",radeon_config.frame_size*radeon_config.num_frames,radeon_ram_size*0x100000); + return -EFAULT; + } + RTRACE("radeon_vid: using video overlay at offset %p\n",radeon_overlay_off); if (copy_to_user((mga_vid_config_t *) arg, &radeon_config, sizeof(mga_vid_config_t))) { printk( "radeon_vid: failed copy to userspace\n"); - return(-EFAULT); + return -EFAULT; } return radeon_vid_init_video(&radeon_config); break; @@ -577,7 +616,7 @@ { RTRACE( "radeon_vid: mapping video memory into userspace\n"); - if(remap_page_range(vma->vm_start, radeon_mem_base + RADEON_SRC_BASE, + if(remap_page_range(vma->vm_start, radeon_mem_base + radeon_overlay_off, vma->vm_end - vma->vm_start, vma->vm_page_prot)) { printk( "radeon_vid: error mapping video memory\n");

1 0

CVS: main/libvo vesa_lvo.c,1.7,1.8
by Nick Kurshev 20 Nov '01

20 Nov '01

Update of /cvsroot/mplayer/main/libvo In directory mplayer:/var/tmp.root/cvs-serv17574/main/libvo Modified Files: vesa_lvo.c Log Message: Bad attempt of YV12 direct support Index: vesa_lvo.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vesa_lvo.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- vesa_lvo.c 20 Nov 2001 08:38:15 -0000 1.7 +++ vesa_lvo.c 20 Nov 2001 10:00:58 -0000 1.8 @@ -144,6 +144,49 @@ if(lvo_handler != -1) close(lvo_handler); } +static void +CopyData420( + unsigned char *src1, + unsigned char *src2, + unsigned char *src3, + unsigned char *dst1, + unsigned char *dst2, + unsigned char *dst3, + int srcPitch, + int srcPitch2, + int dstPitch, + int h, + int w +){ + int count; + + count = h; + while(count--) { + memcpy(dst1, src1, w); + src1 += srcPitch; + dst1 += dstPitch; + } + + w >>= 1; + h >>= 1; + dstPitch >>= 1; + + count = h; + while(count--) { + memcpy(dst2, src2, w); + src2 += srcPitch2; + dst2 += dstPitch; + } + + count = h; + while(count--) { + memcpy(dst3, src3, w); + src3 += srcPitch2; + dst3 += dstPitch; + } +} + + uint32_t vlvo_draw_slice(uint8_t *image[], int stride[], int w,int h,int x,int y) { #if 0 @@ -193,6 +236,25 @@ { yv12toyuy2(image[0],image[1],image[2],dst ,w,h,stride[0],stride[1],w*2); + } + else +#else + if(src_format == IMGFMT_YV12) + { + uint32_t dstPitch,d1line,d2line,d3line,d1offset,d2offset,d3offset; + dstPitch = (mga_vid_config.src_width + 15) & ~15; /* of luma */ + d1line = y * dstPitch; + d2line = (mga_vid_config.src_height * dstPitch) + ((y >> 1) * (dstPitch >> 1)); + d3line = d2line + ((mga_vid_config.src_height >> 1) * (dstPitch >> 1)); + + y &= ~1; + + d1offset = (y * dstPitch) + x; + d2offset = d2line + (x >> 1); + d3offset = d3line + (x >> 1); + CopyData420(image[0],image[1],image[2], + dst+d1offset,dst+d2offset,dst+d3offset, + stride[0],stride[1],dstPitch,h,w); } else #endif

1 0

CVS: main configure,1.267,1.268
by pl 20 Nov '01

20 Nov '01

Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv22016 Modified Files: configure Log Message: fix x11 linking when --disable-x11 used (btw sdl may still require it) fix GL always detected even when x11 disabled Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.267 retrieving revision 1.268 diff -u -r1.267 -r1.268 --- configure 19 Nov 2001 12:04:19 -0000 1.267 +++ configure 19 Nov 2001 12:29:48 -0000 1.268 @@ -1217,7 +1217,7 @@ ######### echocheck "X11" -if test "$_x11" = auto ; then +if test "$_x11" = auto || test "$_x11" = yes ; then cat > $TMPC <<EOF #include <X11/Xlib.h> #include <X11/Xutil.h> @@ -1231,6 +1231,8 @@ _vosrc="$_vosrc vo_x11.c" else _def_x11='#undef HAVE_X11' + _inc_x11='' + _ld_x11='' fi echores "$_x11" @@ -1385,7 +1387,7 @@ echocheck "OpenGL" -if test "$_gl" = auto ; then +if test "$_x11" = yes && test "$_gl" = auto ; then cat > $TMPC << EOF #include <GL/gl.h> int main(void) { return 0; } @@ -1401,6 +1403,8 @@ _gl=no cc_check $_inc_x11 $_ld_x11 -lGL -lm && _gl=yes fi +else + _gl=no fi if test "$_gl" = yes ; then #FIXME ?? : bsd && test -r /usr/X11R6/bin/XFree86 && _ld_gl="-lGL $_ld_pthread"

3 2

CVS: main configure,1.276,1.277
by pl 20 Nov '01

20 Nov '01

Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv11866 Modified Files: configure Log Message: when --enable-gl was used, linker flags (_ld_gl) were not set (found by Nick K) Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.276 retrieving revision 1.277 diff -u -r1.276 -r1.277 --- configure 20 Nov 2001 07:53:20 -0000 1.276 +++ configure 20 Nov 2001 09:26:44 -0000 1.277 @@ -1438,7 +1438,8 @@ echocheck "OpenGL" -if test "$_x11" = yes && test "$_gl" = auto ; then +#Note: this test is run even with --enable-gl since we autodetect $_ld_gl +if test "$_x11" = yes && test "$_gl" != no ; then cat > $TMPC << EOF #include <GL/gl.h> int main(void) { return 0; } @@ -1458,7 +1459,6 @@ _gl=no fi if test "$_gl" = yes ; then - #FIXME ?? : bsd && test -r /usr/X11R6/bin/XFree86 && _ld_gl="-lGL $_ld_pthread" _def_gl='#define HAVE_GL 1' _vosrc="$_vosrc vo_gl.c vo_gl2.c" else @@ -1886,6 +1886,7 @@ else _def_rtc='#undef HAVE_RTC' fi + echocheck "mad support" if test "$_mad" = auto ; then

1 0