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

r10269 - in trunk/libavcodec: allcodecs.c allcodecs.h
by subversion＠mplayerhq.hu 30 Aug '07

30 Aug '07

Author: diego Date: Fri Aug 31 01:13:10 2007 New Revision: 10269 Log: cosmetics: Sort bitstream filters. Modified: trunk/libavcodec/allcodecs.c trunk/libavcodec/allcodecs.h Modified: trunk/libavcodec/allcodecs.c ============================================================================== --- trunk/libavcodec/allcodecs.c (original) +++ trunk/libavcodec/allcodecs.c Fri Aug 31 01:13:10 2007 @@ -278,11 +278,11 @@ void avcodec_register_all(void) /* bitstream filters */ REGISTER_BSF (DUMP_EXTRADATA, dump_extradata); - REGISTER_BSF (REMOVE_EXTRADATA, remove_extradata); - REGISTER_BSF (NOISE, noise); + REGISTER_BSF (IMX_DUMP_HEADER, imx_dump_header); + REGISTER_BSF (MJPEGA_DUMP_HEADER, mjpega_dump_header); REGISTER_BSF (MP3_HEADER_COMPRESS, mp3_header_compress); REGISTER_BSF (MP3_HEADER_DECOMPRESS, mp3_header_decompress); - REGISTER_BSF (MJPEGA_DUMP_HEADER, mjpega_dump_header); - REGISTER_BSF (IMX_DUMP_HEADER, imx_dump_header); + REGISTER_BSF (NOISE, noise); + REGISTER_BSF (REMOVE_EXTRADATA, remove_extradata); } Modified: trunk/libavcodec/allcodecs.h ============================================================================== --- trunk/libavcodec/allcodecs.h (original) +++ trunk/libavcodec/allcodecs.h Fri Aug 31 01:13:10 2007 @@ -307,11 +307,11 @@ extern AVCodecParser vc1_parser; /* bitstream filters */ extern AVBitStreamFilter dump_extradata_bsf; -extern AVBitStreamFilter remove_extradata_bsf; -extern AVBitStreamFilter noise_bsf; +extern AVBitStreamFilter imx_dump_header_bsf; +extern AVBitStreamFilter mjpega_dump_header_bsf; extern AVBitStreamFilter mp3_header_compress_bsf; extern AVBitStreamFilter mp3_header_decompress_bsf; -extern AVBitStreamFilter mjpega_dump_header_bsf; -extern AVBitStreamFilter imx_dump_header_bsf; +extern AVBitStreamFilter noise_bsf; +extern AVBitStreamFilter remove_extradata_bsf; #endif /* ALLCODECS_H */

1 0

r10268 - in trunk: libavcodec/Makefile libavformat/Makefile libavutil/Makefile
by subversion＠mplayerhq.hu 30 Aug '07

30 Aug '07

