July 2008 - ffmpeg-cvslog - lists.ffmpeg.org

r14468 - trunk/libavcodec/ra288.c
by subversion＠mplayerhq.hu 29 Jul '08

29 Jul '08

Author: vitor Date: Tue Jul 29 20:20:49 2008 New Revision: 14468 Log: Cosmetics: rename loop counter vars to i,j Modified: trunk/libavcodec/ra288.c Modified: trunk/libavcodec/ra288.c ============================================================================== --- trunk/libavcodec/ra288.c (original) +++ trunk/libavcodec/ra288.c Tue Jul 29 20:20:49 2008 @@ -61,14 +61,14 @@ static void colmult(float *tgt, const fl static void decode(RA288Context *ractx, float gain, int cb_coef) { - int x, y; + int i, j; double sumsum; float sum, buffer[5]; memmove(ractx->sp_block + 5, ractx->sp_block, 36*sizeof(*ractx->sp_block)); - for (x=4; x >= 0; x--) - ractx->sp_block[x] = -scalar_product_float(ractx->sp_block + x + 1, + for (i=4; i >= 0; i--) + ractx->sp_block[i] = -scalar_product_float(ractx->sp_block + i + 1, ractx->sp_lpc, 36); /* block 46 of G.728 spec */ @@ -80,8 +80,8 @@ static void decode(RA288Context *ractx, /* block 48 of G.728 spec */ sumsum = exp(sum * 0.1151292546497) * gain; /* pow(10.0,sum/20)*gain */ - for (x=0; x < 5; x++) - buffer[x] = codetable[cb_coef][x] * sumsum; + for (i=0; i < 5; i++) + buffer[i] = codetable[cb_coef][i] * sumsum; sum = scalar_product_float(buffer, buffer, 5) / 5; @@ -93,14 +93,14 @@ static void decode(RA288Context *ractx, *ractx->gain_block = 10 * log10(sum) - 32; - for (x=1; x < 5; x++) - for (y=x-1; y >= 0; y--) - buffer[x] -= ractx->sp_lpc[x-y-1] * buffer[y]; + for (i=1; i < 5; i++) + for (j=i-1; j >= 0; j--) + buffer[i] -= ractx->sp_lpc[i-j-1] * buffer[j]; /* output */ - for (x=0; x < 5; x++) - ractx->sp_block[4-x] = - av_clipf(ractx->sp_block[4-x] + buffer[x], -4095, 4095); + for (i=0; i < 5; i++) + ractx->sp_block[4-i] = + av_clipf(ractx->sp_block[4-i] + buffer[i], -4095, 4095); } /** @@ -111,7 +111,7 @@ static void decode(RA288Context *ractx, */ static int eval_lpc_coeffs(const float *in, float *tgt, int n) { - int x, y; + int i, j; double f0, f1, f2; if (in[n] == 0) @@ -122,17 +122,17 @@ static int eval_lpc_coeffs(const float * in--; // To avoid a -1 subtraction in the inner loop - for (x=1; x <= n; x++) { - f1 = in[x+1]; + for (i=1; i <= n; i++) { + f1 = in[i+1]; - for (y=0; y < x - 1; y++) - f1 += in[x-y]*tgt[y]; + for (j=0; j < i - 1; j++) + f1 += in[i-j]*tgt[j]; - tgt[x-1] = f2 = -f1/f0; - for (y=0; y < x >> 1; y++) { - float temp = tgt[y] + tgt[x-y-2]*f2; - tgt[x-y-2] += tgt[y]*f2; - tgt[y] = temp; + tgt[i-1] = f2 = -f1/f0; + for (j=0; j < i >> 1; j++) { + float temp = tgt[j] + tgt[i-j-2]*f2; + tgt[i-j-2] += tgt[j]*f2; + tgt[j] = temp; } if ((f0 += f1*f2) < 0) return -1; @@ -171,7 +171,7 @@ static void do_hybrid_window(int order, float *out, float *hist, float *out2, const float *window) { - unsigned int x; + unsigned int i; float buffer1[order + 1]; float buffer2[order + 1]; float work[order + n + non_rec]; @@ -179,17 +179,17 @@ static void do_hybrid_window(int order, /* update history */ memmove(hist, hist + n, (order + non_rec)*sizeof(*hist)); - for (x=0; x < n; x++) - hist[order + non_rec + x] = in[n-x-1]; + for (i=0; i < n; i++) + hist[order + non_rec + i] = in[n-i-1]; colmult(work, window, hist, order + n + non_rec); prodsum(buffer1, work + order , n , order); prodsum(buffer2, work + order + n, non_rec, order); - for (x=0; x <= order; x++) { - out2[x] = out2[x] * 0.5625 + buffer1[x]; - out [x] = out2[x] + buffer2[x]; + for (i=0; i <= order; i++) { + out2[i] = out2[i] * 0.5625 + buffer1[i]; + out [i] = out2[i] + buffer2[i]; } /* Multiply by the white noise correcting factor (WNCF) */ @@ -222,7 +222,7 @@ static int ra288_decode_frame(AVCodecCon int buf_size) { int16_t *out = data; - int x, y; + int i, j; RA288Context *ractx = avctx->priv_data; GetBitContext gb; @@ -235,16 +235,16 @@ static int ra288_decode_frame(AVCodecCon init_get_bits(&gb, buf, avctx->block_align * 8); - for (x=0; x < 32; x++) { + for (i=0; i < 32; i++) { float gain = amptable[get_bits(&gb, 3)]; - int cb_coef = get_bits(&gb, 6 + (x&1)); + int cb_coef = get_bits(&gb, 6 + (i&1)); decode(ractx, gain, cb_coef); - for (y=0; y < 5; y++) - *(out++) = 8 * ractx->sp_block[4 - y]; + for (j=0; j < 5; j++) + *(out++) = 8 * ractx->sp_block[4 - j]; - if ((x & 7) == 3) + if ((i & 7) == 3) backward_filter(ractx); }

1 0

r14467 - trunk/libavcodec/ra144.c
by subversion＠mplayerhq.hu 29 Jul '08

29 Jul '08

Author: vitor Date: Tue Jul 29 20:07:11 2008 New Revision: 14467 Log: Cosmetics: rename loop counter vars to i,j Modified: trunk/libavcodec/ra144.c Modified: trunk/libavcodec/ra144.c ============================================================================== --- trunk/libavcodec/ra144.c (original) +++ trunk/libavcodec/ra144.c Tue Jul 29 20:07:11 2008 @@ -85,19 +85,19 @@ static void eval_coefs(int *coefs, const int buffer[10]; int *b1 = buffer; int *b2 = coefs; - int x, y; + int i, j; - for (x=0; x < 10; x++) { - b1[x] = refl[x] << 4; + for (i=0; i < 10; i++) { + b1[i] = refl[i] << 4; - for (y=0; y < x; y++) - b1[y] = ((refl[x] * b2[x-y-1]) >> 12) + b2[y]; + for (j=0; j < i; j++) + b1[j] = ((refl[i] * b2[i-j-1]) >> 12) + b2[j]; FFSWAP(int *, b1, b2); } - for (x=0; x < 10; x++) - coefs[x] >>= 4; + for (i=0; i < 10; i++) + coefs[i] >>= 4; } /** @@ -151,12 +151,12 @@ static unsigned int rescale_rms(unsigned static unsigned int rms(const int *data) { - int x; + int i; unsigned int res = 0x10000; int b = 0; - for (x=0; x<10; x++) { - res = (((0x1000000 - data[x]*data[x]) >> 12) * res) >> 12; + for (i=0; i < 10; i++) { + res = (((0x1000000 - data[i]*data[i]) >> 12) * res) >> 12; if (res == 0) return 0; @@ -220,7 +220,7 @@ static void int_to_int16(int16_t *out, c { int i; - for (i=0; i<30; i++) + for (i=0; i < 30; i++) *(out++) = *(inp++); } @@ -282,12 +282,12 @@ static int interp(RA144Context *ractx, i int work[10]; int a = block_num + 1; int b = NBLOCKS - a; - int x; + int i; // Interpolate block coefficients from the this frame forth block and // last frame forth block - for (x=0; x<30; x++) - out[x] = (a * ractx->lpc_coef[0][x] + b * ractx->lpc_coef[1][x])>> 2; + for (i=0; i<30; i++) + out[i] = (a * ractx->lpc_coef[0][i] + b * ractx->lpc_coef[1][i])>> 2; if (eval_refl(work, out, ractx)) { // The interpolated coefficients are unstable, copy either new or old @@ -307,7 +307,7 @@ static int ra144_decode_frame(AVCodecCon unsigned int refl_rms[4]; // RMS of the reflection coefficients uint16_t block_coefs[4][30]; // LPC coefficients of each sub-block unsigned int lpc_refl[10]; // LPC reflection coefficients of the frame - int i, c; + int i, j; int16_t *data = vdata; unsigned int energy; @@ -338,11 +338,11 @@ static int ra144_decode_frame(AVCodecCon int_to_int16(block_coefs[3], ractx->lpc_coef[0]); - for (c=0; c<4; c++) { - do_output_subblock(ractx, block_coefs[c], refl_rms[c], &gb); + for (i=0; i < 4; i++) { + do_output_subblock(ractx, block_coefs[i], refl_rms[i], &gb); - for (i=0; i<BLOCKSIZE; i++) - *data++ = av_clip_int16(ractx->curr_sblock[i + 10] << 2); + for (j=0; j < BLOCKSIZE; j++) + *data++ = av_clip_int16(ractx->curr_sblock[j + 10] << 2); } ractx->old_energy = energy;

1 0

r14466 - in trunk/libavcodec: dsputil.h vorbis_dec.c
by subversion＠mplayerhq.hu 29 Jul '08

29 Jul '08

Author: lorenm Date: Tue Jul 29 16:17:13 2008 New Revision: 14466 Log: r14205 broke vorbis float_to_int on ppc Modified: trunk/libavcodec/dsputil.h trunk/libavcodec/vorbis_dec.c Modified: trunk/libavcodec/dsputil.h ============================================================================== --- trunk/libavcodec/dsputil.h (original) +++ trunk/libavcodec/dsputil.h Tue Jul 29 16:17:13 2008 @@ -66,6 +66,7 @@ void ff_vector_fmul_add_add_c(float *dst void ff_vector_fmul_window_c(float *dst, const float *src0, const float *src1, const float *win, float add_bias, int len); void ff_float_to_int16_c(int16_t *dst, const float *src, long len); +void ff_float_to_int16_interleave_c(int16_t *dst, const float **src, long len, int channels); /* encoding scans */ extern const uint8_t ff_alternate_horizontal_scan[64]; Modified: trunk/libavcodec/vorbis_dec.c ============================================================================== --- trunk/libavcodec/vorbis_dec.c (original) +++ trunk/libavcodec/vorbis_dec.c Tue Jul 29 16:17:13 2008 @@ -926,7 +926,7 @@ static av_cold int vorbis_decode_init(AV vc->avccontext = avccontext; dsputil_init(&vc->dsp, avccontext); - if(vc->dsp.float_to_int16 == ff_float_to_int16_c) { + if(vc->dsp.float_to_int16_interleave == ff_float_to_int16_interleave_c) { vc->add_bias = 385; vc->exp_bias = 0; } else {

2 1

r14465 - trunk/libavformat/sdp.c
by subversion＠mplayerhq.hu 29 Jul '08

29 Jul '08

Author: stefano Date: Tue Jul 29 12:45:53 2008 New Revision: 14465 Log: Fix a typo in sdp_write_header(): change "IPV4", which is not a valid network address type, to "IP4". Modified: trunk/libavformat/sdp.c Modified: trunk/libavformat/sdp.c ============================================================================== --- trunk/libavformat/sdp.c (original) +++ trunk/libavformat/sdp.c Tue Jul 29 12:45:53 2008 @@ -56,7 +56,7 @@ static void dest_write(char *buff, int s static void sdp_write_header(char *buff, int size, struct sdp_session_level *s) { av_strlcatf(buff, size, "v=%d\r\n" - "o=- %d %d IN IPV4 %s\r\n" + "o=- %d %d IN IP4 %s\r\n" "t=%d %d\r\n" "s=%s\r\n" "a=tool:libavformat " AV_STRINGIFY(LIBAVFORMAT_VERSION) "\r\n",

1 0

r14464 - trunk/doc/faq.texi
by subversion＠mplayerhq.hu 29 Jul '08

29 Jul '08

Author: diego Date: Tue Jul 29 09:55:51 2008 New Revision: 14464 Log: Add note about gcc bugs that gcc devs refuse to fix. Modified: trunk/doc/faq.texi Modified: trunk/doc/faq.texi ============================================================================== --- trunk/doc/faq.texi (original) +++ trunk/doc/faq.texi Tue Jul 29 09:55:51 2008 @@ -109,6 +109,11 @@ If some MP3 codec like LAME is installed This is a bug in gcc. Do not report it to us. Instead, please report it to the gcc developers. Note that we will not add workarounds for gcc bugs. +Also note that (some of) the gcc developers believe this is not a bug or +not a bug they should fix: + at url{http://gcc.gnu.org/bugzilla/show_bug.cgi?id=11203}. +Then again, some of them do not know the difference between an undecidable +problem and an NP-hard problem... @chapter Usage

2 1

r13496 - trunk/doc/faq.texi
by subversion＠mplayerhq.hu 29 Jul '08

29 Jul '08

Author: diego Date: Wed May 28 18:12:40 2008 New Revision: 13496 Log: Add a note about everybody's favorite recurring gcc bug: error: can't find a register in class 'GENERAL_REGS' while reloading 'asm' Modified: trunk/doc/faq.texi Modified: trunk/doc/faq.texi ============================================================================== --- trunk/doc/faq.texi (original) +++ trunk/doc/faq.texi Wed May 28 18:12:40 2008 @@ -101,6 +101,14 @@ if some MP3 codec like LAME is installed @end table + at chapter Compilation + + at section @code{error: can't find a register in class 'GENERAL_REGS' while reloading 'asm'} + +This is a bug in gcc. Do not report it to us. Instead, please report it to +the gcc developers. Note that we will not add workarounds for gcc bugs. + + @chapter Usage @section ffmpeg does not work; What is wrong?

3 3

r14463 - trunk/libavcodec/h264.c
by subversion＠mplayerhq.hu 29 Jul '08

29 Jul '08

Author: darkshikari Date: Tue Jul 29 07:39:33 2008 New Revision: 14463 Log: Use #define instead of a constant. Patch by Paul Kendall. Modified: trunk/libavcodec/h264.c Modified: trunk/libavcodec/h264.c ============================================================================== --- trunk/libavcodec/h264.c (original) +++ trunk/libavcodec/h264.c Tue Jul 29 07:39:33 2008 @@ -978,7 +978,7 @@ static inline void pred_direct_motion(H2 int refa = h->ref_cache[list][scan8[0] - 1]; int refb = h->ref_cache[list][scan8[0] - 8]; int refc = h->ref_cache[list][scan8[0] - 8 + 4]; - if(refc == -2) + if(refc == PART_NOT_AVAILABLE) refc = h->ref_cache[list][scan8[0] - 8 - 1]; ref[list] = FFMIN3((unsigned)refa, (unsigned)refb, (unsigned)refc); if(ref[list] < 0)

1 0

r14462 - trunk/ffmpeg.c
by subversion＠mplayerhq.hu 28 Jul '08

28 Jul '08

Author: stefano Date: Mon Jul 28 23:54:12 2008 New Revision: 14462 Log: Make ffmpeg dump output format in case of codec type mismatch between an input stream and the corresponding output stream. Modified: trunk/ffmpeg.c Modified: trunk/ffmpeg.c ============================================================================== --- trunk/ffmpeg.c (original) +++ trunk/ffmpeg.c Mon Jul 28 23:54:12 2008 @@ -1597,6 +1597,8 @@ static int av_encode(AVFormatContext **o /* Sanity check that the stream types match */ if (ist_table[ost->source_index]->st->codec->codec_type != ost->st->codec->codec_type) { + int i= ost->file_index; + dump_format(output_files[i], i, output_files[i]->filename, 1); fprintf(stderr, "Codec type mismatch for mapping #%d.%d -> #%d.%d\n", stream_maps[n-1].file_index, stream_maps[n-1].stream_index, ost->file_index, ost->index);

1 0

r14461 - trunk/libavutil/lfg.h
by subversion＠mplayerhq.hu 28 Jul '08

28 Jul '08

Author: michael Date: Mon Jul 28 17:47:06 2008 New Revision: 14461 Log: Document av_lfg_get(). Modified: trunk/libavutil/lfg.h Modified: trunk/libavutil/lfg.h ============================================================================== --- trunk/libavutil/lfg.h (original) +++ trunk/libavutil/lfg.h Mon Jul 28 17:47:06 2008 @@ -29,6 +29,12 @@ typedef struct { void av_lfg_init(AVLFG *c, unsigned int seed); +/** + * Gets the next random unsigned 32bit number. + * + * Please also consider a simple LCG like state= state*1664525+1013904223, + * it may be good enough and faster for your specific use case. + */ static inline unsigned int av_lfg_get(AVLFG *c){ c->state[c->index & 63] = c->state[(c->index-24) & 63] + c->state[(c->index-55) & 63]; return c->state[c->index++ & 63];

1 0

r14460 - trunk/libavutil/random.h
by subversion＠mplayerhq.hu 28 Jul '08

28 Jul '08

Author: michael Date: Mon Jul 28 17:44:00 2008 New Revision: 14460 Log: Warning about MTs speed. Modified: trunk/libavutil/random.h Modified: trunk/libavutil/random.h ============================================================================== --- trunk/libavutil/random.h (original) +++ trunk/libavutil/random.h Mon Jul 28 17:44:00 2008 @@ -35,7 +35,14 @@ typedef struct { void av_init_random(unsigned int seed, AVRandomState *state); ///< to be inlined, the struct must be visible, so it doesn't make sense to try and keep it opaque with malloc/free like calls void av_random_generate_untempered_numbers(AVRandomState *state); ///< Regenerate the untempered numbers (must be done every 624 iterations, or it will loop) -/** generates a random number on [0,0xffffffff]-interval */ +/** + * generates a random number on [0,0xffffffff]-interval + * + * Please do NOT use the mersenne twister, it is slow, use the random generator + * from lfg.c/h or a simple LCG like state= state*1664525+1013904223. + * If you still choose to use MT, expect that you will have to provide + * some evidence that it makes a difference for the case where you use it. + */ static inline unsigned int av_random(AVRandomState *state) { unsigned int y;

1 0