October 2009 - FFmpeg-soc - lists.ffmpeg.org

[soc]: r5425 - in libavfilter: checkout.sh diffs/01_ffplay_filters.diff diffs/02_ffmpeg_filters.diff diffs/03_libavfilter_doc.diff vf_format.c
by stefano 28 Oct '09

28 Oct '09

Author: stefano Date: Tue Oct 27 23:05:34 2009 New Revision: 5425 Log: Update to FFmpeg r20390, and remove the vf_format.c filters, which are now included in the main repo. Deleted: libavfilter/vf_format.c Modified: libavfilter/checkout.sh libavfilter/diffs/01_ffplay_filters.diff libavfilter/diffs/02_ffmpeg_filters.diff libavfilter/diffs/03_libavfilter_doc.diff Modified: libavfilter/checkout.sh ============================================================================== --- libavfilter/checkout.sh Sat Oct 24 08:21:31 2009 (r5424) +++ libavfilter/checkout.sh Tue Oct 27 23:05:34 2009 (r5425) @@ -1,7 +1,7 @@ #! /bin/sh echo "checking out pristine ffmpeg" -svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r20353 +svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r20390 echo "downloading the corresponding version of swscale" cd ffmpeg/libswscale Modified: libavfilter/diffs/01_ffplay_filters.diff ============================================================================== --- libavfilter/diffs/01_ffplay_filters.diff Sat Oct 24 08:21:31 2009 (r5424) +++ libavfilter/diffs/01_ffplay_filters.diff Tue Oct 27 23:05:34 2009 (r5425) @@ -1,6 +1,6 @@ Index: ffplay.c =================================================================== ---- ffplay.c (revision 20353) +--- ffplay.c (revision 20390) +++ ffplay.c (working copy) @@ -29,6 +29,12 @@ #include "libavcodec/colorspace.h" Modified: libavfilter/diffs/02_ffmpeg_filters.diff ============================================================================== --- libavfilter/diffs/02_ffmpeg_filters.diff Sat Oct 24 08:21:31 2009 (r5424) +++ libavfilter/diffs/02_ffmpeg_filters.diff Tue Oct 27 23:05:34 2009 (r5425) @@ -1,6 +1,6 @@ Index: ffmpeg.c =================================================================== ---- ffmpeg.c (revision 20353) +--- ffmpeg.c (revision 20390) +++ ffmpeg.c (working copy) @@ -41,6 +41,13 @@ #include "libavutil/avstring.h" Modified: libavfilter/diffs/03_libavfilter_doc.diff ============================================================================== --- libavfilter/diffs/03_libavfilter_doc.diff Sat Oct 24 08:21:31 2009 (r5424) +++ libavfilter/diffs/03_libavfilter_doc.diff Tue Oct 27 23:05:34 2009 (r5425) @@ -1,8 +1,8 @@ Index: doc/libavfilter.texi =================================================================== ---- doc/libavfilter.texi (revision 20353) +--- doc/libavfilter.texi (revision 20390) +++ doc/libavfilter.texi (working copy) -@@ -111,10 +111,149 @@ +@@ -111,6 +111,20 @@ The default value of ``width'' and ``height'' is 0. @@ -20,15 +20,13 @@ Index: doc/libavfilter.texi +./ffmpeg -i in.avi -vfilters "fifo" out.avi +@end example + -+@section format -+ -+@example -+./ffmpeg -i in.avi -vfilters "format=yuv420p" out.avi -+@end example -+ -+Convert video to one of the specified filters formats (libavfilter will -+try to pick one that is supported as an input to the next filter). -+ + @section format + + Convert the input video to one of the specified pixel formats. +@@ -128,6 +142,30 @@ + + will convert the input video to the format ``yuv420p''. + +@section fps + +@example @@ -53,16 +51,10 @@ Index: doc/libavfilter.texi + +Convert a video to its negative. + -+@section noformat -+ -+@example -+./ffmpeg -i in.avi -vfilters "noformat=yuv420p" out.avi -+@end example -+ -+Force libavfilter not to send any of the specified pixel formats to the -+next filter. -+ - @section null + @section noformat + + Force libavfilter not to use any of the specified pixel formats as the +@@ -149,6 +187,89 @@ Pass the source unchanged to the output. @@ -152,7 +144,7 @@ Index: doc/libavfilter.texi @section vflip Flip the input video vertically. -@@ -123,4 +262,30 @@ +@@ -157,4 +278,30 @@ ./ffmpeg -i in.avi -vfilters "vflip" out.avi @end example

1 0

[soc]: r5424 - jpeg2000/j2kdec.c
by jai_menon 24 Oct '09

24 Oct '09

