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

CVS: main/libmpdemux demux_real.c,1.6,1.7
by Alex Beregszaszi 18 Jan '02

18 Jan '02

Update of /cvsroot/mplayer/main/libmpdemux In directory mplayer:/var/tmp.root/cvs-serv25537 Modified Files: demux_real.c Log Message: fix dnet support Index: demux_real.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_real.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- demux_real.c 4 Jan 2002 19:32:58 -0000 1.6 +++ demux_real.c 18 Jan 2002 11:02:52 -0000 1.7 @@ -6,6 +6,9 @@ Based on FFmpeg's libav/rm.c. $Log$ + Revision 1.7 2002/01/18 11:02:52 alex + fix dnet support + Revision 1.6 2002/01/04 19:32:58 alex updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes) @@ -14,7 +17,7 @@ ATRC - RealAudio 8 (ATRAC3) - www.minidisc.org/atrac3_article.pdf, ACM decoder uploaded, needs some fine-tuning to work COOK/COKR - RealAudio G2 - DNET - RealAudio 3.0 + DNET - RealAudio 3.0, really it's AC3 in swapped-byteorder SIPR - SiproLab's audio codec, ACELP decoder working with MPlayer, needs fine-tuning too :) @@ -191,6 +194,7 @@ { real_priv_t *priv = demuxer->priv; demux_stream_t *ds = NULL; + sh_audio_t *sh_audio = NULL; int len; int timestamp; int stream_id; @@ -238,6 +242,7 @@ { // printf("packet is audio (id: %d)\n", stream_id); ds = demuxer->audio; /* FIXME */ + sh_audio = ds->sh; break; } } @@ -261,8 +266,34 @@ } demuxer->filepos = stream_tell(demuxer->stream); +#if 0 ds_read_packet(ds, demuxer->stream, len, timestamp/90000.0f, demuxer->filepos, (flags & 0x2) ? 0x10 : 0); +#else + { + demux_packet_t *dp = new_demux_packet(len); + + stream_read(demuxer->stream, dp->buffer, len); + /* if DNET, swap bytes! */ + if (sh_audio != NULL) + if (sh_audio->format == 0x2000) + { + char *ptr = dp->buffer; + + for (i = 0; i < len; i += 2) + { + const char tmp = ptr[0]; + ptr[0] = ptr[1]; + ptr[1] = tmp; + ptr += 2; + } + } + dp->pts = timestamp/90000.0f; + dp->pos = demuxer->filepos; + dp->flags = (flags & 0x2) ? 0x10 : 0; + ds_add_packet(ds, dp); + } +#endif return 1; } @@ -498,8 +529,11 @@ tmp = 0; break; case MKTAG('a', 't', 'r', 'c'): - printf("Audio: ATRAC3 (RealAudio 8?) (unsupported)\n"); + printf("Audio: Sony ATRAC3 (RealAudio 8?) (unsupported)\n"); sh->format = 0x270; + + sh->wf->nAvgBytesPerSec = 8268; + sh->wf->nBlockAlign = 192; break; default: printf("Audio: Unknown (%s)\n", buf);

1 0

CVS: main/libvo vosub_vidix.h,1.3,1.4 vosub_vidix.c,1.11,1.12
by Alex Beregszaszi 18 Jan '02

18 Jan '02

Update of /cvsroot/mplayer/main/libvo In directory mplayer:/var/tmp.root/cvs-serv17773 Modified Files: vosub_vidix.h vosub_vidix.c Log Message: sorry, i really wanted to add vidix_start and stop as int, to detect if something went into the wrong way (also implement check in vo_xvidix) Index: vosub_vidix.h =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vosub_vidix.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- vosub_vidix.h 16 Jan 2002 15:22:45 -0000 1.3 +++ vosub_vidix.h 18 Jan 2002 10:41:31 -0000 1.4 @@ -18,8 +18,8 @@ unsigned dest_x,unsigned dest_y,unsigned dst_width, unsigned dst_height,unsigned format,unsigned dest_bpp, unsigned vid_w,unsigned vid_h); -void vidix_start(void); -void vidix_stop(void); +int vidix_start(void); +int vidix_stop(void); void vidix_term( void ); uint32_t vidix_query_fourcc(unsigned fourcc); Index: vosub_vidix.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vosub_vidix.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- vosub_vidix.c 18 Jan 2002 09:25:56 -0000 1.11 +++ vosub_vidix.c 18 Jan 2002 10:41:31 -0000 1.12 @@ -164,7 +164,7 @@ vidix_video_eq_t vid_eq; -void vidix_start(void) +int vidix_start(void) { int err; @@ -188,7 +188,7 @@ if((err=vdlPlaybackOn(vidix_handler))!=0) { printf("vosub_vidix: Can't start playback: %s\n",strerror(err)); - return; + return -1; } vid_eq.brightness = vo_gamma_brightness; vid_eq.saturation = vo_gamma_saturation; @@ -199,16 +199,18 @@ vid_eq.blue_intense = vo_gamma_blue_intense; vid_eq.flags = VEQ_FLG_ITU_R_BT_601; vdlPlaybackSetEq(vidix_handler,&vid_eq); - return; + return 0; } -void vidix_stop(void) +int vidix_stop(void) { int err; if((err=vdlPlaybackOff(vidix_handler))!=0) { printf("vosub_vidix: Can't stop playback: %s\n",strerror(err)); + return -1; } + return 0; } void vidix_term( void )

1 0

CVS: main/liba52 downmix.c,1.13,1.14
by Nick Kurshev 18 Jan '02

18 Jan '02

