February 2002 - MPlayer-cvslog - lists.mplayerhq.hu

CVS: main/vidix/drivers radeon.h,1.5,1.6
by Nick Kurshev 13 Feb '02

13 Feb '02

Update of /cvsroot/mplayer/main/vidix/drivers In directory mplayer:/var/tmp.root/cvs-serv19050/main/vidix/drivers Modified Files: radeon.h Log Message: typo Index: radeon.h =================================================================== RCS file: /cvsroot/mplayer/main/vidix/drivers/radeon.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- radeon.h 12 Feb 2002 10:36:43 -0000 1.5 +++ radeon.h 13 Feb 2002 08:55:05 -0000 1.6 @@ -820,10 +820,10 @@ #define FCP_CNTL 0x0910 # define FCP_CNTL__PCICLK 0 # define FCP_CNTL__PCLK 1 -# define FCP_CNTL__PCLK6 2 +# define FCP_CNTL__PCLKb 2 # define FCP_CNTL__HREF 3 # define FCP_CNTL__GND 4 -# define FCP_CNTL__HREF6 5 +# define FCP_CNTL__HREFb 5 #define CAP0_BUF0_OFFSET 0x0920 #define CAP0_BUF1_OFFSET 0x0924

1 0

CVS: main/vidix/drivers radeon_vid.c,1.37,1.38
by Nick Kurshev 13 Feb '02

13 Feb '02

Update of /cvsroot/mplayer/main/vidix/drivers In directory mplayer:/var/tmp.root/cvs-serv13215/main/vidix/drivers Modified Files: radeon_vid.c Log Message: Fixing "quake" by direct waiting of vsync. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ (I don't why - but SMART_SWITCH is always disabled on my card) Benchmarks: [SRC] VIDEO: [DIV3] 624x356 24bpp 24.00 fps 497.3 kbps (60.7 kbyte/s) [DEST] 1024x768@32 70fps (-xvidix -fs -zoom) -vc ffdivx -double: BENCHMARKs: V: 3.838s VO: 7.305s A: 0.555s Sys: 18.264s = 29.962s BENCHMARK%: V: 12.8110% VO: 24.3808% A: 1.8518% Sys: 60.9564% = 100.0000% total video time: 11.143s -vc ffdivx -nodouble: BENCHMARKs: V: 3.846s VO: 1.668s A: 0.539s Sys: 23.869s = 29.922s BENCHMARK%: V: 12.8525% VO: 5.5744% A: 1.8015% Sys: 79.7716% = 100.0000% total video time: 5.514s -vc divxds -double (direct rendering) BENCHMARKs: V: 8.275s VO: 5.750s A: 0.532s Sys: 15.414s = 29.971s BENCHMARK%: V: 27.6115% VO: 19.1850% A: 1.7737% Sys: 51.4298% = 100.0000% total video time: 14.070s -vc divxds -nodouble (direct rendering) BENCHMARKs: V: 7.353s VO: 0.002s A: 0.521s Sys: 22.083s = 29.958s BENCHMARK%: V: 24.5433% VO: 0.0052% A: 1.7382% Sys: 73.7133% = 100.0000% total video time: 7.355s Unfortunately we have dramatic lost of performance (100%) :( Index: radeon_vid.c =================================================================== RCS file: /cvsroot/mplayer/main/vidix/drivers/radeon_vid.c,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- radeon_vid.c 12 Feb 2002 10:36:43 -0000 1.37 +++ radeon_vid.c 13 Feb 2002 08:24:13 -0000 1.38 @@ -270,6 +270,18 @@ return yres + 1; } +static void radeon_wait_vsync(void) +{ + int i; + + OUTREG(GEN_INT_STATUS, VSYNC_INT_AK); + for (i = 0; i < 2000000; i++) + { + if (INREG(GEN_INT_STATUS) & VSYNC_INT) break; + } +} + + static __inline__ void radeon_engine_flush ( void ) { int i; @@ -919,6 +931,8 @@ OUTREG(FCP_CNTL, FCP_CNTL__GND); OUTREG(CAP0_TRIG_CNTL, 0); + OUTREG(VID_BUFFER_CONTROL, (1<<16) | 0x01); + OUTREG(DISP_TEST_DEBUG_CNTL, 0); OUTREG(OV0_AUTO_FLIP_CNTL,OV0_AUTO_FLIP_CNTL_SOFT_BUF_ODD); @@ -1292,6 +1306,7 @@ off[4] = besr.vid_buf4_base_adrs; off[5] = besr.vid_buf5_base_adrs; } + radeon_wait_vsync(); radeon_fifo_wait(2); OUTREG(OV0_REG_LOAD_CNTL, REG_LD_CTL_LOCK); radeon_engine_idle();

1 0

CVS: main fli.c,1.6,1.7
by Mike Melanson 12 Feb '02

12 Feb '02

Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv9197 Modified Files: fli.c Log Message: cosmetic fix Index: fli.c =================================================================== RCS file: /cvsroot/mplayer/main/fli.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- fli.c 13 Feb 2002 04:06:55 -0000 1.6 +++ fli.c 13 Feb 2002 04:47:12 -0000 1.7 @@ -353,10 +353,10 @@ } // by the end of the chunk, the stream ptr should equal the frame - // size (minus 1, possible); if it doesn't, issue a warning + // size (minus 1, possibly); if it doesn't, issue a warning if ((stream_ptr != encoded_size) && (stream_ptr != encoded_size - 1)) mp_msg(MSGT_DECVIDEO, MSGL_WARN, " warning: processed FLI chunk where encoded size = %d\n" \ - " and final chunk ptr = and final chunk ptr = %d\n", + " and final chunk ptr = %d\n", encoded_size, stream_ptr); }