Author: jai_menon Date: Sat Oct 24 08:21:31 2009 New Revision: 5424 Log: cosmetics : fix typo Modified: jpeg2000/j2kdec.c Modified: jpeg2000/j2kdec.c ============================================================================== --- jpeg2000/j2kdec.c Fri Oct 23 00:41:03 2009 (r5423) +++ jpeg2000/j2kdec.c Sat Oct 24 08:21:31 2009 (r5424) @@ -402,7 +402,7 @@ static int get_qcd(J2kDecoderContext *s, return 0; } -/** get quantization paramteres for a component in the whole image on in a particular tile */ +/** get quantization parameters for a component in the whole image on in a particular tile */ static int get_qcc(J2kDecoderContext *s, int n, J2kQuantStyle *q, uint8_t *properties) { int compno;

1 0

[soc]: r5419 - als/alsdec.c
by thilo.borgmann 23 Oct '09

23 Oct '09

Author: thilo.borgmann Date: Tue Oct 20 15:00:40 2009 New Revision: 5419 Log: Splits reading of block data and decoding of block data. Introduces ALSBlockData struct. Modified: als/alsdec.c Modified: als/alsdec.c ============================================================================== --- als/alsdec.c Mon Oct 19 11:39:30 2009 (r5418) +++ als/alsdec.c Tue Oct 20 15:00:40 2009 (r5419) @@ -88,6 +88,26 @@ typedef struct { } ALSDecContext; +typedef struct { + unsigned int block_length; ///< number of samples within the block + unsigned int ra_block; ///< if true, this is a random access block + int const_block; ///< if true, this is a constant value block + int32_t const_val; ///< the sample value of a constant block + int js_blocks; ///< true if this block contains a difference signal + unsigned int shift_lsbs; ///< shift of values for this block + unsigned int opt_order; ///< prediction order of this block + int store_prev_samples;///< if true, carryover samples have to be stored + int use_ltp; ///< if true, long-term prediction is used + int ltp_lag; ///< lag value for long-term prediction + int ltp_gain[5]; ///< gain values for ltp 5-tap filter + int32_t *quant_cof; ///< quantized parcor coefficients + int32_t *lpc_cof; ///< coefficients of the direct form prediction + int32_t *raw_samples; ///< decoded raw samples / residuals for this block + int32_t *prev_raw_samples; ///< contains unshifted raw samples from the previous block + int32_t *raw_other; ///< decoded raw samples of the other channel of a channel pair +} ALSBlockData; + + static av_cold void dprint_specific_config(ALSDecContext *ctx) { #ifdef DEBUG @@ -424,38 +444,44 @@ static void get_block_sizes(ALSDecContex /** Reads the block data for a constant block */ -static void read_const_block(ALSDecContext *ctx, int32_t *raw_samples, - unsigned int block_length, unsigned int *js_blocks) +static void read_const_block_data(ALSDecContext *ctx, ALSBlockData *bd) { ALSSpecificConfig *sconf = &ctx->sconf; AVCodecContext *avctx = ctx->avctx; GetBitContext *gb = &ctx->gb; - int32_t const_val = 0; - unsigned int const_block, k; - const_block = get_bits1(gb); // 1 = constant value, 0 = zero block (silence) - *js_blocks = get_bits1(gb); + bd->const_val = 0; + bd->const_block = get_bits1(gb); // 1 = constant value, 0 = zero block (silence) + bd->js_blocks = get_bits1(gb); // skip 5 reserved bits skip_bits(gb, 5); - if (const_block) { + if (bd->const_block) { unsigned int const_val_bits = sconf->floating ? 24 : avctx->bits_per_raw_sample; - const_val = get_sbits_long(gb, const_val_bits); + bd->const_val = get_sbits_long(gb, const_val_bits); } + // ensure constant block decoding by reusing this field + bd->const_block = 1; +} + + +/** Decodes the block data for a constant block + */ +static void decode_const_block_data(ALSDecContext *ctx, ALSBlockData *bd) +{ + int smp; + // write raw samples into buffer - for (k = 0; k < block_length; k++) - raw_samples[k] = const_val; + for (smp = 0; smp < bd->block_length; smp++) + bd->raw_samples[smp] = bd->const_val; } /** Reads the block data for a non-constant block */ -static int read_var_block(ALSDecContext *ctx, unsigned int ra_block, - int32_t *raw_samples, unsigned int block_length, - unsigned int *js_blocks, int32_t *raw_other, - unsigned int *shift_lsbs) +static int read_var_block_data(ALSDecContext *ctx, ALSBlockData *bd) { ALSSpecificConfig *sconf = &ctx->sconf; AVCodecContext *avctx = ctx->avctx; @@ -463,18 +489,14 @@ static int read_var_block(ALSDecContext unsigned int k; unsigned int s[8]; unsigned int sub_blocks, log2_sub_blocks, sb_length; - unsigned int opt_order = 1; - int32_t *quant_cof = ctx->quant_cof; - int32_t *lpc_cof = ctx->lpc_cof; unsigned int start = 0; - int smp = 0; - int sb, store_prev_samples; - int64_t y; - int use_ltp = 0; - int ltp_lag = 0; - int ltp_gain[5]; + int sb; - *js_blocks = get_bits1(gb); + // ensure variable block decoding by reusing this field + bd->const_block = 0; + + bd->opt_order = 1; + bd->js_blocks = get_bits1(gb); // determine the number of subblocks for entropy decoding if (!sconf->bgmc && !sconf->sb_part) { @@ -490,13 +512,13 @@ static int read_var_block(ALSDecContext // do not continue in case of a damaged stream since // block_length must be evenly divisible by sub_blocks - if (block_length & (sub_blocks - 1)) { + if (bd->block_length & (sub_blocks - 1)) { av_log(avctx, AV_LOG_WARNING, "Block length is not evenly divisible by the number of subblocks.\n"); return -1; } - sb_length = block_length >> log2_sub_blocks; + sb_length = bd->block_length >> log2_sub_blocks; if (sconf->bgmc) { @@ -508,119 +530,134 @@ static int read_var_block(ALSDecContext } if (get_bits1(gb)) - *shift_lsbs = get_bits(gb, 4) + 1; - - store_prev_samples = (*js_blocks && raw_other) || *shift_lsbs; + bd->shift_lsbs = get_bits(gb, 4) + 1; + bd->store_prev_samples = (bd->js_blocks && bd->raw_other) || + bd->shift_lsbs; if (!sconf->rlslms) { if (sconf->adapt_order) { - int opt_order_length = av_ceil_log2(av_clip((block_length >> 3) - 1, - 2, sconf->max_order + 1)); - opt_order = get_bits(gb, opt_order_length); + int opt_order_length = av_ceil_log2(av_clip((bd->block_length >> 3) - 1, + 2, sconf->max_order + 1)); + bd->opt_order = get_bits(gb, opt_order_length); } else { - opt_order = sconf->max_order; + bd->opt_order = sconf->max_order; } - if (opt_order) { + if (bd->opt_order) { int add_base; if (sconf->coef_table == 3) { add_base = 0x7F; // read coefficient 0 - quant_cof[0] = parcor_scaled_values[get_bits(gb, 7)]; - quant_cof[0] *= 32; + bd->quant_cof[0] = parcor_scaled_values[get_bits(gb, 7)]; + bd->quant_cof[0] *= 32; // read coefficient 1 - quant_cof[1] = -parcor_scaled_values[get_bits(gb, 7)]; - quant_cof[0] *= 32; + bd->quant_cof[1] = -parcor_scaled_values[get_bits(gb, 7)]; + bd->quant_cof[0] *= 32; // read coefficients 2 to opt_order - for (k = 2; k < opt_order; k++) - quant_cof[k] = get_bits(gb, 7); + for (k = 2; k < bd->opt_order; k++) + bd->quant_cof[k] = get_bits(gb, 7); } else { int k_max; add_base = 1; // read coefficient 0 to 19 - k_max = FFMIN(opt_order, 20); + k_max = FFMIN(bd->opt_order, 20); for (k = 0; k < k_max; k++) { int rice_param = parcor_rice_table[sconf->coef_table][k][1]; int offset = parcor_rice_table[sconf->coef_table][k][0]; - quant_cof[k] = decode_rice(gb, rice_param) + offset; + bd->quant_cof[k] = decode_rice(gb, rice_param) + offset; } // read coefficients 20 to 126 - k_max = FFMIN(opt_order, 127); + k_max = FFMIN(bd->opt_order, 127); for (; k < k_max; k++) - quant_cof[k] = decode_rice(gb, 2) + (k & 1); + bd->quant_cof[k] = decode_rice(gb, 2) + (k & 1); // read coefficients 127 to opt_order - for (; k < opt_order; k++) - quant_cof[k] = decode_rice(gb, 1); + for (; k < bd->opt_order; k++) + bd->quant_cof[k] = decode_rice(gb, 1); - quant_cof[0] = parcor_scaled_values[quant_cof[0] + 64]; - quant_cof[0] *= 32; - quant_cof[1] = -parcor_scaled_values[quant_cof[1] + 64]; - quant_cof[1] *= 32; + bd->quant_cof[0] = parcor_scaled_values[bd->quant_cof[0] + 64]; + bd->quant_cof[0] *= 32; + bd->quant_cof[1] = -parcor_scaled_values[bd->quant_cof[1] + 64]; + bd->quant_cof[1] *= 32; } - for (k = 2; k < opt_order; k++) - quant_cof[k] = (quant_cof[k] << 14) + (add_base << 13); + for (k = 2; k < bd->opt_order; k++) + bd->quant_cof[k] = (bd->quant_cof[k] << 14) + (add_base << 13); } } // read LTP gain and lag values if (sconf->long_term_prediction) { - use_ltp = get_bits1(gb); + bd->use_ltp = get_bits1(gb); - if (use_ltp) { - ltp_gain[0] = decode_rice(gb, 1) << 3; - ltp_gain[1] = decode_rice(gb, 2) << 3; + if (bd->use_ltp) { + bd->ltp_gain[0] = decode_rice(gb, 1) << 3; + bd->ltp_gain[1] = decode_rice(gb, 2) << 3; - ltp_gain[2] = get_unary(gb, 0, 4); - ltp_gain[2] <<= 2; - ltp_gain[2] += get_bits(gb, 2); - ltp_gain[2] = ltp_gain_values[ltp_gain[2]]; + bd->ltp_gain[2] = get_unary(gb, 0, 4); + bd->ltp_gain[2] <<= 2; + bd->ltp_gain[2] += get_bits(gb, 2); + bd->ltp_gain[2] = ltp_gain_values[bd->ltp_gain[2]]; - ltp_gain[3] = decode_rice(gb, 2) << 3; - ltp_gain[4] = decode_rice(gb, 1) << 3; + bd->ltp_gain[3] = decode_rice(gb, 2) << 3; + bd->ltp_gain[4] = decode_rice(gb, 1) << 3; - ltp_lag = get_bits(gb, ctx->ltp_lag_length); - ltp_lag += FFMAX(4, opt_order + 1); + bd->ltp_lag = get_bits(gb, ctx->ltp_lag_length); + bd->ltp_lag += FFMAX(4, bd->opt_order + 1); } } // read first value and residuals in case of a random access block - if (ra_block) { - if (opt_order) - raw_samples[0] = decode_rice(gb, avctx->bits_per_raw_sample - 4); - if (opt_order > 1) - raw_samples[1] = decode_rice(gb, s[0] + 3); - if (opt_order > 2) - raw_samples[2] = decode_rice(gb, s[0] + 1); + if (bd->ra_block) { + if (bd->opt_order) + bd->raw_samples[0] = decode_rice(gb, avctx->bits_per_raw_sample - 4); + if (bd->opt_order > 1) + bd->raw_samples[1] = decode_rice(gb, s[0] + 3); + if (bd->opt_order > 2) + bd->raw_samples[2] = decode_rice(gb, s[0] + 1); - start = FFMIN(opt_order, 3); + start = FFMIN(bd->opt_order, 3); } // read all residuals if (sconf->bgmc) { // TODO: BGMC mode } else { - int32_t *current_res = raw_samples + start; + int32_t *current_res = bd->raw_samples + start; for (sb = 0; sb < sub_blocks; sb++, start = 0) for (; start < sb_length; start++) *current_res++ = decode_rice(gb, s[sb]); - } + } + + return 0; +} + + +/** Decodes the block data for a non-constant block + */ +static int decode_var_block_data(ALSDecContext *ctx, ALSBlockData *bd) +{ + ALSSpecificConfig *sconf = &ctx->sconf; + unsigned int block_length = bd->block_length; + unsigned int smp = 0; + unsigned int k; + int sb; + int64_t y; // reverse long-term prediction - if (use_ltp) { + if (bd->use_ltp) { int ltp_smp; - for (ltp_smp = FFMAX(ltp_lag - 2, 0); ltp_smp < block_length; ltp_smp++) { - int center = ltp_smp - ltp_lag; + for (ltp_smp = FFMAX(bd->ltp_lag - 2, 0); ltp_smp < block_length; ltp_smp++) { + int center = ltp_smp - bd->ltp_lag; int begin = FFMAX(0, center - 2); int end = center + 3; int tab = 5 - (end - begin); @@ -629,68 +666,68 @@ static int read_var_block(ALSDecContext y = 1 << 6; for (base = begin; base < end; base++, tab++) - y += MUL64(ltp_gain[tab], raw_samples[base]); + y += MUL64(bd->ltp_gain[tab], bd->raw_samples[base]); - raw_samples[ltp_smp] += y >> 7; + bd->raw_samples[ltp_smp] += y >> 7; } } // reconstruct all samples from residuals - if (ra_block) { - for (smp = 0; smp < opt_order; smp++) { + if (bd->ra_block) { + for (smp = 0; smp < bd->opt_order; smp++) { y = 1 << 19; for (sb = 0; sb < smp; sb++) - y += MUL64(lpc_cof[sb],raw_samples[smp - (sb + 1)]); + y += MUL64(bd->lpc_cof[sb], bd->raw_samples[smp - (sb + 1)]); - raw_samples[smp] -= y >> 20; - parcor_to_lpc(smp, quant_cof, lpc_cof); + bd->raw_samples[smp] -= y >> 20; + parcor_to_lpc(smp, bd->quant_cof, bd->lpc_cof); } } else { - for (k = 0; k < opt_order; k++) - parcor_to_lpc(k, quant_cof, lpc_cof); + for (k = 0; k < bd->opt_order; k++) + parcor_to_lpc(k, bd->quant_cof, bd->lpc_cof); // store previous samples in case that they have to be altered - if (store_prev_samples) - memcpy(ctx->prev_raw_samples, raw_samples - sconf->max_order, - sizeof(*ctx->prev_raw_samples) * sconf->max_order); + if (bd->store_prev_samples) + memcpy(bd->prev_raw_samples, bd->raw_samples - sconf->max_order, + sizeof(*bd->prev_raw_samples) * sconf->max_order); // reconstruct difference signal for prediction (joint-stereo) - if (*js_blocks && raw_other) { + if (bd->js_blocks && bd->raw_other) { int32_t *left, *right; - if (raw_other > raw_samples) { // D = R - L - left = raw_samples; - right = raw_other; + if (bd->raw_other > bd->raw_samples) { // D = R - L + left = bd->raw_samples; + right = bd->raw_other; } else { // D = R - L - left = raw_other; - right = raw_samples; + left = bd->raw_other; + right = bd->raw_samples; } for (sb = -1; sb >= -sconf->max_order; sb--) - raw_samples[sb] = right[sb] - left[sb]; + bd->raw_samples[sb] = right[sb] - left[sb]; } // reconstruct shifted signal - if (*shift_lsbs) + if (bd->shift_lsbs) for (sb = -1; sb >= -sconf->max_order; sb--) - raw_samples[sb] >>= *shift_lsbs; + bd->raw_samples[sb] >>= bd->shift_lsbs; } // reconstruct raw samples - for (; smp < block_length; smp++) { + for (; smp < bd->block_length; smp++) { y = 1 << 19; - for (sb = 0; sb < opt_order; sb++) - y += MUL64(lpc_cof[sb],raw_samples[smp - (sb + 1)]); + for (sb = 0; sb < bd->opt_order; sb++) + y += MUL64(bd->lpc_cof[sb], bd->raw_samples[smp - (sb + 1)]); - raw_samples[smp] -= y >> 20; + bd->raw_samples[smp] -= y >> 20; } // restore previous samples in case that they have been altered - if (store_prev_samples) - memcpy(raw_samples - sconf->max_order, ctx->prev_raw_samples, - sizeof(*raw_samples) * sconf->max_order); + if (bd->store_prev_samples) + memcpy(bd->raw_samples - sconf->max_order, bd->prev_raw_samples, + sizeof(*bd->raw_samples) * sconf->max_order); return 0; } @@ -698,32 +735,42 @@ static int read_var_block(ALSDecContext /** Reads the block data. */ -static int read_block_data(ALSDecContext *ctx, unsigned int ra_block, - int32_t *raw_samples, unsigned int block_length, - unsigned int *js_blocks, int32_t *raw_other) +static int read_block(ALSDecContext *ctx, ALSBlockData *bd) +{ + GetBitContext *gb = &ctx->gb; + + // read block type flag and read the samples accordingly + if (get_bits1(gb)) + read_var_block_data(ctx, bd); + else + read_const_block_data(ctx, bd); + + return 0; +} + + +/** Decodes the block data. + */ +static int decode_block(ALSDecContext *ctx, ALSBlockData *bd) { ALSSpecificConfig *sconf = &ctx->sconf; GetBitContext *gb = &ctx->gb; - unsigned int shift_lsbs = 0; - unsigned int k; + unsigned int smp; // read block type flag and read the samples accordingly - if (get_bits1(gb)) { - if (read_var_block(ctx, ra_block, raw_samples, block_length, js_blocks, - raw_other, &shift_lsbs)) - return -1; - } else { - read_const_block(ctx, raw_samples, block_length, js_blocks); - } + if (bd->const_block) + decode_const_block_data(ctx, bd); + else if (decode_var_block_data(ctx, bd)) + return -1; // TODO: read RLSLMS extension data if (!sconf->mc_coding || ctx->js_switch) align_get_bits(gb); - if (shift_lsbs) - for (k = 0; k < block_length; k++) - raw_samples[k] <<= shift_lsbs; + if (bd->shift_lsbs) + for (smp = 0; smp < bd->block_length; smp++) + bd->raw_samples[smp] <<= bd->shift_lsbs; return 0; } @@ -750,21 +797,34 @@ static int decode_blocks_ind(ALSDecConte unsigned int c, const unsigned int *div_blocks, unsigned int *js_blocks) { - int32_t *raw_sample; unsigned int b; - raw_sample = ctx->raw_samples[c]; + ALSBlockData bd; + + memset(&bd, 0, sizeof(ALSBlockData)); + + bd.ra_block = ra_frame; + bd.quant_cof = ctx->quant_cof; + bd.lpc_cof = ctx->lpc_cof; + bd.prev_raw_samples = ctx->prev_raw_samples; + bd.raw_samples = ctx->raw_samples[c]; + for (b = 0; b < ctx->num_blocks; b++) { - if (read_block_data(ctx, ra_frame, raw_sample, - div_blocks[b], &js_blocks[0], NULL)) { - // damaged block, write zero for the rest of the frame - zero_remaining(b, ctx->num_blocks, div_blocks, raw_sample); + bd.shift_lsbs = 0; + bd.block_length = div_blocks[b]; + + if (read_block(ctx, &bd) || + decode_block(ctx, &bd)) { + zero_remaining(b, ctx->num_blocks, div_blocks, bd.raw_samples); return -1; - } - raw_sample += div_blocks[b]; - ra_frame = 0; + } + + bd.raw_samples += div_blocks[b]; + bd.ra_block = 0; } + *js_blocks = bd.js_blocks; + return 0; } @@ -777,39 +837,62 @@ static int decode_blocks(ALSDecContext * { ALSSpecificConfig *sconf = &ctx->sconf; unsigned int offset = 0; - int32_t *raw_samples_R; - int32_t *raw_samples_L; unsigned int b; + ALSBlockData bd[2]; + + memset(bd, 0, 2 * sizeof(ALSBlockData)); + + bd[0].ra_block = ra_frame; + bd[0].quant_cof = ctx->quant_cof; + bd[0].lpc_cof = ctx->lpc_cof; + bd[0].prev_raw_samples = ctx->prev_raw_samples; + bd[0].js_blocks = *js_blocks; + + bd[1].ra_block = ra_frame; + bd[1].quant_cof = ctx->quant_cof; + bd[1].lpc_cof = ctx->lpc_cof; + bd[1].prev_raw_samples = ctx->prev_raw_samples; + bd[1].js_blocks = *(js_blocks + 1); // decode all blocks for (b = 0; b < ctx->num_blocks; b++) { unsigned int s; - raw_samples_L = ctx->raw_samples[c ] + offset; - raw_samples_R = ctx->raw_samples[c + 1] + offset; - if (read_block_data(ctx, ra_frame, raw_samples_L, div_blocks[b], - &js_blocks[0], raw_samples_R) || - read_block_data(ctx, ra_frame, raw_samples_R, div_blocks[b], - &js_blocks[1], raw_samples_L)) { + + bd[0].shift_lsbs = 0; + bd[1].shift_lsbs = 0; + + bd[0].block_length = div_blocks[b]; + bd[1].block_length = div_blocks[b]; + + bd[0].raw_samples = ctx->raw_samples[c ] + offset; + bd[1].raw_samples = ctx->raw_samples[c + 1] + offset; + + bd[0].raw_other = bd[1].raw_samples; + bd[1].raw_other = bd[0].raw_samples; + + if (read_block(ctx, &bd[0]) || decode_block(ctx, &bd[0]) || + read_block(ctx, &bd[1]) || decode_block(ctx, &bd[1])) { // damaged block, write zero for the rest of the frame - zero_remaining(b, ctx->num_blocks, div_blocks, raw_samples_L); - zero_remaining(b, ctx->num_blocks, div_blocks, raw_samples_R); + zero_remaining(b, ctx->num_blocks, div_blocks, bd[0].raw_samples); + zero_remaining(b, ctx->num_blocks, div_blocks, bd[1].raw_samples); return -1; } // reconstruct joint-stereo blocks - if (js_blocks[0]) { - if (js_blocks[1]) + if (bd[0].js_blocks) { + if (bd[1].js_blocks) av_log(ctx->avctx, AV_LOG_WARNING, "Invalid channel pair!\n"); for (s = 0; s < div_blocks[b]; s++) - raw_samples_L[s] = raw_samples_R[s] - raw_samples_L[s]; - } else if (js_blocks[1]) { + bd[0].raw_samples[s] = bd[1].raw_samples[s] - bd[0].raw_samples[s]; + } else if (bd[1].js_blocks) { for (s = 0; s < div_blocks[b]; s++) - raw_samples_R[s] = raw_samples_R[s] + raw_samples_L[s]; + bd[1].raw_samples[s] = bd[1].raw_samples[s] + bd[0].raw_samples[s]; } offset += div_blocks[b]; - ra_frame = 0; + bd[0].ra_block = 0; + bd[1].ra_block = 0; } // store carryover raw samples,

3 13

[soc]: r5423 - in libavfilter: checkout.sh diffs/01_ffplay_filters.diff diffs/02_ffmpeg_filters.diff diffs/03_libavfilter_doc.diff vf_vflip.c
by stefano 23 Oct '09

23 Oct '09

Author: stefano Date: Fri Oct 23 00:41:03 2009 New Revision: 5423 Log: Update to FFmpeg r20353, and remove the vflip filter which is now included in the main repo. Deleted: libavfilter/vf_vflip.c Modified: libavfilter/checkout.sh libavfilter/diffs/01_ffplay_filters.diff libavfilter/diffs/02_ffmpeg_filters.diff libavfilter/diffs/03_libavfilter_doc.diff Modified: libavfilter/checkout.sh ============================================================================== --- libavfilter/checkout.sh Wed Oct 21 23:42:18 2009 (r5422) +++ libavfilter/checkout.sh Fri Oct 23 00:41:03 2009 (r5423) @@ -1,7 +1,7 @@ #! /bin/sh echo "checking out pristine ffmpeg" -svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r20344 +svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r20353 echo "downloading the corresponding version of swscale" cd ffmpeg/libswscale Modified: libavfilter/diffs/01_ffplay_filters.diff ============================================================================== --- libavfilter/diffs/01_ffplay_filters.diff Wed Oct 21 23:42:18 2009 (r5422) +++ libavfilter/diffs/01_ffplay_filters.diff Fri Oct 23 00:41:03 2009 (r5423) @@ -1,6 +1,6 @@ Index: ffplay.c =================================================================== ---- ffplay.c (revision 20344) +--- ffplay.c (revision 20353) +++ ffplay.c (working copy) @@ -29,6 +29,12 @@ #include "libavcodec/colorspace.h" Modified: libavfilter/diffs/02_ffmpeg_filters.diff ============================================================================== --- libavfilter/diffs/02_ffmpeg_filters.diff Wed Oct 21 23:42:18 2009 (r5422) +++ libavfilter/diffs/02_ffmpeg_filters.diff Fri Oct 23 00:41:03 2009 (r5423) @@ -1,6 +1,6 @@ Index: ffmpeg.c =================================================================== ---- ffmpeg.c (revision 20344) +--- ffmpeg.c (revision 20353) +++ ffmpeg.c (working copy) @@ -41,6 +41,13 @@ #include "libavutil/avstring.h" Modified: libavfilter/diffs/03_libavfilter_doc.diff ============================================================================== --- libavfilter/diffs/03_libavfilter_doc.diff Wed Oct 21 23:42:18 2009 (r5422) +++ libavfilter/diffs/03_libavfilter_doc.diff Fri Oct 23 00:41:03 2009 (r5423) @@ -1,10 +1,10 @@ Index: doc/libavfilter.texi =================================================================== ---- doc/libavfilter.texi (revision 20344) +--- doc/libavfilter.texi (revision 20353) +++ doc/libavfilter.texi (working copy) -@@ -111,8 +111,185 @@ +@@ -111,10 +111,149 @@ - The default value of ``w'' and ``h'' is 0. + The default value of ``width'' and ``height'' is 0. +@section drawbox + @@ -52,10 +52,6 @@ Index: doc/libavfilter.texi +@end example + +Convert a video to its negative. -+ -+ @section null -+ -+ Pass the source unchanged to the output. + +@section noformat + @@ -153,14 +149,13 @@ Index: doc/libavfilter.texi + +Transpose (line => column) input video to next video filter. + -+@section vflip -+ -+@example -+./ffmpeg -i in.avi -vfilters "vflip" out.avi -+@end example -+ -+Flip the video vertically. -+ + @section vflip + + Flip the input video vertically. +@@ -123,4 +262,30 @@ + ./ffmpeg -i in.avi -vfilters "vflip" out.avi + @end example + +@section buffer + +This input filter is used by the client application to feed pictures to

1 0

[soc]: r5422 - in libavfilter: checkout.sh diffs/01_ffplay_filters.diff diffs/02_ffmpeg_filters.diff diffs/03_libavfilter_doc.diff diffs/03_vfilters_doc.diff vf_crop.c
by stefano 22 Oct '09

22 Oct '09

Author: stefano Date: Wed Oct 21 23:42:18 2009 New Revision: 5422 Log: Update to FFmpeg r20344. In particular remove the vf_crop.c filter, since it is in the main repo. Added: libavfilter/diffs/03_libavfilter_doc.diff (contents, props changed) - copied, changed from r5417, libavfilter/diffs/03_vfilters_doc.diff Deleted: libavfilter/diffs/03_vfilters_doc.diff libavfilter/vf_crop.c Modified: libavfilter/checkout.sh libavfilter/diffs/01_ffplay_filters.diff libavfilter/diffs/02_ffmpeg_filters.diff Modified: libavfilter/checkout.sh ============================================================================== --- libavfilter/checkout.sh Tue Oct 20 23:19:55 2009 (r5421) +++ libavfilter/checkout.sh Wed Oct 21 23:42:18 2009 (r5422) @@ -1,7 +1,7 @@ #! /bin/sh echo "checking out pristine ffmpeg" -svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r20303 +svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r20344 echo "downloading the corresponding version of swscale" cd ffmpeg/libswscale Modified: libavfilter/diffs/01_ffplay_filters.diff ============================================================================== --- libavfilter/diffs/01_ffplay_filters.diff Tue Oct 20 23:19:55 2009 (r5421) +++ libavfilter/diffs/01_ffplay_filters.diff Wed Oct 21 23:42:18 2009 (r5422) @@ -1,6 +1,6 @@ Index: ffplay.c =================================================================== ---- ffplay.c (revision 20303) +--- ffplay.c (revision 20344) +++ ffplay.c (working copy) @@ -29,6 +29,12 @@ #include "libavcodec/colorspace.h" Modified: libavfilter/diffs/02_ffmpeg_filters.diff ============================================================================== --- libavfilter/diffs/02_ffmpeg_filters.diff Tue Oct 20 23:19:55 2009 (r5421) +++ libavfilter/diffs/02_ffmpeg_filters.diff Wed Oct 21 23:42:18 2009 (r5422) @@ -1,6 +1,6 @@ Index: ffmpeg.c =================================================================== ---- ffmpeg.c (revision 20303) +--- ffmpeg.c (revision 20344) +++ ffmpeg.c (working copy) @@ -41,6 +41,13 @@ #include "libavutil/avstring.h" Copied and modified: libavfilter/diffs/03_libavfilter_doc.diff (from r5417, libavfilter/diffs/03_vfilters_doc.diff) ============================================================================== --- libavfilter/diffs/03_vfilters_doc.diff Mon Oct 19 01:55:41 2009 (r5417, copy source) +++ libavfilter/diffs/03_libavfilter_doc.diff Wed Oct 21 23:42:18 2009 (r5422) @@ -1,20 +1,11 @@ -Index: doc/vfilters.texi +Index: doc/libavfilter.texi =================================================================== ---- doc/vfilters.texi (revision 20303) -+++ doc/vfilters.texi (working copy) -@@ -80,8 +80,190 @@ +--- doc/libavfilter.texi (revision 20344) ++++ doc/libavfilter.texi (working copy) +@@ -111,8 +111,185 @@ - Below is a description of the currently available video filters. + The default value of ``w'' and ``h'' is 0. -+@section crop -+ -+@example -+./ffmpeg -i in.avi -vfilters "crop=0:0:-1:240" out.avi -+@end example -+ -+Crop the input video to x:y:width:height. -+The -1 in width or height means that dimension in the input video. -+ +@section drawbox + +@example @@ -62,10 +53,10 @@ Index: doc/vfilters.texi + +Convert a video to its negative. + - @section null - - Pass the source unchanged to the output. - ++ @section null ++ ++ Pass the source unchanged to the output. ++ +@section noformat + +@example @@ -75,6 +66,10 @@ Index: doc/vfilters.texi +Force libavfilter not to send any of the specified pixel formats to the +next filter. + + @section null + + Pass the source unchanged to the output. + +@section overlay + +Overlay one video on top of another (see the example in the introduction

1 0

[soc] [propchange]: r5419 - svn:log
by thilo.borgmann 21 Oct '09

21 Oct '09

Author: thilo.borgmann Revision: 5419 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1,2 +1,3 @@ -Splits reading of block data and decoding of block data. +Splits reading of block data and decoding of block data to prepare support +for multi-channel correlation mode. Introduces ALSBlockData struct.

3 2

[soc] [propchange]: r5419 - svn:log
by thilo.borgmann 21 Oct '09

21 Oct '09

Author: thilo.borgmann Revision: 5419 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1,3 +1,3 @@ -Splits reading of block data and decoding of block data to prepare support -for multi-channel correlation mode. +Read and decode block data in separate functions to prepare support for +multi-channel correlation mode. Introduces ALSBlockData struct.

1 0

[soc]: r5421 - jpeg2000/j2kdec.c
by jai_menon 21 Oct '09

21 Oct '09

Author: jai_menon Date: Tue Oct 20 23:19:55 2009 New Revision: 5421 Log: Mark j2k_flush as static. Modified: jpeg2000/j2kdec.c Modified: jpeg2000/j2kdec.c ============================================================================== --- jpeg2000/j2kdec.c Tue Oct 20 23:15:39 2009 (r5420) +++ jpeg2000/j2kdec.c Tue Oct 20 23:19:55 2009 (r5421) @@ -91,7 +91,7 @@ static int get_bits(J2kDecoderContext *s return res; } -void j2k_flush(J2kDecoderContext *s) +static void j2k_flush(J2kDecoderContext *s) { if (*s->buf == 0xff) s->buf++;

1 0

[soc]: r5420 - jpeg2000/j2kdec.c
by jai_menon 21 Oct '09

21 Oct '09

Author: jai_menon Date: Tue Oct 20 23:15:39 2009 New Revision: 5420 Log: cosmetics : add a newline to the error message. Modified: jpeg2000/j2kdec.c Modified: jpeg2000/j2kdec.c ============================================================================== --- jpeg2000/j2kdec.c Tue Oct 20 15:00:40 2009 (r5419) +++ jpeg2000/j2kdec.c Tue Oct 20 23:15:39 2009 (r5420) @@ -677,7 +677,7 @@ static void decode_clnpass(J2kDecoderCon val = (val << 1) + ff_mqc_decode(&t1->mqc, t1->mqc.cx_states + MQC_CX_UNI); val = (val << 1) + ff_mqc_decode(&t1->mqc, t1->mqc.cx_states + MQC_CX_UNI); if (val != 0xa) { - av_log(s->avctx, AV_LOG_ERROR,"Segmentation symbol value incorrect"); + av_log(s->avctx, AV_LOG_ERROR,"Segmentation symbol value incorrect\n"); } } }

1 0

[soc]: r5418 - libavfilter/Makefile
by benoit 19 Oct '09

19 Oct '09

Author: benoit Date: Mon Oct 19 11:39:30 2009 New Revision: 5418 Log: Reduce Makefile diffs. Modified: libavfilter/Makefile Modified: libavfilter/Makefile ============================================================================== --- libavfilter/Makefile Mon Oct 19 01:55:41 2009 (r5417) +++ libavfilter/Makefile Mon Oct 19 11:39:30 2009 (r5418) @@ -5,13 +5,15 @@ FFLIBS = avcodec avutil FFLIBS-$(CONFIG_SCALE_FILTER) += swscale FFLIBS-$(CONFIG_AVFILTER_LAVF) += avformat -OBJS = allfilters.o \ - avfilter.o \ - avfiltergraph.o \ - defaults.o \ - formats.o \ - graphparser.o \ - parseutils.o \ +HEADERS = avfilter.h + +OBJS = allfilters.o \ + avfilter.o \ + avfiltergraph.o \ + defaults.o \ + formats.o \ + graphparser.o \ + parseutils.o \ OBJS-$(CONFIG_CROP_FILTER) += vf_crop.o @@ -34,6 +36,4 @@ OBJS-$(CONFIG_VFLIP_FILTER) += vf_v OBJS-$(CONFIG_BUFFER_FILTER) += vsrc_buffer.o OBJS-$(CONFIG_MOVIE_FILTER) += vsrc_movie.o -HEADERS = avfilter.h - include $(SUBDIR)../subdir.mak

1 0

[soc]: r5417 - in libavfilter: checkout.sh diffs/01_ffplay_filters.diff diffs/02_ffmpeg_filters.diff diffs/03_vfilters_doc.diff vf_drawbox.c vf_hflip.c vf_negate.c vf_rotate.c vf_transpose.c vsrc_b...
by stefano 19 Oct '09

19 Oct '09

Author: stefano Date: Mon Oct 19 01:55:41 2009 New Revision: 5417 Log: Update to FFmpeg r20303. Modified: libavfilter/checkout.sh libavfilter/diffs/01_ffplay_filters.diff libavfilter/diffs/02_ffmpeg_filters.diff libavfilter/diffs/03_vfilters_doc.diff libavfilter/vf_drawbox.c libavfilter/vf_hflip.c libavfilter/vf_negate.c libavfilter/vf_rotate.c libavfilter/vf_transpose.c libavfilter/vsrc_buffer.c libavfilter/vsrc_movie.c Modified: libavfilter/checkout.sh ============================================================================== --- libavfilter/checkout.sh Mon Oct 19 01:23:24 2009 (r5416) +++ libavfilter/checkout.sh Mon Oct 19 01:55:41 2009 (r5417) @@ -1,7 +1,7 @@ #! /bin/sh echo "checking out pristine ffmpeg" -svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r20299 +svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r20303 echo "downloading the corresponding version of swscale" cd ffmpeg/libswscale Modified: libavfilter/diffs/01_ffplay_filters.diff ============================================================================== --- libavfilter/diffs/01_ffplay_filters.diff Mon Oct 19 01:23:24 2009 (r5416) +++ libavfilter/diffs/01_ffplay_filters.diff Mon Oct 19 01:55:41 2009 (r5417) @@ -1,6 +1,6 @@ Index: ffplay.c =================================================================== ---- ffplay.c (revision 20299) +--- ffplay.c (revision 20303) +++ ffplay.c (working copy) @@ -29,6 +29,12 @@ #include "libavcodec/colorspace.h" @@ -310,7 +310,7 @@ Index: ffplay.c + priv->is->video_st->codec->pix_fmt, PIX_FMT_NONE + }; + -+ avfilter_set_common_formats(ctx, avfilter_make_format_list2(pix_fmts)); ++ avfilter_set_common_formats(ctx, avfilter_make_format_list(pix_fmts)); + return 0; +} + @@ -352,7 +352,7 @@ Index: ffplay.c +{ + enum PixelFormat pix_fmts[] = { PIX_FMT_YUV420P, PIX_FMT_NONE }; + -+ avfilter_set_common_formats(ctx, avfilter_make_format_list2(pix_fmts)); ++ avfilter_set_common_formats(ctx, avfilter_make_format_list(pix_fmts)); + return 0; +} + Modified: libavfilter/diffs/02_ffmpeg_filters.diff ============================================================================== --- libavfilter/diffs/02_ffmpeg_filters.diff Mon Oct 19 01:23:24 2009 (r5416) +++ libavfilter/diffs/02_ffmpeg_filters.diff Mon Oct 19 01:55:41 2009 (r5417) @@ -1,6 +1,6 @@ Index: ffmpeg.c =================================================================== ---- ffmpeg.c (revision 20299) +--- ffmpeg.c (revision 20303) +++ ffmpeg.c (working copy) @@ -41,6 +41,13 @@ #include "libavutil/avstring.h" @@ -71,7 +71,7 @@ Index: ffmpeg.c + FilterOutPriv *priv = ctx->priv; + enum PixelFormat pix_fmts[] = { priv->pix_fmt, PIX_FMT_NONE }; + -+ avfilter_set_common_formats(ctx, avfilter_make_format_list2(pix_fmts)); ++ avfilter_set_common_formats(ctx, avfilter_make_format_list(pix_fmts)); + return 0; +} + Modified: libavfilter/diffs/03_vfilters_doc.diff ============================================================================== --- libavfilter/diffs/03_vfilters_doc.diff Mon Oct 19 01:23:24 2009 (r5416) +++ libavfilter/diffs/03_vfilters_doc.diff Mon Oct 19 01:55:41 2009 (r5417) @@ -1,6 +1,6 @@ Index: doc/vfilters.texi =================================================================== ---- doc/vfilters.texi (revision 20299) +--- doc/vfilters.texi (revision 20303) +++ doc/vfilters.texi (working copy) @@ -80,8 +80,190 @@ Modified: libavfilter/vf_drawbox.c ============================================================================== --- libavfilter/vf_drawbox.c Mon Oct 19 01:23:24 2009 (r5416) +++ libavfilter/vf_drawbox.c Mon Oct 19 01:55:41 2009 (r5417) @@ -78,7 +78,7 @@ static int query_formats(AVFilterContext PIX_FMT_NONE }; - avfilter_set_common_formats(ctx, avfilter_make_format_list2(pix_fmts)); + avfilter_set_common_formats(ctx, avfilter_make_format_list(pix_fmts)); return 0; } Modified: libavfilter/vf_hflip.c ============================================================================== --- libavfilter/vf_hflip.c Mon Oct 19 01:23:24 2009 (r5416) +++ libavfilter/vf_hflip.c Mon Oct 19 01:55:41 2009 (r5417) @@ -37,7 +37,7 @@ static int query_formats(AVFilterContext PIX_FMT_NONE }; - avfilter_set_common_formats(ctx, avfilter_make_format_list2(pix_fmts)); + avfilter_set_common_formats(ctx, avfilter_make_format_list(pix_fmts)); return 0; } Modified: libavfilter/vf_negate.c ============================================================================== --- libavfilter/vf_negate.c Mon Oct 19 01:23:24 2009 (r5416) +++ libavfilter/vf_negate.c Mon Oct 19 01:55:41 2009 (r5417) @@ -38,7 +38,7 @@ static int query_formats(AVFilterContext PIX_FMT_NONE }; - avfilter_set_common_formats(ctx, avfilter_make_format_list2(pix_fmts)); + avfilter_set_common_formats(ctx, avfilter_make_format_list(pix_fmts)); return 0; } Modified: libavfilter/vf_rotate.c ============================================================================== --- libavfilter/vf_rotate.c Mon Oct 19 01:23:24 2009 (r5416) +++ libavfilter/vf_rotate.c Mon Oct 19 01:55:41 2009 (r5417) @@ -64,7 +64,7 @@ static int query_formats(AVFilterContext PIX_FMT_NONE }; - avfilter_set_common_formats(ctx, avfilter_make_format_list2(pix_fmts)); + avfilter_set_common_formats(ctx, avfilter_make_format_list(pix_fmts)); return 0; } Modified: libavfilter/vf_transpose.c ============================================================================== --- libavfilter/vf_transpose.c Mon Oct 19 01:23:24 2009 (r5416) +++ libavfilter/vf_transpose.c Mon Oct 19 01:55:41 2009 (r5417) @@ -52,7 +52,7 @@ static int query_formats(AVFilterContext PIX_FMT_NONE }; - avfilter_set_common_formats(ctx, avfilter_make_format_list2(pix_fmts)); + avfilter_set_common_formats(ctx, avfilter_make_format_list(pix_fmts)); return 0; } Modified: libavfilter/vsrc_buffer.c ============================================================================== --- libavfilter/vsrc_buffer.c Mon Oct 19 01:23:24 2009 (r5416) +++ libavfilter/vsrc_buffer.c Mon Oct 19 01:55:41 2009 (r5417) @@ -68,7 +68,7 @@ static int query_formats(AVFilterContext BufferSourceContext *c = ctx->priv; enum PixelFormat pix_fmts[] = { c->pix_fmt, PIX_FMT_NONE }; - avfilter_set_common_formats(ctx, avfilter_make_format_list2(pix_fmts)); + avfilter_set_common_formats(ctx, avfilter_make_format_list(pix_fmts)); return 0; } Modified: libavfilter/vsrc_movie.c ============================================================================== --- libavfilter/vsrc_movie.c Mon Oct 19 01:23:24 2009 (r5416) +++ libavfilter/vsrc_movie.c Mon Oct 19 01:55:41 2009 (r5417) @@ -151,7 +151,7 @@ static int query_formats(AVFilterContext MovieContext *mv = ctx->priv; enum PixelFormat pix_fmts[] = { mv->codec_ctx->pix_fmt, PIX_FMT_NONE }; - avfilter_set_common_formats(ctx, avfilter_make_format_list2(pix_fmts)); + avfilter_set_common_formats(ctx, avfilter_make_format_list(pix_fmts)); return 0; }

1 0

[soc]: r5416 - in libavfilter: diffs/01_ffplay_filters.diff diffs/02_ffmpeg_filters.diff vf_drawbox.c vf_hflip.c vf_negate.c vf_rotate.c vf_transpose.c vsrc_buffer.c vsrc_movie.c
by stefano 19 Oct '09

19 Oct '09

Author: stefano Date: Mon Oct 19 01:23:24 2009 New Revision: 5416 Log: Prefer avfilter_make_format_list2() over avfilter_make_format_list(), the latter interface is going to be removed. Modified: libavfilter/diffs/01_ffplay_filters.diff libavfilter/diffs/02_ffmpeg_filters.diff libavfilter/vf_drawbox.c libavfilter/vf_hflip.c libavfilter/vf_negate.c libavfilter/vf_rotate.c libavfilter/vf_transpose.c libavfilter/vsrc_buffer.c libavfilter/vsrc_movie.c Modified: libavfilter/diffs/01_ffplay_filters.diff ============================================================================== --- libavfilter/diffs/01_ffplay_filters.diff Mon Oct 19 01:12:39 2009 (r5415) +++ libavfilter/diffs/01_ffplay_filters.diff Mon Oct 19 01:23:24 2009 (r5416) @@ -208,7 +208,7 @@ Index: ffplay.c /* update the bitmap content */ SDL_UnlockYUVOverlay(vp->bmp); -@@ -1313,54 +1384,269 @@ +@@ -1313,54 +1384,273 @@ return queue_picture(is, src_frame, pts); } @@ -306,8 +306,11 @@ Index: ffplay.c +static int input_query_formats(AVFilterContext *ctx) +{ + FilterPriv *priv = ctx->priv; -+ avfilter_set_common_formats(ctx, -+ avfilter_make_format_list(1, priv->is->video_st->codec->pix_fmt)); ++ enum PixelFormat pix_fmts[] = { ++ priv->is->video_st->codec->pix_fmt, PIX_FMT_NONE ++ }; ++ ++ avfilter_set_common_formats(ctx, avfilter_make_format_list2(pix_fmts)); + return 0; +} + @@ -347,8 +350,9 @@ Index: ffplay.c + +static int output_query_formats(AVFilterContext *ctx) +{ -+ avfilter_set_common_formats(ctx, -+ avfilter_make_format_list(1, PIX_FMT_YUV420P)); ++ enum PixelFormat pix_fmts[] = { PIX_FMT_YUV420P, PIX_FMT_NONE }; ++ ++ avfilter_set_common_formats(ctx, avfilter_make_format_list2(pix_fmts)); + return 0; +} + @@ -509,7 +513,7 @@ Index: ffplay.c av_free(frame); return 0; } -@@ -2136,6 +2422,12 @@ +@@ -2136,6 +2426,12 @@ /* free all pictures */ for(i=0;i<VIDEO_PICTURE_QUEUE_SIZE; i++) { vp = &is->pictq[i]; @@ -522,7 +526,7 @@ Index: ffplay.c if (vp->bmp) { SDL_FreeYUVOverlay(vp->bmp); vp->bmp = NULL; -@@ -2145,8 +2437,10 @@ +@@ -2145,8 +2441,10 @@ SDL_DestroyCond(is->pictq_cond); SDL_DestroyMutex(is->subpq_mutex); SDL_DestroyCond(is->subpq_cond); @@ -533,7 +537,7 @@ Index: ffplay.c av_free(is); } -@@ -2238,6 +2532,9 @@ +@@ -2238,6 +2536,9 @@ av_free(avcodec_opts[i]); av_free(avformat_opts); av_free(sws_opts); @@ -543,7 +547,7 @@ Index: ffplay.c if (show_status) printf("\n"); SDL_Quit(); -@@ -2486,6 +2783,9 @@ +@@ -2486,6 +2787,9 @@ { "ec", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&error_concealment}, "set error concealment options", "bit_mask" }, { "sync", HAS_ARG | OPT_FUNC2 | OPT_EXPERT, {(void*)opt_sync}, "set audio-video sync. type (type=audio/video/ext)", "type" }, { "threads", HAS_ARG | OPT_FUNC2 | OPT_EXPERT, {(void*)opt_thread_count}, "thread count", "count" }, @@ -553,7 +557,7 @@ Index: ffplay.c { "default", OPT_FUNC2 | HAS_ARG | OPT_AUDIO | OPT_VIDEO | OPT_EXPERT, {(void*)opt_default}, "generic catch all option", "" }, { "loglevel", HAS_ARG | OPT_FUNC2, {(void*)opt_loglevel}, "set libav* logging level", "loglevel" }, { NULL, }, -@@ -2535,7 +2835,9 @@ +@@ -2535,7 +2839,9 @@ avcodec_opts[i]= avcodec_alloc_context2(i); } avformat_opts = avformat_alloc_context(); Modified: libavfilter/diffs/02_ffmpeg_filters.diff ============================================================================== --- libavfilter/diffs/02_ffmpeg_filters.diff Mon Oct 19 01:12:39 2009 (r5415) +++ libavfilter/diffs/02_ffmpeg_filters.diff Mon Oct 19 01:23:24 2009 (r5416) @@ -41,7 +41,7 @@ Index: ffmpeg.c } AVInputStream; typedef struct AVInputFile { -@@ -314,6 +332,185 @@ +@@ -314,6 +332,186 @@ static struct termios oldtty; #endif @@ -69,8 +69,9 @@ Index: ffmpeg.c +static int output_query_formats(AVFilterContext *ctx) +{ + FilterOutPriv *priv = ctx->priv; -+ avfilter_set_common_formats(ctx, -+ avfilter_make_format_list(1, priv->pix_fmt)); ++ enum PixelFormat pix_fmts[] = { priv->pix_fmt, PIX_FMT_NONE }; ++ ++ avfilter_set_common_formats(ctx, avfilter_make_format_list2(pix_fmts)); + return 0; +} + @@ -227,7 +228,7 @@ Index: ffmpeg.c static void term_exit(void) { #if HAVE_TERMIOS_H -@@ -454,6 +651,10 @@ +@@ -454,6 +652,10 @@ av_free(audio_out2); av_free(samples); @@ -238,7 +239,7 @@ Index: ffmpeg.c if (received_sigterm) { fprintf(stderr, "Received signal %d: terminating.\n", -@@ -868,7 +1069,9 @@ +@@ -868,7 +1070,9 @@ int *frame_size) { int nb_frames, i, ret; @@ -248,7 +249,7 @@ Index: ffmpeg.c AVFrame *final_picture, *formatted_picture, *resampling_dst, *padding_src; AVFrame picture_crop_temp, picture_pad_temp; AVCodecContext *enc, *dec; -@@ -914,6 +1117,9 @@ +@@ -914,6 +1118,9 @@ if (nb_frames <= 0) return; @@ -258,7 +259,7 @@ Index: ffmpeg.c if (ost->video_crop) { if (av_picture_crop((AVPicture *)&picture_crop_temp, (AVPicture *)in_picture, dec->pix_fmt, ost->topBand, ost->leftBand) < 0) { fprintf(stderr, "error cropping picture\n"); -@@ -925,6 +1131,7 @@ +@@ -925,6 +1132,7 @@ } else { formatted_picture = in_picture; } @@ -266,7 +267,7 @@ Index: ffmpeg.c final_picture = formatted_picture; padding_src = formatted_picture; -@@ -942,6 +1149,7 @@ +@@ -942,6 +1150,7 @@ } } @@ -274,7 +275,7 @@ Index: ffmpeg.c if (ost->video_resample) { padding_src = NULL; final_picture = &ost->pict_tmp; -@@ -990,6 +1198,7 @@ +@@ -990,6 +1199,7 @@ sws_scale(ost->img_resample_ctx, formatted_picture->data, formatted_picture->linesize, 0, ost->resample_height, resampling_dst->data, resampling_dst->linesize); } @@ -282,7 +283,7 @@ Index: ffmpeg.c if (ost->video_pad) { av_picture_pad((AVPicture*)final_picture, (AVPicture *)padding_src, -@@ -1256,6 +1465,10 @@ +@@ -1256,6 +1466,10 @@ static unsigned int samples_size= 0; AVSubtitle subtitle, *subtitle_to_free; int got_subtitle; @@ -293,7 +294,7 @@ Index: ffmpeg.c AVPacket avpkt; int bps = av_get_bits_per_sample_format(ist->st->codec->sample_fmt)>>3; -@@ -1378,6 +1591,15 @@ +@@ -1378,6 +1592,15 @@ &buffer_to_free); } @@ -309,7 +310,7 @@ Index: ffmpeg.c // preprocess audio (volume) if (ist->st->codec->codec_type == CODEC_TYPE_AUDIO) { if (audio_volume != 256) { -@@ -1399,10 +1621,18 @@ +@@ -1399,10 +1622,18 @@ if (pts > now) usleep(pts - now); } @@ -329,7 +330,7 @@ Index: ffmpeg.c for(i=0;i<nb_ostreams;i++) { int frame_size; -@@ -1419,6 +1649,9 @@ +@@ -1419,6 +1650,9 @@ do_audio_out(os, ost, ist, data_buf, data_size); break; case CODEC_TYPE_VIDEO: @@ -339,7 +340,7 @@ Index: ffmpeg.c do_video_out(os, ost, ist, &picture, &frame_size); if (vstats_filename && frame_size) do_video_stats(os, ost, frame_size); -@@ -1484,7 +1717,17 @@ +@@ -1484,7 +1718,17 @@ av_free_packet(&opkt); } } @@ -357,7 +358,7 @@ Index: ffmpeg.c av_free(buffer_to_free); /* XXX: allocate the subtitles in the codec ? */ if (subtitle_to_free) { -@@ -1938,16 +2181,27 @@ +@@ -1938,16 +2182,27 @@ av_exit(1); } @@ -385,7 +386,7 @@ Index: ffmpeg.c break; case CODEC_TYPE_SUBTITLE: ost->encoding_needed = 1; -@@ -2334,6 +2588,12 @@ +@@ -2334,6 +2589,12 @@ avcodec_close(ist->st->codec); } } @@ -398,7 +399,7 @@ Index: ffmpeg.c /* finished ! */ ret = 0; -@@ -3897,6 +4157,9 @@ +@@ -3897,6 +4158,9 @@ { "psnr", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&do_psnr}, "calculate PSNR of compressed frames" }, { "vstats", OPT_EXPERT | OPT_VIDEO, {(void*)&opt_vstats}, "dump video coding statistics to file" }, { "vstats_file", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_vstats_file}, "dump video coding statistics to file", "file" }, Modified: libavfilter/vf_drawbox.c ============================================================================== --- libavfilter/vf_drawbox.c Mon Oct 19 01:12:39 2009 (r5415) +++ libavfilter/vf_drawbox.c Mon Oct 19 01:23:24 2009 (r5416) @@ -70,13 +70,15 @@ static av_cold int init(AVFilterContext static int query_formats(AVFilterContext *ctx) { - avfilter_set_common_formats(ctx, - avfilter_make_format_list(10, - PIX_FMT_YUV444P, PIX_FMT_YUV422P, PIX_FMT_YUV420P, - PIX_FMT_YUV411P, PIX_FMT_YUV410P, - PIX_FMT_YUVJ444P, PIX_FMT_YUVJ422P, PIX_FMT_YUVJ420P, - PIX_FMT_YUV440P, PIX_FMT_YUVJ440P) - ); + enum PixelFormat pix_fmts[] = { + PIX_FMT_YUV444P, PIX_FMT_YUV422P, PIX_FMT_YUV420P, + PIX_FMT_YUV411P, PIX_FMT_YUV410P, + PIX_FMT_YUVJ444P, PIX_FMT_YUVJ422P, PIX_FMT_YUVJ420P, + PIX_FMT_YUV440P, PIX_FMT_YUVJ440P, + PIX_FMT_NONE + }; + + avfilter_set_common_formats(ctx, avfilter_make_format_list2(pix_fmts)); return 0; } Modified: libavfilter/vf_hflip.c ============================================================================== --- libavfilter/vf_hflip.c Mon Oct 19 01:12:39 2009 (r5415) +++ libavfilter/vf_hflip.c Mon Oct 19 01:23:24 2009 (r5416) @@ -29,12 +29,15 @@ typedef struct static int query_formats(AVFilterContext *ctx) { - avfilter_set_common_formats(ctx, - avfilter_make_format_list(10, - PIX_FMT_YUV444P, PIX_FMT_YUV422P, PIX_FMT_YUV420P, - PIX_FMT_YUV411P, PIX_FMT_YUV410P, - PIX_FMT_YUVJ444P, PIX_FMT_YUVJ422P, PIX_FMT_YUVJ420P, - PIX_FMT_YUV440P, PIX_FMT_YUVJ440P)); + enum PixelFormat pix_fmts[] = { + PIX_FMT_YUV444P, PIX_FMT_YUV422P, PIX_FMT_YUV420P, + PIX_FMT_YUV411P, PIX_FMT_YUV410P, + PIX_FMT_YUVJ444P, PIX_FMT_YUVJ422P, PIX_FMT_YUVJ420P, + PIX_FMT_YUV440P, PIX_FMT_YUVJ440P, + PIX_FMT_NONE + }; + + avfilter_set_common_formats(ctx, avfilter_make_format_list2(pix_fmts)); return 0; } Modified: libavfilter/vf_negate.c ============================================================================== --- libavfilter/vf_negate.c Mon Oct 19 01:12:39 2009 (r5415) +++ libavfilter/vf_negate.c Mon Oct 19 01:23:24 2009 (r5416) @@ -29,14 +29,16 @@ typedef struct static int query_formats(AVFilterContext *ctx) { - avfilter_set_common_formats(ctx, - avfilter_make_format_list(12, - PIX_FMT_YUV444P, PIX_FMT_YUV422P, PIX_FMT_YUV420P, - PIX_FMT_YUV411P, PIX_FMT_YUV410P, - PIX_FMT_YUVJ444P, PIX_FMT_YUVJ422P, PIX_FMT_YUVJ420P, - PIX_FMT_YUV440P, PIX_FMT_YUVJ440P, - PIX_FMT_MONOWHITE, PIX_FMT_MONOBLACK)); + enum PixelFormat pix_fmts[] = { + PIX_FMT_YUV444P, PIX_FMT_YUV422P, PIX_FMT_YUV420P, + PIX_FMT_YUV411P, PIX_FMT_YUV410P, + PIX_FMT_YUVJ444P, PIX_FMT_YUVJ422P, PIX_FMT_YUVJ420P, + PIX_FMT_YUV440P, PIX_FMT_YUVJ440P, + PIX_FMT_MONOWHITE, PIX_FMT_MONOBLACK, + PIX_FMT_NONE + }; + avfilter_set_common_formats(ctx, avfilter_make_format_list2(pix_fmts)); return 0; } Modified: libavfilter/vf_rotate.c ============================================================================== --- libavfilter/vf_rotate.c Mon Oct 19 01:12:39 2009 (r5415) +++ libavfilter/vf_rotate.c Mon Oct 19 01:23:24 2009 (r5416) @@ -56,12 +56,15 @@ static av_cold int init(AVFilterContext static int query_formats(AVFilterContext *ctx) { - avfilter_set_common_formats(ctx, - avfilter_make_format_list(10, - PIX_FMT_YUV444P, PIX_FMT_YUV422P, PIX_FMT_YUV420P, - PIX_FMT_YUV411P, PIX_FMT_YUV410P, - PIX_FMT_YUVJ444P, PIX_FMT_YUVJ422P, PIX_FMT_YUVJ420P, - PIX_FMT_YUV440P, PIX_FMT_YUVJ440P)); + enum PixelFormat pix_fmts[] = { + PIX_FMT_YUV444P, PIX_FMT_YUV422P, PIX_FMT_YUV420P, + PIX_FMT_YUV411P, PIX_FMT_YUV410P, + PIX_FMT_YUVJ444P, PIX_FMT_YUVJ422P, PIX_FMT_YUVJ420P, + PIX_FMT_YUV440P, PIX_FMT_YUVJ440P, + PIX_FMT_NONE + }; + + avfilter_set_common_formats(ctx, avfilter_make_format_list2(pix_fmts)); return 0; } Modified: libavfilter/vf_transpose.c ============================================================================== --- libavfilter/vf_transpose.c Mon Oct 19 01:12:39 2009 (r5415) +++ libavfilter/vf_transpose.c Mon Oct 19 01:23:24 2009 (r5416) @@ -44,12 +44,15 @@ static int config_props_input(AVFilterLi static int query_formats(AVFilterContext *ctx) { - avfilter_set_common_formats(ctx, - avfilter_make_format_list(10, - PIX_FMT_YUV444P, PIX_FMT_YUV422P, PIX_FMT_YUV420P, - PIX_FMT_YUV411P, PIX_FMT_YUV410P, - PIX_FMT_YUVJ444P, PIX_FMT_YUVJ422P, PIX_FMT_YUVJ420P, - PIX_FMT_YUV440P, PIX_FMT_YUVJ440P)); + enum PixelFormat pix_fmts[] = { + PIX_FMT_YUV444P, PIX_FMT_YUV422P, PIX_FMT_YUV420P, + PIX_FMT_YUV411P, PIX_FMT_YUV410P, + PIX_FMT_YUVJ444P, PIX_FMT_YUVJ422P, PIX_FMT_YUVJ420P, + PIX_FMT_YUV440P, PIX_FMT_YUVJ440P, + PIX_FMT_NONE + }; + + avfilter_set_common_formats(ctx, avfilter_make_format_list2(pix_fmts)); return 0; } Modified: libavfilter/vsrc_buffer.c ============================================================================== --- libavfilter/vsrc_buffer.c Mon Oct 19 01:12:39 2009 (r5415) +++ libavfilter/vsrc_buffer.c Mon Oct 19 01:23:24 2009 (r5416) @@ -66,8 +66,9 @@ static av_cold int init(AVFilterContext static int query_formats(AVFilterContext *ctx) { BufferSourceContext *c = ctx->priv; + enum PixelFormat pix_fmts[] = { c->pix_fmt, PIX_FMT_NONE }; - avfilter_set_common_formats(ctx, avfilter_make_format_list(1, c->pix_fmt)); + avfilter_set_common_formats(ctx, avfilter_make_format_list2(pix_fmts)); return 0; } Modified: libavfilter/vsrc_movie.c ============================================================================== --- libavfilter/vsrc_movie.c Mon Oct 19 01:12:39 2009 (r5415) +++ libavfilter/vsrc_movie.c Mon Oct 19 01:23:24 2009 (r5416) @@ -149,9 +149,9 @@ static av_cold int init(AVFilterContext static int query_formats(AVFilterContext *ctx) { MovieContext *mv = ctx->priv; + enum PixelFormat pix_fmts[] = { mv->codec_ctx->pix_fmt, PIX_FMT_NONE }; - avfilter_set_common_formats(ctx, - avfilter_make_format_list(1, mv->codec_ctx->pix_fmt)); + avfilter_set_common_formats(ctx, avfilter_make_format_list2(pix_fmts)); return 0; }

1 0

[soc]: r5415 - in libavfilter: checkout.sh diffs/01_ffplay_filters.diff diffs/02_ffmpeg_filters.diff diffs/03_vfilters_doc.diff
by stefano 19 Oct '09

19 Oct '09

Author: stefano Date: Mon Oct 19 01:12:39 2009 New Revision: 5415 Log: Update to FFmpeg r20299. Modified: libavfilter/checkout.sh libavfilter/diffs/01_ffplay_filters.diff libavfilter/diffs/02_ffmpeg_filters.diff libavfilter/diffs/03_vfilters_doc.diff Modified: libavfilter/checkout.sh ============================================================================== --- libavfilter/checkout.sh Mon Oct 19 00:22:36 2009 (r5414) +++ libavfilter/checkout.sh Mon Oct 19 01:12:39 2009 (r5415) @@ -1,7 +1,7 @@ #! /bin/sh echo "checking out pristine ffmpeg" -svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r20275 +svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r20299 echo "downloading the corresponding version of swscale" cd ffmpeg/libswscale Modified: libavfilter/diffs/01_ffplay_filters.diff ============================================================================== --- libavfilter/diffs/01_ffplay_filters.diff Mon Oct 19 00:22:36 2009 (r5414) +++ libavfilter/diffs/01_ffplay_filters.diff Mon Oct 19 01:12:39 2009 (r5415) @@ -1,6 +1,6 @@ Index: ffplay.c =================================================================== ---- ffplay.c (revision 20275) +--- ffplay.c (revision 20299) +++ ffplay.c (working copy) @@ -29,6 +29,12 @@ #include "libavcodec/colorspace.h" Modified: libavfilter/diffs/02_ffmpeg_filters.diff ============================================================================== --- libavfilter/diffs/02_ffmpeg_filters.diff Mon Oct 19 00:22:36 2009 (r5414) +++ libavfilter/diffs/02_ffmpeg_filters.diff Mon Oct 19 01:12:39 2009 (r5415) @@ -1,6 +1,6 @@ Index: ffmpeg.c =================================================================== ---- ffmpeg.c (revision 20275) +--- ffmpeg.c (revision 20299) +++ ffmpeg.c (working copy) @@ -41,6 +41,13 @@ #include "libavutil/avstring.h" Modified: libavfilter/diffs/03_vfilters_doc.diff ============================================================================== --- libavfilter/diffs/03_vfilters_doc.diff Mon Oct 19 00:22:36 2009 (r5414) +++ libavfilter/diffs/03_vfilters_doc.diff Mon Oct 19 01:12:39 2009 (r5415) @@ -1,8 +1,8 @@ Index: doc/vfilters.texi =================================================================== ---- doc/vfilters.texi (revision 20275) +--- doc/vfilters.texi (revision 20299) +++ doc/vfilters.texi (working copy) -@@ -78,8 +78,190 @@ +@@ -80,8 +80,190 @@ Below is a description of the currently available video filters.

1 0

[soc]: r5414 - jpeg2000/j2kdec.c
by jai_menon 19 Oct '09

19 Oct '09

Author: jai_menon Date: Mon Oct 19 00:22:36 2009 New Revision: 5414 Log: Release allocated buffer after decoding has finished. Modified: jpeg2000/j2kdec.c Modified: jpeg2000/j2kdec.c ============================================================================== --- jpeg2000/j2kdec.c Sun Oct 18 23:53:00 2009 (r5413) +++ jpeg2000/j2kdec.c Mon Oct 19 00:22:36 2009 (r5414) @@ -1028,6 +1028,16 @@ static av_cold int j2kdec_init(AVCodecCo return 0; } +static av_cold int decode_end(AVCodecContext *avctx) +{ + J2kDecoderContext *s = avctx->priv_data; + + if (s->picture.data[0]) + avctx->release_buffer(avctx, &s->picture); + + return 0; +} + AVCodec jpeg2000_decoder = { "j2k", CODEC_TYPE_VIDEO, @@ -1035,7 +1045,7 @@ AVCodec jpeg2000_decoder = { sizeof(J2kDecoderContext), j2kdec_init, NULL, - NULL, + decode_end, decode_frame, 0, .pix_fmts =

1 0

[soc]: r5413 - jpeg2000/ffmpeg.patch
by jai_menon 19 Oct '09

19 Oct '09

Author: jai_menon Date: Sun Oct 18 23:53:00 2009 New Revision: 5413 Log: Update the glue code to svn head, add a few extensions to img2 to ease debugging and disable the encoder temporarily. Modified: jpeg2000/ffmpeg.patch Modified: jpeg2000/ffmpeg.patch ============================================================================== --- jpeg2000/ffmpeg.patch Sun Oct 18 12:41:28 2009 (r5412) +++ jpeg2000/ffmpeg.patch Sun Oct 18 23:53:00 2009 (r5413) @@ -1,57 +1,76 @@ Index: Changelog =================================================================== ---- Changelog (revision 14483) +--- Changelog (revision 20294) +++ Changelog (working copy) -@@ -127,6 +127,7 @@ - - Motion Pixels Video decoder - - Motion Pixels MVI demuxer - - removed animated GIF decoder/demuxer +@@ -41,9 +41,11 @@ + - Atrac1 decoder + - MD STUDIO audio demuxer + - RF64 support in WAV demuxer +- JPEG2000 encoder and decoder - version 0.4.9-pre1: -Index: libavcodec/Makefile -=================================================================== ---- libavcodec/Makefile (revision 14483) -+++ libavcodec/Makefile (working copy) -@@ -99,6 +99,8 @@ - OBJS-$(CONFIG_INTERPLAY_VIDEO_DECODER) += interplayvideo.o - OBJS-$(CONFIG_JPEGLS_DECODER) += jpeglsdec.o jpegls.o mjpegdec.o mjpeg.o golomb.o - OBJS-$(CONFIG_JPEGLS_ENCODER) += jpeglsenc.o jpegls.o golomb.o -+OBJS-$(CONFIG_JPEG2000_DECODER) += j2kdec.o mqcdec.o mqc.o j2k.o dwt.o -+OBJS-$(CONFIG_JPEG2000_ENCODER) += j2kenc.o mqcenc.o mqc.o j2k.o dwt.o - OBJS-$(CONFIG_KMVC_DECODER) += kmvc.o - OBJS-$(CONFIG_LJPEG_ENCODER) += ljpegenc.o mjpegenc.o mjpeg.o mpegvideo_enc.o motion_est.o ratecontrol.o mpeg12data.o mpegvideo.o - OBJS-$(CONFIG_LOCO_DECODER) += loco.o golomb.o + ++ + version 0.5: + + - DV50 AKA DVCPRO50 encoder, decoder, muxer and demuxer Index: libavcodec/allcodecs.c =================================================================== ---- libavcodec/allcodecs.c (revision 14483) +--- libavcodec/allcodecs.c (revision 20294) +++ libavcodec/allcodecs.c (working copy) -@@ -101,6 +101,7 @@ +@@ -109,6 +109,7 @@ REGISTER_DECODER (INDEO2, indeo2); REGISTER_DECODER (INDEO3, indeo3); REGISTER_DECODER (INTERPLAY_VIDEO, interplay_video); -+ REGISTER_ENCDEC (JPEG2000, jpeg2000); ++ REGISTER_DECODER (JPEG2000, jpeg2000); REGISTER_ENCDEC (JPEGLS, jpegls); REGISTER_DECODER (KMVC, kmvc); REGISTER_ENCODER (LJPEG, ljpeg); +Index: libavcodec/Makefile +=================================================================== +--- libavcodec/Makefile (revision 20294) ++++ libavcodec/Makefile (working copy) +@@ -144,6 +144,8 @@ + OBJS-$(CONFIG_INDEO3_DECODER) += indeo3.o + OBJS-$(CONFIG_INTERPLAY_DPCM_DECODER) += dpcm.o + OBJS-$(CONFIG_INTERPLAY_VIDEO_DECODER) += interplayvideo.o ++OBJS-$(CONFIG_JPEG2000_DECODER) += j2kdec.o mqcdec.o mqc.o j2k.o dwt.o ++#OBJS-$(CONFIG_JPEG2000_ENCODER) += j2kenc.o mqcenc.o mqc.o j2k.o dwt.o + OBJS-$(CONFIG_JPEGLS_DECODER) += jpeglsdec.o jpegls.o \ + mjpegdec.o mjpeg.o + OBJS-$(CONFIG_JPEGLS_ENCODER) += jpeglsenc.o jpegls.o Index: doc/general.texi =================================================================== ---- doc/general.texi (revision 14483) +--- doc/general.texi (revision 20294) +++ doc/general.texi (working copy) -@@ -253,6 +253,7 @@ - @tab Used in Interplay .MVE files. - @item JPEG-LS @tab X @tab X - @tab fourcc: MJLS, lossless and near-lossless is supported. -+@item JPEG2000 @tab X @tab X - @item KMVC @tab @tab X - @tab Codec used in Worms games. - @item LOCO @tab @tab X +@@ -253,8 +253,7 @@ + @tab Digital Picture Exchange + @item JPEG @tab X @tab X + @tab Progressive JPEG is not supported. +-@item JPEG 2000 @tab @tab E +- @tab decoding supported through external library libopenjpeg ++@item JPEG 2000 @tab X @tab X + @item JPEG-LS @tab X @tab X + @item LJPEG @tab X @tab + @tab Lossless JPEG +Index: libavformat/img2.c +=================================================================== +--- libavformat/img2.c (revision 20294) ++++ libavformat/img2.c (working copy) +@@ -72,6 +72,8 @@ + { CODEC_ID_SUNRAST , "im24"}, + { CODEC_ID_SUNRAST , "sunras"}, + { CODEC_ID_JPEG2000 , "jp2"}, ++ { CODEC_ID_JPEG2000 , "jpc"}, ++ { CODEC_ID_JPEG2000 , "j2k"}, + { CODEC_ID_DPX , "dpx"}, + { CODEC_ID_NONE , NULL} + }; Index: libavformat/riff.c =================================================================== ---- libavformat/riff.c (revision 14483) +--- libavformat/riff.c (revision 20294) +++ libavformat/riff.c (working copy) -@@ -156,6 +156,7 @@ +@@ -204,6 +204,7 @@ { CODEC_ID_ZMBV, MKTAG('Z', 'M', 'B', 'V') }, { CODEC_ID_KMVC, MKTAG('K', 'M', 'V', 'C') }, { CODEC_ID_CAVS, MKTAG('C', 'A', 'V', 'S') },

1 0

[soc]: r5412 - in libavfilter: checkout.sh diffs/01_ffplay_filters.diff diffs/02_ffmpeg_filters.diff diffs/03_vfilters_doc.diff vf_null.c
by stefano 18 Oct '09

18 Oct '09

Author: stefano Date: Sun Oct 18 12:41:28 2009 New Revision: 5412 Log: Update to FFmpeg r20275, in particular remove the vf_null filter, which is now part of the main repo. Deleted: libavfilter/vf_null.c Modified: libavfilter/checkout.sh libavfilter/diffs/01_ffplay_filters.diff libavfilter/diffs/02_ffmpeg_filters.diff libavfilter/diffs/03_vfilters_doc.diff Modified: libavfilter/checkout.sh ============================================================================== --- libavfilter/checkout.sh Sun Oct 18 11:17:56 2009 (r5411) +++ libavfilter/checkout.sh Sun Oct 18 12:41:28 2009 (r5412) @@ -1,7 +1,7 @@ #! /bin/sh echo "checking out pristine ffmpeg" -svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r20272 +svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r20275 echo "downloading the corresponding version of swscale" cd ffmpeg/libswscale Modified: libavfilter/diffs/01_ffplay_filters.diff ============================================================================== --- libavfilter/diffs/01_ffplay_filters.diff Sun Oct 18 11:17:56 2009 (r5411) +++ libavfilter/diffs/01_ffplay_filters.diff Sun Oct 18 12:41:28 2009 (r5412) @@ -1,6 +1,6 @@ Index: ffplay.c =================================================================== ---- ffplay.c (revision 20272) +--- ffplay.c (revision 20275) +++ ffplay.c (working copy) @@ -29,6 +29,12 @@ #include "libavcodec/colorspace.h" Modified: libavfilter/diffs/02_ffmpeg_filters.diff ============================================================================== --- libavfilter/diffs/02_ffmpeg_filters.diff Sun Oct 18 11:17:56 2009 (r5411) +++ libavfilter/diffs/02_ffmpeg_filters.diff Sun Oct 18 12:41:28 2009 (r5412) @@ -1,6 +1,6 @@ Index: ffmpeg.c =================================================================== ---- ffmpeg.c (revision 20272) +--- ffmpeg.c (revision 20275) +++ ffmpeg.c (working copy) @@ -41,6 +41,13 @@ #include "libavutil/avstring.h" Modified: libavfilter/diffs/03_vfilters_doc.diff ============================================================================== --- libavfilter/diffs/03_vfilters_doc.diff Sun Oct 18 11:17:56 2009 (r5411) +++ libavfilter/diffs/03_vfilters_doc.diff Sun Oct 18 12:41:28 2009 (r5412) @@ -1,8 +1,8 @@ Index: doc/vfilters.texi =================================================================== ---- doc/vfilters.texi (revision 20272) +--- doc/vfilters.texi (revision 20275) +++ doc/vfilters.texi (working copy) -@@ -78,4 +78,186 @@ +@@ -78,8 +78,190 @@ Below is a description of the currently available video filters. @@ -62,6 +62,10 @@ Index: doc/vfilters.texi + +Convert a video to its negative. + + @section null + + Pass the source unchanged to the output. + +@section noformat + +@example

1 0

[soc]: r5411 - in libavfilter: checkout.sh diffs/01_ffplay_filters.diff diffs/02_ffmpeg_filters.diff diffs/03_vfilters_doc.diff doc vf_crop.c vf_null.c vf_overlay.c vf_scale.c vf_transpose.c vsrc_b...
by stefano 18 Oct '09

18 Oct '09

Author: stefano Date: Sun Oct 18 11:17:56 2009 New Revision: 5411 Log: Update to FFmpeg r20272. Added: libavfilter/diffs/03_vfilters_doc.diff Deleted: libavfilter/doc/ Modified: libavfilter/checkout.sh libavfilter/diffs/01_ffplay_filters.diff libavfilter/diffs/02_ffmpeg_filters.diff libavfilter/vf_crop.c libavfilter/vf_null.c libavfilter/vf_overlay.c libavfilter/vf_scale.c libavfilter/vf_transpose.c libavfilter/vsrc_buffer.c libavfilter/vsrc_movie.c Modified: libavfilter/checkout.sh ============================================================================== --- libavfilter/checkout.sh Wed Oct 14 02:45:13 2009 (r5410) +++ libavfilter/checkout.sh Sun Oct 18 11:17:56 2009 (r5411) @@ -1,7 +1,7 @@ #! /bin/sh echo "checking out pristine ffmpeg" -svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r20198 +svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r20272 echo "downloading the corresponding version of swscale" cd ffmpeg/libswscale @@ -13,6 +13,3 @@ for diff in $(ls $(pwd)/diffs/*.diff); d echo "copying files to libavfilter" find $(pwd) -maxdepth 1 -type f -not -name $(basename $0) -exec cp {} ffmpeg/libavfilter \; - -echo "copying libavfilter doc files" -cp -p $(pwd)/doc/* ffmpeg/doc Modified: libavfilter/diffs/01_ffplay_filters.diff ============================================================================== --- libavfilter/diffs/01_ffplay_filters.diff Wed Oct 14 02:45:13 2009 (r5410) +++ libavfilter/diffs/01_ffplay_filters.diff Sun Oct 18 11:17:56 2009 (r5411) @@ -1,6 +1,6 @@ Index: ffplay.c =================================================================== ---- ffplay.c (revision 20198) +--- ffplay.c (revision 20272) +++ ffplay.c (working copy) @@ -29,6 +29,12 @@ #include "libavcodec/colorspace.h" @@ -288,15 +288,15 @@ Index: ffplay.c + + /* FIXME: until I figure out how to hook everything up to the codec + * right, we're just copying the entire frame. */ -+ picref = avfilter_get_video_buffer(link, AV_PERM_WRITE); ++ picref = avfilter_get_video_buffer(link, AV_PERM_WRITE, link->w, link->h); + av_picture_copy((AVPicture *)&picref->data, (AVPicture *)priv->frame, -+ picref->pic->format, picref->w, picref->h); ++ picref->pic->format, link->w, link->h); + av_free_packet(&pkt); + + picref->pts = pts; + picref->pixel_aspect = priv->is->video_st->codec->sample_aspect_ratio; + avfilter_start_frame(link, avfilter_ref_pic(picref, ~0)); -+ avfilter_draw_slice(link, 0, picref->h); ++ avfilter_draw_slice(link, 0, link->h); + avfilter_end_frame(link); + avfilter_unref_pic(picref); + Modified: libavfilter/diffs/02_ffmpeg_filters.diff ============================================================================== --- libavfilter/diffs/02_ffmpeg_filters.diff Wed Oct 14 02:45:13 2009 (r5410) +++ libavfilter/diffs/02_ffmpeg_filters.diff Sun Oct 18 11:17:56 2009 (r5411) @@ -1,6 +1,6 @@ Index: ffmpeg.c =================================================================== ---- ffmpeg.c (revision 20198) +--- ffmpeg.c (revision 20272) +++ ffmpeg.c (working copy) @@ -41,6 +41,13 @@ #include "libavutil/avstring.h" Added: libavfilter/diffs/03_vfilters_doc.diff ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ libavfilter/diffs/03_vfilters_doc.diff Sun Oct 18 11:17:56 2009 (r5411) @@ -0,0 +1,191 @@ +Index: doc/vfilters.texi +=================================================================== +--- doc/vfilters.texi (revision 20272) ++++ doc/vfilters.texi (working copy) +@@ -78,4 +78,186 @@ + + Below is a description of the currently available video filters. + ++@section crop ++ ++@example ++./ffmpeg -i in.avi -vfilters "crop=0:0:-1:240" out.avi ++@end example ++ ++Crop the input video to x:y:width:height. ++The -1 in width or height means that dimension in the input video. ++ ++@section drawbox ++ ++@example ++./ffmpeg -i in.avi -vfilters "drawbox=10:20:200:60:red" out.avi ++@end example ++ ++Draw a box with x:y:width:height dimensions in a chosen color. ++ ++@section fifo ++ ++@example ++./ffmpeg -i in.avi -vfilters "fifo" out.avi ++@end example ++ ++@section format ++ ++@example ++./ffmpeg -i in.avi -vfilters "format=yuv420p" out.avi ++@end example ++ ++Convert video to one of the specified filters formats (libavfilter will ++try to pick one that is supported as an input to the next filter). ++ ++@section fps ++ ++@example ++./ffmpeg -i in.avi -vfilters "fps=30000:1001" out.avi ++@end example ++ ++Modifies the framerate of the input video to a chosen one. ++ ++@section hflip ++ ++@example ++./ffmpeg -i in.avi -vfilters "hflip" out.avi ++@end example ++ ++Flip the video horizontally. ++ ++@section negate ++ ++@example ++./ffmpeg -i in.avi -vfilters "negate" out.avi ++@end example ++ ++Convert a video to its negative. ++ ++@section noformat ++ ++@example ++./ffmpeg -i in.avi -vfilters "noformat=yuv420p" out.avi ++@end example ++ ++Force libavfilter not to send any of the specified pixel formats to the ++next filter. ++ ++@section overlay ++ ++Overlay one video on top of another (see the example in the introduction ++section). ++Be aware that frames are taken ++from each input video in timestamp order, hence, if their initial ++timestamps differ, it is a a good idea to pass the two ++inputs through a @var{setpts=PTS-STARTPTS} filter to have them ++begin in the same zero timestamp, as it does the example for ++the @var{movie} filter. ++ ++Parameters to the filter are separated by a colon. The first parameter ++is the x coordinate of the overlay, the second parameter is the y ++coordinate. The parameters need not be constant expressions, but may ++be expressions containing the names @var{mainW}, @var{mainH}, ++@var{overlayW} and @var{overlayH}, for the size of the first and second ++input video, respectively. For example, ++@example ++overlay=mainW-overlayW-10:mainH-overlayH-10 ++@end example ++can be used to draw the overlay at 10 pixels from the bottom right ++corner of the main video. ++ ++@section rotate ++ ++@example ++./ffmpeg -i in.avi -vfilters "rotate=30" out.avi ++@end example ++ ++Rotate video by a chosen amount in degrees. By default, 45 degrees. ++ ++@section scale ++ ++@example ++./ffmpeg -i in.avi -vfilters "scale=200:100:sws_flags=bicubic" out.avi ++@end example ++ ++Scale to new width/height and/or convert pixel format. ++The two first parameter are the desired width and height. ++If the third parameter @var{sws_flags} is absent, then @var{bilinear} is assumed. ++ ++@section setpts ++ ++@example ++# Start counting PTS from zero ++ffmpeg -i input.avi -vfilters setpts=PTS-STARTPTS output.avi ++ ++# Fast motion ++ffmpeg -i input.avi -vfilters setpts=0.5*PTS output.avi ++ ++# Fixed rate 25 fps ++ffmpeg -i input.avi -vfilters setpts=N*AVTB/25 output.avi ++ ++# Fixed rate 25 fps with some jitter ++ffmpeg -i input.avi -vfilters 'setpts=AVTB/25*(N+0.05*sin(N*2*PI/25))' output.avi ++@end example ++ ++Modifies the presentation timestamp (PTS) of the input video. ++ ++@section slicify ++ ++@example ++./ffmpeg -i in.avi -vfilters "slicify=32" out.avi ++@end example ++ ++Pass on input video to next video filter as multiple slices. ++The parameter is the slice height (16 if not specified). ++Adding this in the beginning of filter chains should make filtering ++faster due to the better use of the memory cache. ++ ++@section split ++ ++See the example in the introduction section. ++The input video is passed on to two outputs. ++ ++@section transpose ++ ++@example ++./ffmpeg -i in.avi -vfilters "transpose" out.avi ++@end example ++ ++Transpose (line => column) input video to next video filter. ++ ++@section vflip ++ ++@example ++./ffmpeg -i in.avi -vfilters "vflip" out.avi ++@end example ++ ++Flip the video vertically. ++ ++@section buffer ++ ++This input filter is used by the client application to feed pictures to ++the filter chain. See ffmpeg.c for an usage example. ++ ++@section movie ++ ++The parameters of the movie filter are ++@example ++ seekpoint in microseconds : string format : string filename ++@end example ++ ++We can overlay a second movie on top of a main one as in this graph: ++ ++@example ++ input -----------> deltapts0 --> overlay --> output ++ ^ ++ movie --> scale--> deltapts1 ------| ++@end example ++ ++To do that ++ ++@example ++ffmpeg -i in.avi -s 240x320 -vfilters "[in]setpts=PTS-STARTPTS, [T1]overlay=16:16[out]; movie=3200000:avi:in.avi, scale=180:144, setpts=PTS-STARTPTS[T1]" -y out.avi ++@end example ++ + @bye Modified: libavfilter/vf_crop.c ============================================================================== --- libavfilter/vf_crop.c Wed Oct 14 02:45:13 2009 (r5410) +++ libavfilter/vf_crop.c Sun Oct 18 11:17:56 2009 (r5411) @@ -99,6 +99,11 @@ static int config_output(AVFilterLink *l return 0; } +static AVFilterPicRef *get_video_buffer(AVFilterLink *link, int perms, int w, int h) +{ + return avfilter_get_video_buffer(link->dst->outputs[0], perms, w, h); +} + static void start_frame(AVFilterLink *link, AVFilterPicRef *picref) { CropContext *crop = link->dst->priv; @@ -150,6 +155,7 @@ AVFilter avfilter_vf_crop = .type = CODEC_TYPE_VIDEO, .start_frame = start_frame, .draw_slice = draw_slice, + .get_video_buffer= get_video_buffer, .config_props = config_input, }, { .name = NULL}}, .outputs = (AVFilterPad[]) {{ .name = "default", Modified: libavfilter/vf_null.c ============================================================================== --- libavfilter/vf_null.c Wed Oct 14 02:45:13 2009 (r5410) +++ libavfilter/vf_null.c Sun Oct 18 11:17:56 2009 (r5411) @@ -29,6 +29,11 @@ static void start_frame(AVFilterLink *in avfilter_start_frame(in_link->dst->outputs[0], picref); } +static AVFilterPicRef *get_video_buffer(AVFilterLink *link, int perms, int w, int h) +{ + return avfilter_get_video_buffer(link->dst->outputs[0], perms, w, h); +} + static void end_frame(AVFilterLink *in_link) { avfilter_end_frame(in_link->dst->outputs[0]); @@ -42,6 +47,7 @@ AVFilter avfilter_vf_null = .inputs = (AVFilterPad[]) {{ .name = "default", .type = CODEC_TYPE_VIDEO, + .get_video_buffer= get_video_buffer, .start_frame = start_frame, .end_frame = end_frame }, { .name = NULL}}, Modified: libavfilter/vf_overlay.c ============================================================================== --- libavfilter/vf_overlay.c Wed Oct 14 02:45:13 2009 (r5410) +++ libavfilter/vf_overlay.c Sun Oct 18 11:17:56 2009 (r5411) @@ -249,7 +249,7 @@ static int request_frame(AVFilterLink *l } /* we draw the output frame */ - pic = avfilter_get_video_buffer(link, AV_PERM_WRITE); + pic = avfilter_get_video_buffer(link, AV_PERM_WRITE, link->w, link->h); if(over->pics[0][0]) { pic->pixel_aspect = over->pics[0][0]->pixel_aspect; copy_image(pic, 0, 0, over->pics[0][0], link->w, link->h, Modified: libavfilter/vf_scale.c ============================================================================== --- libavfilter/vf_scale.c Wed Oct 14 02:45:13 2009 (r5410) +++ libavfilter/vf_scale.c Sun Oct 18 11:17:56 2009 (r5411) @@ -99,6 +99,11 @@ static int query_formats(AVFilterContext return 0; } +static AVFilterPicRef *get_video_buffer(AVFilterLink *link, int perms, int w, int h) +{ + return avfilter_default_get_video_buffer(link, perms, w, h); +} + static int config_props(AVFilterLink *link) { ScaleContext *scale = link->src->priv; @@ -130,7 +135,7 @@ static void start_frame(AVFilterLink *li AVFilterLink *out = link->dst->outputs[0]; int64_t gcd; - out->outpic = avfilter_get_video_buffer(out, AV_PERM_WRITE); + out->outpic = avfilter_get_video_buffer(out, AV_PERM_WRITE, out->w, out->h); out->outpic->pts = picref->pts; out->outpic->pixel_aspect.num = picref->pixel_aspect.num * out->h * link->w; @@ -188,6 +193,7 @@ AVFilter avfilter_vf_scale = .inputs = (AVFilterPad[]) {{ .name = "default", .type = CODEC_TYPE_VIDEO, + .get_video_buffer= get_video_buffer, .start_frame = start_frame, .draw_slice = draw_slice, .min_perms = AV_PERM_READ, }, Modified: libavfilter/vf_transpose.c ============================================================================== --- libavfilter/vf_transpose.c Wed Oct 14 02:45:13 2009 (r5410) +++ libavfilter/vf_transpose.c Sun Oct 18 11:17:56 2009 (r5411) @@ -90,7 +90,7 @@ static void start_frame(AVFilterLink *li { AVFilterLink *out = link->dst->outputs[0]; - out->outpic = avfilter_get_video_buffer(out, AV_PERM_WRITE); + out->outpic = avfilter_get_video_buffer(out, AV_PERM_WRITE, link->w, link->h); out->outpic->pts = picref->pts; out->outpic->pixel_aspect.num = picref->pixel_aspect.den; Modified: libavfilter/vsrc_buffer.c ============================================================================== --- libavfilter/vsrc_buffer.c Wed Oct 14 02:45:13 2009 (r5410) +++ libavfilter/vsrc_buffer.c Sun Oct 18 11:17:56 2009 (r5411) @@ -96,15 +96,16 @@ static int request_frame(AVFilterLink *l /* This picture will be needed unmodified later for decoding the next * frame */ picref = avfilter_get_video_buffer(link, AV_PERM_WRITE | AV_PERM_PRESERVE | - AV_PERM_REUSE2); + AV_PERM_REUSE2, + link->w, link->h); - memcpy(picref->data , c->frame.data , sizeof(c->frame.data )); - memcpy(picref->linesize, c->frame.linesize, sizeof(c->frame.linesize)); + av_picture_copy((AVPicture *)&picref->data, (AVPicture *)&c->frame, + picref->pic->format, link->w, link->h); picref->pts = c->pts; picref->pixel_aspect = c->pixel_aspect; avfilter_start_frame(link, avfilter_ref_pic(picref, ~0)); - avfilter_draw_slice(link, 0, picref->h); + avfilter_draw_slice(link, 0, link->h); avfilter_end_frame(link); avfilter_unref_pic(picref); Modified: libavfilter/vsrc_movie.c ============================================================================== --- libavfilter/vsrc_movie.c Wed Oct 14 02:45:13 2009 (r5410) +++ libavfilter/vsrc_movie.c Sun Oct 18 11:17:56 2009 (r5411) @@ -177,7 +177,8 @@ int movie_get_frame(AVFilterLink *link) if(!mv->pic) mv->pic = avfilter_get_video_buffer(link, AV_PERM_WRITE | AV_PERM_PRESERVE | - AV_PERM_REUSE2); + AV_PERM_REUSE2, + link->w, link->h); //av_log(link->src, AV_LOG_INFO, "movie_get_frame() w:%d h:%d\n", mv->w, mv->h); // Get frame

1 0

[soc]: r5408 - in als: als_data.h alsdec.c
by thilo.borgmann 14 Oct '09

14 Oct '09

Author: thilo.borgmann Date: Tue Oct 13 21:35:21 2009 New Revision: 5408 Log: Added long-term prediction. Modified: als/als_data.h als/alsdec.c Modified: als/als_data.h ============================================================================== --- als/als_data.h Tue Oct 13 21:29:01 2009 (r5407) +++ als/als_data.h Tue Oct 13 21:35:21 2009 (r5408) @@ -92,4 +92,11 @@ static const int16_t parcor_scaled_value }; +/** Gain values of p(0) for long-term prediction. + * To be indexed by the Rice coded indices. + */ +static const int ltp_gain [] = { + 0, 8, 16, 24, 32, 40, 48, 56, 64, 70, 76, 82, 88, 92, 96, 100 +}; + #endif /* AVCODEC_ALS_DATA_H */ Modified: als/alsdec.c ============================================================================== --- als/alsdec.c Tue Oct 13 21:29:01 2009 (r5407) +++ als/alsdec.c Tue Oct 13 21:35:21 2009 (r5408) @@ -79,6 +79,7 @@ typedef struct { unsigned int frame_id; ///< the frame ID / number of the current frame unsigned int js_switch; ///< if true, joint-stereo decoding is enforced unsigned int num_blocks; ///< number of blocks used in the current frame + int ltp_lag_length; ///< number of bits used for ltp lag value int32_t *quant_cof; ///< quantized parcor coefficients int32_t *lpc_cof; ///< coefficients of the direct form prediction filter int32_t *prev_raw_samples; ///< contains unshifted raw samples from the previous block @@ -290,7 +291,6 @@ static int check_specific_config(ALSDecC } MISSING_ERR(sconf->floating, "Floating point decoding", -1); - MISSING_ERR(sconf->long_term_prediction, "Long-term prediction", -1); MISSING_ERR(sconf->bgmc, "BGMC entropy decoding", -1); MISSING_ERR(sconf->mc_coding, "Multi-channel correlation", -1); MISSING_ERR(sconf->rlslms, "Adaptive RLS-LMS prediction", -1); @@ -470,6 +470,9 @@ static int read_var_block(ALSDecContext int smp = 0; int sb, store_prev_samples; int64_t y; + int use_ltp = 0; + int lag = 0; + int gain[5]; *js_blocks = get_bits1(gb); @@ -568,7 +571,26 @@ static int read_var_block(ALSDecContext } } - // TODO: LTP mode + // read LTP gain and lag values + if (sconf->long_term_prediction) { + use_ltp = get_bits1(gb); + + if (use_ltp) { + gain[0] = decode_rice(gb, 1) << 3; + gain[1] = decode_rice(gb, 2) << 3; + + gain[2] = get_unary(gb, 0, 4); + gain[2] <<= 2; + gain[2] += get_bits(gb, 2); + gain[2] = ltp_gain[gain[2]]; + + gain[3] = decode_rice(gb, 2) << 3; + gain[4] = decode_rice(gb, 1) << 3; + + lag = get_bits(gb, ctx->ltp_lag_length); + lag += FFMAX(4, opt_order + 1); + } + } // read first value and residuals in case of a random access block if (ra_block) { @@ -593,6 +615,26 @@ static int read_var_block(ALSDecContext *current_res++ = decode_rice(gb, s[sb]); } + // revert long-term prediction + if (use_ltp) { + int ltp_smp; + + for (ltp_smp = 0; ltp_smp < block_length; ltp_smp++) { + int center = ltp_smp - lag; + int begin = FFMAX(0, center - 2); + int end = center + 3; + int tab = 5 - (end - begin); + int base; + + y = 1 << 6; + + for (base = begin; base < end; base++, tab++) + y += MUL64(gain[tab], raw_samples[base]); + + raw_samples[ltp_smp] += y >> 7; + } + } + // reconstruct all samples from residuals if (ra_block) { for (smp = 0; smp < opt_order; smp++) { @@ -974,6 +1016,14 @@ static av_cold int decode_init(AVCodecCo avctx->bits_per_raw_sample = (sconf->resolution + 1) * 8; } + // set lag value for long-term prediction + if (avctx->sample_rate >= 192000) + ctx->ltp_lag_length = 10; + else if (avctx->sample_rate >= 96000) + ctx->ltp_lag_length = 9; + else + ctx->ltp_lag_length = 8; + avctx->frame_size = sconf->frame_length; channel_size = sconf->frame_length + sconf->max_order;

3 2

[soc]: r5410 - als/alsdec.c
by thilo.borgmann 14 Oct '09

14 Oct '09

Author: thilo.borgmann Date: Wed Oct 14 02:45:13 2009 New Revision: 5410 Log: Changed long-term prediction to skip sums of zero. Modified: als/alsdec.c Modified: als/alsdec.c ============================================================================== --- als/alsdec.c Wed Oct 14 02:41:47 2009 (r5409) +++ als/alsdec.c Wed Oct 14 02:45:13 2009 (r5410) @@ -619,7 +619,7 @@ static int read_var_block(ALSDecContext if (use_ltp) { int ltp_smp; - for (ltp_smp = 0; ltp_smp < block_length; ltp_smp++) { + for (ltp_smp = FFMAX(ltp_lag - 2, 0); ltp_smp < block_length; ltp_smp++) { int center = ltp_smp - ltp_lag; int begin = FFMAX(0, center - 2); int end = center + 3;

1 0

[soc]: r5409 - in als: als_data.h alsdec.c
by thilo.borgmann 14 Oct '09

14 Oct '09

Author: thilo.borgmann Date: Wed Oct 14 02:41:47 2009 New Revision: 5409 Log: Changed variable names and type and comment. Modified: als/als_data.h als/alsdec.c Modified: als/als_data.h ============================================================================== --- als/als_data.h Tue Oct 13 21:35:21 2009 (r5408) +++ als/als_data.h Wed Oct 14 02:41:47 2009 (r5409) @@ -95,7 +95,7 @@ static const int16_t parcor_scaled_value /** Gain values of p(0) for long-term prediction. * To be indexed by the Rice coded indices. */ -static const int ltp_gain [] = { +static const uint8_t ltp_gain_values [] = { 0, 8, 16, 24, 32, 40, 48, 56, 64, 70, 76, 82, 88, 92, 96, 100 }; Modified: als/alsdec.c ============================================================================== --- als/alsdec.c Tue Oct 13 21:35:21 2009 (r5408) +++ als/alsdec.c Wed Oct 14 02:41:47 2009 (r5409) @@ -471,8 +471,8 @@ static int read_var_block(ALSDecContext int sb, store_prev_samples; int64_t y; int use_ltp = 0; - int lag = 0; - int gain[5]; + int ltp_lag = 0; + int ltp_gain[5]; *js_blocks = get_bits1(gb); @@ -576,19 +576,19 @@ static int read_var_block(ALSDecContext use_ltp = get_bits1(gb); if (use_ltp) { - gain[0] = decode_rice(gb, 1) << 3; - gain[1] = decode_rice(gb, 2) << 3; + ltp_gain[0] = decode_rice(gb, 1) << 3; + ltp_gain[1] = decode_rice(gb, 2) << 3; - gain[2] = get_unary(gb, 0, 4); - gain[2] <<= 2; - gain[2] += get_bits(gb, 2); - gain[2] = ltp_gain[gain[2]]; + ltp_gain[2] = get_unary(gb, 0, 4); + ltp_gain[2] <<= 2; + ltp_gain[2] += get_bits(gb, 2); + ltp_gain[2] = ltp_gain_values[ltp_gain[2]]; - gain[3] = decode_rice(gb, 2) << 3; - gain[4] = decode_rice(gb, 1) << 3; + ltp_gain[3] = decode_rice(gb, 2) << 3; + ltp_gain[4] = decode_rice(gb, 1) << 3; - lag = get_bits(gb, ctx->ltp_lag_length); - lag += FFMAX(4, opt_order + 1); + ltp_lag = get_bits(gb, ctx->ltp_lag_length); + ltp_lag += FFMAX(4, opt_order + 1); } } @@ -615,12 +615,12 @@ static int read_var_block(ALSDecContext *current_res++ = decode_rice(gb, s[sb]); } - // revert long-term prediction + // reverse long-term prediction if (use_ltp) { int ltp_smp; for (ltp_smp = 0; ltp_smp < block_length; ltp_smp++) { - int center = ltp_smp - lag; + int center = ltp_smp - ltp_lag; int begin = FFMAX(0, center - 2); int end = center + 3; int tab = 5 - (end - begin); @@ -629,7 +629,7 @@ static int read_var_block(ALSDecContext y = 1 << 6; for (base = begin; base < end; base++, tab++) - y += MUL64(gain[tab], raw_samples[base]); + y += MUL64(ltp_gain[tab], raw_samples[base]); raw_samples[ltp_smp] += y >> 7; }

1 0

[soc]: r5407 - in als: als_data.h alsdec.c
by thilo.borgmann 13 Oct '09

13 Oct '09

Author: thilo.borgmann Date: Tue Oct 13 21:29:01 2009 New Revision: 5407 Log: Updated to the current version (rev. 23) still being reviewed on ffmpeg-devel. Modified: als/als_data.h als/alsdec.c Modified: als/als_data.h ============================================================================== --- als/als_data.h Sat Oct 10 12:55:16 2009 (r5406) +++ als/als_data.h Tue Oct 13 21:29:01 2009 (r5407) @@ -19,129 +19,77 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef AVCODEC_ALS_DATA_H +#define AVCODEC_ALS_DATA_H + /** * @file libavcodec/als_data.h - * MPEG-4 ALS header file for common data + * MPEG-4 ALS common data tables * @author Thilo Borgmann <thilo.borgmann _at_ googlemail.com> */ -#ifndef AVCODEC_ALS_DATA_H -#define AVCODEC_ALS_DATA_H - - #include <stdint.h> /** Rice parameters and corresponding index offsets for decoding the * indices of scaled PARCOR values. The table choosen is set globally * by the encoder and stored in ALSSpecificConfig. */ -int8_t parcor_rice_table[3][20][2] = { - { - {-52, 4}, - {-29, 5}, - {-31, 4}, - { 19, 4}, - {-16, 4}, - { 12, 3}, - { -7, 3}, - { 9, 3}, - { -5, 3}, - { 6, 3}, - { -4, 3}, - { 3, 3}, - { -3, 2}, - { 3, 2}, - { -2, 2}, - { 3, 2}, - { -1, 2}, - { 2, 2}, - { -1, 2}, - { 2, 2} - }, - { - {-58, 3}, - {-42, 4}, - {-46, 4}, - { 37, 5}, - {-36, 4}, - { 29, 4}, - {-29, 4}, - { 25, 4}, - {-23, 4}, - { 20, 4}, - {-17, 4}, - { 16, 4}, - {-12, 4}, - { 12, 3}, - {-10, 4}, - { 7, 3}, - { -4, 4}, - { 3, 3}, - { -1, 3}, - { 1, 3} - }, - { - {-59, 3}, - {-45, 5}, - {-50, 4}, - { 38, 4}, - {-39, 4}, - { 32, 4}, - {-30, 4}, - { 25, 3}, - {-23, 3}, - { 20, 3}, - {-20, 3}, - { 16, 3}, - {-13, 3}, - { 10, 3}, - { -7, 3}, - { 3, 3}, - { 0, 3}, - { -1, 3}, - { 2, 3}, - { -1, 2} - } - }; +static const int8_t parcor_rice_table[3][20][2] = { + { {-52, 4}, {-29, 5}, {-31, 4}, { 19, 4}, {-16, 4}, + { 12, 3}, { -7, 3}, { 9, 3}, { -5, 3}, { 6, 3}, + { -4, 3}, { 3, 3}, { -3, 2}, { 3, 2}, { -2, 2}, + { 3, 2}, { -1, 2}, { 2, 2}, { -1, 2}, { 2, 2} }, + { {-58, 3}, {-42, 4}, {-46, 4}, { 37, 5}, {-36, 4}, + { 29, 4}, {-29, 4}, { 25, 4}, {-23, 4}, { 20, 4}, + {-17, 4}, { 16, 4}, {-12, 4}, { 12, 3}, {-10, 4}, + { 7, 3}, { -4, 4}, { 3, 3}, { -1, 3}, { 1, 3} }, + { {-59, 3}, {-45, 5}, {-50, 4}, { 38, 4}, {-39, 4}, + { 32, 4}, {-30, 4}, { 25, 3}, {-23, 3}, { 20, 3}, + {-20, 3}, { 16, 3}, {-13, 3}, { 10, 3}, { -7, 3}, + { 3, 3}, { 0, 3}, { -1, 3}, { 2, 3}, { -1, 2} } +}; /** Scaled PARCOR values used for the first two PARCOR coefficients. * To be indexed by the Rice coded indices. * Generated by: parcor_scaled_values[i] = 32 + ((i * (i+1)) << 7) - (1 << 20) + * Actual values are divided by 32 in order to be stored in 16 bits. */ -int32_t parcor_scaled_values[] = {-1048544, -1048288, -1047776, -1047008, - -1045984, -1044704, -1043168, -1041376, - -1039328, -1037024, -1034464, -1031648, - -1028576, -1025248, -1021664, -1017824, - -1013728, -1009376, -1004768, -999904, - -994784, -989408, -983776, -977888, - -971744, -965344, -958688, -951776, - -944608, -937184, -929504, -921568, - -913376, -904928, -896224, -887264, - -878048, -868576, -858848, -848864, - -838624, -828128, -817376, -806368, - -795104, -783584, -771808, -759776, - -747488, -734944, -722144, -709088, - -695776, -682208, -668384, -654304, - -639968, -625376, -610528, -595424, - -580064, -564448, -548576, -532448, - -516064, -499424, -482528, -465376, - -447968, -430304, -412384, -394208, - -375776, -357088, -338144, -318944, - -299488, -279776, -259808, -239584, - -219104, -198368, -177376, -156128, - -134624, -112864, -90848, -68576, - -46048, -23264, -224, 23072, - 46624, 70432, 94496, 118816, - 143392, 168224, 193312, 218656, - 244256, 270112, 296224, 322592, - 349216, 376096, 403232, 430624, - 458272, 486176, 514336, 542752, - 571424, 600352, 629536, 658976, - 688672, 718624, 748832, 779296, - 810016, 840992, 872224, 903712, - 935456, 967456, 999712, 1032224}; +static const int16_t parcor_scaled_values[] = { + -1048544 / 32, -1048288 / 32, -1047776 / 32, -1047008 / 32, + -1045984 / 32, -1044704 / 32, -1043168 / 32, -1041376 / 32, + -1039328 / 32, -1037024 / 32, -1034464 / 32, -1031648 / 32, + -1028576 / 32, -1025248 / 32, -1021664 / 32, -1017824 / 32, + -1013728 / 32, -1009376 / 32, -1004768 / 32, -999904 / 32, + -994784 / 32, -989408 / 32, -983776 / 32, -977888 / 32, + -971744 / 32, -965344 / 32, -958688 / 32, -951776 / 32, + -944608 / 32, -937184 / 32, -929504 / 32, -921568 / 32, + -913376 / 32, -904928 / 32, -896224 / 32, -887264 / 32, + -878048 / 32, -868576 / 32, -858848 / 32, -848864 / 32, + -838624 / 32, -828128 / 32, -817376 / 32, -806368 / 32, + -795104 / 32, -783584 / 32, -771808 / 32, -759776 / 32, + -747488 / 32, -734944 / 32, -722144 / 32, -709088 / 32, + -695776 / 32, -682208 / 32, -668384 / 32, -654304 / 32, + -639968 / 32, -625376 / 32, -610528 / 32, -595424 / 32, + -580064 / 32, -564448 / 32, -548576 / 32, -532448 / 32, + -516064 / 32, -499424 / 32, -482528 / 32, -465376 / 32, + -447968 / 32, -430304 / 32, -412384 / 32, -394208 / 32, + -375776 / 32, -357088 / 32, -338144 / 32, -318944 / 32, + -299488 / 32, -279776 / 32, -259808 / 32, -239584 / 32, + -219104 / 32, -198368 / 32, -177376 / 32, -156128 / 32, + -134624 / 32, -112864 / 32, -90848 / 32, -68576 / 32, + -46048 / 32, -23264 / 32, -224 / 32, 23072 / 32, + 46624 / 32, 70432 / 32, 94496 / 32, 118816 / 32, + 143392 / 32, 168224 / 32, 193312 / 32, 218656 / 32, + 244256 / 32, 270112 / 32, 296224 / 32, 322592 / 32, + 349216 / 32, 376096 / 32, 403232 / 32, 430624 / 32, + 458272 / 32, 486176 / 32, 514336 / 32, 542752 / 32, + 571424 / 32, 600352 / 32, 629536 / 32, 658976 / 32, + 688672 / 32, 718624 / 32, 748832 / 32, 779296 / 32, + 810016 / 32, 840992 / 32, 872224 / 32, 903712 / 32, + 935456 / 32, 967456 / 32, 999712 / 32, 1032224 / 32 +}; #endif /* AVCODEC_ALS_DATA_H */ Modified: als/alsdec.c ============================================================================== --- als/alsdec.c Sat Oct 10 12:55:16 2009 (r5406) +++ als/alsdec.c Tue Oct 13 21:29:01 2009 (r5407) @@ -1,5 +1,5 @@ /* - * ALS decoder + * MPEG-4 ALS decoder * Copyright (c) 2009 Thilo Borgmann <thilo.borgmann _at_ googlemail.com> * * This file is part of FFmpeg. @@ -33,6 +33,7 @@ #include "get_bits.h" #include "unary.h" #include "mpeg4audio.h" +#include "bytestream.h" #include "als_data.h" @@ -44,103 +45,86 @@ enum RA_Flag { typedef struct { - uint32_t als_id; ///< ALS identifier - uint32_t samp_freq; ///< sampling frequency in Hz - uint32_t samples; ///< number of samples (per channel), 0xFFFFFFFF if unknown - int channels; ///< number of channels - int file_type; ///< not used, provided for debugging - int resolution; ///< 000 = 8-bit; 001 = 16-bit; 010 = 24-bit; 011 = 32-bit - int floating; ///< 1 = IEEE 32-bit floating-point, 0 = integer - int msb_first; ///< original byte order of the input audio data - int frame_length; ///< frame Length - int random_access; ///< distance between RA frames (in frames, 0...255) - enum RA_Flag ra_flag; ///< indicates where the size of ra units is stored - int adapt_order; ///< adaptive order: 1 = on, 0 = off - int coef_table; ///< table index of Rice code parameters - int long_term_prediction; ///< long term prediction (LTP): 1 = on, 0 = off - int max_order; ///< maximum prediction order (0..1023) - int block_switching; ///< number of block switching levels - int bgmc_mode; ///< BGMC Mode: 1 = on, 0 = off (Rice coding only) - int sb_part; ///< sub-block partition - int joint_stereo; ///< joint Stereo: 1 = on, 0 = off - int mc_coding; ///< extended inter-channel coding: 1 = on, 0 = off - int chan_config; ///< indicates that a chan_config_info field is present - int chan_sort; ///< channel rearrangement: 1 = on, 0 = off - int crc_enabled; ///< indicates that the crc field is present - int rlslms; ///< use RLS-LMS predictor: 1 = on, 0 = off - int aux_data_enabled; ///< indicates that auxiliary data is present - int chan_config_info; ///< mapping of channels to loudspeaker locations - int *chan_pos; ///< original channel positions - uint32_t header_size; ///< header size of original audio file in bytes, provided for debugging - uint32_t trailer_size; ///< Trailer size of original audio file in bytes, provided for debugging - uint32_t crc; ///< 32-bit CCITT-32 CRC checksum + int resolution; ///< 000 = 8-bit; 001 = 16-bit; 010 = 24-bit; 011 = 32-bit + int floating; ///< 1 = IEEE 32-bit floating-point, 0 = integer + int frame_length; ///< frame length for each frame (last frame may differ) + int ra_distance; ///< distance between RA frames (in frames, 0...255) + enum RA_Flag ra_flag; ///< indicates where the size of ra units is stored + int adapt_order; ///< adaptive order: 1 = on, 0 = off + int coef_table; ///< table index of Rice code parameters + int long_term_prediction; ///< long term prediction (LTP): 1 = on, 0 = off + int max_order; ///< maximum prediction order (0..1023) + int block_switching; ///< number of block switching levels + int bgmc; ///< "Block Gilbert-Moore Code": 1 = on, 0 = off (Rice coding only) + int sb_part; ///< sub-block partition + int joint_stereo; ///< joint stereo: 1 = on, 0 = off + int mc_coding; ///< extended inter-channel coding (multi channel coding): 1 = on, 0 = off + int chan_config; ///< indicates that a chan_config_info field is present + int chan_sort; ///< channel rearrangement: 1 = on, 0 = off + int rlslms; ///< use "Recursive Least Square-Least Mean Square" predictor: 1 = on, 0 = off + int chan_config_info; ///< mapping of channels to loudspeaker locations. Unused until setting channel configuration is implemented. + int *chan_pos; ///< original channel positions + uint32_t header_size; ///< header size of original audio file in bytes, provided for debugging + uint32_t trailer_size; ///< trailer size of original audio file in bytes, provided for debugging } ALSSpecificConfig; typedef struct { - AVCodecContext *avctx; + AVCodecContext *avctx; ALSSpecificConfig sconf; - GetBitContext gb; ///< a bit reader context - unsigned int num_frames; ///< number of frames to decode, 0 if unknown - unsigned int cur_frame_length; ///< length of the current frame to decode - unsigned int last_frame_length; ///< length of the last frame to decode, 0 if unknown - unsigned int frame_id; ///< the frame id / number of the current frame - unsigned int js_switch; ///< if true, joint-stereo decoding is enforced - unsigned int num_blocks; ///< number of blocks used in the current frame - int64_t *quant_cof; ///< quantized parcor coefficients - int64_t *lpc_cof; ///< coefficients of the direct form prediction filter - int64_t *prev_raw_samples; ///< contains unshifted raw samples from the previous block - int64_t **raw_samples; ///< decoded raw samples for each channel - int64_t *raw_buffer; ///< contains all decoded raw samples including carryover samples + GetBitContext gb; + unsigned int num_frames; ///< number of frames to decode, 0 if unknown + unsigned int cur_frame_length; ///< length of the current frame to decode + unsigned int last_frame_length; ///< length of the last frame to decode, 0 if unknown + unsigned int frame_id; ///< the frame ID / number of the current frame + unsigned int js_switch; ///< if true, joint-stereo decoding is enforced + unsigned int num_blocks; ///< number of blocks used in the current frame + int32_t *quant_cof; ///< quantized parcor coefficients + int32_t *lpc_cof; ///< coefficients of the direct form prediction filter + int32_t *prev_raw_samples; ///< contains unshifted raw samples from the previous block + int32_t **raw_samples; ///< decoded raw samples for each channel + int32_t *raw_buffer; ///< contains all decoded raw samples including carryover samples } ALSDecContext; -#ifdef DEBUG static av_cold void dprint_specific_config(ALSDecContext *ctx) { +#ifdef DEBUG AVCodecContext *avctx = ctx->avctx; ALSSpecificConfig *sconf = &ctx->sconf; - dprintf(avctx, "als_id = %x\n", sconf->als_id); - dprintf(avctx, "samp_freq = %i\n", sconf->samp_freq); - dprintf(avctx, "samples = %i\n", sconf->samples); - dprintf(avctx, "channels = %i\n", sconf->channels); - dprintf(avctx, "file_type = %i\n", sconf->file_type); dprintf(avctx, "resolution = %i\n", sconf->resolution); dprintf(avctx, "floating = %i\n", sconf->floating); - dprintf(avctx, "msb_first = %i\n", sconf->msb_first); dprintf(avctx, "frame_length = %i\n", sconf->frame_length); - dprintf(avctx, "random_access = %i\n", sconf->random_access); + dprintf(avctx, "ra_distance = %i\n", sconf->ra_distance); dprintf(avctx, "ra_flag = %i\n", sconf->ra_flag); dprintf(avctx, "adapt_order = %i\n", sconf->adapt_order); dprintf(avctx, "coef_table = %i\n", sconf->coef_table); dprintf(avctx, "long_term_prediction = %i\n", sconf->long_term_prediction); dprintf(avctx, "max_order = %i\n", sconf->max_order); dprintf(avctx, "block_switching = %i\n", sconf->block_switching); - dprintf(avctx, "bgmc_mode = %i\n", sconf->bgmc_mode); + dprintf(avctx, "bgmc = %i\n", sconf->bgmc); dprintf(avctx, "sb_part = %i\n", sconf->sb_part); dprintf(avctx, "joint_stereo = %i\n", sconf->joint_stereo); dprintf(avctx, "mc_coding = %i\n", sconf->mc_coding); dprintf(avctx, "chan_config = %i\n", sconf->chan_config); dprintf(avctx, "chan_sort = %i\n", sconf->chan_sort); - dprintf(avctx, "crc_enabled = %i\n", sconf->crc_enabled); dprintf(avctx, "RLSLMS = %i\n", sconf->rlslms); - dprintf(avctx, "aux_data_enabled = %i\n", sconf->aux_data_enabled); dprintf(avctx, "chan_config_info = %i\n", sconf->chan_config_info); dprintf(avctx, "header_size = %i\n", sconf->header_size); dprintf(avctx, "trailer_size = %i\n", sconf->trailer_size); - dprintf(avctx, "crc_enabled = %i\n", sconf->crc_enabled); dprintf(avctx, " num_frames = %i\n", ctx->num_frames); dprintf(avctx, " last_frame_length = %i\n", ctx->last_frame_length); -} #endif +} -/** Computes ceil(log2(x)) using av_log2. +/** Returns the bits left for reading. */ -static inline int ceil_log2(int x) { - return x > 0 ? av_log2((x - 1) << 1) : 0; +static inline int get_bits_left(GetBitContext *gb) +{ + return gb->size_in_bits - get_bits_count(gb); } @@ -150,123 +134,106 @@ static av_cold int read_specific_config( { GetBitContext gb; uint64_t ht_size; - int i, config_offset; + int i, config_offset, crc_enabled; MPEG4AudioConfig m4ac; ALSSpecificConfig *sconf = &ctx->sconf; - const uint8_t *buffer = ctx->avctx->extradata; - int buffer_size = ctx->avctx->extradata_size; + AVCodecContext *avctx = ctx->avctx; + uint32_t samples, als_id; - init_get_bits(&gb, buffer, buffer_size * 8); + init_get_bits(&gb, avctx->extradata, avctx->extradata_size * 8); - config_offset = ff_mpeg4audio_get_config(&m4ac, buffer, buffer_size); + config_offset = ff_mpeg4audio_get_config(&m4ac, avctx->extradata, + avctx->extradata_size); if (config_offset < 0) return -1; skip_bits_long(&gb, config_offset); - buffer_size -= config_offset >> 3; - if (buffer_size < 22) + if (get_bits_left(&gb) < (30 << 3)) return -1; // read the fixed items - sconf->als_id = get_bits_long(&gb, 32); - sconf->samp_freq = m4ac.sample_rate; - skip_bits_long(&gb, 32); - sconf->samples = get_bits_long(&gb, 32); - sconf->channels = m4ac.channels; - skip_bits(&gb, 16); - sconf->file_type = get_bits(&gb, 3); + als_id = get_bits_long(&gb, 32); + avctx->sample_rate = m4ac.sample_rate; + skip_bits_long(&gb, 32); // sample rate already known + samples = get_bits_long(&gb, 32); + avctx->channels = m4ac.channels; + skip_bits(&gb, 16); // number of channels already knwon + skip_bits(&gb, 3); // skip file_type sconf->resolution = get_bits(&gb, 3); sconf->floating = get_bits1(&gb); - sconf->msb_first = get_bits1(&gb); + skip_bits1(&gb); // skip msb_first sconf->frame_length = get_bits(&gb, 16) + 1; - sconf->random_access = get_bits(&gb, 8); + sconf->ra_distance = get_bits(&gb, 8); sconf->ra_flag = get_bits(&gb, 2); sconf->adapt_order = get_bits1(&gb); sconf->coef_table = get_bits(&gb, 2); sconf->long_term_prediction = get_bits1(&gb); sconf->max_order = get_bits(&gb, 10); sconf->block_switching = get_bits(&gb, 2); - sconf->bgmc_mode = get_bits1(&gb); + sconf->bgmc = get_bits1(&gb); sconf->sb_part = get_bits1(&gb); sconf->joint_stereo = get_bits1(&gb); sconf->mc_coding = get_bits1(&gb); sconf->chan_config = get_bits1(&gb); sconf->chan_sort = get_bits1(&gb); - sconf->crc_enabled = get_bits1(&gb); + crc_enabled = get_bits1(&gb); sconf->rlslms = get_bits1(&gb); - skip_bits(&gb, 5); // skip 5 reserved bits - sconf->aux_data_enabled = get_bits1(&gb); - buffer_size -= 22; + skip_bits(&gb, 5); // skip 5 reserved bits + skip_bits1(&gb); // skip aux_data_enabled // check for ALSSpecificConfig struct - if (sconf->als_id != MKBETAG('A','L','S','\0')) + if (als_id != MKBETAG('A','L','S','\0')) return -1; ctx->cur_frame_length = sconf->frame_length; // allocate quantized parcor coefficient buffer - if (!(ctx->quant_cof = av_malloc(sizeof(int64_t) * sconf->max_order))) { - av_log(ctx->avctx, AV_LOG_ERROR, "Allocating buffer memory failed.\n"); - return AVERROR(ENOMEM); - } - - // allocate LPC coefficients - if (!(ctx->lpc_cof = av_malloc(sizeof(int64_t) * sconf->max_order))) { - av_log(ctx->avctx, AV_LOG_ERROR, "Allocating buffer memory failed.\n"); + if (!(ctx->quant_cof = av_malloc(sizeof(*ctx->quant_cof) * sconf->max_order)) || + !(ctx->lpc_cof = av_malloc(sizeof(*ctx->lpc_cof) * sconf->max_order))) { + av_log(avctx, AV_LOG_ERROR, "Allocating buffer memory failed.\n"); return AVERROR(ENOMEM); } - // calculate total number of frames to decode if possible - if (sconf->samples != 0xFFFFFFFF) { - ctx->num_frames = ((sconf->samples - 1) / sconf->frame_length) + 1; - ctx->last_frame_length = sconf->samples % ctx->sconf.frame_length; - if (!ctx->last_frame_length) { - ctx->last_frame_length = sconf->frame_length; - } + if (samples != 0xFFFFFFFF) { + ctx->num_frames = (samples - 1) / sconf->frame_length + 1; + ctx->last_frame_length = (samples - 1) % sconf->frame_length + 1; } else { ctx->num_frames = 0; ctx->last_frame_length = 0; } - // read channel config - if (sconf->chan_config) { - if (buffer_size < 2) - return -1; - + if (sconf->chan_config) sconf->chan_config_info = get_bits(&gb, 16); - buffer_size -= 2; - // TODO: use this to set avctx->channel_layout - } + // TODO: use this to set avctx->channel_layout // read channel sorting - if (sconf->chan_sort && sconf->channels > 1) { - int chan_pos_bits = ceil_log2(sconf->channels); - int bytes_needed = (sconf->channels * chan_pos_bits + 7) >> 3; - if (buffer_size < bytes_needed) + if (sconf->chan_sort && avctx->channels > 1) { + int chan_pos_bits = av_ceil_log2(avctx->channels); + int bits_needed = avctx->channels * chan_pos_bits + 7; + if (get_bits_left(&gb) < bits_needed) return -1; - if(!(sconf->chan_pos = av_malloc(sconf->channels * sizeof(int)))) - return -1; + if (!(sconf->chan_pos = av_malloc(avctx->channels * sizeof(*sconf->chan_pos)))) + return AVERROR(ENOMEM); - for (i = 0; i < sconf->channels; i++) { + for (i = 0; i < avctx->channels; i++) sconf->chan_pos[i] = get_bits(&gb, chan_pos_bits); - } align_get_bits(&gb); - buffer_size -= bytes_needed; // TODO: use this to actually do channel sorting } else { sconf->chan_sort = 0; } - // read fixed header and trailer sizes, if size = 0xFFFFFFFF then there is no data field! - if (buffer_size < 8) + // read fixed header and trailer sizes, + // if size = 0xFFFFFFFF then there is no data field! + if (get_bits_left(&gb) < 64) return -1; sconf->header_size = get_bits_long(&gb, 32); @@ -276,39 +243,32 @@ static av_cold int read_specific_config( if (sconf->trailer_size == 0xFFFFFFFF) sconf->trailer_size = 0; - ht_size = sconf->header_size + sconf->trailer_size; - - buffer_size -= 8; + ht_size = ((int64_t)(sconf->header_size) + (int64_t)(sconf->trailer_size)) << 3; // skip the header and trailer data - if (buffer_size < ht_size) + if (get_bits_left(&gb) < ht_size) return -1; - ht_size <<= 3; - - while (ht_size > 0) { - int len = FFMIN(ht_size, INT32_MAX); - skip_bits_long(&gb, len); - ht_size -= len; - } + if (ht_size > INT32_MAX) + return -1; - buffer_size -= ht_size >> 3; + skip_bits_long(&gb, ht_size); - // read the crc data - if (sconf->crc_enabled) { - if (buffer_size < 4) + // skip the crc data + if (crc_enabled) { + if (get_bits_left(&gb) < 32) return -1; - sconf->crc = get_bits_long(&gb, 32); + skip_bits_long(&gb, 32); } // no need to read the rest of ALSSpecificConfig (ra_unit_size & aux data) -#ifdef DEBUG + dprint_specific_config(ctx); -#endif + return 0; } @@ -320,45 +280,34 @@ static int check_specific_config(ALSDecC ALSSpecificConfig *sconf = &ctx->sconf; int error = 0; - if (sconf->floating) { - av_log_missing_feature(ctx->avctx, "Floating point decoding", 0); - error = -1; - } - - if (sconf->long_term_prediction) { - av_log_missing_feature(ctx->avctx, "Long-term prediction", 0); - error = -1; - } - - if (sconf->bgmc_mode) { - av_log_missing_feature(ctx->avctx, "BGMC entropy decoding", 0); - error = -1; - } - - if (sconf->mc_coding) { - av_log_missing_feature(ctx->avctx, "Multi-channel correlation", 0); - error = -1; - } - - if (sconf->chan_sort) { - av_log_missing_feature(ctx->avctx, "Channel sorting", 0); + // report unsupported feature and set error value + #define MISSING_ERR(cond, str, errval) \ + { \ + if (cond) { \ + av_log_missing_feature(ctx->avctx, str, 0); \ + error = errval; \ + } \ } - if (sconf->rlslms) { - av_log_missing_feature(ctx->avctx, "Adaptive RLS-LMS prediction", 0); - error = -1; - } + MISSING_ERR(sconf->floating, "Floating point decoding", -1); + MISSING_ERR(sconf->long_term_prediction, "Long-term prediction", -1); + MISSING_ERR(sconf->bgmc, "BGMC entropy decoding", -1); + MISSING_ERR(sconf->mc_coding, "Multi-channel correlation", -1); + MISSING_ERR(sconf->rlslms, "Adaptive RLS-LMS prediction", -1); + MISSING_ERR(sconf->chan_sort, "Channel sorting", 0); return error; } -/** Parses the bs_info item to extract the block partitioning. +/** Parses the bs_info field to extract the block partitioning used in + * block switching mode, refer to ISO/IEC 14496-3, section 11.6.2. */ -static void parse_bs_info(uint32_t bs_info, unsigned int n, unsigned int div, - unsigned int **div_blocks, unsigned int *num_blocks) +static void parse_bs_info(const uint32_t bs_info, unsigned int n, + unsigned int div, unsigned int **div_blocks, + unsigned int *num_blocks) { - if (n < 31 && ((bs_info >> (30 - n)) & 1)) { + if (n < 31 && ((bs_info << n) & 0x40000000)) { // if the level is valid and the investigated bit n is set // then recursively check both children at bits (2n+1) and (2n+2) n *= 2; @@ -377,45 +326,35 @@ static void parse_bs_info(uint32_t bs_in /** Reads and decodes a Rice codeword. */ -static int64_t decode_rice(GetBitContext *gb, unsigned int k) +static int32_t decode_rice(GetBitContext *gb, unsigned int k) { - int64_t value = 0; - int64_t q = 0; - int max = gb->size_in_bits - get_bits_count(gb) - k; - - if (!k) { - q = get_unary(gb, 0, max); - return (q & 1) ? -((q + 1) >> 1) : ((q + 1) >> 1); - } else if (k == 1) { - q = get_unary(gb, 0, max); - return get_bits1(gb) ? q : -(q + 1); - } else { - unsigned int r, sub_sign; - - q = get_unary(gb, 0, max); - sub_sign = get_bits1(gb); - r = get_bits_long(gb, k - 1); - - value = (q << (k - 1)) + r; + int max = gb->size_in_bits - get_bits_count(gb) - k; + int q = get_unary(gb, 0, max); + int r = k ? get_bits1(gb) : !(q & 1); - return sub_sign ? value : -(value + 1); + if (k > 1) { + q <<= (k - 1); + q += get_bits_long(gb, k - 1); + } else if (!k) { + q >>= 1; } + return r ? q : ~q; } /** Converts PARCOR coefficient k to direct filter coefficient. */ -static void parcor_to_lpc(unsigned int k, int64_t *par, int64_t *cof) +static void parcor_to_lpc(unsigned int k, const int32_t *par, int32_t *cof) { - int i; - int64_t tmp1, tmp2; + int i, j; - for (i = 0; i < (k+1) >> 1; i++) { - tmp1 = cof[ i ] + ((par[k] * cof[k - i - 1] + (1 << 19)) >> 20); - tmp2 = cof[k - i - 1] + ((par[k] * cof[ i ] + (1 << 19)) >> 20); - cof[k - i - 1] = tmp2; - cof[ i ] = tmp1; + for (i = 0, j = k - 1; i < j; i++, j--) { + int tmp1 = ((MUL64(par[k], cof[j]) + (1 << 19)) >> 20); + cof[j] += ((MUL64(par[k], cof[i]) + (1 << 19)) >> 20); + cof[i] += tmp1; } + if (i == j) + cof[i] += ((MUL64(par[k], cof[j]) + (1 << 19)) >> 20); cof[k] = par[k]; } @@ -442,295 +381,401 @@ static void reconstruct_block_sizes(ALSD // of 14496-3. // The ALS conformance files feature an odd number of samples in the last // frame. + + for (b = 0; b < ctx->num_blocks; b++) + div_blocks[b] = ctx->sconf.frame_length >> div_blocks[b]; + if (ctx->cur_frame_length == ctx->last_frame_length) { unsigned int remaining = ctx->cur_frame_length; for (b = 0; b < ctx->num_blocks; b++) { - div_blocks[b] = ctx->sconf.frame_length >> div_blocks[b]; - if (remaining < div_blocks[b]) { div_blocks[b] = remaining; ctx->num_blocks = b + 1; break; - } else { - remaining -= div_blocks[b]; } + + remaining -= div_blocks[b]; } - } else { - for (b = 0; b < ctx->num_blocks; b++) - div_blocks[b] = ctx->sconf.frame_length >> div_blocks[b]; } } -/** Reads the block data. +/** Reads block switching field if necessary and sets actual block sizes. */ -static int read_block_data(ALSDecContext *ctx, unsigned int ra_block, - int64_t *raw_samples, unsigned int block_length, - unsigned int *js_blocks, int64_t *raw_other) +static void get_block_sizes(ALSDecContext *ctx, unsigned int *div_blocks, + uint32_t *bs_info) +{ + ALSSpecificConfig *sconf = &ctx->sconf; + GetBitContext *gb = &ctx->gb; + unsigned int *ptr_div_blocks = div_blocks; + + if (sconf->block_switching) { + unsigned int bs_info_len = 1 << (sconf->block_switching + 2); + *bs_info = get_bits_long(gb, bs_info_len); + *bs_info <<= (32 - bs_info_len); + } + + ctx->num_blocks = 0; + parse_bs_info(*bs_info, 0, 0, &ptr_div_blocks, &ctx->num_blocks); + reconstruct_block_sizes(ctx, div_blocks); +} + + +/** Reads the block data for a constant block + */ +static void read_const_block(ALSDecContext *ctx, int32_t *raw_samples, + unsigned int block_length, unsigned int *js_blocks) { ALSSpecificConfig *sconf = &ctx->sconf; AVCodecContext *avctx = ctx->avctx; GetBitContext *gb = &ctx->gb; - unsigned int shift_lsbs = 0; - unsigned int block_type; - unsigned int k; + int32_t const_val = 0; + unsigned int const_block, k; - block_type = get_bits1(gb); + const_block = get_bits1(gb); // 1 = constant value, 0 = zero block (silence) + *js_blocks = get_bits1(gb); - if (block_type == 0) { - unsigned int const_block; - int32_t const_val = 0; + // skip 5 reserved bits + skip_bits(gb, 5); - const_block = get_bits1(gb); // 1 = constant value, 0 = zero block (silence) - *js_blocks = get_bits1(gb); + if (const_block) { + unsigned int const_val_bits = sconf->floating ? 24 : avctx->bits_per_raw_sample; + const_val = get_sbits_long(gb, const_val_bits); + } - // skip 5 reserved bits - skip_bits(gb, 5); + // write raw samples into buffer + for (k = 0; k < block_length; k++) + raw_samples[k] = const_val; +} - if (const_block) { - unsigned int const_val_bits; - if (sconf->resolution == 2 || sconf->floating) - const_val_bits = 24; - else - const_val_bits = avctx->bits_per_raw_sample; +/** Reads the block data for a non-constant block + */ +static int read_var_block(ALSDecContext *ctx, unsigned int ra_block, + int32_t *raw_samples, unsigned int block_length, + unsigned int *js_blocks, int32_t *raw_other, + unsigned int *shift_lsbs) +{ + ALSSpecificConfig *sconf = &ctx->sconf; + AVCodecContext *avctx = ctx->avctx; + GetBitContext *gb = &ctx->gb; + unsigned int k; + unsigned int s[8]; + unsigned int sub_blocks, log2_sub_blocks, sb_length; + unsigned int opt_order = 1; + int32_t *quant_cof = ctx->quant_cof; + int32_t *lpc_cof = ctx->lpc_cof; + unsigned int start = 0; + int smp = 0; + int sb, store_prev_samples; + int64_t y; - const_val = get_sbits_long(gb, const_val_bits); - } + *js_blocks = get_bits1(gb); - // write raw samples into buffer - for (k = 0; k < block_length; k++) - raw_samples[k] = const_val; + // determine the number of subblocks for entropy decoding + if (!sconf->bgmc && !sconf->sb_part) { + log2_sub_blocks = 0; } else { - unsigned int s[8]; - unsigned int sub_blocks, sb_length; - unsigned int opt_order = 1; - int64_t *quant_cof = ctx->quant_cof; - int64_t *lpc_cof = ctx->lpc_cof; - unsigned int start = 0; - int sb, smp; - int64_t y; + if (sconf->bgmc && sconf->sb_part) + log2_sub_blocks = get_bits(gb, 2); + else + log2_sub_blocks = 2 * get_bits1(gb); + } - *js_blocks = get_bits1(gb); + sub_blocks = 1 << log2_sub_blocks; - // determine the number of sub blocks for entropy decoding - if (!sconf->bgmc_mode && !sconf->sb_part) - sub_blocks = 1; - else if (sconf->bgmc_mode && sconf->sb_part) - sub_blocks = 1 << get_bits(gb, 2); - else - sub_blocks = get_bits1(gb) ? 4 : 1; + // do not continue in case of a damaged stream since + // block_length must be evenly divisible by sub_blocks + if (block_length & (sub_blocks - 1)) { + av_log(avctx, AV_LOG_WARNING, + "Block length is not evenly divisible by the number of subblocks.\n"); + return -1; + } - // do not continue in case of a damaged stream since - // block_length must be evenly divisible by sub_blocks - if (block_length % sub_blocks) { - av_log(avctx, AV_LOG_WARNING, - "Block length is not evenly divisible by the number of sub blocks.\n"); - return -1; - } + sb_length = block_length >> log2_sub_blocks; - sb_length = block_length / sub_blocks; + if (sconf->bgmc) { + // TODO: BGMC mode + } else { + s[0] = get_bits(gb, 4 + (sconf->resolution > 1)); + for (k = 1; k < sub_blocks; k++) + s[k] = s[k - 1] + decode_rice(gb, 0); + } - if (!sconf->bgmc_mode) { - s[0] = get_bits(gb, (sconf->resolution > 1) ? 5 : 4); - for (k = 1; k < sub_blocks; k++) - s[k] = s[k - 1] + decode_rice(gb, 0); + if (get_bits1(gb)) + *shift_lsbs = get_bits(gb, 4) + 1; + + store_prev_samples = (*js_blocks && raw_other) || *shift_lsbs; + + + if (!sconf->rlslms) { + if (sconf->adapt_order) { + int opt_order_length = av_ceil_log2(av_clip((block_length >> 3) - 1, + 2, sconf->max_order + 1)); + opt_order = get_bits(gb, opt_order_length); } else { - // TODO: BGMC mode + opt_order = sconf->max_order; } - if (get_bits1(gb)) { - shift_lsbs = get_bits(gb, 4) + 1; - } + if (opt_order) { + int add_base; + if (sconf->coef_table == 3) { + add_base = 0x7F; - if (!sconf->rlslms) { - int64_t quant_index; + // read coefficient 0 + quant_cof[0] = parcor_scaled_values[get_bits(gb, 7)]; + quant_cof[0] *= 32; - if (sconf->adapt_order) { - int opt_order_length = - FFMIN( - ceil_log2(sconf->max_order+1), - FFMAX(ceil_log2((block_length >> 3) - 1), 1) - ); - opt_order = get_bits(gb, opt_order_length); + // read coefficient 1 + quant_cof[1] = -parcor_scaled_values[get_bits(gb, 7)]; + quant_cof[0] *= 32; + + // read coefficients 2 to opt_order + for (k = 2; k < opt_order; k++) + quant_cof[k] = get_bits(gb, 7); } else { - opt_order = sconf->max_order; + int k_max; + add_base = 1; + + // read coefficient 0 to 19 + k_max = FFMIN(opt_order, 20); + for (k = 0; k < k_max; k++) { + int rice_param = parcor_rice_table[sconf->coef_table][k][1]; + int offset = parcor_rice_table[sconf->coef_table][k][0]; + quant_cof[k] = decode_rice(gb, rice_param) + offset; + } + + // read coefficients 20 to 126 + k_max = FFMIN(opt_order, 127); + for (; k < k_max; k++) + quant_cof[k] = decode_rice(gb, 2) + (k & 1); + + // read coefficients 127 to opt_order + for (; k < opt_order; k++) + quant_cof[k] = decode_rice(gb, 1); + + quant_cof[0] = parcor_scaled_values[quant_cof[0] + 64]; + quant_cof[0] *= 32; + quant_cof[1] = -parcor_scaled_values[quant_cof[1] + 64]; + quant_cof[1] *= 32; } - if (opt_order) { - if (sconf->coef_table == 3) { - // read coefficient 0 - quant_index = get_bits(gb, 7) - 64; - quant_cof[0] = parcor_scaled_values[quant_index + 64]; + for (k = 2; k < opt_order; k++) + quant_cof[k] = (quant_cof[k] << 14) + (add_base << 13); + } + } - // read coefficient 1 - quant_index = get_bits(gb, 7) - 64; - quant_cof[1] = -parcor_scaled_values[quant_index + 64]; + // TODO: LTP mode - // read coefficients 2 to opt_order - for (k = 2; k < opt_order; k++) { - quant_index = get_bits(gb, 7) - 64; - quant_cof[k] = (quant_index << 14) + (1 << 13); - } - } else { - int offset, rice_param, k_max; + // read first value and residuals in case of a random access block + if (ra_block) { + if (opt_order) + raw_samples[0] = decode_rice(gb, avctx->bits_per_raw_sample - 4); + if (opt_order > 1) + raw_samples[1] = decode_rice(gb, s[0] + 3); + if (opt_order > 2) + raw_samples[2] = decode_rice(gb, s[0] + 1); - // read coefficient 0 - offset = parcor_rice_table[sconf->coef_table][0][0]; - rice_param = parcor_rice_table[sconf->coef_table][0][1]; - quant_index = decode_rice(gb, rice_param) + offset; - quant_cof[0] = parcor_scaled_values[quant_index + 64]; + start = FFMIN(opt_order, 3); + } - // read coefficient 1 - offset = parcor_rice_table[sconf->coef_table][1][0]; - rice_param = parcor_rice_table[sconf->coef_table][1][1]; - quant_index = decode_rice(gb, rice_param) + offset; - quant_cof[1] = -parcor_scaled_values[quant_index + 64]; + // read all residuals + if (sconf->bgmc) { + // TODO: BGMC mode + } else { + int32_t *current_res = raw_samples + start; - // read coefficients 2 to 19 - k_max = FFMIN(20, opt_order); - for (k = 2; k < k_max; k++) { - offset = parcor_rice_table[sconf->coef_table][k][0]; - rice_param = parcor_rice_table[sconf->coef_table][k][1]; - quant_index = decode_rice(gb, rice_param) + offset; - quant_cof[k] = (quant_index << 14) + (1 << 13); - } + for (sb = 0; sb < sub_blocks; sb++, start = 0) + for (; start < sb_length; start++) + *current_res++ = decode_rice(gb, s[sb]); + } - // read coefficients 20 to 126 - k_max = FFMIN(127, opt_order); - for (k = 20; k < k_max; k++) { - offset = k & 1; - rice_param = 2; - quant_index = decode_rice(gb, rice_param) + offset; - quant_cof[k] = (quant_index << 14) + (1 << 13); - } + // reconstruct all samples from residuals + if (ra_block) { + for (smp = 0; smp < opt_order; smp++) { + y = 1 << 19; - // read coefficients 127 to opt_order - for (k = 127; k < opt_order; k++) { - offset = 0; - rice_param = 1; - quant_index = decode_rice(gb, rice_param) + offset; - quant_cof[k] = (quant_index << 14) + (1 << 13); - } - } - } - } + for (sb = 0; sb < smp; sb++) + y += MUL64(lpc_cof[sb],raw_samples[smp - (sb + 1)]); - if (sconf->long_term_prediction) { - // TODO: LTP mode + raw_samples[smp] -= y >> 20; + parcor_to_lpc(smp, quant_cof, lpc_cof); } + } else { + for (k = 0; k < opt_order; k++) + parcor_to_lpc(k, quant_cof, lpc_cof); - start = 0; + // store previous samples in case that they have to be altered + if (store_prev_samples) + memcpy(ctx->prev_raw_samples, raw_samples - sconf->max_order, + sizeof(*ctx->prev_raw_samples) * sconf->max_order); - // read first value and residuals in case of a random access block - if (ra_block) { - if (opt_order) - raw_samples[0] = decode_rice(gb, avctx->bits_per_raw_sample - 4); - if (opt_order > 1) - raw_samples[1] = decode_rice(gb, s[0] + 3); - if (opt_order > 2) - raw_samples[2] = decode_rice(gb, s[0] + 1); + // reconstruct difference signal for prediction (joint-stereo) + if (*js_blocks && raw_other) { + int32_t *left, *right; - start = FFMIN(opt_order, 3); - } else { - for (k = 0; k < opt_order; k++) - parcor_to_lpc(k, quant_cof, lpc_cof); + if (raw_other > raw_samples) { // D = R - L + left = raw_samples; + right = raw_other; + } else { // D = R - L + left = raw_other; + right = raw_samples; + } + + for (sb = -1; sb >= -sconf->max_order; sb--) + raw_samples[sb] = right[sb] - left[sb]; } - // read all residuals - // TODO: decode directly into ctx->raw_samples[] instead of storing the residuals - if (sconf->bgmc_mode) { - // TODO: BGMC mode - } else { - int64_t *current_res = raw_samples; + // reconstruct shifted signal + if (*shift_lsbs) + for (sb = -1; sb >= -sconf->max_order; sb--) + raw_samples[sb] >>= *shift_lsbs; + } - for (sb = 0; sb < sub_blocks; sb++) { - for (k = start; k < sb_length; k++) { - current_res[k] = decode_rice(gb, s[sb]); - } - current_res += sb_length; - start = 0; - } - } + // reconstruct raw samples + for (; smp < block_length; smp++) { + y = 1 << 19; - // reconstruct all samples from residuals - if (ra_block) { - unsigned int progressive = FFMIN(block_length, opt_order); + for (sb = 0; sb < opt_order; sb++) + y += MUL64(lpc_cof[sb],raw_samples[smp - (sb + 1)]); - for (smp = 0; smp < block_length; smp++) { - unsigned int max, dequant; + raw_samples[smp] -= y >> 20; + } - dequant = smp < progressive; - max = dequant ? smp : progressive; + // restore previous samples in case that they have been altered + if (store_prev_samples) + memcpy(raw_samples - sconf->max_order, ctx->prev_raw_samples, + sizeof(*raw_samples) * sconf->max_order); - y = 1 << 19; + return 0; +} - for (sb = 0; sb < max; sb++) - y += lpc_cof[sb] * raw_samples[smp - (sb + 1)]; - raw_samples[smp] -= y >> 20; - if (dequant) - parcor_to_lpc(smp, quant_cof, lpc_cof); - } - } else { - int store_prev_samples = (*js_blocks && raw_other) || shift_lsbs; +/** Reads the block data. + */ +static int read_block_data(ALSDecContext *ctx, unsigned int ra_block, + int32_t *raw_samples, unsigned int block_length, + unsigned int *js_blocks, int32_t *raw_other) +{ + ALSSpecificConfig *sconf = &ctx->sconf; + GetBitContext *gb = &ctx->gb; + unsigned int shift_lsbs = 0; + unsigned int k; - // store previous smaples in case that they have to be altered - if (store_prev_samples) - memcpy(ctx->prev_raw_samples, raw_samples - sconf->max_order, - sizeof(int64_t) * sconf->max_order); + // read block type flag and read the samples accordingly + if (get_bits1(gb)) { + if (read_var_block(ctx, ra_block, raw_samples, block_length, js_blocks, + raw_other, &shift_lsbs)) + return -1; + } else { + read_const_block(ctx, raw_samples, block_length, js_blocks); + } - // reconstruct difference signal for prediction (joint-stereo) - if (*js_blocks && raw_other) { - int i; - if (raw_other > raw_samples) { // D = R - L - for (i = -1; i >= -sconf->max_order; i--) - raw_samples[i] = raw_other[i] - raw_samples[i]; - } else { // D = R - L - for (i = -1; i >= -sconf->max_order; i--) - raw_samples[i] = raw_samples[i] - raw_other[i]; - } - } + // TODO: read RLSLMS extension data - // reconstruct shifted signal - if (shift_lsbs) { - for (smp = -1; smp >= -sconf->max_order; smp--) - raw_samples[smp] >>= shift_lsbs; - } + if (!sconf->mc_coding || ctx->js_switch) + align_get_bits(gb); - // reconstruct raw samples - for (smp = 0; smp < block_length; smp++) { - y = 1 << 19; + if (shift_lsbs) + for (k = 0; k < block_length; k++) + raw_samples[k] <<= shift_lsbs; - for (sb = 0; sb < opt_order; sb++) - y += lpc_cof[sb] * raw_samples[smp - (sb + 1)]; + return 0; +} - raw_samples[smp] -= y >> 20; - } - // restore previous samples in case that they have been altered - if (store_prev_samples) - memcpy(raw_samples - sconf->max_order, ctx->prev_raw_samples, - sizeof(int64_t) * sconf->max_order); +/** Computes the number of samples left to decode for the current frame and + * sets these samples to zero. + */ +static void zero_remaining(unsigned int b, unsigned int b_max, + const unsigned int *div_blocks, int32_t *buf) +{ + unsigned int count = 0; + + while (b < b_max) + count += div_blocks[b]; + + memset(buf, 0, sizeof(*buf) * count); +} + + +/** Decodes blocks independently. + */ +static int decode_blocks_ind(ALSDecContext *ctx, unsigned int ra_frame, + unsigned int c, const unsigned int *div_blocks, + unsigned int *js_blocks) +{ + int32_t *raw_sample; + unsigned int b; + raw_sample = ctx->raw_samples[c]; + + for (b = 0; b < ctx->num_blocks; b++) { + if (read_block_data(ctx, ra_frame, raw_sample, + div_blocks[b], &js_blocks[0], NULL)) { + // damaged block, write zero for the rest of the frame + zero_remaining(b, ctx->num_blocks, div_blocks, raw_sample); + return -1; } + raw_sample += div_blocks[b]; + ra_frame = 0; } - if (sconf->rlslms) { - // TODO: read RLSLMS extension data - } + return 0; +} - if (!sconf->mc_coding || ctx->js_switch) { - align_get_bits(gb); - } - if (shift_lsbs) { - for (k = 0; k < block_length; k++) - raw_samples[k] <<= shift_lsbs; +/** Decodes blocks dependently. + */ +static int decode_blocks(ALSDecContext *ctx, unsigned int ra_frame, + unsigned int c, const unsigned int *div_blocks, + unsigned int *js_blocks) +{ + ALSSpecificConfig *sconf = &ctx->sconf; + unsigned int offset = 0; + int32_t *raw_samples_R; + int32_t *raw_samples_L; + unsigned int b; + + // decode all blocks + for (b = 0; b < ctx->num_blocks; b++) { + unsigned int s; + raw_samples_L = ctx->raw_samples[c ] + offset; + raw_samples_R = ctx->raw_samples[c + 1] + offset; + if (read_block_data(ctx, ra_frame, raw_samples_L, div_blocks[b], + &js_blocks[0], raw_samples_R) || + read_block_data(ctx, ra_frame, raw_samples_R, div_blocks[b], + &js_blocks[1], raw_samples_L)) { + // damaged block, write zero for the rest of the frame + zero_remaining(b, ctx->num_blocks, div_blocks, raw_samples_L); + zero_remaining(b, ctx->num_blocks, div_blocks, raw_samples_R); + return -1; + } + + // reconstruct joint-stereo blocks + if (js_blocks[0]) { + if (js_blocks[1]) + av_log(ctx->avctx, AV_LOG_WARNING, "Invalid channel pair!\n"); + + for (s = 0; s < div_blocks[b]; s++) + raw_samples_L[s] = raw_samples_R[s] - raw_samples_L[s]; + } else if (js_blocks[1]) { + for (s = 0; s < div_blocks[b]; s++) + raw_samples_R[s] = raw_samples_R[s] + raw_samples_L[s]; + } + + offset += div_blocks[b]; + ra_frame = 0; } + // store carryover raw samples, + // the others channel raw samples are stored by the calling function. + memmove(ctx->raw_samples[c] - sconf->max_order, + ctx->raw_samples[c] - sconf->max_order + sconf->frame_length, + sizeof(*ctx->raw_samples[c]) * sconf->max_order); + return 0; } @@ -740,17 +785,15 @@ static int read_block_data(ALSDecContext static int read_frame_data(ALSDecContext *ctx, unsigned int ra_frame) { ALSSpecificConfig *sconf = &ctx->sconf; + AVCodecContext *avctx = ctx->avctx; GetBitContext *gb = &ctx->gb; - unsigned int div_blocks[32]; ///< Block sizes. - unsigned int c, b, ra_block; - int64_t *raw_samples_L; - int64_t *raw_samples_R; + unsigned int div_blocks[32]; ///< block sizes. + unsigned int c; unsigned int js_blocks[2]; uint32_t bs_info = 0; - unsigned int *ptr_div_blocks; - // skip ra_unit_size if present + // skip the size of the ra unit if present in the frame if (sconf->ra_flag == RA_FLAG_FRAMES && ra_frame) skip_bits_long(gb, 32); @@ -762,144 +805,51 @@ static int read_frame_data(ALSDecContext if (!sconf->mc_coding || ctx->js_switch) { int independent_bs = !sconf->joint_stereo; - for (c = 0; c < sconf->channels; c++) { + for (c = 0; c < avctx->channels; c++) { js_blocks[0] = 0; js_blocks[1] = 0; - if (sconf->block_switching) { - unsigned int bs_info_len = 1 << (sconf->block_switching + 2); - bs_info = get_bits_long(gb, bs_info_len); - bs_info <<= (32 - bs_info_len); - } - - ctx->num_blocks = 0; - ptr_div_blocks = &div_blocks[0]; - parse_bs_info(bs_info, 0, 0, &ptr_div_blocks, &ctx->num_blocks); - reconstruct_block_sizes(ctx, div_blocks); + get_block_sizes(ctx, div_blocks, &bs_info); // if joint_stereo and block_switching is set, independent decoding // is signaled via the first bit of bs_info - if(sconf->joint_stereo && sconf->block_switching) { + if (sconf->joint_stereo && sconf->block_switching) if (bs_info >> 31) independent_bs = 2; - } // if this is the last channel, it has to be decoded independently - if (c == sconf->channels - 1) + if (c == avctx->channels - 1) independent_bs = 1; if (independent_bs) { - raw_samples_L = ctx->raw_samples[c]; - - for (b = 0; b < ctx->num_blocks; b++) { - ra_block = !b && ra_frame; - if (read_block_data(ctx, ra_block, raw_samples_L, - div_blocks[b], &js_blocks[0], NULL)) { - // damaged block, write zero for the rest of the frame - while (b < ctx->num_blocks) { - memset(raw_samples_L, 0, div_blocks[b]); - raw_samples_L += div_blocks[b]; - b++; - } - return -1; - } - raw_samples_L += div_blocks[b]; - } - - // store carryover raw samples - memmove((ctx->raw_samples[c]) - sconf->max_order, - (ctx->raw_samples[c]) - sconf->max_order + sconf->frame_length, - sizeof(int64_t) * sconf->max_order); + if (decode_blocks_ind(ctx, ra_frame, c, div_blocks, js_blocks)) + return -1; - if(independent_bs) + if (independent_bs) independent_bs--; } else { - unsigned int offset = 0; - - // decode all blocks - for (b = 0; b < ctx->num_blocks; b++) { - unsigned int s; - raw_samples_L = ctx->raw_samples[c ] + offset; - raw_samples_R = ctx->raw_samples[c + 1] + offset; - ra_block = !b && ra_frame; - if (read_block_data(ctx, ra_block, raw_samples_L, div_blocks[b], - &js_blocks[0], raw_samples_R) || - read_block_data(ctx, ra_block, raw_samples_R, div_blocks[b], - &js_blocks[1], raw_samples_L)) { - // damaged block, write zero for the rest of the frame - while (b < ctx->num_blocks) { - memset(raw_samples_L, 0, div_blocks[b]); - memset(raw_samples_R, 0, div_blocks[b]); - raw_samples_L += div_blocks[b]; - raw_samples_R += div_blocks[b]; - b++; - } - return -1; - } - - // reconstruct joint-stereo blocks - if (js_blocks[0]) { - if (js_blocks[1]) - av_log(ctx->avctx, AV_LOG_WARNING, "Invalid channel pair!\n"); - - for (s = 0; s < div_blocks[b]; s++) - raw_samples_L[s] = raw_samples_R[s] - raw_samples_L[s]; - } else if (js_blocks[1]) { - for (s = 0; s < div_blocks[b]; s++) - raw_samples_R[s] = raw_samples_R[s] + raw_samples_L[s]; - } - - offset += div_blocks[b]; - } - - // store carryover raw samples - memmove((ctx->raw_samples[c]) - sconf->max_order, - (ctx->raw_samples[c]) - sconf->max_order + sconf->frame_length, - sizeof(int64_t) * sconf->max_order); - - memmove((ctx->raw_samples[c + 1]) - sconf->max_order, - (ctx->raw_samples[c + 1]) - sconf->max_order + sconf->frame_length, - sizeof(int64_t) * sconf->max_order); + if (decode_blocks(ctx, ra_frame, c, div_blocks, js_blocks)) + return -1; c++; } + + // store carryover raw samples + memmove(ctx->raw_samples[c] - sconf->max_order, + ctx->raw_samples[c] - sconf->max_order + sconf->frame_length, + sizeof(*ctx->raw_samples[c]) * sconf->max_order); } } else { // multi-channel coding - if (sconf->block_switching) { - unsigned int bs_info_len = 1 << (sconf->block_switching + 2); - bs_info = get_bits_long(gb, bs_info_len); - bs_info <<= (32 - bs_info_len); - } - - ctx->num_blocks = 0; - ptr_div_blocks = &div_blocks[0]; - parse_bs_info(bs_info, 0, 0, &ptr_div_blocks, &ctx->num_blocks); - reconstruct_block_sizes(ctx, div_blocks); + get_block_sizes(ctx, div_blocks, &bs_info); // TODO: multi channel coding might use a temporary buffer instead as // the actual channel is not known when read_block-data is called - raw_samples_L = ctx->raw_samples[0]; - - for (b = 0; b < ctx->num_blocks; b++) { - ra_block = !b && ra_frame; - if (read_block_data(ctx, ra_block, raw_samples_L, - div_blocks[b], &js_blocks[0], NULL)) { - // damaged block, write zero for the rest of the frame - while (b < ctx->num_blocks) { - memset(raw_samples_L, 0, div_blocks[b]); - raw_samples_L += div_blocks[b]; - b++; - } - return -1; - } - raw_samples_L += div_blocks[b]; - // TODO: read_channel_data - } + if (decode_blocks_ind(ctx, ra_frame, 0, div_blocks, js_blocks)) + return -1; + // TODO: read_channel_data } - if (sconf->floating) { - // TODO: read_diff_float_data - } + // TODO: read_diff_float_data return 0; } @@ -915,37 +865,47 @@ static int decode_frame(AVCodecContext * ALSSpecificConfig *sconf = &ctx->sconf; const uint8_t *buffer = avpkt->data; int buffer_size = avpkt->size; - int invalid_frame = 0; + int invalid_frame, size; unsigned int c, sample, ra_frame, bytes_read, shift; init_get_bits(&ctx->gb, buffer, buffer_size * 8); - ra_frame = sconf->random_access && ((!ctx->frame_id) || - !(ctx->frame_id % sconf->random_access)); + + // In the case that the distance between random access frames is set to zero + // (sconf->ra_distance == 0) no frame is treated as a random access frame. + // For the first frame, if prediction is used, all samples used from the + // previous frame are assumed to be zero. + ra_frame = sconf->ra_distance && !(ctx->frame_id % sconf->ra_distance); // the last frame to decode might have a different length - if (ctx->num_frames && ctx->num_frames - 1 == ctx->frame_id) { + if (ctx->num_frames && ctx->num_frames - 1 == ctx->frame_id) ctx->cur_frame_length = ctx->last_frame_length; - } // decode the frame data - if ((invalid_frame = read_frame_data(ctx, ra_frame))) { + if ((invalid_frame = read_frame_data(ctx, ra_frame) < 0)) av_log(ctx->avctx, AV_LOG_WARNING, "Reading frame data failed. Skipping RA unit.\n"); - } - // increment the frame counter ctx->frame_id++; + // check for size of decoded data + size = ctx->cur_frame_length * avctx->channels * + (av_get_bits_per_sample_format(avctx->sample_fmt) >> 3); + + if (size > *data_size) { + av_log(avctx, AV_LOG_ERROR, "Decoded data exceeds buffer size.\n"); + return -1; + } + + *data_size = size; + // transform decoded frame into output format - #define INTERLEAVE_OUTPUT(bps) \ - { \ - int##bps##_t *dest = (int##bps##_t*) data; \ - shift = bps - ctx->avctx->bits_per_raw_sample; \ - for (sample = 0; sample < ctx->cur_frame_length; sample++) { \ - for (c = 0; c < sconf->channels; c++) { \ - *(dest++) = (int##bps##_t) (ctx->raw_samples[c][sample] << shift); \ - } \ - } \ + #define INTERLEAVE_OUTPUT(bps) \ + { \ + int##bps##_t *dest = (int##bps##_t*) data; \ + shift = bps - ctx->avctx->bits_per_raw_sample; \ + for (sample = 0; sample < ctx->cur_frame_length; sample++) \ + for (c = 0; c < avctx->channels; c++) \ + *dest++ = ctx->raw_samples[c][sample] << shift; \ } if (ctx->avctx->bits_per_raw_sample <= 16) { @@ -954,9 +914,6 @@ static int decode_frame(AVCodecContext * INTERLEAVE_OUTPUT(32) } - *data_size = ctx->cur_frame_length * sconf->channels - * (av_get_bits_per_sample_format(avctx->sample_fmt) >> 3); - bytes_read = invalid_frame ? buffer_size : (get_bits_count(&ctx->gb) + 7) >> 3; @@ -1008,9 +965,6 @@ static av_cold int decode_init(AVCodecCo return -1; } - avctx->sample_rate = sconf->samp_freq; - avctx->channels = sconf->channels; - if (sconf->floating) { avctx->sample_fmt = SAMPLE_FMT_FLT; avctx->bits_per_raw_sample = 32; @@ -1023,38 +977,36 @@ static av_cold int decode_init(AVCodecCo avctx->frame_size = sconf->frame_length; channel_size = sconf->frame_length + sconf->max_order; - // allocate previous raw sample buffer - if (!(ctx->prev_raw_samples = av_malloc(sizeof(int64_t) * sconf->max_order))) { - av_log(avctx, AV_LOG_ERROR, "Allocating buffer memory failed.\n"); - decode_end(avctx); - return AVERROR(ENOMEM); - } + ctx->prev_raw_samples = av_malloc (sizeof(*ctx->prev_raw_samples) * sconf->max_order); + ctx->raw_buffer = av_mallocz(sizeof(*ctx-> raw_buffer) * avctx->channels * channel_size); + ctx->raw_samples = av_malloc (sizeof(*ctx-> raw_samples) * avctx->channels); - // allocate raw and carried sample buffer - if (!(ctx->raw_buffer = av_mallocz(sizeof(int64_t) * - avctx->channels * channel_size))) { + // allocate previous raw sample buffer + if (!ctx->prev_raw_samples || !ctx->raw_buffer|| !ctx->raw_samples) { av_log(avctx, AV_LOG_ERROR, "Allocating buffer memory failed.\n"); decode_end(avctx); return AVERROR(ENOMEM); } - // allocate raw sample array buffer - if (!(ctx->raw_samples = av_malloc(sizeof(int64_t*) * avctx->channels))) { - av_log(avctx, AV_LOG_ERROR, "Allocating buffer array failed.\n"); - decode_end(avctx); - return AVERROR(ENOMEM); - } - - // allocate raw and carried samples buffers + // assign raw samples buffers ctx->raw_samples[0] = ctx->raw_buffer + sconf->max_order; - for (c = 1; c < avctx->channels; c++) { + for (c = 1; c < avctx->channels; c++) ctx->raw_samples[c] = ctx->raw_samples[c - 1] + channel_size; - } return 0; } +/** Flushes (resets) the frame ID after seeking. + */ +static av_cold void flush(AVCodecContext *avctx) +{ + ALSDecContext *ctx = avctx->priv_data; + + ctx->frame_id = 0; +} + + AVCodec als_decoder = { "als", CODEC_TYPE_AUDIO, @@ -1064,6 +1016,8 @@ AVCodec als_decoder = { NULL, decode_end, decode_frame, + .flush = flush, + .capabilities = CODEC_CAP_SUBFRAMES, .long_name = NULL_IF_CONFIG_SMALL("MPEG-4 Audio Lossless Coding (ALS)"), };

1 0

[soc]: r5406 - in libavfilter: checkout.sh diffs/01_ffplay_filters.diff diffs/02_ffmpeg_filters.diff
by stefano 10 Oct '09

10 Oct '09

Author: stefano Date: Sat Oct 10 12:55:16 2009 New Revision: 5406 Log: Update to FFmpeg r20198. Modified: libavfilter/checkout.sh libavfilter/diffs/01_ffplay_filters.diff libavfilter/diffs/02_ffmpeg_filters.diff Modified: libavfilter/checkout.sh ============================================================================== --- libavfilter/checkout.sh Wed Sep 30 00:02:35 2009 (r5405) +++ libavfilter/checkout.sh Sat Oct 10 12:55:16 2009 (r5406) @@ -1,7 +1,7 @@ #! /bin/sh echo "checking out pristine ffmpeg" -svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r20088 +svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r20198 echo "downloading the corresponding version of swscale" cd ffmpeg/libswscale Modified: libavfilter/diffs/01_ffplay_filters.diff ============================================================================== --- libavfilter/diffs/01_ffplay_filters.diff Wed Sep 30 00:02:35 2009 (r5405) +++ libavfilter/diffs/01_ffplay_filters.diff Sat Oct 10 12:55:16 2009 (r5406) @@ -1,6 +1,6 @@ Index: ffplay.c =================================================================== ---- ffplay.c (revision 20088) +--- ffplay.c (revision 20198) +++ ffplay.c (working copy) @@ -29,6 +29,12 @@ #include "libavcodec/colorspace.h" @@ -551,7 +551,7 @@ Index: ffplay.c + { "vfilters", OPT_STRING | HAS_ARG, {(void*)&vfilters}, "video filters", "filter list" }, +#endif { "default", OPT_FUNC2 | HAS_ARG | OPT_AUDIO | OPT_VIDEO | OPT_EXPERT, {(void*)opt_default}, "generic catch all option", "" }, - { "loglevel", HAS_ARG | OPT_FUNC2, {(void*)opt_loglevel}, "set libav* logging level", "logging level number or string" }, + { "loglevel", HAS_ARG | OPT_FUNC2, {(void*)opt_loglevel}, "set libav* logging level", "loglevel" }, { NULL, }, @@ -2535,7 +2835,9 @@ avcodec_opts[i]= avcodec_alloc_context2(i); Modified: libavfilter/diffs/02_ffmpeg_filters.diff ============================================================================== --- libavfilter/diffs/02_ffmpeg_filters.diff Wed Sep 30 00:02:35 2009 (r5405) +++ libavfilter/diffs/02_ffmpeg_filters.diff Sat Oct 10 12:55:16 2009 (r5406) @@ -1,6 +1,6 @@ Index: ffmpeg.c =================================================================== ---- ffmpeg.c (revision 20088) +--- ffmpeg.c (revision 20198) +++ ffmpeg.c (working copy) @@ -41,6 +41,13 @@ #include "libavutil/avstring.h"

1 0

[PATCH] Implement non-positional parameters parsing and parametric expressions for the crop filter arguments
by Stefano Sabatini 05 Oct '09

05 Oct '09

Hi, this greatly boosts the crop filter exressivity. Regards.

2 3

[PATCH]new avfilter vf_logo.c overlaying logo onto video
by Juergen_Meissner＠spiegel.de 03 Oct '09

03 Oct '09

This is a patch which can easyly be applied to checkout svn://svn.mplayerhq.hu/soc/libavfilter. Hopefully it will find a way to the /soc/libavfilter store this time. Best regards Jürgen Meissner stellv. Leiter EDV SPIEGEL-Verlag Rudolf Augstein GmbH & Co. KG Brandstwiete 19 20457 Hamburg Tel: +49 (40) 30 07 - 2137 Fax: +49 (40) 30 07 - 85 - 2137 E-Mail: juergen_meissner(a)spiegel.de http://www.spiegel.de

2 2

[PATCH]new avfilter vf_logo.c overlaying logo onto video (revised patchfile)
by Juergen_Meissner＠spiegel.de 02 Oct '09

02 Oct '09

Learned this lesson: Never send a file in the afternoon, send it in the evening. It's a reised edition for the afternoon patch. the diffs/03.... was malformed. This is a patch which can easyly be applied to checkout svn://svn.mplayerhq.hu/soc/libavfilter. Hopefully it will find a way to the /soc/libavfilter store this time. Best regards Jürgen Meissner stellv. Leiter EDV SPIEGEL-Verlag Rudolf Augstein GmbH & Co. KG Brandstwiete 19 20457 Hamburg Tel: +49 (40) 30 07 - 2137 Fax: +49 (40) 30 07 - 85 - 2137 E-Mail: juergen_meissner(a)spiegel.de http://www.spiegel.de

1 0