Update of /cvsroot/mplayer/main/liba52 In directory mplayer:/var/tmp.root/cvs-serv8031/main/liba52 Modified Files: downmix.c Log Message: 3dnow optimization. Not all functions are tested!!! Index: downmix.c =================================================================== RCS file: /cvsroot/mplayer/main/liba52/downmix.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- downmix.c 30 Dec 2001 21:53:56 -0000 1.13 +++ downmix.c 18 Jan 2002 09:58:43 -0000 1.14 @@ -41,6 +41,8 @@ static void downmix_SSE (sample_t * samples, int acmod, int output, sample_t bias, sample_t clev, sample_t slev); +static void downmix_3dnow (sample_t * samples, int acmod, int output, sample_t bias, + sample_t clev, sample_t slev); static void downmix_C (sample_t * samples, int acmod, int output, sample_t bias, sample_t clev, sample_t slev); static void upmix_MMX (sample_t * samples, int acmod, int output); @@ -53,6 +55,7 @@ #ifdef ARCH_X86 if(mm_accel & MM_ACCEL_X86_MMX) upmix= upmix_MMX; if(mm_accel & MM_ACCEL_X86_SSE) downmix= downmix_SSE; + if(mm_accel & MM_ACCEL_X86_3DNOW) downmix= downmix_3dnow; #endif } @@ -685,6 +688,7 @@ "movlps %2, %%xmm7 \n\t" "shufps $0x00, %%xmm7, %%xmm7 \n\t" "movl $-1024, %%esi \n\t" + ".balign 16\n\t" "1: \n\t" "movaps (%0, %%esi), %%xmm0 \n\t" "movaps 16(%0, %%esi), %%xmm1 \n\t" @@ -707,6 +711,7 @@ "movlps %1, %%xmm7 \n\t" "shufps $0x00, %%xmm7, %%xmm7 \n\t" "movl $-1024, %%esi \n\t" + ".balign 16\n\t" "1: \n\t" "movaps (%0, %%esi), %%xmm0 \n\t" "movaps 1024(%0, %%esi), %%xmm1 \n\t" @@ -727,6 +732,7 @@ "movlps %1, %%xmm7 \n\t" "shufps $0x00, %%xmm7, %%xmm7 \n\t" "movl $-1024, %%esi \n\t" + ".balign 16\n\t" "1: \n\t" "movaps (%0, %%esi), %%xmm0 \n\t" "movaps 1024(%0, %%esi), %%xmm1 \n\t" @@ -748,6 +754,7 @@ "movlps %1, %%xmm7 \n\t" "shufps $0x00, %%xmm7, %%xmm7 \n\t" "movl $-1024, %%esi \n\t" + ".balign 16\n\t" "1: \n\t" "movaps (%0, %%esi), %%xmm0 \n\t" "movaps 1024(%0, %%esi), %%xmm1 \n\t" @@ -770,6 +777,7 @@ "movlps %1, %%xmm7 \n\t" "shufps $0x00, %%xmm7, %%xmm7 \n\t" "movl $-1024, %%esi \n\t" + ".balign 16\n\t" "1: \n\t" "movaps 1024(%0, %%esi), %%xmm0 \n\t" "addps %%xmm7, %%xmm0 \n\t" //common @@ -792,6 +800,7 @@ "movlps %2, %%xmm7 \n\t" "shufps $0x00, %%xmm7, %%xmm7 \n\t" "movl $-1024, %%esi \n\t" + ".balign 16\n\t" "1: \n\t" "movaps 1024(%1, %%esi), %%xmm0 \n\t" "addps %%xmm7, %%xmm0 \n\t" //common @@ -814,6 +823,7 @@ "movlps %1, %%xmm7 \n\t" "shufps $0x00, %%xmm7, %%xmm7 \n\t" "movl $-1024, %%esi \n\t" + ".balign 16\n\t" "1: \n\t" "movaps 2048(%0, %%esi), %%xmm0 \n\t" // surround "movaps (%0, %%esi), %%xmm1 \n\t" @@ -837,6 +847,7 @@ "movlps %1, %%xmm7 \n\t" "shufps $0x00, %%xmm7, %%xmm7 \n\t" "movl $-1024, %%esi \n\t" + ".balign 16\n\t" "1: \n\t" "movaps 1024(%0, %%esi), %%xmm0 \n\t" "addps 3072(%0, %%esi), %%xmm0 \n\t" @@ -860,6 +871,7 @@ "movlps %1, %%xmm7 \n\t" "shufps $0x00, %%xmm7, %%xmm7 \n\t" "movl $-1024, %%esi \n\t" + ".balign 16\n\t" "1: \n\t" "movaps 1024(%0, %%esi), %%xmm0 \n\t" "movaps 3072(%0, %%esi), %%xmm3 \n\t" // surround @@ -885,6 +897,7 @@ "movlps %1, %%xmm7 \n\t" "shufps $0x00, %%xmm7, %%xmm7 \n\t" "movl $-1024, %%esi \n\t" + ".balign 16\n\t" "1: \n\t" "movaps 2048(%0, %%esi), %%xmm0 \n\t" "addps 3072(%0, %%esi), %%xmm0 \n\t" // surround @@ -909,6 +922,7 @@ "movlps %1, %%xmm7 \n\t" "shufps $0x00, %%xmm7, %%xmm7 \n\t" "movl $-1024, %%esi \n\t" + ".balign 16\n\t" "1: \n\t" "movaps 1024(%0, %%esi), %%xmm0 \n\t" "addps %%xmm7, %%xmm0 \n\t" // common @@ -932,6 +946,7 @@ "movlps %1, %%xmm7 \n\t" "shufps $0x00, %%xmm7, %%xmm7 \n\t" "movl $-1024, %%esi \n\t" + ".balign 16\n\t" "1: \n\t" "movaps 1024(%0, %%esi), %%xmm0 \n\t" "movaps 3072(%0, %%esi), %%xmm2 \n\t" @@ -958,6 +973,7 @@ "movlps %2, %%xmm7 \n\t" "shufps $0x00, %%xmm7, %%xmm7 \n\t" "movl $-1024, %%esi \n\t" + ".balign 16\n\t" "1: \n\t" "movaps (%0, %%esi), %%xmm0 \n\t" "movaps 16(%0, %%esi), %%xmm1 \n\t" @@ -979,6 +995,7 @@ asm volatile( "movl $-1024, %%esi \n\t" "pxor %%mm0, %%mm0 \n\t" + ".balign 16\n\t" "1: \n\t" "movq %%mm0, (%0, %%esi) \n\t" "movq %%mm0, 8(%0, %%esi) \n\t" @@ -992,6 +1009,38 @@ ); } +/* + I hope dest and src will be at least 8 byte aligned and size + will devide on 8 without remain + Note: untested and unused. +*/ +static void copy_MMX(void *dest,const void *src,unsigned size) +{ + unsigned i; + size /= 64; + for(i=0;i<size;i++) + { + __asm __volatile( + "movq %0, %%mm0\n\t" + "movq 8%0, %%mm1\n\t" + "movq 16%0, %%mm2\n\t" + "movq 24%0, %%mm3\n\t" + "movq 32%0, %%mm4\n\t" + "movq 40%0, %%mm5\n\t" + "movq 48%0, %%mm6\n\t" + "movq 56%0, %%mm7\n\t" + "movq %%mm0, %1\n\t" + "movq %%mm1, 8%1\n\t" + "movq %%mm2, 16%1\n\t" + "movq %%mm3, 24%1\n\t" + "movq %%mm4, 32%1\n\t" + "movq %%mm5, 40%1\n\t" + "movq %%mm6, 48%1\n\t" + "movq %%mm7, 56%1\n\t" + : + :"m"(src),"m"(dest)); + } +} static void downmix_SSE (sample_t * samples, int acmod, int output, sample_t bias, sample_t clev, sample_t slev) @@ -1199,4 +1248,569 @@ goto mix_31to21_MMX; } } + +static void mix2to1_3dnow (sample_t * dest, sample_t * src, sample_t bias) +{ + asm volatile( + "movd %2, %%mm7 \n\t" + "punpckldq %2, %%mm7 \n\t" + "movl $-1024, %%esi \n\t" + ".balign 16\n\t" + "1: \n\t" + "movq (%0, %%esi), %%mm0 \n\t" + "movq 8(%0, %%esi), %%mm1 \n\t" + "movq 16(%0, %%esi), %%mm2 \n\t" + "movq 24(%0, %%esi), %%mm3 \n\t" + "pfadd (%1, %%esi), %%mm0 \n\t" + "pfadd 8(%1, %%esi), %%mm1 \n\t" + "pfadd 16(%1, %%esi), %%mm2 \n\t" + "pfadd 24(%1, %%esi), %%mm3 \n\t" + "pfadd %%mm7, %%mm0 \n\t" + "pfadd %%mm7, %%mm1 \n\t" + "pfadd %%mm7, %%mm2 \n\t" + "pfadd %%mm7, %%mm3 \n\t" + "movq %%mm0, (%1, %%esi) \n\t" + "movq %%mm1, 8(%1, %%esi) \n\t" + "movq %%mm2, 16(%1, %%esi) \n\t" + "movq %%mm3, 24(%1, %%esi) \n\t" + "addl $32, %%esi \n\t" + " jnz 1b \n\t" + :: "r" (src+256), "r" (dest+256), "m" (bias) + : "%esi" + ); +} + +static void mix3to1_3dnow (sample_t * samples, sample_t bias) +{ + asm volatile( + "movd %1, %%mm7 \n\t" + "punpckldq %1, %%mm7 \n\t" + "movl $-1024, %%esi \n\t" + ".balign 16\n\t" + "1: \n\t" + "movq (%0, %%esi), %%mm0 \n\t" + "movq 8(%0, %%esi), %%mm1 \n\t" + "movq 1024(%0, %%esi), %%mm2 \n\t" + "movq 1032(%0, %%esi), %%mm3 \n\t" + "pfadd 2048(%0, %%esi), %%mm0 \n\t" + "pfadd 2056(%0, %%esi), %%mm1 \n\t" + "pfadd %%mm7, %%mm0 \n\t" + "pfadd %%mm7, %%mm1 \n\t" + "pfadd %%mm2, %%mm0 \n\t" + "pfadd %%mm3, %%mm1 \n\t" + "movq %%mm0, (%0, %%esi) \n\t" + "movq %%mm1, 8(%0, %%esi) \n\t" + "addl $16, %%esi \n\t" + " jnz 1b \n\t" + :: "r" (samples+256), "m" (bias) + : "%esi" + ); +} + +static void mix4to1_3dnow (sample_t * samples, sample_t bias) +{ + asm volatile( + "movd %1, %%mm7 \n\t" + "punpckldq %1, %%mm7 \n\t" + "movl $-1024, %%esi \n\t" + ".balign 16\n\t" + "1: \n\t" + "movq (%0, %%esi), %%mm0 \n\t" + "movq 8(%0, %%esi), %%mm1 \n\t" + "movq 1024(%0, %%esi), %%mm2 \n\t" + "movq 1032(%0, %%esi), %%mm3 \n\t" + "pfadd 2048(%0, %%esi), %%mm0 \n\t" + "pfadd 2056(%0, %%esi), %%mm1 \n\t" + "pfadd 3072(%0, %%esi), %%mm2 \n\t" + "pfadd 3080(%0, %%esi), %%mm3 \n\t" + "pfadd %%mm7, %%mm0 \n\t" + "pfadd %%mm7, %%mm1 \n\t" + "pfadd %%mm2, %%mm0 \n\t" + "pfadd %%mm3, %%mm1 \n\t" + "movq %%mm0, (%0, %%esi) \n\t" + "movq %%mm1, 8(%0, %%esi) \n\t" + "addl $16, %%esi \n\t" + " jnz 1b \n\t" + :: "r" (samples+256), "m" (bias) + : "%esi" + ); +} + +static void mix5to1_3dnow (sample_t * samples, sample_t bias) +{ + asm volatile( + "movd %1, %%mm7 \n\t" + "punpckldq %1, %%mm7 \n\t" + "movl $-1024, %%esi \n\t" + ".balign 16\n\t" + "1: \n\t" + "movq (%0, %%esi), %%mm0 \n\t" + "movq 8(%0, %%esi), %%mm1 \n\t" + "movq 1024(%0, %%esi), %%mm2 \n\t" + "movq 1032(%0, %%esi), %%mm3 \n\t" + "pfadd 2048(%0, %%esi), %%mm0 \n\t" + "pfadd 2056(%0, %%esi), %%mm1 \n\t" + "pfadd 3072(%0, %%esi), %%mm2 \n\t" + "pfadd 3080(%0, %%esi), %%mm3 \n\t" + "pfadd %%mm7, %%mm0 \n\t" + "pfadd %%mm7, %%mm1 \n\t" + "pfadd 4096(%0, %%esi), %%mm2 \n\t" + "pfadd 4104(%0, %%esi), %%mm3 \n\t" + "pfadd %%mm2, %%mm0 \n\t" + "pfadd %%mm3, %%mm1 \n\t" + "movq %%mm0, (%0, %%esi) \n\t" + "movq %%mm1, 8(%0, %%esi) \n\t" + "addl $16, %%esi \n\t" + " jnz 1b \n\t" + :: "r" (samples+256), "m" (bias) + : "%esi" + ); +} + +static void mix3to2_3dnow (sample_t * samples, sample_t bias) +{ + asm volatile( + "movd %1, %%mm7 \n\t" + "punpckldq %1, %%mm7 \n\t" + "movl $-1024, %%esi \n\t" + ".balign 16\n\t" + "1: \n\t" + "movq 1024(%0, %%esi), %%mm0 \n\t" + "movq 1032(%0, %%esi), %%mm1 \n\t" + "pfadd %%mm7, %%mm0 \n\t" //common + "pfadd %%mm7, %%mm1 \n\t" //common + "movq (%0, %%esi), %%mm2 \n\t" + "movq 8(%0, %%esi), %%mm3 \n\t" + "movq 2048(%0, %%esi), %%mm4 \n\t" + "movq 2056(%0, %%esi), %%mm5 \n\t" + "pfadd %%mm0, %%mm2 \n\t" + "pfadd %%mm0, %%mm3 \n\t" + "pfadd %%mm0, %%mm4 \n\t" + "pfadd %%mm0, %%mm5 \n\t" + "movq %%mm2, (%0, %%esi) \n\t" + "movq %%mm3, 8(%0, %%esi) \n\t" + "movq %%mm4, 1024(%0, %%esi) \n\t" + "movq %%mm5, 1032(%0, %%esi) \n\t" + "addl $16, %%esi \n\t" + " jnz 1b \n\t" + :: "r" (samples+256), "m" (bias) + : "%esi" + ); +} + +static void mix21to2_3dnow (sample_t * left, sample_t * right, sample_t bias) +{ + asm volatile( + "movd %2, %%mm7 \n\t" + "punpckldq %2, %%mm7 \n\t" + "movl $-1024, %%esi \n\t" + ".balign 16\n\t" + "1: \n\t" + "movq 1024(%1, %%esi), %%mm0 \n\t" + "movq 1032(%1, %%esi), %%mm1 \n\t" + "pfadd %%mm7, %%mm0 \n\t" //common + "pfadd %%mm7, %%mm1 \n\t" //common + "movq (%0, %%esi), %%mm2 \n\t" + "movq 8(%0, %%esi), %%mm3 \n\t" + "movq (%1, %%esi), %%mm4 \n\t" + "movq 8(%1, %%esi), %%mm5 \n\t" + "pfadd %%mm0, %%mm2 \n\t" + "pfadd %%mm1, %%mm3 \n\t" + "pfadd %%mm0, %%mm4 \n\t" + "pfadd %%mm1, %%mm5 \n\t" + "movq %%mm2, (%0, %%esi) \n\t" + "movq %%mm3, 8(%0, %%esi) \n\t" + "movq %%mm4, (%1, %%esi) \n\t" + "movq %%mm5, 8(%1, %%esi) \n\t" + "addl $16, %%esi \n\t" + " jnz 1b \n\t" + :: "r" (left+256), "r" (right+256), "m" (bias) + : "%esi" + ); +} + +static void mix21toS_3dnow (sample_t * samples, sample_t bias) +{ + asm volatile( + "movd %1, %%mm7 \n\t" + "punpckldq %1, %%mm7 \n\t" + "movl $-1024, %%esi \n\t" + ".balign 16\n\t" + "1: \n\t" + "movq 2048(%0, %%esi), %%mm0 \n\t" // surround + "movq 2056(%0, %%esi), %%mm1 \n\t" // surround + "movq (%0, %%esi), %%mm2 \n\t" + "movq 8(%0, %%esi), %%mm3 \n\t" + "movq 1024(%0, %%esi), %%mm4 \n\t" + "movq 1032(%0, %%esi), %%mm5 \n\t" + "pfadd %%mm7, %%mm2 \n\t" + "pfadd %%mm7, %%mm3 \n\t" + "pfadd %%mm7, %%mm4 \n\t" + "pfadd %%mm7, %%mm5 \n\t" + "pfsub %%mm0, %%mm2 \n\t" + "pfsub %%mm1, %%mm3 \n\t" + "pfadd %%mm0, %%mm4 \n\t" + "pfadd %%mm1, %%mm5 \n\t" + "movq %%mm2, (%0, %%esi) \n\t" + "movq %%mm3, 8(%0, %%esi) \n\t" + "movq %%mm4, 1024(%0, %%esi) \n\t" + "movq %%mm5, 1032(%0, %%esi) \n\t" + "addl $16, %%esi \n\t" + " jnz 1b \n\t" + :: "r" (samples+256), "m" (bias) + : "%esi" + ); +} + +static void mix31to2_3dnow (sample_t * samples, sample_t bias) +{ + asm volatile( + "movd %1, %%mm7 \n\t" + "punpckldq %1, %%mm7 \n\t" + "movl $-1024, %%esi \n\t" + ".balign 16\n\t" + "1: \n\t" + "movq 1024(%0, %%esi), %%mm0 \n\t" + "movq 1032(%0, %%esi), %%mm1 \n\t" + "pfadd 3072(%0, %%esi), %%mm0 \n\t" + "pfadd 3080(%0, %%esi), %%mm1 \n\t" + "pfadd %%mm7, %%mm0 \n\t" // common + "pfadd %%mm7, %%mm1 \n\t" // common + "movq (%0, %%esi), %%mm2 \n\t" + "movq 8(%0, %%esi), %%mm3 \n\t" + "movq 2048(%0, %%esi), %%mm4 \n\t" + "movq 2056(%0, %%esi), %%mm5 \n\t" + "pfadd %%mm0, %%mm2 \n\t" + "pfadd %%mm1, %%mm3 \n\t" + "pfadd %%mm0, %%mm4 \n\t" + "pfadd %%mm1, %%mm5 \n\t" + "movq %%mm2, (%0, %%esi) \n\t" + "movq %%mm3, 8(%0, %%esi) \n\t" + "movq %%mm4, 1024(%0, %%esi) \n\t" + "movq %%mm5, 1032(%0, %%esi) \n\t" + "addl $16, %%esi \n\t" + " jnz 1b \n\t" + :: "r" (samples+256), "m" (bias) + : "%esi" + ); +} + +static void mix31toS_3dnow (sample_t * samples, sample_t bias) +{ + asm volatile( + "movd %1, %%mm7 \n\t" + "punpckldq %1, %%mm7 \n\t" + "movl $-1024, %%esi \n\t" + ".balign 16\n\t" + "1: \n\t" + "movq 1024(%0, %%esi), %%mm0 \n\t" + "movq 1032(%0, %%esi), %%mm1 \n\t" + "pfadd %%mm7, %%mm0 \n\t" // common + "pfadd %%mm7, %%mm1 \n\t" // common + "movq (%0, %%esi), %%mm2 \n\t" + "movq 8(%0, %%esi), %%mm3 \n\t" + "movq 2048(%0, %%esi), %%mm4 \n\t" + "movq 2056(%0, %%esi), %%mm5 \n\t" + "pfadd %%mm0, %%mm2 \n\t" + "pfadd %%mm1, %%mm3 \n\t" + "pfadd %%mm0, %%mm4 \n\t" + "pfadd %%mm1, %%mm5 \n\t" + "movq 3072(%0, %%esi), %%mm0 \n\t" // surround + "movq 3080(%0, %%esi), %%mm1 \n\t" // surround + "pfsub %%mm0, %%mm2 \n\t" + "pfsub %%mm1, %%mm3 \n\t" + "pfadd %%mm0, %%mm4 \n\t" + "pfadd %%mm1, %%mm5 \n\t" + "movq %%mm2, (%0, %%esi) \n\t" + "movq %%mm3, 8(%0, %%esi) \n\t" + "movq %%mm4, 1024(%0, %%esi) \n\t" + "movq %%mm5, 1032(%0, %%esi) \n\t" + "addl $16, %%esi \n\t" + " jnz 1b \n\t" + :: "r" (samples+256), "m" (bias) + : "%esi" + ); +} + +static void mix22toS_3dnow (sample_t * samples, sample_t bias) +{ + asm volatile( + "movd %1, %%mm7 \n\t" + "punpckldq %1, %%mm7 \n\t" + "movl $-1024, %%esi \n\t" + ".balign 16\n\t" + "1: \n\t" + "movq 2048(%0, %%esi), %%mm0 \n\t" + "movq 2056(%0, %%esi), %%mm1 \n\t" + "pfadd 3072(%0, %%esi), %%mm0 \n\t" // surround + "pfadd 3080(%0, %%esi), %%mm1 \n\t" // surround + "movq (%0, %%esi), %%mm2 \n\t" + "movq 8(%0, %%esi), %%mm3 \n\t" + "movq 1024(%0, %%esi), %%mm4 \n\t" + "movq 1032(%0, %%esi), %%mm5 \n\t" + "pfadd %%mm7, %%mm2 \n\t" + "pfadd %%mm7, %%mm3 \n\t" + "pfadd %%mm7, %%mm4 \n\t" + "pfadd %%mm7, %%mm5 \n\t" + "pfsub %%mm0, %%mm2 \n\t" + "pfsub %%mm1, %%mm3 \n\t" + "pfadd %%mm0, %%mm4 \n\t" + "pfadd %%mm1, %%mm5 \n\t" + "movq %%mm2, (%0, %%esi) \n\t" + "movq %%mm3, 8(%0, %%esi) \n\t" + "movq %%mm4, 1024(%0, %%esi) \n\t" + "movq %%mm5, 1032(%0, %%esi) \n\t" + "addl $16, %%esi \n\t" + " jnz 1b \n\t" + :: "r" (samples+256), "m" (bias) + : "%esi" + ); +} + +static void mix32to2_3dnow (sample_t * samples, sample_t bias) +{ + asm volatile( + "movd %1, %%mm7 \n\t" + "punpckldq %1, %%mm7 \n\t" + "movl $-1024, %%esi \n\t" + ".balign 16\n\t" + "1: \n\t" + "movq 1024(%0, %%esi), %%mm0 \n\t" + "movq 1032(%0, %%esi), %%mm1 \n\t" + "pfadd %%mm7, %%mm0 \n\t" // common + "pfadd %%mm7, %%mm1 \n\t" // common + "movq %%mm0, %%mm2 \n\t" // common + "movq %%mm1, %%mm3 \n\t" // common + "pfadd (%0, %%esi), %%mm0 \n\t" + "pfadd 8(%0, %%esi), %%mm1 \n\t" + "pfadd 2048(%0, %%esi), %%mm2 \n\t" + "pfadd 2056(%0, %%esi), %%mm3 \n\t" + "pfadd 3072(%0, %%esi), %%mm0 \n\t" + "pfadd 3080(%0, %%esi), %%mm1 \n\t" + "pfadd 4096(%0, %%esi), %%mm2 \n\t" + "pfadd 4104(%0, %%esi), %%mm3 \n\t" + "movq %%mm0, (%0, %%esi) \n\t" + "movq %%mm1, 8(%0, %%esi) \n\t" + "movq %%mm2, 1024(%0, %%esi) \n\t" + "movq %%mm3, 1032(%0, %%esi) \n\t" + "addl $16, %%esi \n\t" + " jnz 1b \n\t" + :: "r" (samples+256), "m" (bias) + : "%esi" + ); +} + +/* todo: should be optimized better */ +static void mix32toS_3dnow (sample_t * samples, sample_t bias) +{ + asm volatile( + "movl $-1024, %%esi \n\t" + ".balign 16\n\t" + "1: \n\t" + "movd %1, %%mm7 \n\t" + "punpckldq %1, %%mm7 \n\t" + "movq 1024(%0, %%esi), %%mm0 \n\t" + "movq 1032(%0, %%esi), %%mm1 \n\t" + "movq 3072(%0, %%esi), %%mm4 \n\t" + "movq 3080(%0, %%esi), %%mm5 \n\t" + "pfadd %%mm7, %%mm0 \n\t" // common + "pfadd %%mm7, %%mm1 \n\t" // common + "pfadd 4096(%0, %%esi), %%mm4 \n\t" // surround + "pfadd 4104(%0, %%esi), %%mm5 \n\t" // surround + "movq (%0, %%esi), %%mm2 \n\t" + "movq 8(%0, %%esi), %%mm3 \n\t" + "movq 2048(%0, %%esi), %%mm6 \n\t" + "movq 2056(%0, %%esi), %%mm7 \n\t" + "pfsub %%mm4, %%mm2 \n\t" + "pfsub %%mm5, %%mm3 \n\t" + "pfadd %%mm4, %%mm6 \n\t" + "pfadd %%mm5, %%mm7 \n\t" + "pfadd %%mm0, %%mm2 \n\t" + "pfadd %%mm1, %%mm3 \n\t" + "pfadd %%mm0, %%mm6 \n\t" + "pfadd %%mm1, %%mm7 \n\t" + "movq %%mm2, (%0, %%esi) \n\t" + "movq %%mm3, 8(%0, %%esi) \n\t" + "movq %%mm6, 1024(%0, %%esi) \n\t" + "movq %%mm7, 1032(%0, %%esi) \n\t" + "addl $16, %%esi \n\t" + " jnz 1b \n\t" + :: "r" (samples+256), "m" (bias) + : "%esi" + ); +} + +static void move2to1_3dnow (sample_t * src, sample_t * dest, sample_t bias) +{ + asm volatile( + "movd %2, %%mm7 \n\t" + "punpckldq %2, %%mm7 \n\t" + "movl $-1024, %%esi \n\t" + ".balign 16\n\t" + "1: \n\t" + "movq (%0, %%esi), %%mm0 \n\t" + "movq 8(%0, %%esi), %%mm1 \n\t" + "movq 16(%0, %%esi), %%mm2 \n\t" + "movq 24(%0, %%esi), %%mm3 \n\t" + "pfadd 1024(%0, %%esi), %%mm0 \n\t" + "pfadd 1032(%0, %%esi), %%mm1 \n\t" + "pfadd 1040(%0, %%esi), %%mm2 \n\t" + "pfadd 1048(%0, %%esi), %%mm3 \n\t" + "pfadd %%mm7, %%mm0 \n\t" + "pfadd %%mm7, %%mm1 \n\t" + "pfadd %%mm7, %%mm2 \n\t" + "pfadd %%mm7, %%mm3 \n\t" + "movq %%mm0, (%1, %%esi) \n\t" + "movq %%mm1, 8(%1, %%esi) \n\t" + "movq %%mm2, 16(%1, %%esi) \n\t" + "movq %%mm3, 24(%1, %%esi) \n\t" + "addl $32, %%esi \n\t" + " jnz 1b \n\t" + :: "r" (src+256), "r" (dest+256), "m" (bias) + : "%esi" + ); +} + +static void downmix_3dnow (sample_t * samples, int acmod, int output, sample_t bias, + sample_t clev, sample_t slev) +{ + switch (CONVERT (acmod, output & A52_CHANNEL_MASK)) { + + case CONVERT (A52_CHANNEL, A52_CHANNEL2): + memcpy (samples, samples + 256, 256 * sizeof (sample_t)); + break; + + case CONVERT (A52_CHANNEL, A52_MONO): + case CONVERT (A52_STEREO, A52_MONO): + mix_2to1_3dnow: + mix2to1_3dnow (samples, samples + 256, bias); + break; + + case CONVERT (A52_2F1R, A52_MONO): + if (slev == 0) + goto mix_2to1_3dnow; + case CONVERT (A52_3F, A52_MONO): + mix_3to1_3dnow: + mix3to1_3dnow (samples, bias); + break; + + case CONVERT (A52_3F1R, A52_MONO): + if (slev == 0) + goto mix_3to1_3dnow; + case CONVERT (A52_2F2R, A52_MONO): + if (slev == 0) + goto mix_2to1_3dnow; + mix4to1_3dnow (samples, bias); + break; + + case CONVERT (A52_3F2R, A52_MONO): + if (slev == 0) + goto mix_3to1_3dnow; + mix5to1_3dnow (samples, bias); + break; + + case CONVERT (A52_MONO, A52_DOLBY): + memcpy (samples + 256, samples, 256 * sizeof (sample_t)); + break; + + case CONVERT (A52_3F, A52_STEREO): + case CONVERT (A52_3F, A52_DOLBY): + mix_3to2_3dnow: + mix3to2_3dnow (samples, bias); + break; + + case CONVERT (A52_2F1R, A52_STEREO): + if (slev == 0) + break; + mix21to2_3dnow (samples, samples + 256, bias); + break; + + case CONVERT (A52_2F1R, A52_DOLBY): + mix21toS_3dnow (samples, bias); + break; + + case CONVERT (A52_3F1R, A52_STEREO): + if (slev == 0) + goto mix_3to2_3dnow; + mix31to2_3dnow (samples, bias); + break; + + case CONVERT (A52_3F1R, A52_DOLBY): + mix31toS_3dnow (samples, bias); + break; + + case CONVERT (A52_2F2R, A52_STEREO): + if (slev == 0) + break; + mix2to1_3dnow (samples, samples + 512, bias); + mix2to1_3dnow (samples + 256, samples + 768, bias); + break; + + case CONVERT (A52_2F2R, A52_DOLBY): + mix22toS_3dnow (samples, bias); + break; + + case CONVERT (A52_3F2R, A52_STEREO): + if (slev == 0) + goto mix_3to2_3dnow; + mix32to2_3dnow (samples, bias); + break; + + case CONVERT (A52_3F2R, A52_DOLBY): + mix32toS_3dnow (samples, bias); + break; + + case CONVERT (A52_3F1R, A52_3F): + if (slev == 0) + break; + mix21to2_3dnow (samples, samples + 512, bias); + break; + + case CONVERT (A52_3F2R, A52_3F): + if (slev == 0) + break; + mix2to1_3dnow (samples, samples + 768, bias); + mix2to1_3dnow (samples + 512, samples + 1024, bias); + break; + + case CONVERT (A52_3F1R, A52_2F1R): + mix3to2_3dnow (samples, bias); + memcpy (samples + 512, samples + 768, 256 * sizeof (sample_t)); + break; + + case CONVERT (A52_2F2R, A52_2F1R): + mix2to1_3dnow (samples + 512, samples + 768, bias); + break; + + case CONVERT (A52_3F2R, A52_2F1R): + mix3to2_3dnow (samples, bias); //FIXME possible bug? (output doesnt seem to be used) + move2to1_3dnow (samples + 768, samples + 512, bias); + break; + + case CONVERT (A52_3F2R, A52_3F1R): + mix2to1_3dnow (samples + 768, samples + 1024, bias); + break; + + case CONVERT (A52_2F1R, A52_2F2R): + memcpy (samples + 768, samples + 512, 256 * sizeof (sample_t)); + break; + + case CONVERT (A52_3F1R, A52_2F2R): + mix3to2_3dnow (samples, bias); + memcpy (samples + 512, samples + 768, 256 * sizeof (sample_t)); + break; + + case CONVERT (A52_3F2R, A52_2F2R): + mix3to2_3dnow (samples, bias); + memcpy (samples + 512, samples + 768, 256 * sizeof (sample_t)); + memcpy (samples + 768, samples + 1024, 256 * sizeof (sample_t)); + break; + + case CONVERT (A52_3F1R, A52_3F2R): + memcpy (samples + 1027, samples + 768, 256 * sizeof (sample_t)); + break; + } + __asm __volatile("femms":::"memory"); +} + #endif //ARCH_X86