1 0

CVS: main fli.c,1.5,1.6 dec_video.c,1.103,1.104
by Mike Melanson 12 Feb '02

12 Feb '02

Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv3426 Modified Files: fli.c dec_video.c Log Message: some obscure bug fixes to the FLI decoder, with many thanks to Roberto Togni Index: fli.c =================================================================== RCS file: /cvsroot/mplayer/main/fli.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- fli.c 25 Dec 2001 16:43:27 -0000 1.5 +++ fli.c 13 Feb 2002 04:06:55 -0000 1.6 @@ -4,11 +4,19 @@ (C) 2001 Mike Melanson 32bpp support (c) alex + + Additional code and bug fixes by Roberto Togni + + For information on the FLI format, as well as various traps to + avoid while programming one, visit: + http://www.pcisys.net/~melanson/codecs/ */ +#include <stdio.h> +#include <stdlib.h> #include "config.h" #include "bswap.h" -#include <stdio.h> +#include "mp_msg.h" #define LE_16(x) (le2me_16(*(unsigned short *)(x))) #define LE_32(x) (le2me_32(*(unsigned int *)(x))) @@ -24,15 +32,24 @@ // 256 RGB entries; 25% of these bytes will be unused, but it's faster // to index 4-byte entries -static unsigned char palette[256 * 4]; +#define PALETTE_SIZE 1024 +static unsigned char palette[PALETTE_SIZE]; + +void *init_fli_decoder(int width, int height) +{ + memset(palette, 0, PALETTE_SIZE); + + return malloc(width * height * sizeof (unsigned int)); +} -void Decode_Fli( +void decode_fli_frame( unsigned char *encoded, int encoded_size, unsigned char *decoded, int width, int height, - int bytes_per_pixel) + int bytes_per_pixel, + void *context) { int stream_ptr = 0; int pixel_ptr; @@ -56,9 +73,14 @@ int starting_line; signed short line_packets; int y_ptr; - int line_inc; + int line_inc = width * bytes_per_pixel; signed char byte_run; - + int pixel_skip; + int update_whole_frame = 0; // Palette change flag + unsigned int *fli_ghost_image = (unsigned int *)context; + int ghost_pixel_ptr; + int ghost_y_ptr; + frame_size = LE_32(&encoded[stream_ptr]); stream_ptr += 6; // skip the magic number num_chunks = LE_16(&encoded[stream_ptr]); @@ -89,6 +111,9 @@ { // first byte is how many colors to skip palette_ptr1 += (encoded[stream_ptr++] * 4); + // wrap around, for good measure + if (palette_ptr1 >= PALETTE_SIZE) + palette_ptr1 = 0; // next byte indicates how many entries to change color_changes = encoded[stream_ptr++]; // if there are 0 color changes, there are actually 256 @@ -107,11 +132,12 @@ // so account for a pad byte if (stream_ptr & 0x01) stream_ptr++; + /* Palette has changed, must update frame */ + update_whole_frame = 1; break; case FLI_DELTA: - line_inc = width * bytes_per_pixel; - y_ptr = 0; + y_ptr = ghost_y_ptr = 0; compressed_lines = LE_16(&encoded[stream_ptr]); stream_ptr += 2; while (compressed_lines > 0) @@ -122,14 +148,18 @@ { line_packets = -line_packets; y_ptr += (line_packets * line_inc); + ghost_y_ptr += (line_packets * width); } else { pixel_ptr = y_ptr; + ghost_pixel_ptr = ghost_y_ptr; for (i = 0; i < line_packets; i++) { // account for the skip bytes - pixel_ptr += encoded[stream_ptr++] * bytes_per_pixel; + pixel_skip = encoded[stream_ptr++]; + pixel_ptr += pixel_skip * bytes_per_pixel; + ghost_pixel_ptr += pixel_skip; byte_run = encoded[stream_ptr++]; if (byte_run < 0) { @@ -138,12 +168,14 @@ palette_ptr2 = encoded[stream_ptr++] * 4; for (j = 0; j < byte_run; j++) { + fli_ghost_image[ghost_pixel_ptr++] = palette_ptr1; decoded[pixel_ptr++] = palette[palette_ptr1 + 0]; decoded[pixel_ptr++] = palette[palette_ptr1 + 1]; decoded[pixel_ptr++] = palette[palette_ptr1 + 2]; if (bytes_per_pixel == 4) /* 32bpp */ pixel_ptr++; + fli_ghost_image[ghost_pixel_ptr++] = palette_ptr2; decoded[pixel_ptr++] = palette[palette_ptr2 + 0]; decoded[pixel_ptr++] = palette[palette_ptr2 + 1]; decoded[pixel_ptr++] = palette[palette_ptr2 + 2]; @@ -156,6 +188,7 @@ for (j = 0; j < byte_run * 2; j++) { palette_ptr1 = encoded[stream_ptr++] * 4; + fli_ghost_image[ghost_pixel_ptr++] = palette_ptr1; decoded[pixel_ptr++] = palette[palette_ptr1 + 0]; decoded[pixel_ptr++] = palette[palette_ptr1 + 1]; decoded[pixel_ptr++] = palette[palette_ptr1 + 2]; @@ -165,6 +198,7 @@ } } y_ptr += line_inc; + ghost_y_ptr += width; compressed_lines--; } } @@ -172,29 +206,33 @@ case FLI_LC: // line compressed - line_inc = width * bytes_per_pixel; starting_line = LE_16(&encoded[stream_ptr]); stream_ptr += 2; y_ptr = starting_line * line_inc; + ghost_y_ptr = starting_line * width; compressed_lines = LE_16(&encoded[stream_ptr]); stream_ptr += 2; while (compressed_lines > 0) { pixel_ptr = y_ptr; + ghost_pixel_ptr = ghost_y_ptr; line_packets = encoded[stream_ptr++]; if (line_packets > 0) { for (i = 0; i < line_packets; i++) { // account for the skip bytes - pixel_ptr += encoded[stream_ptr++] * bytes_per_pixel; + pixel_skip = encoded[stream_ptr++]; + pixel_ptr += pixel_skip * bytes_per_pixel; + ghost_pixel_ptr += pixel_skip; byte_run = encoded[stream_ptr++]; if (byte_run > 0) { for (j = 0; j < byte_run; j++) { palette_ptr1 = encoded[stream_ptr++] * 4; + fli_ghost_image[ghost_pixel_ptr++] = palette_ptr1; decoded[pixel_ptr++] = palette[palette_ptr1 + 0]; decoded[pixel_ptr++] = palette[palette_ptr1 + 1]; decoded[pixel_ptr++] = palette[palette_ptr1 + 2]; @@ -208,6 +246,7 @@ palette_ptr1 = encoded[stream_ptr++] * 4; for (j = 0; j < byte_run; j++) { + fli_ghost_image[ghost_pixel_ptr++] = palette_ptr1; decoded[pixel_ptr++] = palette[palette_ptr1 + 0]; decoded[pixel_ptr++] = palette[palette_ptr1 + 1]; decoded[pixel_ptr++] = palette[palette_ptr1 + 2]; @@ -219,29 +258,26 @@ } y_ptr += line_inc; + ghost_y_ptr += width; compressed_lines--; } break; case FLI_BLACK: - // set the whole frame to color 0 (which is usually black) - for (pixel_ptr = 0; pixel_ptr < (width * height * bytes_per_pixel); pixel_ptr++) - { - decoded[pixel_ptr++] = palette[0]; - decoded[pixel_ptr++] = palette[1]; - decoded[pixel_ptr++] = palette[2]; - if (bytes_per_pixel == 4) /* 32bpp */ - pixel_ptr++; - } + // set the whole frame to color 0 (which is usually black) by + // clearing the ghost image and trigger a full frame update + memset(fli_ghost_image, 0, width * height * sizeof(unsigned int)); + update_whole_frame = 1; break; case FLI_BRUN: // byte run compression - line_inc = width * bytes_per_pixel; y_ptr = 0; + ghost_y_ptr = 0; for (lines = 0; lines < height; lines++) { pixel_ptr = y_ptr; + ghost_pixel_ptr = ghost_y_ptr; line_packets = encoded[stream_ptr++]; for (i = 0; i < line_packets; i++) { @@ -251,6 +287,7 @@ palette_ptr1 = encoded[stream_ptr++] * 4; for (j = 0; j < byte_run; j++) { + fli_ghost_image[ghost_pixel_ptr++] = palette_ptr1; decoded[pixel_ptr++] = palette[palette_ptr1 + 0]; decoded[pixel_ptr++] = palette[palette_ptr1 + 1]; decoded[pixel_ptr++] = palette[palette_ptr1 + 2]; @@ -264,6 +301,7 @@ for (j = 0; j < byte_run; j++) { palette_ptr1 = encoded[stream_ptr++] * 4; + fli_ghost_image[ghost_pixel_ptr++] = palette_ptr1; decoded[pixel_ptr++] = palette[palette_ptr1 + 0]; decoded[pixel_ptr++] = palette[palette_ptr1 + 1]; decoded[pixel_ptr++] = palette[palette_ptr1 + 2]; @@ -274,20 +312,16 @@ } y_ptr += line_inc; + ghost_y_ptr += width; } break; case FLI_COPY: - // copy the chunk (uncompressed frame) - for (pixel_ptr = 0; pixel_ptr < chunk_size - 6; pixel_ptr++) - { - palette_ptr1 = encoded[stream_ptr++] * 4; - decoded[pixel_ptr++] = palette[palette_ptr1 + 0]; - decoded[pixel_ptr++] = palette[palette_ptr1 + 1]; - decoded[pixel_ptr++] = palette[palette_ptr1 + 2]; - if (bytes_per_pixel == 4) /* 32bpp */ - pixel_ptr++; - } + // copy the chunk (uncompressed frame) to the ghost image and + // schedule the whole frame to be updated + memcpy(fli_ghost_image, &encoded[stream_ptr], chunk_size - 6); + stream_ptr += chunk_size - 6; + update_whole_frame = 1; break; case FLI_MINI: @@ -303,4 +337,26 @@ frame_size -= chunk_size; num_chunks--; } + + if (update_whole_frame) + { + pixel_ptr = 0; + while (pixel_ptr < (width * height * bytes_per_pixel)) + { + palette_ptr1 = fli_ghost_image[pixel_ptr/bytes_per_pixel]; + decoded[pixel_ptr++] = palette[palette_ptr1 + 0]; + decoded[pixel_ptr++] = palette[palette_ptr1 + 1]; + decoded[pixel_ptr++] = palette[palette_ptr1 + 2]; + if (bytes_per_pixel == 4) /* 32bpp */ + pixel_ptr++; + } + } + + // by the end of the chunk, the stream ptr should equal the frame + // size (minus 1, possible); if it doesn't, issue a warning + if ((stream_ptr != encoded_size) && (stream_ptr != encoded_size - 1)) + mp_msg(MSGT_DECVIDEO, MSGL_WARN, + " warning: processed FLI chunk where encoded size = %d\n" \ + " and final chunk ptr = and final chunk ptr = %d\n", + encoded_size, stream_ptr); } Index: dec_video.c =================================================================== RCS file: /cvsroot/mplayer/main/dec_video.c,v retrieving revision 1.103 retrieving revision 1.104 diff -u -r1.103 -r1.104 --- dec_video.c 12 Feb 2002 17:04:43 -0000 1.103 +++ dec_video.c 13 Feb 2002 04:06:55 -0000 1.104 @@ -118,13 +118,16 @@ unsigned char *palette_map, int bytes_per_pixel); -void Decode_Fli( +void *init_fli_decoder(int width, int height); + +void decode_fli_frame( unsigned char *encoded, int encoded_size, unsigned char *decoded, int width, int height, - int bytes_per_pixel); + int bytes_per_pixel, + void *context); void qt_decode_rle( unsigned char *encoded, @@ -712,8 +715,9 @@ } } break; - case VFM_MSVIDC: case VFM_FLI: + sh_video->context = init_fli_decoder(sh_video->disp_w, sh_video->disp_h); + case VFM_MSVIDC: case VFM_QTRLE: case VFM_DUCKTM1: #ifdef HAVE_PNG @@ -1117,10 +1121,11 @@ blit_frame = 3; break; case VFM_FLI: - Decode_Fli( + decode_fli_frame( start, in_size, sh_video->our_out_buffer, sh_video->disp_w, sh_video->disp_h, - ((out_fmt&255)+7)/8); + ((out_fmt&255)+7)/8, + sh_video->context); blit_frame = 3; break; case VFM_NUV:

1 0

CVS: main configure,1.389,1.390
by Richard Felker CVS 12 Feb '02

12 Feb '02

Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv25955 Modified Files: configure Log Message: fixed broken xvid support ("lm" rather than "-lm" in libs) Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.389 retrieving revision 1.390 diff -u -r1.389 -r1.390 --- configure 12 Feb 2002 22:03:44 -0000 1.389 +++ configure 13 Feb 2002 03:14:45 -0000 1.390 @@ -2667,11 +2667,11 @@ EOF if test "$_xvid" != no && test "$_xvidcore" && cc_check -lm "$_xvidcore" ; then _def_encore='#define HAVE_DIVX4ENCORE 1' - _ld_encore="lm $_xvidcore" + _ld_encore="-lm $_xvidcore" echores "XviD (with $_xvidcore)" elif test "$_xvid" != no && cc_check -lm -lxvidcore ; then _def_encore='#define HAVE_DIVX4ENCORE 1' - _ld_encore='lm -lxvidcore' + _ld_encore='-lm -lxvidcore' echores "XviD (with libxvidcore.so)" elif test "$_divx4linux" != no && cc_check -lm -ldivxencore ; then _def_encore='#define HAVE_DIVX4ENCORE 1'

1 0

CVS: main/libvo vo_dxr3.c,1.53,1.54
by David Holm 12 Feb '02

