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

r13598 - trunk/libavcodec/ra144.c
by subversion＠mplayerhq.hu 01 Jun '08

01 Jun '08

Author: vitor Date: Sun Jun 1 15:28:41 2008 New Revision: 13598 Log: More variable renaming Modified: trunk/libavcodec/ra144.c Modified: trunk/libavcodec/ra144.c ============================================================================== --- trunk/libavcodec/ra144.c (original) +++ trunk/libavcodec/ra144.c Sun Jun 1 15:28:41 2008 @@ -331,7 +331,7 @@ static int ra144_decode_frame(AVCodecCon { static const uint8_t sizes[10] = {6, 5, 5, 4, 4, 3, 3, 3, 3, 2}; unsigned int refl_rms[4]; // RMS of the reflection coefficients - uint16_t gbuf2[4][30]; + uint16_t block_coefs[4][30]; // LPC coefficients of each sub-block int i, c; int16_t *data = vdata; unsigned int energy; @@ -354,15 +354,16 @@ static int ra144_decode_frame(AVCodecCon energy = decodeval[get_bits(&gb, 5) << 1]; // Useless table entries? - refl_rms[0] = dec2(ractx, gbuf2[0], 0, 0, ractx->old_energy); - refl_rms[1] = dec2(ractx, gbuf2[1], 1, energy > ractx->old_energy, + refl_rms[0] = dec2(ractx, block_coefs[0], 0, 0, ractx->old_energy); + refl_rms[1] = dec2(ractx, block_coefs[1], 1, energy > ractx->old_energy, t_sqrt(energy*ractx->old_energy) >> 12); - refl_rms[2] = dec2(ractx, gbuf2[2], 2, 1, energy); - refl_rms[3] = dec1(gbuf2[3], ractx->lpc_refl, ractx->lpc_coef, energy); + refl_rms[2] = dec2(ractx, block_coefs[2], 2, 1, energy); + refl_rms[3] = dec1(block_coefs[3], ractx->lpc_refl, ractx->lpc_coef, + energy); /* do output */ for (c=0; c<4; c++) { - do_output_subblock(ractx, gbuf2[c], refl_rms[c], data, &gb); + do_output_subblock(ractx, block_coefs[c], refl_rms[c], data, &gb); for (i=0; i<BLOCKSIZE; i++) { *data = av_clip_int16(*data << 2);

1 0

r13597 - trunk/libavcodec/ra144.c
by subversion＠mplayerhq.hu 01 Jun '08

01 Jun '08

Author: vitor Date: Sun Jun 1 15:17:22 2008 New Revision: 13597 Log: Rename functions Modified: trunk/libavcodec/ra144.c Modified: trunk/libavcodec/ra144.c ============================================================================== --- trunk/libavcodec/ra144.c (original) +++ trunk/libavcodec/ra144.c Sun Jun 1 15:17:22 2008 @@ -73,9 +73,9 @@ static int t_sqrt(unsigned int x) /** * Evaluate the LPC filter coefficients from the reflection coefficients. - * Does the inverse of the eq() function. + * Does the inverse of the eval_refl() function. */ -static void do_voice(const int *refl, int *coefs) +static void eval_coefs(const int *refl, int *coefs) { int buffer[10]; int *b1 = buffer; @@ -251,12 +251,12 @@ static int dec1(int16_t *decsp, const in /** * Evaluate the reflection coefficients from the filter coefficients. - * Does the inverse of the do_voice() function. + * Does the inverse of the eval_coefs() function. * * @return 1 if one of the reflection coefficients is of magnitude greater than * 4095, 0 if not. */ -static int eq(const int16_t *coefs, int *refl) +static int eval_refl(const int16_t *coefs, int *refl) { int retval = 0; int b, c, i; @@ -312,7 +312,7 @@ static int dec2(RA144Context *ractx, int for (x=0; x<30; x++) decsp[x] = (a * ractx->lpc_coef[x] + b * ractx->lpc_coef_old[x])>> 2; - if (eq(decsp, work)) { + if (eval_refl(decsp, work)) { // The interpolated coefficients are unstable, copy either new or old // coefficients if (copynew) @@ -350,7 +350,7 @@ static int ra144_decode_frame(AVCodecCon // "<< 1"? Doesn't this make one value out of two of the table useless? ractx->lpc_refl[i] = decodetable[i][get_bits(&gb, sizes[i]) << 1]; - do_voice(ractx->lpc_refl, ractx->lpc_coef); + eval_coefs(ractx->lpc_refl, ractx->lpc_coef); energy = decodeval[get_bits(&gb, 5) << 1]; // Useless table entries?

1 0

r13596 - trunk/libavcodec/ra144.c
by subversion＠mplayerhq.hu 01 Jun '08

01 Jun '08

Author: vitor Date: Sun Jun 1 15:16:13 2008 New Revision: 13596 Log: Rename variables Modified: trunk/libavcodec/ra144.c Modified: trunk/libavcodec/ra144.c ============================================================================== --- trunk/libavcodec/ra144.c (original) +++ trunk/libavcodec/ra144.c Sun Jun 1 15:16:13 2008 @@ -75,24 +75,24 @@ static int t_sqrt(unsigned int x) * Evaluate the LPC filter coefficients from the reflection coefficients. * Does the inverse of the eq() function. */ -static void do_voice(const int *a1, int *a2) +static void do_voice(const int *refl, int *coefs) { int buffer[10]; int *b1 = buffer; - int *b2 = a2; + int *b2 = coefs; int x, y; for (x=0; x < 10; x++) { - b1[x] = a1[x] << 4; + b1[x] = refl[x] << 4; for (y=0; y < x; y++) - b1[y] = ((a1[x] * b2[x-y-1]) >> 12) + b2[y]; + b1[y] = ((refl[x] * b2[x-y-1]) >> 12) + b2[y]; FFSWAP(int *, b1, b2); } for (x=0; x < 10; x++) - a2[x] >>= 4; + coefs[x] >>= 4; } /* rotate block */ @@ -256,7 +256,7 @@ static int dec1(int16_t *decsp, const in * @return 1 if one of the reflection coefficients is of magnitude greater than * 4095, 0 if not. */ -static int eq(const int16_t *in, int *target) +static int eq(const int16_t *coefs, int *refl) { int retval = 0; int b, c, i; @@ -267,9 +267,9 @@ static int eq(const int16_t *in, int *ta int *bp2 = buffer2; for (i=0; i < 10; i++) - buffer2[i] = in[i]; + buffer2[i] = coefs[i]; - u = target[9] = bp2[9]; + u = refl[9] = bp2[9]; if (u + 0x1000 > 0x1fff) return 0; /* We're screwed, might as well go out with a bang. :P */ @@ -287,9 +287,9 @@ static int eq(const int16_t *in, int *ta b++; for (u=0; u<=c; u++) - bp1[u] = ((bp2[u] - ((target[c+1] * bp2[c-u]) >> 12)) * (0x1000000 / b)) >> 12; + bp1[u] = ((bp2[u] - ((refl[c+1] * bp2[c-u]) >> 12)) * (0x1000000 / b)) >> 12; - target[c] = u = bp1[c]; + refl[c] = u = bp1[c]; if ((u + 0x1000) > 0x1fff) retval = 1;

1 0

r13593 - trunk/libavcodec/imgresample.c
by subversion＠mplayerhq.hu 01 Jun '08

01 Jun '08

Author: bcoudurier Date: Sun Jun 1 04:21:53 2008 New Revision: 13593 Log: give context to av_log Modified: trunk/libavcodec/imgresample.c Modified: trunk/libavcodec/imgresample.c ============================================================================== --- trunk/libavcodec/imgresample.c (original) +++ trunk/libavcodec/imgresample.c Sun Jun 1 04:21:53 2008 @@ -531,7 +531,7 @@ struct SwsContext *sws_getContext(int sr if ((srcH != dstH) || (srcW != dstW)) { if ((srcFormat != PIX_FMT_YUV420P) || (dstFormat != PIX_FMT_YUV420P)) { - av_log(NULL, AV_LOG_INFO, "PIX_FMT_YUV420P will be used as an intermediate format for rescaling\n"); + av_log(ctx, AV_LOG_INFO, "PIX_FMT_YUV420P will be used as an intermediate format for rescaling\n"); } ctx->resampling_ctx = img_resample_init(dstW, dstH, srcW, srcH); } else { @@ -634,7 +634,7 @@ int sws_scale(struct SwsContext *ctx, ui &src_pict, ctx->src_pix_fmt, ctx->resampling_ctx->iwidth, ctx->resampling_ctx->iheight) < 0) { - av_log(NULL, AV_LOG_ERROR, "pixel format conversion not handled\n"); + av_log(ctx, AV_LOG_ERROR, "pixel format conversion not handled\n"); res = -1; goto the_end; } @@ -673,7 +673,7 @@ int sws_scale(struct SwsContext *ctx, ui resampled_picture, current_pix_fmt, ctx->resampling_ctx->owidth, ctx->resampling_ctx->oheight) < 0) { - av_log(NULL, AV_LOG_ERROR, "pixel format conversion not handled\n"); + av_log(ctx, AV_LOG_ERROR, "pixel format conversion not handled\n"); res = -1; goto the_end;

1 0

r13592 - trunk/ffserver.c
by subversion＠mplayerhq.hu 01 Jun '08

01 Jun '08

Author: bcoudurier Date: Sun Jun 1 04:01:22 2008 New Revision: 13592 Log: add \n to error message Modified: trunk/ffserver.c Modified: trunk/ffserver.c ============================================================================== --- trunk/ffserver.c (original) +++ trunk/ffserver.c Sun Jun 1 04:01:22 2008 @@ -3330,7 +3330,7 @@ static void build_file_streams(void) /* find all the AVStreams inside and reference them in 'stream' */ if (av_find_stream_info(infile) < 0) { - http_log("Could not find codec parameters from '%s'", + http_log("Could not find codec parameters from '%s'\n", stream->feed_filename); av_close_input_file(infile); goto fail;

1 0

r13591 - trunk/libavcodec/mpegaudioenc.c
by subversion＠mplayerhq.hu 01 Jun '08

01 Jun '08

Author: michael Date: Sun Jun 1 03:07:59 2008 New Revision: 13591 Log: Prevent scalefactors from overflowing. fixes issue351 Modified: trunk/libavcodec/mpegaudioenc.c Modified: trunk/libavcodec/mpegaudioenc.c ============================================================================== --- trunk/libavcodec/mpegaudioenc.c (original) +++ trunk/libavcodec/mpegaudioenc.c Sun Jun 1 03:07:59 2008 @@ -387,7 +387,7 @@ static void compute_scale_factors(unsign vmax = v; } /* compute the scale factor index using log 2 computations */ - if (vmax > 0) { + if (vmax > 1) { n = av_log2(vmax); /* n is the position of the MSB of vmax. now use at most 2 compares to find the index */

1 0