1 0

CVS: main/libvo vo_zr.c,1.1,1.2
by Nick Kurshev 18 Jan '02

18 Jan '02

Update of /cvsroot/mplayer/main/libvo In directory mplayer:/var/tmp.root/cvs-serv7958/main/libvo Modified Files: vo_zr.c Log Message: Missed fastmemcpy Index: vo_zr.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_zr.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- vo_zr.c 17 Jan 2002 01:32:29 -0000 1.1 +++ vo_zr.c 18 Jan 2002 09:58:18 -0000 1.2 @@ -24,6 +24,7 @@ #include "video_out_internal.h" #include "../mp_msg.h" #include "../cfgparser.h" +#include "fastmemcpy.h" LIBVO_EXTERN (zr)

1 0

CVS: main/vidix/drivers radeon_vid.c,1.16,1.17
by Nick Kurshev 18 Jan '02

18 Jan '02

Update of /cvsroot/mplayer/main/vidix/drivers In directory mplayer:/var/tmp.root/cvs-serv27933/main/vidix/drivers Modified Files: radeon_vid.c Log Message: Fixed saturation computing for rage128 Index: radeon_vid.c =================================================================== RCS file: /cvsroot/mplayer/main/vidix/drivers/radeon_vid.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- radeon_vid.c 18 Jan 2002 09:11:11 -0000 1.16 +++ radeon_vid.c 18 Jan 2002 09:21:06 -0000 1.17 @@ -1089,7 +1089,7 @@ #ifdef RAGE128 br = equal.brightness * 64 / 1000; if(br < -64) br = -64; if(br > 63) br = 63; - sat = (equal.saturation + 1000) * 32 / 1000; + sat = (equal.saturation + 1000) * 16 / 1000; if(sat < 0) sat = 0; if(sat > 31) sat = 31; OUTREG(OV0_COLOUR_CNTL, (br & 0x7f) | (sat << 8) | (sat << 16)); #else