Author: diego Date: Fri Aug 31 01:11:24 2007 New Revision: 10268 Log: cosmetics: Sort some lines, whitespace changes. Modified: trunk/libavcodec/Makefile trunk/libavformat/Makefile trunk/libavutil/Makefile Modified: trunk/libavcodec/Makefile ============================================================================== --- trunk/libavcodec/Makefile (original) +++ trunk/libavcodec/Makefile Fri Aug 31 01:11:24 2007 @@ -4,29 +4,29 @@ # include ../config.mak -CFLAGS+=-I$(SRC_PATH)/libswscale -I$(SRC_PATH)/libavcodec +CFLAGS += -I$(SRC_PATH)/libswscale -I$(SRC_PATH)/libavcodec -OBJS= bitstream.o \ - utils.o \ - allcodecs.o \ - mpegvideo.o \ - jrevdct.o \ - jfdctfst.o \ - jfdctint.o\ - resample.o \ - resample2.o \ - dsputil.o \ - imgconvert.o \ - mpeg12.o mpeg12data.o \ - simple_idct.o \ - eval.o \ - error_resilience.o \ - raw.o \ - faandct.o \ - parser.o \ - opt.o \ - bitstream_filter.o \ - audioconvert.o \ +OBJS = allcodecs.o \ + audioconvert.o \ + bitstream.o \ + bitstream_filter.o \ + dsputil.o \ + error_resilience.o \ + eval.o \ + faandct.o \ + imgconvert.o \ + jrevdct.o \ + jfdctfst.o \ + jfdctint.o\ + mpeg12.o mpeg12data.o \ + mpegvideo.o \ + opt.o \ + parser.o \ + raw.o \ + resample.o \ + resample2.o \ + simple_idct.o \ + utils.o \ HEADERS = avcodec.h opt.h @@ -320,17 +320,17 @@ OBJS-$(CONFIG_PNM_PARSER) + OBJS-$(CONFIG_VC1_PARSER) += vc1_parser.o OBJS-$(CONFIG_DUMP_EXTRADATA_BSF) += dump_extradata_bsf.o -OBJS-$(CONFIG_REMOVE_EXTRADATA_BSF) += remove_extradata_bsf.o -OBJS-$(CONFIG_NOISE_BSF) += noise_bsf.o +OBJS-$(CONFIG_IMX_DUMP_HEADER_BSF) += imx_dump_header_bsf.o +OBJS-$(CONFIG_MJPEGA_DUMP_HEADER_BSF) += mjpega_dump_header_bsf.o OBJS-$(CONFIG_MP3_HEADER_COMPRESS_BSF) += mp3_header_compress_bsf.o OBJS-$(CONFIG_MP3_HEADER_DECOMPRESS_BSF) += mp3_header_decompress_bsf.o mpegaudiodata.o -OBJS-$(CONFIG_MJPEGA_DUMP_HEADER_BSF) += mjpega_dump_header_bsf.o -OBJS-$(CONFIG_IMX_DUMP_HEADER_BSF) += imx_dump_header_bsf.o +OBJS-$(CONFIG_NOISE_BSF) += noise_bsf.o +OBJS-$(CONFIG_REMOVE_EXTRADATA_BSF) += remove_extradata_bsf.o +OBJS-$(HAVE_BEOSTHREADS) += beosthread.o +OBJS-$(HAVE_OS2THREADS) += os2thread.o OBJS-$(HAVE_PTHREADS) += pthread.o OBJS-$(HAVE_W32THREADS) += w32thread.o -OBJS-$(HAVE_OS2THREADS) += os2thread.o -OBJS-$(HAVE_BEOSTHREADS) += beosthread.o OBJS-$(HAVE_XVMC_ACCEL) += xvmcvideo.o @@ -353,11 +353,11 @@ OBJS += i386/fdct_mmx.o \ OBJS-$(CONFIG_GPL) += i386/idct_mmx.o OBJS-$(CONFIG_CAVS_DECODER) += i386/cavsdsp_mmx.o -OBJS-$(CONFIG_SNOW_DECODER) += i386/snowdsp_mmx.o OBJS-$(CONFIG_VP3_DECODER) += i386/vp3dsp_mmx.o i386/vp3dsp_sse2.o OBJS-$(CONFIG_VP5_DECODER) += i386/vp3dsp_mmx.o i386/vp3dsp_sse2.o OBJS-$(CONFIG_VP6_DECODER) += i386/vp3dsp_mmx.o i386/vp3dsp_sse2.o OBJS-$(CONFIG_VP6F_DECODER) += i386/vp3dsp_mmx.o i386/vp3dsp_sse2.o +OBJS-$(CONFIG_SNOW_DECODER) += i386/snowdsp_mmx.o endif ASM_OBJS-$(ARCH_ARMV4L) += armv4l/jrevdct_arm.o \ @@ -383,9 +383,9 @@ sparc/dsputil_vis.o: CFLAGS += -mcpu=ult OBJS-$(HAVE_MLIB) += mlib/dsputil_mlib.o \ OBJS-$(ARCH_ALPHA) += alpha/dsputil_alpha.o \ + alpha/motion_est_alpha.o \ alpha/mpegvideo_alpha.o \ alpha/simple_idct_alpha.o \ - alpha/motion_est_alpha.o \ ASM_OBJS-$(ARCH_ALPHA) += alpha/dsputil_alpha_asm.o \ alpha/motion_est_mvi_asm.o \ @@ -398,17 +398,17 @@ OBJS-$(HAVE_MMI) + ps2/mpegvideo_mmi.o \ OBJS-$(ARCH_SH4) += sh4/idct_sh4.o \ - sh4/dsputil_sh4.o \ sh4/dsputil_align.o \ + sh4/dsputil_sh4.o \ OBJS-$(HAVE_ALTIVEC) += ppc/dsputil_altivec.o \ - ppc/mpegvideo_altivec.o \ - ppc/idct_altivec.o \ - ppc/fft_altivec.o \ - ppc/gmc_altivec.o \ ppc/fdct_altivec.o \ + ppc/fft_altivec.o \ ppc/float_altivec.o \ + ppc/gmc_altivec.o \ + ppc/idct_altivec.o \ ppc/int_altivec.o \ + ppc/mpegvideo_altivec.o \ ifeq ($(HAVE_ALTIVEC),yes) OBJS-$(CONFIG_H264_DECODER) += ppc/h264_altivec.o @@ -421,8 +421,8 @@ OBJS-$(ARCH_BFIN) + bfin/mpegvideo_bfin.o \ ASM_OBJS-$(ARCH_BFIN) += bfin/pixels_bfin.o \ - bfin/idct_bfin.o \ bfin/fdct_bfin.o \ + bfin/idct_bfin.o \ EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS) @@ -457,13 +457,13 @@ apiexample: apiexample.o $(LIB) cpuid-test: i386/cputest.c $(CC) $(CFLAGS) -DTEST -o $@ $< +dct-test: dct-test.o fdctref.o $(LIB) + +fft-test: fft-test.o $(LIB) + imgresample-test: imgresample.c $(LIB) $(CC) $(CFLAGS) -DTEST -o $@ $^ $(EXTRALIBS) -dct-test: dct-test.o fdctref.o $(LIB) - motion-test: motion-test.o $(LIB) -fft-test: fft-test.o $(LIB) - .PHONY: tests Modified: trunk/libavformat/Makefile ============================================================================== --- trunk/libavformat/Makefile (original) +++ trunk/libavformat/Makefile Fri Aug 31 01:11:24 2007 @@ -4,9 +4,9 @@ # include ../config.mak -CFLAGS+=-I$(SRC_PATH)/libavcodec +CFLAGS += -I$(SRC_PATH)/libavcodec -OBJS= utils.o cutils.o os_support.o allformats.o sdp.o +OBJS = allformats.o cutils.o os_support.o sdp.o utils.o HEADERS = avformat.h avio.h rtp.h rtsp.h rtspcodes.h Modified: trunk/libavutil/Makefile ============================================================================== --- trunk/libavutil/Makefile (original) +++ trunk/libavutil/Makefile Fri Aug 31 01:11:24 2007 @@ -1,25 +1,37 @@ include ../config.mak -OBJS= mathematics.o \ - rational.o \ - intfloat_readwrite.o \ - crc.o \ - md5.o \ - lls.o \ - adler32.o \ - log.o \ - mem.o \ - fifo.o \ - tree.o \ - lzo.o \ - random.o \ - aes.o \ - base64.o \ - string.o \ +OBJS = adler32.o \ + aes.o \ + base64.o \ + crc.o \ + intfloat_readwrite.o \ + fifo.o \ + lls.o \ + log.o \ + lzo.o \ + mathematics.o \ + md5.o \ + mem.o \ + random.o \ + rational.o \ + string.o \ + tree.o \ -HEADERS = avutil.h common.h mathematics.h integer.h rational.h \ - intfloat_readwrite.h md5.h adler32.h log.h fifo.h lzo.h \ - random.h mem.h base64.h avstring.h +HEADERS = adler32.h \ + avstring.h \ + avutil.h \ + base64.h \ + common.h \ + fifo.h \ + integer.h \ + intfloat_readwrite.h \ + log.h \ + lzo.h \ + mathematics.h \ + md5.h \ + mem.h \ + random.h \ + rational.h \ NAME=avutil LIBVERSION=$(LAVUVERSION)

1 0

r10267 - trunk/libavcodec/bfin/mathops.h
by subversion＠mplayerhq.hu 30 Aug '07

30 Aug '07

Author: diego Date: Fri Aug 31 00:41:54 2007 New Revision: 10267 Log: Use a consistent multiple inclusion guard. Modified: trunk/libavcodec/bfin/mathops.h Modified: trunk/libavcodec/bfin/mathops.h ============================================================================== --- trunk/libavcodec/bfin/mathops.h (original) +++ trunk/libavcodec/bfin/mathops.h Fri Aug 31 00:41:54 2007 @@ -19,8 +19,8 @@ * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef MATHOPS_BFIN -#define MATHOPS_BFIN +#ifndef AVCODEC_BFIN_MATHOPS_H +#define AVCODEC_BFIN_MATHOPS_H #ifdef CONFIG_MPEGAUDIO_HP #define MULH(X,Y) ({ int xxo; \ @@ -49,4 +49,4 @@ : "=W" (xxo) : "d" (a), "d" (b)); \ xxo; }) -#endif +#endif /* AVCODEC_BFIN_MATHOPS_H */

1 0

r10266 - in trunk/libavcodec: Makefile avcodec.h sparc/dsputil_vis.c sparc/simple_idct_vis.c
by subversion＠mplayerhq.hu 30 Aug '07

30 Aug '07

