June 2008 - ffmpeg-cvslog - lists.ffmpeg.org

r14032 - trunk/libavcodec/armv4l/dsputil_arm.c
by subversion＠mplayerhq.hu 30 Jun '08

30 Jun '08

Author: benoit Date: Mon Jun 30 09:31:41 2008 New Revision: 14032 Log: Define mm_support() for ARM. Patch by Matthieu Castet <castet matthieu free fr> Modified: trunk/libavcodec/armv4l/dsputil_arm.c Modified: trunk/libavcodec/armv4l/dsputil_arm.c ============================================================================== --- trunk/libavcodec/armv4l/dsputil_arm.c (original) +++ trunk/libavcodec/armv4l/dsputil_arm.c Mon Jun 30 09:31:41 2008 @@ -203,6 +203,15 @@ static void simple_idct_ipp_add(uint8_t } #endif +int mm_support(void) +{ + int result = 0; +#ifdef HAVE_IWMMXT + result |= MM_IWMMXT; +#endif /* result */ + return result; +} + void dsputil_init_armv4l(DSPContext* c, AVCodecContext *avctx) { int idct_algo= avctx->idct_algo;

3 4

r14033 - trunk/libavcodec/armv4l/dsputil_arm.c
by subversion＠mplayerhq.hu 30 Jun '08

30 Jun '08