1 0

CVS: main/vidix/drivers radeon_vid.c,1.15,1.16
by Nick Kurshev 18 Jan '02

18 Jan '02

Update of /cvsroot/mplayer/main/vidix/drivers In directory mplayer:/var/tmp.root/cvs-serv25359/main/vidix/drivers Modified Files: radeon_vid.c Log Message: gamma correction support Index: radeon_vid.c =================================================================== RCS file: /cvsroot/mplayer/main/vidix/drivers/radeon_vid.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- radeon_vid.c 17 Jan 2002 00:19:57 -0000 1.15 +++ radeon_vid.c 18 Jan 2002 09:11:11 -0000 1.16 @@ -1070,20 +1070,39 @@ return 0; } +#ifndef RAGE128 +#define RTFSaturation(a) (1.0 + ((a)*1.0)/1000.0) +#define RTFBrightness(a) (((a)*1.0)/2000.0) +#define RTFContrast(a) (1.0 + ((a)*1.0)/1000.0) +#define RTFHue(a) (((a)*3.1416)/1000.0) +#define RTFCheckParam(a) {if((a)<-1000) (a)=-1000; if((a)>1000) (a)=1000;} +#endif + int vixPlaybackSetEq( const vidix_video_eq_t * eq) { #ifdef RAGE128 int br,sat; +#else + int itu_space; #endif memcpy(&equal,eq,sizeof(vidix_video_eq_t)); #ifdef RAGE128 br = equal.brightness * 64 / 1000; - sat = equal.saturation * 32 / 1000; - if(sat < 0) sat = 0; + if(br < -64) br = -64; if(br > 63) br = 63; + sat = (equal.saturation + 1000) * 32 / 1000; + if(sat < 0) sat = 0; if(sat > 31) sat = 31; OUTREG(OV0_COLOUR_CNTL, (br & 0x7f) | (sat << 8) | (sat << 16)); #else - radeon_set_transform(equal.brightness,equal.contrast, - equal.saturation,equal.hue,0); + itu_space = equal.flags == VEQ_FLG_ITU_R_BT_709 ? 1 : 0; + RTFCheckParam(equal.brightness); + RTFCheckParam(equal.saturation); + RTFCheckParam(equal.contrast); + RTFCheckParam(equal.hue); + radeon_set_transform(RTFBrightness(equal.brightness), + RTFContrast(equal.contrast), + RTFSaturation(equal.saturation), + RTFHue(equal.hue), + itu_space); #endif return 0; }