Author: gpoirier Date: Thu Aug 30 21:18:23 2007 New Revision: 10266 Log: add simple_idct implemented in Sparc VIS patch by Balatoni Denes % dbalatoni A interware P hu% Original thread: Messages starting with: [PATCH] SPARC VIS simple_idct * Added: trunk/libavcodec/sparc/simple_idct_vis.c Modified: trunk/libavcodec/Makefile trunk/libavcodec/avcodec.h trunk/libavcodec/sparc/dsputil_vis.c Modified: trunk/libavcodec/Makefile ============================================================================== --- trunk/libavcodec/Makefile (original) +++ trunk/libavcodec/Makefile Thu Aug 30 21:18:23 2007 @@ -376,6 +376,7 @@ ASM_OBJS-$(HAVE_ARMV5TE) + ASM_OBJS-$(HAVE_ARMV6) += armv4l/simple_idct_armv6.o \ OBJS-$(ARCH_SPARC) += sparc/dsputil_vis.o \ + sparc/simple_idct_vis.o \ sparc/dsputil_vis.o: CFLAGS += -mcpu=ultrasparc -mtune=ultrasparc Modified: trunk/libavcodec/avcodec.h ============================================================================== --- trunk/libavcodec/avcodec.h (original) +++ trunk/libavcodec/avcodec.h Thu Aug 30 21:18:23 2007 @@ -1281,6 +1281,7 @@ typedef struct AVCodecContext { #define FF_IDCT_CAVS 15 #define FF_IDCT_SIMPLEARMV5TE 16 #define FF_IDCT_SIMPLEARMV6 17 +#define FF_IDCT_SIMPLEVIS 18 /** * slice count Modified: trunk/libavcodec/sparc/dsputil_vis.c ============================================================================== --- trunk/libavcodec/sparc/dsputil_vis.c (original) +++ trunk/libavcodec/sparc/dsputil_vis.c Thu Aug 30 21:18:23 2007 @@ -35,6 +35,10 @@ #include "vis.h" +extern void ff_simple_idct_put_vis(uint8_t *dest, int line_size, DCTELEM *data); +extern void ff_simple_idct_add_vis(uint8_t *dest, int line_size, DCTELEM *data); +extern void ff_simple_idct_vis(DCTELEM *data); + /* The trick used in some of this file is the formula from the MMX * motion comp code, which is: * @@ -4045,6 +4049,13 @@ void dsputil_init_vis(DSPContext* c, AVC int accel = vis_level (); if (accel & ACCEL_SPARC_VIS) { + if(avctx->idct_algo==FF_IDCT_SIMPLEVIS){ + c->idct_put = ff_simple_idct_put_vis; + c->idct_add = ff_simple_idct_add_vis; + c->idct = ff_simple_idct_vis; + c->idct_permutation_type = FF_TRANSPOSE_IDCT_PERM; + } + c->put_pixels_tab[0][0] = MC_put_o_16_vis; c->put_pixels_tab[0][1] = MC_put_x_16_vis; c->put_pixels_tab[0][2] = MC_put_y_16_vis; Added: trunk/libavcodec/sparc/simple_idct_vis.c ============================================================================== --- (empty file) +++ trunk/libavcodec/sparc/simple_idct_vis.c Thu Aug 30 21:18:23 2007 @@ -0,0 +1,528 @@ +/* + * SPARC VIS optimized inverse DCT + * Copyright (c) 2007 Denes Balatoni < dbalatoni XatX interware XdotX hu > + * + * I did consult the following fine web page about dct + * http://www.geocities.com/ssavekar/dct.htm + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "dsputil.h" + +static const DECLARE_ALIGNED_8(int16_t, coeffs[28]) = { + - 1259,- 1259,- 1259,- 1259, + - 4989,- 4989,- 4989,- 4989, + -11045,-11045,-11045,-11045, + -19195,-19195,-19195,-19195, + -29126,-29126,-29126,-29126, + 25080, 25080, 25080, 25080, + 12785, 12785, 12785, 12785 +}; +static const DECLARE_ALIGNED_8(uint16_t, scale[4]) = { + 65536>>6, 65536>>6, 65536>>6, 65536>>6 +}; +static const DECLARE_ALIGNED_8(uint16_t, rounder[4]) = { + 1<<5, 1<<5, 1<<5, 1<<5 +}; +static const DECLARE_ALIGNED_8(uint16_t, expand[4]) = { + 1<<14, 1<<14, 1<<14, 1<<14 +}; + +#define INIT_IDCT \ + "ldd [%1], %%f32 \n\t"\ + "ldd [%1+8], %%f34 \n\t"\ + "ldd [%1+16], %%f36 \n\t"\ + "ldd [%1+24], %%f38 \n\t"\ + "ldd [%1+32], %%f40 \n\t"\ + "ldd [%1+40], %%f42 \n\t"\ + "ldd [%1+48], %%f44 \n\t"\ + "ldd [%0], %%f46 \n\t"\ + "fzero %%f62 \n\t"\ + +#define LOADSCALE(in) \ + "ldd [" in "], %%f0 \n\t"\ + "ldd [" in "+16], %%f2 \n\t"\ + "ldd [" in "+32], %%f4 \n\t"\ + "ldd [" in "+48], %%f6 \n\t"\ + "ldd [" in "+64], %%f8 \n\t"\ + "ldd [" in "+80], %%f10 \n\t"\ + "ldd [" in "+96], %%f12 \n\t"\ + "ldd [" in "+112], %%f14 \n\t"\ + "fpadd16 %%f0, %%f0, %%f0 \n\t"\ + "fpadd16 %%f2, %%f2, %%f2 \n\t"\ + "fpadd16 %%f4, %%f4, %%f4 \n\t"\ + "fpadd16 %%f6, %%f6, %%f6 \n\t"\ + "fpadd16 %%f8, %%f8, %%f8 \n\t"\ + "fpadd16 %%f10, %%f10, %%f10 \n\t"\ + "fpadd16 %%f12, %%f12, %%f12 \n\t"\ + "fpadd16 %%f14, %%f14, %%f14 \n\t"\ +\ + "fpadd16 %%f0, %%f0, %%f0 \n\t"\ + "fpadd16 %%f2, %%f2, %%f2 \n\t"\ + "fpadd16 %%f4, %%f4, %%f4 \n\t"\ + "fpadd16 %%f6, %%f6, %%f6 \n\t"\ + "fpadd16 %%f8, %%f8, %%f8 \n\t"\ + "fpadd16 %%f10, %%f10, %%f10 \n\t"\ + "fpadd16 %%f12, %%f12, %%f12 \n\t"\ + "fpadd16 %%f14, %%f14, %%f14 \n\t"\ +\ + "fpadd16 %%f0, %%f0, %%f0 \n\t"\ + "fpadd16 %%f2, %%f2, %%f2 \n\t"\ + "fpadd16 %%f4, %%f4, %%f4 \n\t"\ + "fpadd16 %%f6, %%f6, %%f6 \n\t"\ + "fpadd16 %%f8, %%f8, %%f8 \n\t"\ + "fpadd16 %%f10, %%f10, %%f10 \n\t"\ + "fpadd16 %%f12, %%f12, %%f12 \n\t"\ + "fpadd16 %%f14, %%f14, %%f14 \n\t"\ +\ + "fpadd16 %%f0, %%f0, %%f0 \n\t"\ + "fpadd16 %%f2, %%f2, %%f2 \n\t"\ + "fpadd16 %%f4, %%f4, %%f4 \n\t"\ + "fpadd16 %%f6, %%f6, %%f6 \n\t"\ + "fpadd16 %%f8, %%f8, %%f8 \n\t"\ + "fpadd16 %%f10, %%f10, %%f10 \n\t"\ + "fpadd16 %%f12, %%f12, %%f12 \n\t"\ + "fpadd16 %%f14, %%f14, %%f14 \n\t"\ + +#define LOAD(in) \ + "ldd [" in "], %%f16 \n\t"\ + "ldd [" in "+8], %%f18 \n\t"\ + "ldd [" in "+16], %%f20 \n\t"\ + "ldd [" in "+24], %%f22 \n\t"\ + "ldd [" in "+32], %%f24 \n\t"\ + "ldd [" in "+40], %%f26 \n\t"\ + "ldd [" in "+48], %%f28 \n\t"\ + "ldd [" in "+56], %%f30 \n\t"\ + +#define TRANSPOSE \ + "fpmerge %%f16, %%f24, %%f0 \n\t"\ + "fpmerge %%f20, %%f28, %%f2 \n\t"\ + "fpmerge %%f17, %%f25, %%f4 \n\t"\ + "fpmerge %%f21, %%f29, %%f6 \n\t"\ + "fpmerge %%f18, %%f26, %%f8 \n\t"\ + "fpmerge %%f22, %%f30, %%f10 \n\t"\ + "fpmerge %%f19, %%f27, %%f12 \n\t"\ + "fpmerge %%f23, %%f31, %%f14 \n\t"\ +\ + "fpmerge %%f0, %%f2, %%f16 \n\t"\ + "fpmerge %%f1, %%f3, %%f18 \n\t"\ + "fpmerge %%f4, %%f6, %%f20 \n\t"\ + "fpmerge %%f5, %%f7, %%f22 \n\t"\ + "fpmerge %%f8, %%f10, %%f24 \n\t"\ + "fpmerge %%f9, %%f11, %%f26 \n\t"\ + "fpmerge %%f12, %%f14, %%f28 \n\t"\ + "fpmerge %%f13, %%f15, %%f30 \n\t"\ +\ + "fpmerge %%f16, %%f17, %%f0 \n\t"\ + "fpmerge %%f18, %%f19, %%f2 \n\t"\ + "fpmerge %%f20, %%f21, %%f4 \n\t"\ + "fpmerge %%f22, %%f23, %%f6 \n\t"\ + "fpmerge %%f24, %%f25, %%f8 \n\t"\ + "fpmerge %%f26, %%f27, %%f10 \n\t"\ + "fpmerge %%f28, %%f29, %%f12 \n\t"\ + "fpmerge %%f30, %%f31, %%f14 \n\t"\ + +#define IDCT4ROWS \ + /* 1. column */\ + "fmul8ulx16 %%f0, %%f38, %%f28 \n\t"\ + "for %%f4, %%f6, %%f60 \n\t"\ + "fmul8ulx16 %%f2, %%f32, %%f18 \n\t"\ + "fmul8ulx16 %%f2, %%f36, %%f22 \n\t"\ + "fmul8ulx16 %%f2, %%f40, %%f26 \n\t"\ + "fmul8ulx16 %%f2, %%f44, %%f30 \n\t"\ +\ + ADDROUNDER\ +\ + "fmul8sux16 %%f0, %%f38, %%f48 \n\t"\ + "fcmpd %%fcc0, %%f62, %%f60 \n\t"\ + "for %%f8, %%f10, %%f60 \n\t"\ + "fmul8sux16 %%f2, %%f32, %%f50 \n\t"\ + "fmul8sux16 %%f2, %%f36, %%f52 \n\t"\ + "fmul8sux16 %%f2, %%f40, %%f54 \n\t"\ + "fmul8sux16 %%f2, %%f44, %%f56 \n\t"\ +\ + "fpadd16 %%f48, %%f28, %%f28 \n\t"\ + "fcmpd %%fcc1, %%f62, %%f60 \n\t"\ + "for %%f12, %%f14, %%f60 \n\t"\ + "fpadd16 %%f50, %%f18, %%f18 \n\t"\ + "fpadd16 %%f52, %%f22, %%f22 \n\t"\ + "fpadd16 %%f54, %%f26, %%f26 \n\t"\ + "fpadd16 %%f56, %%f30, %%f30 \n\t"\ +\ + "fpadd16 %%f28, %%f0, %%f16 \n\t"\ + "fcmpd %%fcc2, %%f62, %%f60 \n\t"\ + "fpadd16 %%f28, %%f0, %%f20 \n\t"\ + "fpadd16 %%f28, %%f0, %%f24 \n\t"\ + "fpadd16 %%f28, %%f0, %%f28 \n\t"\ + "fpadd16 %%f18, %%f2, %%f18 \n\t"\ + "fpadd16 %%f22, %%f2, %%f22 \n\t"\ + /* 2. column */\ + "fbe %%fcc0, 3f \n\t"\ + "fpadd16 %%f26, %%f2, %%f26 \n\t"\ + "fmul8ulx16 %%f4, %%f34, %%f48 \n\t"\ + "fmul8ulx16 %%f4, %%f42, %%f50 \n\t"\ + "fmul8ulx16 %%f6, %%f36, %%f52 \n\t"\ + "fmul8ulx16 %%f6, %%f44, %%f54 \n\t"\ + "fmul8ulx16 %%f6, %%f32, %%f56 \n\t"\ + "fmul8ulx16 %%f6, %%f40, %%f58 \n\t"\ +\ + "fpadd16 %%f16, %%f48, %%f16 \n\t"\ + "fpadd16 %%f20, %%f50, %%f20 \n\t"\ + "fpsub16 %%f24, %%f50, %%f24 \n\t"\ + "fpsub16 %%f28, %%f48, %%f28 \n\t"\ + "fpadd16 %%f18, %%f52, %%f18 \n\t"\ + "fpsub16 %%f22, %%f54, %%f22 \n\t"\ + "fpsub16 %%f26, %%f56, %%f26 \n\t"\ + "fpsub16 %%f30, %%f58, %%f30 \n\t"\ +\ + "fmul8sux16 %%f4, %%f34, %%f48 \n\t"\ + "fmul8sux16 %%f4, %%f42, %%f50 \n\t"\ + "fmul8sux16 %%f6, %%f36, %%f52 \n\t"\ + "fmul8sux16 %%f6, %%f44, %%f54 \n\t"\ + "fmul8sux16 %%f6, %%f32, %%f56 \n\t"\ + "fmul8sux16 %%f6, %%f40, %%f58 \n\t"\ +\ + "fpadd16 %%f16, %%f48, %%f16 \n\t"\ + "fpadd16 %%f20, %%f50, %%f20 \n\t"\ + "fpsub16 %%f24, %%f50, %%f24 \n\t"\ + "fpsub16 %%f28, %%f48, %%f28 \n\t"\ + "fpadd16 %%f18, %%f52, %%f18 \n\t"\ + "fpsub16 %%f22, %%f54, %%f22 \n\t"\ + "fpsub16 %%f26, %%f56, %%f26 \n\t"\ + "fpsub16 %%f30, %%f58, %%f30 \n\t"\ +\ + "fpadd16 %%f16, %%f4, %%f16 \n\t"\ + "fpsub16 %%f28, %%f4, %%f28 \n\t"\ + "fpadd16 %%f18, %%f6, %%f18 \n\t"\ + "fpsub16 %%f26, %%f6, %%f26 \n\t"\ + /* 3. column */\ + "3: \n\t"\ + "fbe %%fcc1, 4f \n\t"\ + "fpsub16 %%f30, %%f6, %%f30 \n\t"\ + "fmul8ulx16 %%f8, %%f38, %%f48 \n\t"\ + "fmul8ulx16 %%f10, %%f40, %%f50 \n\t"\ + "fmul8ulx16 %%f10, %%f32, %%f52 \n\t"\ + "fmul8ulx16 %%f10, %%f44, %%f54 \n\t"\ + "fmul8ulx16 %%f10, %%f36, %%f56 \n\t"\ +\ + "fpadd16 %%f16, %%f48, %%f16 \n\t"\ + "fpsub16 %%f20, %%f48, %%f20 \n\t"\ + "fpsub16 %%f24, %%f48, %%f24 \n\t"\ + "fpadd16 %%f28, %%f48, %%f28 \n\t"\ + "fpadd16 %%f18, %%f50, %%f18 \n\t"\ + "fpsub16 %%f22, %%f52, %%f22 \n\t"\ + "fpadd16 %%f26, %%f54, %%f26 \n\t"\ + "fpadd16 %%f30, %%f56, %%f30 \n\t"\ +\ + "fmul8sux16 %%f8, %%f38, %%f48 \n\t"\ + "fmul8sux16 %%f10, %%f40, %%f50 \n\t"\ + "fmul8sux16 %%f10, %%f32, %%f52 \n\t"\ + "fmul8sux16 %%f10, %%f44, %%f54 \n\t"\ + "fmul8sux16 %%f10, %%f36, %%f56 \n\t"\ +\ + "fpadd16 %%f16, %%f48, %%f16 \n\t"\ + "fpsub16 %%f20, %%f48, %%f20 \n\t"\ + "fpsub16 %%f24, %%f48, %%f24 \n\t"\ + "fpadd16 %%f28, %%f48, %%f28 \n\t"\ + "fpadd16 %%f18, %%f50, %%f18 \n\t"\ + "fpsub16 %%f22, %%f52, %%f22 \n\t"\ + "fpadd16 %%f26, %%f54, %%f26 \n\t"\ + "fpadd16 %%f30, %%f56, %%f30 \n\t"\ +\ + "fpadd16 %%f16, %%f8, %%f16 \n\t"\ + "fpsub16 %%f20, %%f8, %%f20 \n\t"\ + "fpsub16 %%f24, %%f8, %%f24 \n\t"\ + "fpadd16 %%f28, %%f8, %%f28 \n\t"\ + "fpadd16 %%f18, %%f10, %%f18 \n\t"\ + "fpsub16 %%f22, %%f10, %%f22 \n\t"\ + /* 4. column */\ + "4: \n\t"\ + "fbe %%fcc2, 5f \n\t"\ + "fpadd16 %%f30, %%f10, %%f30 \n\t"\ + "fmul8ulx16 %%f12, %%f42, %%f48 \n\t"\ + "fmul8ulx16 %%f12, %%f34, %%f50 \n\t"\ + "fmul8ulx16 %%f14, %%f44, %%f52 \n\t"\ + "fmul8ulx16 %%f14, %%f40, %%f54 \n\t"\ + "fmul8ulx16 %%f14, %%f36, %%f56 \n\t"\ + "fmul8ulx16 %%f14, %%f32, %%f58 \n\t"\ +\ + "fpadd16 %%f16, %%f48, %%f16 \n\t"\ + "fpsub16 %%f20, %%f50, %%f20 \n\t"\ + "fpadd16 %%f24, %%f50, %%f24 \n\t"\ + "fpsub16 %%f28, %%f48, %%f28 \n\t"\ + "fpadd16 %%f18, %%f52, %%f18 \n\t"\ + "fpsub16 %%f22, %%f54, %%f22 \n\t"\ + "fpadd16 %%f26, %%f56, %%f26 \n\t"\ + "fpsub16 %%f30, %%f58, %%f30 \n\t"\ +\ + "fmul8sux16 %%f12, %%f42, %%f48 \n\t"\ + "fmul8sux16 %%f12, %%f34, %%f50 \n\t"\ + "fmul8sux16 %%f14, %%f44, %%f52 \n\t"\ + "fmul8sux16 %%f14, %%f40, %%f54 \n\t"\ + "fmul8sux16 %%f14, %%f36, %%f56 \n\t"\ + "fmul8sux16 %%f14, %%f32, %%f58 \n\t"\ +\ + "fpadd16 %%f16, %%f48, %%f16 \n\t"\ + "fpsub16 %%f20, %%f50, %%f20 \n\t"\ + "fpadd16 %%f24, %%f50, %%f24 \n\t"\ + "fpsub16 %%f28, %%f48, %%f28 \n\t"\ + "fpadd16 %%f18, %%f52, %%f18 \n\t"\ + "fpsub16 %%f22, %%f54, %%f22 \n\t"\ + "fpadd16 %%f26, %%f56, %%f26 \n\t"\ + "fpsub16 %%f30, %%f58, %%f30 \n\t"\ +\ + "fpsub16 %%f20, %%f12, %%f20 \n\t"\ + "fpadd16 %%f24, %%f12, %%f24 \n\t"\ + "fpsub16 %%f22, %%f14, %%f22 \n\t"\ + "fpadd16 %%f26, %%f14, %%f26 \n\t"\ + "fpsub16 %%f30, %%f14, %%f30 \n\t"\ + /* final butterfly */\ + "5: \n\t"\ + "fpsub16 %%f16, %%f18, %%f48 \n\t"\ + "fpsub16 %%f20, %%f22, %%f50 \n\t"\ + "fpsub16 %%f24, %%f26, %%f52 \n\t"\ + "fpsub16 %%f28, %%f30, %%f54 \n\t"\ + "fpadd16 %%f16, %%f18, %%f16 \n\t"\ + "fpadd16 %%f20, %%f22, %%f20 \n\t"\ + "fpadd16 %%f24, %%f26, %%f24 \n\t"\ + "fpadd16 %%f28, %%f30, %%f28 \n\t"\ + +#define STOREROWS(out) \ + "std %%f48, [" out "+112] \n\t"\ + "std %%f50, [" out "+96] \n\t"\ + "std %%f52, [" out "+80] \n\t"\ + "std %%f54, [" out "+64] \n\t"\ + "std %%f16, [" out "] \n\t"\ + "std %%f20, [" out "+16] \n\t"\ + "std %%f24, [" out "+32] \n\t"\ + "std %%f28, [" out "+48] \n\t"\ + +#define SCALEROWS \ + "fmul8sux16 %%f46, %%f48, %%f48 \n\t"\ + "fmul8sux16 %%f46, %%f50, %%f50 \n\t"\ + "fmul8sux16 %%f46, %%f52, %%f52 \n\t"\ + "fmul8sux16 %%f46, %%f54, %%f54 \n\t"\ + "fmul8sux16 %%f46, %%f16, %%f16 \n\t"\ + "fmul8sux16 %%f46, %%f20, %%f20 \n\t"\ + "fmul8sux16 %%f46, %%f24, %%f24 \n\t"\ + "fmul8sux16 %%f46, %%f28, %%f28 \n\t"\ + +#define PUTPIXELSCLAMPED(dest) \ + "fpack16 %%f48, %%f14 \n\t"\ + "fpack16 %%f50, %%f12 \n\t"\ + "fpack16 %%f16, %%f0 \n\t"\ + "fpack16 %%f20, %%f2 \n\t"\ + "fpack16 %%f24, %%f4 \n\t"\ + "fpack16 %%f28, %%f6 \n\t"\ + "fpack16 %%f54, %%f8 \n\t"\ + "fpack16 %%f52, %%f10 \n\t"\ + "st %%f0, [%3+" dest "] \n\t"\ + "st %%f2, [%5+" dest "] \n\t"\ + "st %%f4, [%6+" dest "] \n\t"\ + "st %%f6, [%7+" dest "] \n\t"\ + "st %%f8, [%8+" dest "] \n\t"\ + "st %%f10, [%9+" dest "] \n\t"\ + "st %%f12, [%10+" dest "] \n\t"\ + "st %%f14, [%11+" dest "] \n\t"\ + +#define ADDPIXELSCLAMPED(dest) \ + "ldd [%5], %%f18 \n\t"\ + "ld [%3+" dest"], %%f0 \n\t"\ + "ld [%6+" dest"], %%f2 \n\t"\ + "ld [%7+" dest"], %%f4 \n\t"\ + "ld [%8+" dest"], %%f6 \n\t"\ + "ld [%9+" dest"], %%f8 \n\t"\ + "ld [%10+" dest"], %%f10 \n\t"\ + "ld [%11+" dest"], %%f12 \n\t"\ + "ld [%12+" dest"], %%f14 \n\t"\ + "fmul8x16 %%f0, %%f18, %%f0 \n\t"\ + "fmul8x16 %%f2, %%f18, %%f2 \n\t"\ + "fmul8x16 %%f4, %%f18, %%f4 \n\t"\ + "fmul8x16 %%f6, %%f18, %%f6 \n\t"\ + "fmul8x16 %%f8, %%f18, %%f8 \n\t"\ + "fmul8x16 %%f10, %%f18, %%f10 \n\t"\ + "fmul8x16 %%f12, %%f18, %%f12 \n\t"\ + "fmul8x16 %%f14, %%f18, %%f14 \n\t"\ + "fpadd16 %%f0, %%f16, %%f0 \n\t"\ + "fpadd16 %%f2, %%f20, %%f2 \n\t"\ + "fpadd16 %%f4, %%f24, %%f4 \n\t"\ + "fpadd16 %%f6, %%f28, %%f6 \n\t"\ + "fpadd16 %%f8, %%f54, %%f8 \n\t"\ + "fpadd16 %%f10, %%f52, %%f10 \n\t"\ + "fpadd16 %%f12, %%f50, %%f12 \n\t"\ + "fpadd16 %%f14, %%f48, %%f14 \n\t"\ + "fpack16 %%f0, %%f0 \n\t"\ + "fpack16 %%f2, %%f2 \n\t"\ + "fpack16 %%f4, %%f4 \n\t"\ + "fpack16 %%f6, %%f6 \n\t"\ + "fpack16 %%f8, %%f8 \n\t"\ + "fpack16 %%f10, %%f10 \n\t"\ + "fpack16 %%f12, %%f12 \n\t"\ + "fpack16 %%f14, %%f14 \n\t"\ + "st %%f0, [%3+" dest "] \n\t"\ + "st %%f2, [%6+" dest "] \n\t"\ + "st %%f4, [%7+" dest "] \n\t"\ + "st %%f6, [%8+" dest "] \n\t"\ + "st %%f8, [%9+" dest "] \n\t"\ + "st %%f10, [%10+" dest "] \n\t"\ + "st %%f12, [%11+" dest "] \n\t"\ + "st %%f14, [%12+" dest "] \n\t"\ + + +inline void ff_simple_idct_vis(DCTELEM *data) { + int out1, out2, out3, out4; + DECLARE_ALIGNED_8(int16_t, temp[8*8]); + + asm volatile( + INIT_IDCT + +#define ADDROUNDER + + // shift right 16-4=12 + LOADSCALE("%2+8") + IDCT4ROWS + STOREROWS("%3+8") + LOADSCALE("%2+0") + IDCT4ROWS + "std %%f48, [%3+112] \n\t" + "std %%f50, [%3+96] \n\t" + "std %%f52, [%3+80] \n\t" + "std %%f54, [%3+64] \n\t" + + // shift right 16+4 + "ldd [%3+8], %%f18 \n\t" + "ldd [%3+24], %%f22 \n\t" + "ldd [%3+40], %%f26 \n\t" + "ldd [%3+56], %%f30 \n\t" + TRANSPOSE + IDCT4ROWS + SCALEROWS + STOREROWS("%2+0") + LOAD("%3+64") + TRANSPOSE + IDCT4ROWS + SCALEROWS + STOREROWS("%2+8") + + : "=r" (out1), "=r" (out2), "=r" (out3), "=r" (out4) + : "0" (scale), "1" (coeffs), "2" (data), "3" (temp) + ); +} + +void ff_simple_idct_put_vis(uint8_t *dest, int line_size, DCTELEM *data) { + int out1, out2, out3, out4, out5; + int r1, r2, r3, r4, r5, r6, r7; + + asm volatile( + "wr %%g0, 0x8, %%gsr \n\t" + + INIT_IDCT + + "add %3, %4, %5 \n\t" + "add %5, %4, %6 \n\t" + "add %6, %4, %7 \n\t" + "add %7, %4, %8 \n\t" + "add %8, %4, %9 \n\t" + "add %9, %4, %10 \n\t" + "add %10, %4, %11 \n\t" + + // shift right 16-4=12 + LOADSCALE("%2+8") + IDCT4ROWS + STOREROWS("%2+8") + LOADSCALE("%2+0") + IDCT4ROWS + "std %%f48, [%2+112] \n\t" + "std %%f50, [%2+96] \n\t" + "std %%f52, [%2+80] \n\t" + "std %%f54, [%2+64] \n\t" + +#undef ADDROUNDER +#define ADDROUNDER "fpadd16 %%f28, %%f46, %%f28 \n\t" + + // shift right 16+4 + "ldd [%2+8], %%f18 \n\t" + "ldd [%2+24], %%f22 \n\t" + "ldd [%2+40], %%f26 \n\t" + "ldd [%2+56], %%f30 \n\t" + TRANSPOSE + IDCT4ROWS + PUTPIXELSCLAMPED("0") + LOAD("%2+64") + TRANSPOSE + IDCT4ROWS + PUTPIXELSCLAMPED("4") + + : "=r" (out1), "=r" (out2), "=r" (out3), "=r" (out4), "=r" (out5), + "=r" (r1), "=r" (r2), "=r" (r3), "=r" (r4), "=r" (r5), "=r" (r6), "=r" (r7) + : "0" (rounder), "1" (coeffs), "2" (data), "3" (dest), "4" (line_size) + ); +} + +void ff_simple_idct_add_vis(uint8_t *dest, int line_size, DCTELEM *data) { + int out1, out2, out3, out4, out5, out6; + int r1, r2, r3, r4, r5, r6, r7; + + asm volatile( + "wr %%g0, 0x8, %%gsr \n\t" + + INIT_IDCT + + "add %3, %4, %6 \n\t" + "add %6, %4, %7 \n\t" + "add %7, %4, %8 \n\t" + "add %8, %4, %9 \n\t" + "add %9, %4, %10 \n\t" + "add %10, %4, %11 \n\t" + "add %11, %4, %12 \n\t" + +#undef ADDROUNDER +#define ADDROUNDER + + // shift right 16-4=12 + LOADSCALE("%2+8") + IDCT4ROWS + STOREROWS("%2+8") + LOADSCALE("%2+0") + IDCT4ROWS + "std %%f48, [%2+112] \n\t" + "std %%f50, [%2+96] \n\t" + "std %%f52, [%2+80] \n\t" + "std %%f54, [%2+64] \n\t" + +#undef ADDROUNDER +#define ADDROUNDER "fpadd16 %%f28, %%f46, %%f28 \n\t" + + // shift right 16+4 + "ldd [%2+8], %%f18 \n\t" + "ldd [%2+24], %%f22 \n\t" + "ldd [%2+40], %%f26 \n\t" + "ldd [%2+56], %%f30 \n\t" + TRANSPOSE + IDCT4ROWS + ADDPIXELSCLAMPED("0") + LOAD("%2+64") + TRANSPOSE + IDCT4ROWS + ADDPIXELSCLAMPED("4") + + : "=r" (out1), "=r" (out2), "=r" (out3), "=r" (out4), "=r" (out5), "=r" (out6), + "=r" (r1), "=r" (r2), "=r" (r3), "=r" (r4), "=r" (r5), "=r" (r6), "=r" (r7) + : "0" (rounder), "1" (coeffs), "2" (data), "3" (dest), "4" (line_size), "5" (expand) + ); +}

1 0

r10265 - trunk/libavcodec/alac.c
by subversion＠mplayerhq.hu 30 Aug '07

30 Aug '07

Author: vitor Date: Thu Aug 30 18:40:51 2007 New Revision: 10265 Log: Rename function Modified: trunk/libavcodec/alac.c Modified: trunk/libavcodec/alac.c ============================================================================== --- trunk/libavcodec/alac.c (original) +++ trunk/libavcodec/alac.c Thu Aug 30 18:40:51 2007 @@ -269,7 +269,7 @@ static void bastardized_rice_decompress( } } -static inline int32_t sign_extended32(int32_t val, int bits) +static inline int32_t extend_sign32(int32_t val, int bits) { return (val << (32 - bits)) >> (32 - bits); } @@ -313,7 +313,7 @@ static void predictor_decompress_fir_ada prev_value = buffer_out[i]; error_value = error_buffer[i+1]; buffer_out[i+1] = - sign_extended32((prev_value + error_value), readsamplesize); + extend_sign32((prev_value + error_value), readsamplesize); } return; } @@ -324,7 +324,7 @@ static void predictor_decompress_fir_ada int32_t val; val = buffer_out[i] + error_buffer[i+1]; - val = sign_extended32(val, readsamplesize); + val = extend_sign32(val, readsamplesize); buffer_out[i+1] = val; } @@ -359,7 +359,7 @@ static void predictor_decompress_fir_ada outval = (1 << (predictor_quantitization-1)) + sum; outval = outval >> predictor_quantitization; outval = outval + buffer_out[0] + error_val; - outval = sign_extended32(outval, readsamplesize); + outval = extend_sign32(outval, readsamplesize); buffer_out[predictor_coef_num+1] = outval; @@ -573,7 +573,7 @@ static int alac_decode_frame(AVCodecCont int32_t audiobits; audiobits = get_bits(&alac->gb, alac->setinfo_sample_size); - audiobits = sign_extended32(audiobits, readsamplesize); + audiobits = extend_sign32(audiobits, readsamplesize); alac->outputsamples_buffer[chan][i] = audiobits; }