12 Feb '02

Update of /cvsroot/mplayer/main/libvo In directory mplayer:/var/tmp.root/cvs-serv21962/libvo Modified Files: vo_dxr3.c Log Message: Using the mplayer SwScaler instead of doing scaling manually (sometimes this dies with sig FPE when not using -vc mpegpes with mpegs (I find it unlikely it would only happen on mpegs though)) Using detection code to check if using NTSC or PAL/SECAM and setting appropriate resolution and GOP-Size based on this information. It now generates a valid mpeg1 stream instead of a hybrid mpeg2 (with mpeg1 headers). Index: vo_dxr3.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_dxr3.c,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- vo_dxr3.c 9 Feb 2002 17:40:33 -0000 1.53 +++ vo_dxr3.c 13 Feb 2002 00:38:23 -0000 1.54 @@ -6,6 +6,13 @@ */ /* ChangeLog added 2002-01-10 + * 2002-02-13: + * Using the swscaler instead of the old hand coded shit. (Checkout man mplayer and search for sws ;). + * Using aspect function to setup a proper mpeg1, no more hassling with odd resolutions or GOP-sizes, + * this would only create jitter on some vids! + * The swscaler sometimes exits with sig8 on mpegs, I don't know why yet (just use -vc mpegpes in this + * case, and report to me if you have any avi's etc which does this...) + * * 2002-02-09: * Thanks to the new control() method I have finally been able to enable the em8300 prebuffering. * This should speed up playback on all systems, the vout cpu usage should rocket since I will be hogging @@ -35,6 +42,7 @@ #include <sys/ioctl.h> #include <sys/stat.h> #include <sys/types.h> +#include <sys/select.h> #include <unistd.h> #include <stdio.h> #include <stdlib.h> @@ -48,7 +56,9 @@ #include "video_out.h" #include "video_out_internal.h" +#include "aspect.h" #include "../postproc/rgb2rgb.h" +#include "../postproc/swscale.h" #ifdef USE_LIBAVCODEC #ifdef USE_LIBAVCODEC_SO @@ -79,6 +89,8 @@ static int osd_w, osd_h; static int noprebuf = 0; static int img_format = 0; +static SwsContext * sws = NULL; +float scalefactor = 1.0; /* File descriptors */ static int fd_control = -1; @@ -138,11 +150,12 @@ return VO_NOTIMPL; } -static uint32_t config(uint32_t scr_width, uint32_t scr_height, uint32_t width, uint32_t height, uint32_t fullscreen, char *title, uint32_t format,const vo_tune_info_t *info) +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,const vo_tune_info_t *info) { int tmp1, tmp2; em8300_register_t reg; + /* Softzoom turned on, downscale */ /* This activates the subpicture processor, you can safely disable this and still send */ /* broken subpics to the em8300, if it's enabled and you send broken subpics you will end */ /* up in a lockup */ @@ -180,19 +193,26 @@ /* Store some variables statically that we need later in another scope */ img_format = format; - v_width = scr_width; - v_height = scr_height; + v_width = width; + v_height = height; - /* libmp1e requires a width and height that is x|16 */ - s_width = (v_width + 15) / 16; - s_width *= 16; - s_height = (v_height + 15) / 16; - s_height *= 16; + /* libavcodec requires a width and height that is x|16 */ + aspect_save_orig(width, height); + aspect_save_prescale(d_width, d_height); + ioctl(fd_control, EM8300_IOCTL_GET_VIDEOMODE, &ioval); + if (ioval == EM8300_VIDEOMODE_NTSC) { + printf("VO: [dxr3] Setting up for NTSC.\n"); + aspect_save_screenres(352, 240); + } else { + printf("VO: [dxr3] Setting up for PAL/SECAM.\n"); + aspect_save_screenres(352, 288); + } + aspect(&s_width, &s_height, A_ZOOM); /* Try to figure out whether to use widescreen output or not */ /* Anamorphic widescreen modes makes this a pain in the ass */ - tmp1 = abs(height - ((width / 4) * 3)); - tmp2 = abs(height - (int) (width / 2.35)); + tmp1 = abs(d_height - ((d_width / 4) * 3)); + tmp2 = abs(d_height - (int) (d_width / 2.35)); if (tmp1 < tmp2) { ioval = EM8300_ASPECTRATIO_4_3; printf("VO: [dxr3] Setting aspect ratio to 4:3\n"); @@ -214,10 +234,16 @@ } avc_context = malloc(sizeof(AVCodecContext)); memset(avc_context, 0, sizeof(avc_context)); - avc_context->width = v_width; - avc_context->height = v_height; - avc_context->frame_rate = 30 * FRAME_RATE_BASE; - avc_context->gop_size = 12; + avc_context->width = s_width; + avc_context->height = s_height; + ioctl(fd_control, EM8300_IOCTL_GET_VIDEOMODE, &ioval); + if (ioval == EM8300_VIDEOMODE_NTSC) { + avc_context->gop_size = 18; + avc_context->frame_rate = 29.97 * FRAME_RATE_BASE; + } else { + avc_context->gop_size = 15; + avc_context->frame_rate = 25 * FRAME_RATE_BASE; + } avc_context->bit_rate = 8e6; avc_context->flags = CODEC_FLAG_HQ | CODEC_FLAG_QSCALE; avc_context->quality = 2; @@ -227,6 +253,13 @@ uninit(); return -1; } + + sws = getSwsContextFromCmdLine(v_width, v_height, img_format, s_width, s_height, IMGFMT_YV12); + if (!sws) + { + printf("vo_vesa: Can't initialize SwScaler\n"); + return -1; + } /* This stuff calculations the relative position of video and osd on screen */ /* Old stuff taken from the dvb driver, should be removed when introducing spuenc */ @@ -240,7 +273,7 @@ s_pos_x = 0; } osd_h = s_height; - d_pos_y = (s_height - v_height) / 2; + d_pos_y = (s_height - v_width) / 2; if (d_pos_y < 0) { s_pos_y = -d_pos_y; d_pos_y = 0; @@ -251,9 +284,9 @@ /* Create a pixel buffer and set up pointers for color components */ memset(&avc_picture, 0, sizeof(avc_picture)); - avc_picture.linesize[0] = v_width; - avc_picture.linesize[1] = v_width / 2; - avc_picture.linesize[2] = v_width / 2; + avc_picture.linesize[0] = s_width; + avc_picture.linesize[1] = s_width / 2; + avc_picture.linesize[2] = s_width / 2; avc_outbuf = malloc(avc_outbuf_size); size = s_width * s_height; @@ -318,14 +351,8 @@ return 0; #ifdef USE_LIBAVCODEC } else { - int size = s_width * s_height; - if (img_format == IMGFMT_YUY2) { - yuy2toyv12(src[0], avc_picture.data[0], avc_picture.data[1], avc_picture.data[2], - v_width, v_height, avc_picture.linesize[0], avc_picture.linesize[1], v_width*2); - } else if (img_format == IMGFMT_BGR24) { - rgb24toyv12(src[0], avc_picture.data[0], avc_picture.data[1], avc_picture.data[2], - v_width, v_height, avc_picture.linesize[0], avc_picture.linesize[1], v_width*3); - } + int size, srcStride = (img_format == IMGFMT_YUY2) ? (v_width * 2) : (v_width * 3); + sws->swScale(sws, src, &srcStride, 0, v_height, avc_picture.data, avc_picture.linesize); draw_osd(); size = avcodec_encode_video(avc_context, avc_outbuf, avc_outbuf_size, &avc_picture); write(fd_video, avc_outbuf, size); @@ -337,6 +364,8 @@ static void flip_page(void) { + fd_set rfds; + struct timeval tv; #ifdef USE_LIBAVCODEC if (img_format == IMGFMT_YV12) { int out_size = avcodec_encode_video(avc_context, avc_outbuf, avc_outbuf_size, &avc_picture); @@ -346,51 +375,18 @@ write(fd_video, avc_outbuf, out_size); } #endif + tv.tv_sec = 0; + tv.tv_usec = 1e6 / floor(vo_fps); + FD_ZERO(&rfds); + FD_SET(fd_video, &rfds); + select(fd_video + 1, NULL, &rfds, NULL, &tv); } static uint32_t draw_slice(uint8_t *srcimg[], int stride[], int w, int h, int x0, int y0) { #ifdef USE_LIBAVCODEC if (img_format == IMGFMT_YV12) { - int y; - unsigned char *s, *s1; - unsigned char *d, *d1; - - x0 += d_pos_x; - y0 += d_pos_y; - - if ((x0 + w) > avc_picture.linesize[0]) { - w = avc_picture.linesize[0] - x0; - } - if ((y0 + h) > s_height) { - h = s_height - y0; - } - - s = srcimg[0] + s_pos_x + s_pos_y * stride[0]; - d = avc_picture.data[0] + x0 + y0 * avc_picture.linesize[0]; - for(y = 0; y < h; y++) { - memcpy(d, s, w); - s += stride[0]; - d += avc_picture.linesize[0]; - } - - w /= 2; - h /= 2; - x0 /= 2; - y0 /= 2; - - s = srcimg[1] + s_pos_x + (s_pos_y * stride[1]); - d = avc_picture.data[1] + x0 + (y0 * avc_picture.linesize[1]); - s1 = srcimg[2] + s_pos_x + (s_pos_y * stride[2]); - d1 = avc_picture.data[2] + x0 + (y0 * avc_picture.linesize[2]); - for(y = 0; y < h; y++) { - memcpy(d, s, w); - memcpy(d1, s1, w); - s += stride[1]; - s1 += stride[2]; - d += avc_picture.linesize[1]; - d1 += avc_picture.linesize[2]; - } + sws->swScale(sws, srcimg, stride, y0, h, avc_picture.data, avc_picture.linesize); return 0; } #endif @@ -400,6 +396,9 @@ static void uninit(void) { printf("VO: [dxr3] Uninitializing\n"); + if (sws) { + freeSwsContext(sws); + } #ifdef USE_LIBAVCODEC if (avc_context) { avcodec_close(avc_context);

1 0

CVS: main/libvo aclib_template.c,1.5,1.6
by Michael Niedermayer 12 Feb '02

12 Feb '02

Update of /cvsroot/mplayer/main/libvo In directory mplayer:/var/tmp.root/cvs-serv18112 Modified Files: aclib_template.c Log Message: 101 Index: aclib_template.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/aclib_template.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- aclib_template.c 12 Feb 2002 23:17:14 -0000 1.5 +++ aclib_template.c 13 Feb 2002 00:17:16 -0000 1.6 @@ -426,10 +426,8 @@ * is needed to become ordered again. */ __asm__ __volatile__ ("sfence":::"memory"); #endif -#ifndef HAVE_SSE /* enables to use FPU */ __asm__ __volatile__ (EMMS:::"memory"); -#endif } /* * Now do the tail of the block

2 1

CVS: main/libvo jpeg_enc.c,1.2,1.3
by Rik Snel CVS 12 Feb '02

12 Feb '02

Update of /cvsroot/mplayer/main/libvo In directory mplayer:/var/tmp.root/cvs-serv3544 Modified Files: jpeg_enc.c Log Message: we are now able to use the new bitwriter code in libavcodec Index: jpeg_enc.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/jpeg_enc.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- jpeg_enc.c 11 Feb 2002 01:24:56 -0000 1.2 +++ jpeg_enc.c 12 Feb 2002 23:30:07 -0000 1.3 @@ -32,6 +32,9 @@ #include "fastmemcpy.h" #endif #include "../mp_msg.h" +/* We need this #define because we need ../libavcodec/common.h to #define + * be2me_32, otherwise the linker will complain that it doesn't exist */ +#define HAVE_AV_CONFIG_H #include "../libavcodec/avcodec.h" #include "../libavcodec/dsputil.h" #include "../libavcodec/mpegvideo.h" @@ -440,7 +443,7 @@ if (j->s->mjpeg_write_tables == 1) j->s->mjpeg_write_tables = 0; - return j->s->pb.buf_ptr - j->s->pb.buf; + return pbBufPtr(&(j->s->pb)) - j->s->pb.buf; } void jpeg_enc_uninit(jpeg_enc_t *j) {

1 0

CVS: main/libvo vo_dga.c,1.41,1.42
by Michael Niedermayer 12 Feb '02

12 Feb '02

Update of /cvsroot/mplayer/main/libvo In directory mplayer:/var/tmp.root/cvs-serv864 Modified Files: vo_dga.c Log Message: use mem2agpcpy() instead of fast_memcpy() Index: vo_dga.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_dga.c,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- vo_dga.c 9 Feb 2002 01:21:48 -0000 1.41 +++ vo_dga.c 12 Feb 2002 23:19:37 -0000 1.42 @@ -23,6 +23,9 @@ * - works only on x86 architectures * * $Log$ + * Revision 1.42 2002/02/12 23:19:37 michael + * use mem2agpcpy() instead of fast_memcpy() + * * Revision 1.41 2002/02/09 01:21:48 arpi * 10000hl to Holm... control MUST BE static... * @@ -480,14 +483,14 @@ // use some stride ... int i; for(i=0; i< vo_dga_lines; i++){ - memcpy(d, s, vo_dga_bytes_per_line); + mem2agpcpy(d, s, vo_dga_bytes_per_line); d+=vo_dga_vp_skip; d+=vo_dga_bytes_per_line; s+=vo_dga_bytes_per_line; } }else{ // no stride, cool + fast ... - memcpy(d,s, vo_dga_bytes_per_line * vo_dga_lines); + mem2agpcpy(d,s, vo_dga_bytes_per_line * vo_dga_lines); } #else /* ARCH_X86 and NO_MMX */ // use some homebrewn assembly code ...

1 0

CVS: main/libvo aclib.c,1.4,1.5 aclib_template.c,1.4,1.5 fastmemcpy.h,1.15,1.16
by Michael Niedermayer 12 Feb '02

12 Feb '02

Update of /cvsroot/mplayer/main/libvo In directory mplayer:/var/tmp.root/cvs-serv32643 Modified Files: aclib.c aclib_template.c fastmemcpy.h Log Message: mem2agpcpy() Index: aclib.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/aclib.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- aclib.c 9 Dec 2001 15:25:11 -0000 1.4 +++ aclib.c 12 Feb 2002 23:17:14 -0000 1.5 @@ -118,4 +118,34 @@ #endif //!RUNTIME_CPUDETECT } -#endif /* use fastmemcpy */ \ No newline at end of file +inline void * mem2agpcpy(void * to, const void * from, size_t len) +{ +#ifdef RUNTIME_CPUDETECT +#ifdef CAN_COMPILE_X86_ASM + // ordered per speed fasterst first + if(gCpuCaps.hasMMX2) + mem2agpcpy_MMX2(to, from, len); + else if(gCpuCaps.has3DNow) + mem2agpcpy_3DNow(to, from, len); + else if(gCpuCaps.hasMMX) + mem2agpcpy_MMX(to, from, len); + else +#endif //CAN_COMPILE_X86_ASM + memcpy(to, from, len); // prior to mmx we use the standart memcpy +#else +#ifdef HAVE_MMX2 + mem2agpcpy_MMX2(to, from, len); +#elif defined (HAVE_3DNOW) + mem2agpcpy_3DNow(to, from, len); +#elif defined (HAVE_MMX) + mem2agpcpy_MMX(to, from, len); +#else + memcpy(to, from, len); // prior to mmx we use the standart memcpy +#endif + +#endif //!RUNTIME_CPUDETECT +} + + +#endif /* use fastmemcpy */ + Index: aclib_template.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/aclib_template.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- aclib_template.c 9 Dec 2001 15:25:11 -0000 1.4 +++ aclib_template.c 12 Feb 2002 23:17:14 -0000 1.5 @@ -353,3 +353,88 @@ if(len) small_memcpy(to, from, len); return retval; } + +/** + * special copy routine for mem -> agp/pci copy (based upon fast_memcpy) + */ +static inline void * RENAME(mem2agpcpy)(void * to, const void * from, size_t len) +{ + void *retval; + size_t i; + retval = to; +#ifdef STATISTICS + { + static int freq[33]; + static int t=0; + int i; + for(i=0; len>(1<<i); i++); + freq[i]++; + t++; + if(1024*1024*1024 % t == 0) + for(i=0; i<32; i++) + printf("mem2agp freq < %8d %4d\n", 1<<i, freq[i]); + } +#endif + if(len >= MIN_LEN) + { + register unsigned long int delta; + /* Align destinition to MMREG_SIZE -boundary */ + delta = ((unsigned long int)to)&7; + if(delta) + { + delta=8-delta; + len -= delta; + small_memcpy(to, from, delta); + } + i = len >> 6; /* len/64 */ + len &= 63; + /* + This algorithm is top effective when the code consequently + reads and writes blocks which have size of cache line. + Size of cache line is processor-dependent. + It will, however, be a minimum of 32 bytes on any processors. + It would be better to have a number of instructions which + perform reading and writing to be multiple to a number of + processor's decoders, but it's not always possible. + */ + for(; i>0; i--) + { + __asm__ __volatile__ ( + PREFETCH" 320(%0)\n" + "movq (%0), %%mm0\n" + "movq 8(%0), %%mm1\n" + "movq 16(%0), %%mm2\n" + "movq 24(%0), %%mm3\n" + "movq 32(%0), %%mm4\n" + "movq 40(%0), %%mm5\n" + "movq 48(%0), %%mm6\n" + "movq 56(%0), %%mm7\n" + MOVNTQ" %%mm0, (%1)\n" + MOVNTQ" %%mm1, 8(%1)\n" + MOVNTQ" %%mm2, 16(%1)\n" + MOVNTQ" %%mm3, 24(%1)\n" + MOVNTQ" %%mm4, 32(%1)\n" + MOVNTQ" %%mm5, 40(%1)\n" + MOVNTQ" %%mm6, 48(%1)\n" + MOVNTQ" %%mm7, 56(%1)\n" + :: "r" (from), "r" (to) : "memory"); + ((const unsigned char *)from)+=64; + ((unsigned char *)to)+=64; + } +#ifdef HAVE_MMX2 + /* since movntq is weakly-ordered, a "sfence" + * is needed to become ordered again. */ + __asm__ __volatile__ ("sfence":::"memory"); +#endif +#ifndef HAVE_SSE + /* enables to use FPU */ + __asm__ __volatile__ (EMMS:::"memory"); +#endif + } + /* + * Now do the tail of the block + */ + if(len) small_memcpy(to, from, len); + return retval; +} + Index: fastmemcpy.h =================================================================== RCS file: /cvsroot/mplayer/main/libvo/fastmemcpy.h,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- fastmemcpy.h 15 Jun 2001 12:42:00 -0000 1.15 +++ fastmemcpy.h 12 Feb 2002 23:17:14 -0000 1.16 @@ -9,8 +9,14 @@ #include <stddef.h> extern void * fast_memcpy(void * to, const void * from, size_t len); +extern void * mem2agpcpy(void * to, const void * from, size_t len); #define memcpy(a,b,c) fast_memcpy(a,b,c) -#endif /* HAVE_MMX/MMX2/3DNOW/SSE/SSE2 */ -#endif /* USE_FASTMEMCPY */ +#else /* HAVE_MMX/MMX2/3DNOW/SSE/SSE2 */ +#define mem2agpcpy(a,b,c) memcpy(a,b,c) +#endif + +#else /* USE_FASTMEMCPY */ +#define mem2agpcpy(a,b,c) memcpy(a,b,c) +#endif #endif

1 0