1 0

CVS: main/libvo video_out.c,1.34,1.35 vosub_vidix.c,1.9,1.10
by Nick Kurshev 18 Jan '02

18 Jan '02

Update of /cvsroot/mplayer/main/libvo In directory mplayer:/var/tmp.root/cvs-serv25359/main/libvo Modified Files: video_out.c vosub_vidix.c Log Message: gamma correction support Index: video_out.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/video_out.c,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- video_out.c 17 Jan 2002 01:32:29 -0000 1.34 +++ video_out.c 18 Jan 2002 09:11:09 -0000 1.35 @@ -47,7 +47,16 @@ float vo_fps=0; // for mp1e rte char *vo_subdevice = NULL; - +/**************************************** +* GAMMA CORRECTION * +****************************************/ +int vo_gamma_brightness=0; +int vo_gamma_saturation=0; +int vo_gamma_contrast=0; +int vo_gamma_hue=0; +int vo_gamma_red_intense=0; +int vo_gamma_green_intense=0; +int vo_gamma_blue_intense=0; // // Externally visible list of all vo drivers // Index: vosub_vidix.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vosub_vidix.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- vosub_vidix.c 16 Jan 2002 15:22:45 -0000 1.9 +++ vosub_vidix.c 18 Jan 2002 09:11:09 -0000 1.10 @@ -154,15 +154,51 @@ return 0; } +extern int vo_gamma_brightness; +extern int vo_gamma_saturation; +extern int vo_gamma_contrast; +extern int vo_gamma_hue; +extern int vo_gamma_red_intense; +extern int vo_gamma_green_intense; +extern int vo_gamma_blue_intense; + +vidix_video_eq_t vid_eq; + void vidix_start(void) { int err; + if(verbose > 1) + { + printf("vosub_vidix: vo_gamma_brightness=%i\n" + "vosub_vidix: vo_gamma_saturation=%i\n" + "vosub_vidix: vo_gamma_contrast=%i\n" + "vosub_vidix: vo_gamma_hue=%i\n" + "vosub_vidix: vo_gamma_red_intense=%i\n" + "vosub_vidix: vo_gamma_green_intense=%i\n" + "vosub_vidix: vo_gamma_blue_intense=%i\n" + ,vo_gamma_brightness + ,vo_gamma_saturation + ,vo_gamma_contrast + ,vo_gamma_hue + ,vo_gamma_red_intense + ,vo_gamma_green_intense + ,vo_gamma_blue_intense); + } if((err=vdlPlaybackOn(vidix_handler))!=0) { printf("vosub_vidix: Can't start playback: %s\n",strerror(err)); return -1; } + vid_eq.brightness = vo_gamma_brightness; + vid_eq.saturation = vo_gamma_saturation; + vid_eq.contrast = vo_gamma_contrast; + vid_eq.hue = vo_gamma_hue; + vid_eq.red_intense = vo_gamma_red_intense; + vid_eq.green_intense = vo_gamma_green_intense; + vid_eq.blue_intense = vo_gamma_blue_intense; + vid_eq.flags = VEQ_FLG_ITU_R_BT_601; + vdlPlaybackSetEq(vidix_handler,&vid_eq); return 0; }