1 0

r10264 - trunk/libavcodec/alac.c
by subversion＠mplayerhq.hu 30 Aug '07

30 Aug '07

Author: vitor Date: Thu Aug 30 18:04:00 2007 New Revision: 10264 Log: Replace two #define's by inline functions Modified: trunk/libavcodec/alac.c Modified: trunk/libavcodec/alac.c ============================================================================== --- trunk/libavcodec/alac.c (original) +++ trunk/libavcodec/alac.c Thu Aug 30 18:04:00 2007 @@ -269,12 +269,15 @@ static void bastardized_rice_decompress( } } -#define SIGN_EXTENDED32(val, bits) ((val << (32 - bits)) >> (32 - bits)) +static inline int32_t sign_extended32(int32_t val, int bits) +{ + return (val << (32 - bits)) >> (32 - bits); +} -#define SIGN_ONLY(v) \ - ((v < 0) ? (-1) : \ - ((v > 0) ? (1) : \ - (0))) +static inline int sign_only(int v) +{ + return v ? FFSIGN(v) : 0; +} static void predictor_decompress_fir_adapt(int32_t *error_buffer, int32_t *buffer_out, @@ -310,7 +313,7 @@ static void predictor_decompress_fir_ada prev_value = buffer_out[i]; error_value = error_buffer[i+1]; buffer_out[i+1] = - SIGN_EXTENDED32((prev_value + error_value), readsamplesize); + sign_extended32((prev_value + error_value), readsamplesize); } return; } @@ -321,7 +324,7 @@ static void predictor_decompress_fir_ada int32_t val; val = buffer_out[i] + error_buffer[i+1]; - val = SIGN_EXTENDED32(val, readsamplesize); + val = sign_extended32(val, readsamplesize); buffer_out[i+1] = val; } @@ -356,7 +359,7 @@ static void predictor_decompress_fir_ada outval = (1 << (predictor_quantitization-1)) + sum; outval = outval >> predictor_quantitization; outval = outval + buffer_out[0] + error_val; - outval = SIGN_EXTENDED32(outval, readsamplesize); + outval = sign_extended32(outval, readsamplesize); buffer_out[predictor_coef_num+1] = outval; @@ -365,7 +368,7 @@ static void predictor_decompress_fir_ada while (predictor_num >= 0 && error_val > 0) { int val = buffer_out[0] - buffer_out[predictor_coef_num - predictor_num]; - int sign = SIGN_ONLY(val); + int sign = sign_only(val); predictor_coef_table[predictor_num] -= sign; @@ -381,7 +384,7 @@ static void predictor_decompress_fir_ada while (predictor_num >= 0 && error_val < 0) { int val = buffer_out[0] - buffer_out[predictor_coef_num - predictor_num]; - int sign = - SIGN_ONLY(val); + int sign = - sign_only(val); predictor_coef_table[predictor_num] -= sign; @@ -570,7 +573,7 @@ static int alac_decode_frame(AVCodecCont int32_t audiobits; audiobits = get_bits(&alac->gb, alac->setinfo_sample_size); - audiobits = SIGN_EXTENDED32(audiobits, readsamplesize); + audiobits = sign_extended32(audiobits, readsamplesize); alac->outputsamples_buffer[chan][i] = audiobits; }