Author: benoit Date: Mon Jun 30 13:16:47 2008 New Revision: 14033 Log: Simplify mm_support() for ARM (by M?ns). Modified: trunk/libavcodec/armv4l/dsputil_arm.c Modified: trunk/libavcodec/armv4l/dsputil_arm.c ============================================================================== --- trunk/libavcodec/armv4l/dsputil_arm.c (original) +++ trunk/libavcodec/armv4l/dsputil_arm.c Mon Jun 30 13:16:47 2008 @@ -205,11 +205,7 @@ static void simple_idct_ipp_add(uint8_t int mm_support(void) { - int result = 0; -#ifdef HAVE_IWMMXT - result |= MM_IWMMXT; -#endif /* result */ - return result; + return ENABLE_IWMMXT * MM_IWMMXT; } void dsputil_init_armv4l(DSPContext* c, AVCodecContext *avctx)

1 0

r14031 - in trunk/libavcodec: acelp_filters.c acelp_filters.h ra144.c
by subversion＠mplayerhq.hu 29 Jun '08

29 Jun '08

Author: vitor Date: Sun Jun 29 23:37:03 2008 New Revision: 14031 Log: Make ff_acelp_lp_synthesis_filter() receives a pointer to the actual filter coefficients and not the pointer minus one Modified: trunk/libavcodec/acelp_filters.c trunk/libavcodec/acelp_filters.h trunk/libavcodec/ra144.c Modified: trunk/libavcodec/acelp_filters.c ============================================================================== --- trunk/libavcodec/acelp_filters.c (original) +++ trunk/libavcodec/acelp_filters.c Sun Jun 29 23:37:03 2008 @@ -121,6 +121,10 @@ int ff_acelp_lp_synthesis_filter( { int i,n; + // These two lines are two avoid a -1 subtraction in the main loop + filter_length++; + filter_coeffs--; + for(n=0; n<buffer_length; n++) { int sum = rounder; Modified: trunk/libavcodec/acelp_filters.h ============================================================================== --- trunk/libavcodec/acelp_filters.h (original) +++ trunk/libavcodec/acelp_filters.h Sun Jun 29 23:37:03 2008 @@ -125,7 +125,7 @@ void ff_acelp_convolve_circ( * \param filter_coeffs filter coefficients (-0x8000 <= (3.12) < 0x8000) * \param in input signal * \param buffer_length amount of data to process - * \param filter_length filter length (11 for 10th order LP filter) + * \param filter_length filter length (10 for 10th order LP filter) * \param stop_on_overflow 1 - return immediately if overflow occurs * 0 - ignore overflows * \param rounder the amount to add for rounding (usually 0x800 or 0xfff) Modified: trunk/libavcodec/ra144.c ============================================================================== --- trunk/libavcodec/ra144.c (original) +++ trunk/libavcodec/ra144.c Sun Jun 29 23:37:03 2008 @@ -209,9 +209,9 @@ static void do_output_subblock(RA144Cont BLOCKSIZE*sizeof(*ractx->curr_sblock)); if (ff_acelp_lp_synthesis_filter( - ractx->curr_sblock + 10, lpc_coefs -1, + ractx->curr_sblock + 10, lpc_coefs, ractx->curr_sblock + 10, BLOCKSIZE, - 11, 1, 0xfff) + 10, 1, 0xfff) ) memset(ractx->curr_sblock, 0, 50*sizeof(*ractx->curr_sblock)); }

1 0

r14030 - trunk/libavcodec/ra144.c
by subversion＠mplayerhq.hu 29 Jun '08

29 Jun '08

Author: vitor Date: Sun Jun 29 15:12:31 2008 New Revision: 14030 Log: Update copyright Modified: trunk/libavcodec/ra144.c Modified: trunk/libavcodec/ra144.c ============================================================================== --- trunk/libavcodec/ra144.c (original) +++ trunk/libavcodec/ra144.c Sun Jun 29 15:12:31 2008 @@ -1,6 +1,9 @@ /* * Real Audio 1.0 (14.4K) - * Copyright (c) 2003 the ffmpeg project + * + * Copyright (c) 2008 Vitor Sessak + * Copyright (c) 2003 Nick Kurshev + * Based on public domain decoder at http://www.honeypot.net/audio * * This file is part of FFmpeg. *

1 0

r14029 - in trunk/libavcodec: Makefile ra144.c
by subversion＠mplayerhq.hu 29 Jun '08

29 Jun '08

Author: vitor Date: Sun Jun 29 13:21:06 2008 New Revision: 14029 Log: Use ff_acelp_lp_synthesis_filter() instead of duplicating it Modified: trunk/libavcodec/Makefile trunk/libavcodec/ra144.c Modified: trunk/libavcodec/Makefile ============================================================================== --- trunk/libavcodec/Makefile (original) +++ trunk/libavcodec/Makefile Sun Jun 29 13:21:06 2008 @@ -148,7 +148,7 @@ OBJS-$(CONFIG_QDRAW_DECODER) + OBJS-$(CONFIG_QPEG_DECODER) += qpeg.o OBJS-$(CONFIG_QTRLE_DECODER) += qtrle.o OBJS-$(CONFIG_QTRLE_ENCODER) += qtrleenc.o -OBJS-$(CONFIG_RA_144_DECODER) += ra144.o +OBJS-$(CONFIG_RA_144_DECODER) += ra144.o acelp_filters.o OBJS-$(CONFIG_RA_288_DECODER) += ra288.o OBJS-$(CONFIG_RAWVIDEO_DECODER) += rawdec.o OBJS-$(CONFIG_RAWVIDEO_ENCODER) += rawenc.o Modified: trunk/libavcodec/ra144.c ============================================================================== --- trunk/libavcodec/ra144.c (original) +++ trunk/libavcodec/ra144.c Sun Jun 29 13:21:06 2008 @@ -22,6 +22,7 @@ #include "avcodec.h" #include "bitstream.h" #include "ra144.h" +#include "acelp_filters.h" #define NBLOCKS 4 ///< number of subblocks within a block #define BLOCKSIZE 40 ///< subblock size in 16-bit words @@ -140,39 +141,6 @@ static void add_wav(int16_t *dest, int n dest[i] = (s1[i]*v[0] + s2[i]*v[1] + s3[i]*v[2]) >> 12; } -/** - * LPC Filter. Each output value is predicted from the 10 previous computed - * ones. It overwrites the input with the output. - * - * @param in the input of the filter. It should be an array of size len + 10. - * The 10 first input values are used to evaluate the first filtered one. - */ -static void lpc_filter(uint16_t *in, const int16_t *lpc_coefs, int len) -{ - int x, i; - int16_t *ptr = in; - - for (i=0; i<len; i++) { - int sum = 0; - int new_val; - - for(x=0; x<10; x++) - sum += lpc_coefs[9-x] * ptr[x]; - - sum >>= 12; - - new_val = ptr[10] - sum; - - if (new_val < -32768 || new_val > 32767) { - memset(in, 0, 50*sizeof(*in)); - return; - } - - ptr[10] = new_val; - ptr++; - } -} - static unsigned int rescale_rms(unsigned int rms, unsigned int energy) { return (rms * energy) >> 10; @@ -237,7 +205,12 @@ static void do_output_subblock(RA144Cont memcpy(ractx->curr_sblock + 10, block, BLOCKSIZE*sizeof(*ractx->curr_sblock)); - lpc_filter(ractx->curr_sblock, lpc_coefs, BLOCKSIZE); + if (ff_acelp_lp_synthesis_filter( + ractx->curr_sblock + 10, lpc_coefs -1, + ractx->curr_sblock + 10, BLOCKSIZE, + 11, 1, 0xfff) + ) + memset(ractx->curr_sblock, 0, 50*sizeof(*ractx->curr_sblock)); } static void int_to_int16(int16_t *out, const int *inp)

1 0

r14028 - in trunk/libavcodec: acelp_filters.c acelp_filters.h
by subversion＠mplayerhq.hu 29 Jun '08

29 Jun '08

Author: vitor Date: Sun Jun 29 13:19:50 2008 New Revision: 14028 Log: Add a rounding parameter to ff_acelp_lp_synthesis_filter() Modified: trunk/libavcodec/acelp_filters.c trunk/libavcodec/acelp_filters.h Modified: trunk/libavcodec/acelp_filters.c ============================================================================== --- trunk/libavcodec/acelp_filters.c (original) +++ trunk/libavcodec/acelp_filters.c Sun Jun 29 13:19:50 2008 @@ -116,13 +116,14 @@ int ff_acelp_lp_synthesis_filter( const int16_t* in, int buffer_length, int filter_length, - int stop_on_overflow) + int stop_on_overflow, + int rounder) { int i,n; for(n=0; n<buffer_length; n++) { - int sum = 0x800; + int sum = rounder; for(i=1; i<filter_length; i++) sum -= filter_coeffs[i] * out[n-i]; Modified: trunk/libavcodec/acelp_filters.h ============================================================================== --- trunk/libavcodec/acelp_filters.h (original) +++ trunk/libavcodec/acelp_filters.h Sun Jun 29 13:19:50 2008 @@ -128,6 +128,7 @@ void ff_acelp_convolve_circ( * \param filter_length filter length (11 for 10th order LP filter) * \param stop_on_overflow 1 - return immediately if overflow occurs * 0 - ignore overflows + * \param rounder the amount to add for rounding (usually 0x800 or 0xfff) * * \return 1 if overflow occurred, 0 - otherwise * @@ -142,7 +143,8 @@ int ff_acelp_lp_synthesis_filter( const int16_t* in, int buffer_length, int filter_length, - int stop_on_overflow); + int stop_on_overflow, + int rounder); /** * \brief Calculates coefficients of weighted A(z/weight) filter.

1 0

[propchange]: r14021 - svn:log
by subversion＠mplayerhq.hu 29 Jun '08

29 Jun '08

Author: diego Revision: 14021 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1,2 +1,2 @@ -Make code independant/less dependant on dsputil. +Make code independent/less dependent on dsputil. This also makes the mmx parts work again ...

1 0

r14027 - trunk/libavcodec/utils.c
by subversion＠mplayerhq.hu 29 Jun '08

29 Jun '08

Author: diego Date: Sun Jun 29 10:32:27 2008 New Revision: 14027 Log: Add command line support for '-idct simplearmv6'. patch by Laurent Desnogues, laurent.desnogues gmail com Modified: trunk/libavcodec/utils.c Modified: trunk/libavcodec/utils.c ============================================================================== --- trunk/libavcodec/utils.c (original) +++ trunk/libavcodec/utils.c Sun Jun 29 10:32:27 2008 @@ -545,6 +545,7 @@ static const AVOption options[]={ {"sh4", NULL, 0, FF_OPT_TYPE_CONST, FF_IDCT_SH4, INT_MIN, INT_MAX, V|E|D, "idct"}, {"simplearm", NULL, 0, FF_OPT_TYPE_CONST, FF_IDCT_SIMPLEARM, INT_MIN, INT_MAX, V|E|D, "idct"}, {"simplearmv5te", NULL, 0, FF_OPT_TYPE_CONST, FF_IDCT_SIMPLEARMV5TE, INT_MIN, INT_MAX, V|E|D, "idct"}, +{"simplearmv6", NULL, 0, FF_OPT_TYPE_CONST, FF_IDCT_SIMPLEARMV6, INT_MIN, INT_MAX, V|E|D, "idct"}, {"h264", NULL, 0, FF_OPT_TYPE_CONST, FF_IDCT_H264, INT_MIN, INT_MAX, V|E|D, "idct"}, {"vp3", NULL, 0, FF_OPT_TYPE_CONST, FF_IDCT_VP3, INT_MIN, INT_MAX, V|E|D, "idct"}, {"ipp", NULL, 0, FF_OPT_TYPE_CONST, FF_IDCT_IPP, INT_MIN, INT_MAX, V|E|D, "idct"},

1 0

r14026 - trunk/libavcodec/ra144.c
by subversion＠mplayerhq.hu 29 Jun '08

29 Jun '08

Author: vitor Date: Sun Jun 29 09:58:46 2008 New Revision: 14026 Log: Doxy comment Modified: trunk/libavcodec/ra144.c Modified: trunk/libavcodec/ra144.c ============================================================================== --- trunk/libavcodec/ra144.c (original) +++ trunk/libavcodec/ra144.c Sun Jun 29 09:58:46 2008 @@ -323,7 +323,7 @@ static int interp(RA144Context *ractx, i } } -/* Uncompress one block (20 bytes -> 160*2 bytes) */ +/** Uncompress one block (20 bytes -> 160*2 bytes) */ static int ra144_decode_frame(AVCodecContext * avctx, void *vdata, int *data_size, const uint8_t *buf, int buf_size) {

1 0

r14025 - trunk/libavformat/mxf.c
by subversion＠mplayerhq.hu 28 Jun '08

28 Jun '08

Author: bcoudurier Date: Sat Jun 28 22:32:37 2008 New Revision: 14025 Log: include track id in error message Modified: trunk/libavformat/mxf.c Modified: trunk/libavformat/mxf.c ============================================================================== --- trunk/libavformat/mxf.c (original) +++ trunk/libavformat/mxf.c Sat Jun 28 22:32:37 2008 @@ -349,7 +349,7 @@ static int mxf_read_packet(AVFormatConte if (IS_KLV_KEY(klv.key, mxf_essence_element_key)) { int index = mxf_get_stream_index(s, &klv); if (index < 0) { - av_log(s, AV_LOG_ERROR, "error getting stream index\n"); + av_log(s, AV_LOG_ERROR, "error getting stream index %x\n", AV_RB32(klv.key+12)); goto skip; } if (s->streams[index]->discard == AVDISCARD_ALL)

1 0