1 0

CVS: main/libmpdemux dvdauth.c,1.12,1.13
by Nick Kurshev 18 Jan '02

18 Jan '02

Update of /cvsroot/mplayer/main/libmpdemux In directory mplayer:/var/tmp.root/cvs-serv25164/main/libmpdemux Modified Files: dvdauth.c Log Message: Fixed bug of multiple declaration of 'dvd_device' Index: dvdauth.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/dvdauth.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- dvdauth.c 13 Jan 2002 01:36:38 -0000 1.12 +++ dvdauth.c 18 Jan 2002 09:10:00 -0000 1.13 @@ -63,7 +63,7 @@ char *dvd_auth_device=NULL; -char *dvd_device=NULL; +extern char *dvd_device; char *dvd_raw_device=NULL; char *css_so=NULL; unsigned char key_disc[2048];

1 0

CVS: main/etc codecs.conf,1.124,1.125
by Mike Melanson 18 Jan '02

18 Jan '02

Update of /cvsroot/mplayer/main/etc In directory mplayer:/var/tmp.root/cvs-serv8883/etc Modified Files: codecs.conf Log Message: added skeleton for QT SMC decoder Index: codecs.conf =================================================================== RCS file: /cvsroot/mplayer/main/etc/codecs.conf,v retrieving revision 1.124 retrieving revision 1.125 diff -u -r1.124 -r1.125 --- codecs.conf 17 Jan 2002 00:55:07 -0000 1.124 +++ codecs.conf 18 Jan 2002 05:43:48 -0000 1.125 @@ -328,6 +328,14 @@ driver cyuv out UYVY +videocodec qtsmc + info "Apple Graphics (SMC) codec" + status buggy +; codec fourcc = "smc " + format 0x20636d73 + driver qtsmc + out BGR32,BGR24 + audiocodec imaadpcm info "IMA ADPCM" status working