1 0

r10263 - trunk/libavcodec/mathops.h
by subversion＠mplayerhq.hu 30 Aug '07

30 Aug '07

Author: mhoffman Date: Thu Aug 30 17:16:52 2007 New Revision: 10263 Log: Hooking bfin/mathops.h Modified: trunk/libavcodec/mathops.h Modified: trunk/libavcodec/mathops.h ============================================================================== --- trunk/libavcodec/mathops.h (original) +++ trunk/libavcodec/mathops.h Thu Aug 30 17:16:52 2007 @@ -36,6 +36,10 @@ #include "ppc/mathops.h" +#elif defined(ARCH_BFIN) + +#include "bfin/mathops.h" + #endif /* generic implementation */

1 0

r10262 - trunk/libavcodec/bfin/mathops.h
by subversion＠mplayerhq.hu 30 Aug '07

30 Aug '07

Author: mhoffman Date: Thu Aug 30 17:15:48 2007 New Revision: 10262 Log: Blackfin 32bit multiplication primitives MULH MUL16 Added: trunk/libavcodec/bfin/mathops.h Added: trunk/libavcodec/bfin/mathops.h ============================================================================== --- (empty file) +++ trunk/libavcodec/bfin/mathops.h Thu Aug 30 17:15:48 2007 @@ -0,0 +1,52 @@ +/* + * mathops.h + * + * Copyright (C) 2007 Marc Hoffman <mmhoffm at gmail.com> + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ +#ifndef MATHOPS_BFIN +#define MATHOPS_BFIN + +#ifdef CONFIG_MPEGAUDIO_HP +#define MULH(X,Y) ({ int xxo; \ + asm ( \ + "a1 = %2.L * %1.L (FU);\n\t" \ + "a1 = a1 >> 16;\n\t" \ + "a1 += %2.H * %1.L (IS,M);\n\t" \ + "a0 = %1.H * %2.H, a1+= %1.H * %2.L (IS,M);\n\t"\ + "a1 = a1 >>> 16;\n\t" \ + "%0 = (a0 += a1);\n\t" \ + : "=d" (xxo) : "d" (X), "d" (Y)); xxo; }) +#else +#define MULH(X,Y) ({ int xxo; \ + asm ( \ + "a1 = %2.H * %1.L (IS,M);\n\t" \ + "a0 = %1.H * %2.H, a1+= %1.H * %2.L (IS,M);\n\t"\ + "a1 = a1 >>> 16;\n\t" \ + "%0 = (a0 += a1);\n\t" \ + : "=d" (xxo) : "d" (X), "d" (Y)); xxo; }) +#endif + +/* signed 16x16 -> 32 multiply */ +#define MUL16(a, b) ({ int xxo; \ + asm ( \ + "%0 = %1.l*%2.l (is);\n\t" \ + : "=W" (xxo) : "d" (a), "d" (b)); \ + xxo; }) + +#endif

