August 2007 - ffmpeg-cvslog - lists.ffmpeg.org

r10251 - trunk/libavformat/nutdec.c
by subversion＠mplayerhq.hu 27 Aug '07

27 Aug '07

Author: diego Date: Mon Aug 27 14:36:19 2007 New Revision: 10251 Log: Remove unused variable. Modified: trunk/libavformat/nutdec.c Modified: trunk/libavformat/nutdec.c ============================================================================== --- trunk/libavformat/nutdec.c (original) +++ trunk/libavformat/nutdec.c Mon Aug 27 14:36:19 2007 @@ -425,7 +425,6 @@ static int decode_syncpoint(NUTContext * AVFormatContext *s= nut->avf; ByteIOContext *bc = &s->pb; int64_t end, tmp; - AVRational time_base; nut->last_syncpoint_pos= url_ftell(bc)-8;

1 0

r10231 - trunk/libavcodec/i386/snowdsp_mmx.c
by subversion＠mplayerhq.hu 27 Aug '07

27 Aug '07

Author: michael Date: Sun Aug 26 10:31:55 2007 New Revision: 10231 Log: optimize 1st horizontal lifting step Modified: trunk/libavcodec/i386/snowdsp_mmx.c Modified: trunk/libavcodec/i386/snowdsp_mmx.c ============================================================================== --- trunk/libavcodec/i386/snowdsp_mmx.c (original) +++ trunk/libavcodec/i386/snowdsp_mmx.c Sun Aug 26 10:31:55 2007 @@ -42,8 +42,10 @@ void ff_snow_horizontal_compose97i_sse2( i = 0; asm volatile( "pcmpeqd %%xmm7, %%xmm7 \n\t" - "psllw $15, %%xmm7 \n\t" - "psrlw $14, %%xmm7 \n\t" + "pcmpeqd %%xmm3, %%xmm3 \n\t" + "psllw $1, %%xmm3 \n\t" + "paddw %%xmm7, %%xmm3 \n\t" + "psrlw $13, %%xmm3 \n\t" ::); for(; i<w_l-15; i+=16){ asm volatile( @@ -53,22 +55,14 @@ void ff_snow_horizontal_compose97i_sse2( "movdqu 18(%1), %%xmm6 \n\t" "paddw %%xmm1, %%xmm2 \n\t" "paddw %%xmm5, %%xmm6 \n\t" - "movdqa %%xmm2, %%xmm0 \n\t" - "movdqa %%xmm6, %%xmm4 \n\t" - "psraw $1, %%xmm0 \n\t" - "psraw $1, %%xmm4 \n\t" - "paddw %%xmm0, %%xmm2 \n\t" - "paddw %%xmm4, %%xmm6 \n\t" "paddw %%xmm7, %%xmm2 \n\t" "paddw %%xmm7, %%xmm6 \n\t" - "psraw $2, %%xmm2 \n\t" - "psraw $2, %%xmm6 \n\t" - "movdqa (%0), %%xmm0 \n\t" - "movdqa 16(%0), %%xmm4 \n\t" - "psubw %%xmm2, %%xmm0 \n\t" - "psubw %%xmm6, %%xmm4 \n\t" - "movdqa %%xmm0, (%0) \n\t" - "movdqa %%xmm4, 16(%0) \n\t" + "pmulhw %%xmm3, %%xmm2 \n\t" + "pmulhw %%xmm3, %%xmm6 \n\t" + "paddw (%0), %%xmm2 \n\t" + "paddw 16(%0), %%xmm6 \n\t" + "movdqa %%xmm2, (%0) \n\t" + "movdqa %%xmm6, 16(%0) \n\t" :: "r"(&b[i]), "r"(&ref[i]) : "memory" ); @@ -111,7 +105,7 @@ void ff_snow_horizontal_compose97i_sse2( i = 0; asm volatile( - "psllw $13, %%xmm7 \n\t" + "psllw $15, %%xmm7 \n\t" "pcmpeqw %%xmm6, %%xmm6 \n\t" "psrlw $13, %%xmm6 \n\t" "paddw %%xmm7, %%xmm6 \n\t" @@ -234,8 +228,10 @@ void ff_snow_horizontal_compose97i_mmx(I b[0] = b[0] - ((W_DM * 2 * ref[1]+W_DO)>>W_DS); asm volatile( "pcmpeqw %%mm7, %%mm7 \n\t" - "psllw $15, %%mm7 \n\t" - "psrlw $14, %%mm7 \n\t" + "pcmpeqw %%mm3, %%mm3 \n\t" + "psllw $1, %%mm3 \n\t" + "paddw %%mm7, %%mm3 \n\t" + "psllw $13, %%mm3 \n\t" ::); for(; i<w_l-7; i+=8){ asm volatile( @@ -243,22 +239,14 @@ void ff_snow_horizontal_compose97i_mmx(I "movq 8(%1), %%mm6 \n\t" "paddw 2(%1), %%mm2 \n\t" "paddw 10(%1), %%mm6 \n\t" - "movq %%mm2, %%mm0 \n\t" - "movq %%mm6, %%mm4 \n\t" - "psraw $1, %%mm2 \n\t" - "psraw $1, %%mm6 \n\t" - "paddw %%mm0, %%mm2 \n\t" - "paddw %%mm4, %%mm6 \n\t" "paddw %%mm7, %%mm2 \n\t" "paddw %%mm7, %%mm6 \n\t" - "psraw $2, %%mm2 \n\t" - "psraw $2, %%mm6 \n\t" - "movq (%0), %%mm0 \n\t" - "movq 8(%0), %%mm4 \n\t" - "psubw %%mm2, %%mm0 \n\t" - "psubw %%mm6, %%mm4 \n\t" - "movq %%mm0, (%0) \n\t" - "movq %%mm4, 8(%0) \n\t" + "pmulhw %%mm3, %%mm2 \n\t" + "pmulhw %%mm3, %%mm6 \n\t" + "paddw (%0), %%mm2 \n\t" + "paddw 8(%0), %%mm6 \n\t" + "movq %%mm2, (%0) \n\t" + "movq %%mm6, 8(%0) \n\t" :: "r"(&b[i]), "r"(&ref[i]) : "memory" ); @@ -295,7 +283,7 @@ void ff_snow_horizontal_compose97i_mmx(I i = 1; b[0] = b[0] + (((2 * ref[1] + W_BO) + 4 * b[0]) >> W_BS); asm volatile( - "psllw $14, %%mm7 \n\t" + "psllw $15, %%mm7 \n\t" "pcmpeqw %%mm6, %%mm6 \n\t" "psrlw $13, %%mm6 \n\t" "paddw %%mm7, %%mm6 \n\t"

3 2

r10250 - trunk/libavcodec/i386/snowdsp_mmx.c
by subversion＠mplayerhq.hu 27 Aug '07

27 Aug '07

Author: michael Date: Mon Aug 27 12:39:31 2007 New Revision: 10250 Log: typo Modified: trunk/libavcodec/i386/snowdsp_mmx.c Modified: trunk/libavcodec/i386/snowdsp_mmx.c ============================================================================== --- trunk/libavcodec/i386/snowdsp_mmx.c (original) +++ trunk/libavcodec/i386/snowdsp_mmx.c Mon Aug 27 12:39:31 2007 @@ -45,7 +45,7 @@ void ff_snow_horizontal_compose97i_sse2( "pcmpeqd %%xmm3, %%xmm3 \n\t" "psllw $1, %%xmm3 \n\t" "paddw %%xmm7, %%xmm3 \n\t" - "psrlw $13, %%xmm3 \n\t" + "psllw $13, %%xmm3 \n\t" ::); for(; i<w_l-15; i+=16){ asm volatile(

1 0

r10249 - trunk/libavcodec/ppc/dsputil_altivec.c
by subversion＠mplayerhq.hu 27 Aug '07

27 Aug '07

Author: diego Date: Mon Aug 27 11:21:33 2007 New Revision: 10249 Log: Simplify preprocessor directives. Modified: trunk/libavcodec/ppc/dsputil_altivec.c Modified: trunk/libavcodec/ppc/dsputil_altivec.c ============================================================================== --- trunk/libavcodec/ppc/dsputil_altivec.c (original) +++ trunk/libavcodec/ppc/dsputil_altivec.c Mon Aug 27 11:21:33 2007 @@ -1426,9 +1426,7 @@ int has_altivec(void) IExec->GetCPUInfoTags(GCIT_VectorUnit, &result, TAG_DONE); if (result == VECTORTYPE_ALTIVEC) return 1; return 0; -#else /* __AMIGAOS4__ */ - -#ifdef __APPLE__ +#elif __APPLE__ int sels[2] = {CTL_HW, HW_VECTORUNIT}; int has_vu = 0; size_t len = sizeof(has_vu); @@ -1437,9 +1435,9 @@ int has_altivec(void) err = sysctl(sels, 2, &has_vu, &len, NULL, 0); if (err == 0) return (has_vu != 0); -#else /* __APPLE__ */ -/* no Mac OS X, do it the brute-force way */ -/* this is borrowed from the libmpeg2 library */ + return 0; +#else +/* Do it the brute-force way, borrowed from the libmpeg2 library. */ { signal (SIGILL, sigill_handler); if (sigsetjmp (jmpbuf, 1)) { @@ -1456,7 +1454,6 @@ int has_altivec(void) return 1; } } -#endif /* __APPLE__ */ return 0; #endif /* __AMIGAOS4__ */ }

1 0

r10248 - trunk/configure
by subversion＠mplayerhq.hu 27 Aug '07

27 Aug '07

Author: diego Date: Mon Aug 27 11:17:20 2007 New Revision: 10248 Log: Remove unused definition. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure (original) +++ trunk/configure Mon Aug 27 11:17:20 2007 @@ -1970,10 +1970,6 @@ print_config CONFIG_ $TMPH config.mak $C $MUXER_LIST \ $PROTOCOL_LIST \ -if test "$targetos" = darwin; then - echo "#define SYS_DARWIN 1" >> $TMPH -fi - echo "#define restrict $_restrict" >> $TMPH if enabled small; then

1 0

r10247 - in trunk: ffplay.c libavcodec/ppc/dsputil_altivec.c libavutil/internal.h
by subversion＠mplayerhq.hu 27 Aug '07

27 Aug '07

Author: diego Date: Mon Aug 27 11:17:03 2007 New Revision: 10247 Log: Change SYS_DARWIN preprocessor checks to __APPLE__, they are specific to Mac OS X rather than to Darwin. Modified: trunk/ffplay.c trunk/libavcodec/ppc/dsputil_altivec.c trunk/libavutil/internal.h Modified: trunk/ffplay.c ============================================================================== --- trunk/ffplay.c (original) +++ trunk/ffplay.c Mon Aug 27 11:17:03 2007 @@ -865,7 +865,7 @@ static int video_open(VideoState *is){ w = 640; h = 480; } -#ifndef SYS_DARWIN +#ifndef __APPLE__ screen = SDL_SetVideoMode(w, h, 0, flags); #else /* setting bits_per_pixel = 0 or 32 causes blank video on OS X */ @@ -2520,8 +2520,8 @@ int main(int argc, char **argv) video_disable = 1; } flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_INIT_TIMER; -#if !defined(__MINGW32__) && !defined(SYS_DARWIN) - flags |= SDL_INIT_EVENTTHREAD; /* Not supported on win32 or darwin */ +#if !defined(__MINGW32__) && !defined(__APPLE__) + flags |= SDL_INIT_EVENTTHREAD; /* Not supported on Windows or Mac OS X */ #endif if (SDL_Init (flags)) { fprintf(stderr, "Could not initialize SDL - %s\n", SDL_GetError()); Modified: trunk/libavcodec/ppc/dsputil_altivec.c ============================================================================== --- trunk/libavcodec/ppc/dsputil_altivec.c (original) +++ trunk/libavcodec/ppc/dsputil_altivec.c Mon Aug 27 11:17:03 2007 @@ -26,7 +26,7 @@ #include "dsputil_altivec.h" -#ifdef SYS_DARWIN +#ifdef __APPLE__ #include <sys/sysctl.h> #elif __AMIGAOS4__ #include <exec/exec.h> @@ -49,7 +49,7 @@ static void sigill_handler (int sig) canjump = 0; siglongjmp (jmpbuf, 1); } -#endif /* SYS_DARWIN */ +#endif /* __APPLE__ */ int sad16_x2_altivec(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h) { @@ -1428,7 +1428,7 @@ int has_altivec(void) return 0; #else /* __AMIGAOS4__ */ -#ifdef SYS_DARWIN +#ifdef __APPLE__ int sels[2] = {CTL_HW, HW_VECTORUNIT}; int has_vu = 0; size_t len = sizeof(has_vu); @@ -1437,8 +1437,8 @@ int has_altivec(void) err = sysctl(sels, 2, &has_vu, &len, NULL, 0); if (err == 0) return (has_vu != 0); -#else /* SYS_DARWIN */ -/* no Darwin, do it the brute-force way */ +#else /* __APPLE__ */ +/* no Mac OS X, do it the brute-force way */ /* this is borrowed from the libmpeg2 library */ { signal (SIGILL, sigill_handler); @@ -1456,7 +1456,7 @@ int has_altivec(void) return 1; } } -#endif /* SYS_DARWIN */ +#endif /* __APPLE__ */ return 0; #endif /* __AMIGAOS4__ */ } Modified: trunk/libavutil/internal.h ============================================================================== --- trunk/libavutil/internal.h (original) +++ trunk/libavutil/internal.h Mon Aug 27 11:17:03 2007 @@ -128,7 +128,7 @@ #else # if defined(ARCH_X86_64) && defined(PIC) # define MANGLE(a) #a"(%%rip)" -# elif defined(SYS_DARWIN) +# elif defined(__APPLE__) # define MANGLE(a) "_" #a # else # define MANGLE(a) #a

1 0

[propchange]: r10236 - svn:log
by subversion＠mplayerhq.hu 27 Aug '07

27 Aug '07

Author: diego Revision: 10236 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1 +1 @@ -workaound gcc bug, untested as my gcc isnt complaining +workaround gcc bug, untested as my gcc is not complaining

1 0

[propchange]: r10227 - svn:log
by subversion＠mplayerhq.hu 27 Aug '07

27 Aug '07

Author: diego Revision: 10227 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1,3 +1,3 @@ cosmetics -remove brain aputated mmx wrapers around sse2 macros +remove brain amputated mmx wrappers around sse2 macros fix name of ..._sub macro to match ..._add naming

1 0

r10246 - trunk/Makefile
by subversion＠mplayerhq.hu 27 Aug '07

27 Aug '07

Author: diego Date: Mon Aug 27 10:42:23 2007 New Revision: 10246 Log: Give seektest .libs dependency so that it gets updated on libavformat changes. patch by Wolfram Gloger, wmglo dent.med.uni-muenchen de Modified: trunk/Makefile Modified: trunk/Makefile ============================================================================== --- trunk/Makefile (original) +++ trunk/Makefile Mon Aug 27 10:42:23 2007 @@ -278,7 +278,7 @@ codectest mpeg4 mpeg ac3 snow snowll: ff libavtest: ffmpeg$(EXESUF) tests/vsynth1/00.pgm tests/asynth1.sw $(SRC_PATH)/tests/regression.sh $@ $(LIBAV_REFFILE) tests/vsynth1 -seektest: tests/seek_test$(EXESUF) +seektest: tests/seek_test$(EXESUF) .libs $(SRC_PATH)/tests/seek_test.sh $(SEEK_REFFILE) ifeq ($(CONFIG_SWSCALER),yes)

1 0

r10245 - trunk/Makefile
by subversion＠mplayerhq.hu 27 Aug '07

27 Aug '07

Author: diego Date: Mon Aug 27 10:40:16 2007 New Revision: 10245 Log: cosmetics: Insert empty line for readability. Modified: trunk/Makefile Modified: trunk/Makefile ============================================================================== --- trunk/Makefile (original) +++ trunk/Makefile Mon Aug 27 10:40:16 2007 @@ -277,6 +277,7 @@ codectest mpeg4 mpeg ac3 snow snowll: ff libavtest: ffmpeg$(EXESUF) tests/vsynth1/00.pgm tests/asynth1.sw $(SRC_PATH)/tests/regression.sh $@ $(LIBAV_REFFILE) tests/vsynth1 + seektest: tests/seek_test$(EXESUF) $(SRC_PATH)/tests/seek_test.sh $(SEEK_REFFILE)

1 0