1 0

CVS: main qtsmc.c,NONE,1.1 codec-cfg.c,1.62,1.63 codec-cfg.h,1.36,1.37 dec_video.c,1.85,1.86 Makefile,1.142,1.143
by Mike Melanson 18 Jan '02

18 Jan '02

Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv8883 Modified Files: codec-cfg.c codec-cfg.h dec_video.c Makefile Added Files: qtsmc.c Log Message: added skeleton for QT SMC decoder --- NEW FILE --- /* Apple Graphics (SMC) Decoder for MPlayer by Mike Melanson */ #include "config.h" #include "bswap.h" #define BE_16(x) (be2me_16(*(unsigned short *)(x))) #define BE_32(x) (be2me_32(*(unsigned int *)(x))) void qt_decode_smc( unsigned char *encoded, int encoded_size, unsigned char *decoded, int width, int height, int bytes_per_pixel) { } Index: codec-cfg.c =================================================================== RCS file: /cvsroot/mplayer/main/codec-cfg.c,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- codec-cfg.c 7 Jan 2002 00:52:09 -0000 1.62 +++ codec-cfg.c 18 Jan 2002 05:43:40 -0000 1.63 @@ -241,6 +241,7 @@ "qtrle", "nuv", "cyuv", + "qtsmc", NULL }; char **drv=audioflag?audiodrv:videodrv; Index: codec-cfg.h =================================================================== RCS file: /cvsroot/mplayer/main/codec-cfg.h,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- codec-cfg.h 17 Jan 2002 09:20:29 -0000 1.36 +++ codec-cfg.h 18 Jan 2002 05:43:40 -0000 1.37 @@ -53,6 +53,7 @@ #define VFM_QTRLE 14 #define VFM_NUV 15 #define VFM_CYUV 16 +#define VFM_QTSMC 17 #ifndef GUID_TYPE #define GUID_TYPE Index: dec_video.c =================================================================== RCS file: /cvsroot/mplayer/main/dec_video.c,v retrieving revision 1.85 retrieving revision 1.86 diff -u -r1.85 -r1.86 --- dec_video.c 16 Jan 2002 01:51:34 -0000 1.85 +++ dec_video.c 18 Jan 2002 05:43:40 -0000 1.86 @@ -157,6 +157,15 @@ int height, int bit_per_pixel); +void qt_decode_smc( + unsigned char *encoded, + int encoded_size, + unsigned char *decoded, + int width, + int height, + int encoded_bpp, + int bytes_per_pixel); + //**************************************************************************// // The OpenDivX stuff: //**************************************************************************// @@ -593,6 +602,7 @@ case VFM_MSVIDC: case VFM_FLI: case VFM_QTRLE: + case VFM_QTSMC: { #ifdef USE_MP_IMAGE sh_video->image->type=MP_IMGTYPE_STATIC; @@ -939,6 +949,14 @@ break; case VFM_QTRLE: qt_decode_rle( + start, in_size, sh_video->our_out_buffer, + sh_video->disp_w, sh_video->disp_h, + sh_video->bih->biBitCount, + ((out_fmt&255)+7)/8); + blit_frame = 3; + break; + case VFM_QTSMC: + qt_decode_smc( start, in_size, sh_video->our_out_buffer, sh_video->disp_w, sh_video->disp_h, sh_video->bih->biBitCount, Index: Makefile =================================================================== RCS file: /cvsroot/mplayer/main/Makefile,v retrieving revision 1.142 retrieving revision 1.143 diff -u -r1.142 -r1.143 --- Makefile 17 Jan 2002 01:27:45 -0000 1.142 +++ Makefile 18 Jan 2002 05:43:40 -0000 1.143 @@ -27,7 +27,7 @@ # a BSD compatible 'install' program INSTALL = install -SRCS_COMMON = cyuv.c adpcm.c xacodec.c cpudetect.c mp_msg.c ac3-iec958.c dec_audio.c dec_video.c msvidc.c cinepak.c fli.c qtrle.c codec-cfg.c cfgparser.c my_profile.c RTjpegN.c minilzo.c nuppelvideo.c spudec.c playtree.c playtreeparser.c asxparser.c +SRCS_COMMON = cyuv.c adpcm.c xacodec.c cpudetect.c mp_msg.c ac3-iec958.c dec_audio.c dec_video.c msvidc.c cinepak.c fli.c qtrle.c codec-cfg.c cfgparser.c my_profile.c RTjpegN.c minilzo.c nuppelvideo.c spudec.c playtree.c playtreeparser.c asxparser.c qtsmc.c SRCS_MENCODER = mencoder.c $(SRCS_COMMON) libao2/afmt.c divx4_vbr.c libvo/aclib.c libvo/img_format.c libvo/osd.c SRCS_MPLAYER = mplayer.c $(SRCS_COMMON) find_sub.c subreader.c lirc_mp.c mixer.c vobsub.c

1 0