1 0

[ffmpeg.org]: r98 - trunk/src/documentation
by subversion＠mplayerhq.hu 29 Aug '07

29 Aug '07

Author: diego Date: Wed Aug 29 21:23:38 2007 New Revision: 98 Log: Link to general documentation. Modified: trunk/src/documentation Modified: trunk/src/documentation ============================================================================== --- trunk/src/documentation (original) +++ trunk/src/documentation Wed Aug 29 21:23:38 2007 @@ -21,7 +21,8 @@ <h3>FFmpeg System Documentation</h3> <ul> <li><a href="faq.html">Frequently Asked Questions</a> -<li><a href="ffmpeg-doc.html">FFmpeg program documentation</a> +<li><a href="general.html">general documentation</a> +<li><a href="ffmpeg-doc.html">ffmpeg documentation</a> <li><a href="ffserver-doc.html">ffserver documentation</a> <li><a href="ffplay-doc.html">ffplay documentation</a> <li><a href="hooks.html">video hook documentation</a>

1 0

r10260 - trunk/libavformat/rtp_mpv.c
by subversion＠mplayerhq.hu 29 Aug '07

29 Aug '07

Author: lucabe Date: Wed Aug 29 12:47:15 2007 New Revision: 10260 Log: Correct packetization for MPEG video frames, and correct setting of the "B" and "E" bits in the payload header Modified: trunk/libavformat/rtp_mpv.c Modified: trunk/libavformat/rtp_mpv.c ============================================================================== --- trunk/libavformat/rtp_mpv.c (original) +++ trunk/libavformat/rtp_mpv.c Wed Aug 29 12:47:15 2007 @@ -21,6 +21,8 @@ #include "avformat.h" #include "rtp_internal.h" +#include "mpegvideo.h" + /* NOTE: a single frame must be passed with sequence header if needed. XXX: use slices. */ void ff_rtp_send_mpegvideo(AVFormatContext *s1, const uint8_t *buf1, int size) @@ -28,22 +30,54 @@ void ff_rtp_send_mpegvideo(AVFormatConte RTPDemuxContext *s = s1->priv_data; AVStream *st = s1->streams[0]; int len, h, max_packet_size; - int b=1, e=0; uint8_t *q; + int begin_of_slice, end_of_slice; max_packet_size = s->max_payload_size; + begin_of_slice = 1; + end_of_slice = 0; while (size > 0) { len = max_packet_size - 4; if (len >= size) { len = size; - e = 1; + end_of_slice = 1; + } else { + const uint8_t *r, *r1; + int start_code; + + r1 = buf1; + while (1) { + start_code = -1; + r = ff_find_start_code(r1, buf1 + size, &start_code); + if((start_code & 0xFFFFFF00) == 0x100) { + /* New start code found */ + if (r - buf1 < len) { + /* The current slice fits in the packet */ + if (begin_of_slice == 0) { + /* no slice at the beginning of the packet... */ + end_of_slice = 1; + len = r - buf1 - 4; + break; + } + r1 = r; + } else { + if (r - r1 < max_packet_size) { + len = r1 - buf1 - 4; + end_of_slice = 1; + } + break; + } + } else { + break; + } + } } h = 0; - h |= b << 12; - h |= e << 11; + h |= begin_of_slice << 12; + h |= end_of_slice << 11; q = s->buf; *q++ = h >> 24; @@ -61,6 +95,8 @@ void ff_rtp_send_mpegvideo(AVFormatConte buf1 += len; size -= len; + begin_of_slice = end_of_slice; + end_of_slice = 0; } s->cur_timestamp++; }

1 0