June 2008 - FFmpeg-soc - lists.ffmpeg.org

[soc]: r2590 - alacenc/alacenc.c
by jai_menon 29 Jun '08

29 Jun '08

Author: jai_menon Date: Sun Jun 29 19:32:35 2008 New Revision: 2590 Log: store residuals in a separate predictor buffer Modified: alacenc/alacenc.c Modified: alacenc/alacenc.c ============================================================================== --- alacenc/alacenc.c (original) +++ alacenc/alacenc.c Sun Jun 29 19:32:35 2008 @@ -52,6 +52,7 @@ typedef struct AlacEncodeContext { int max_coded_frame_size; int write_sample_size; int32_t *sample_buf[MAX_CHANNELS]; + int32_t *predictor_buf; PutBitContext pbctx; RiceContext rc; LPCContext lpc; @@ -77,6 +78,7 @@ static void allocate_sample_buffers(Alac s->sample_buf[i-1] = av_mallocz(s->avctx->frame_size*sizeof(int32_t)); i--; } + s->predictor_buf = av_mallocz(s->avctx->frame_size*sizeof(int32_t)); } static void free_sample_buffers(AlacEncodeContext *s) @@ -87,6 +89,7 @@ static void free_sample_buffers(AlacEnco av_freep(&s->sample_buf[i-1]); i--; } + av_freep(&s->predictor_buf); } static void init_sample_buffers(AlacEncodeContext *s, int16_t *input_samples) @@ -146,18 +149,18 @@ static void alac_linear_predictor(AlacEn if(s->lpc.lpc_order == 31) { i = s->avctx->frame_size - 1; while(i > 0) { - s->sample_buf[ch][i] -= s->sample_buf[ch][i-1]; + s->predictor_buf[i] = s->sample_buf[ch][i] - s->sample_buf[ch][i-1]; i--; } return; } } -static void alac_entropy_coder(AlacEncodeContext *s, int ch) +static void alac_entropy_coder(AlacEncodeContext *s) { unsigned int history = s->rc.initial_history; int sign_modifier = 0, i = 0, k; - int32_t *samples = s->sample_buf[ch]; + int32_t *samples = s->predictor_buf; while(i < s->avctx->frame_size) { int x; @@ -223,7 +226,7 @@ static void write_compressed_frame(AlacE for(i=0;i<s->channels;i++) { alac_linear_predictor(s, i); - alac_entropy_coder(s, i); + alac_entropy_coder(s); } }

1 0

Midterms
by Mike Melanson 29 Jun '08

29 Jun '08

Hi team, Midterms are quickly approaching. Starting July 7, mentors are expected to submit evaluations of their students' progress up to this point. Have a good week! Also, vacation notice: I will be away from July 4-7. -- -Mike Melanson

2 1

[soc] [propchange]: r2589 - svn:log
by superdump 29 Jun '08

29 Jun '08

Author: superdump Revision: 2589 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1,4 +1,4 @@ -Use overall mean noise energy rather than calculate the noise per band. +Use overall mean noise energy rather than calculate the noise energy per band. Note: This differs from the 3GPP reference implementation which calculates -the energy per band and scales using that energy. +the noise energy per band and scales using that energy.

1 0

[soc]: r2589 - in aac: aac.c aactab.h
by superdump 29 Jun '08

29 Jun '08

Author: superdump Date: Sun Jun 29 17:21:29 2008 New Revision: 2589 Log: Use overall mean noise energy rather than calculate the noise per band. Note: This differs from the 3GPP reference implementation which calculates the energy per band and scales using that energy. Modified: aac/aac.c aac/aactab.h Modified: aac/aac.c ============================================================================== --- aac/aac.c (original) +++ aac/aac.c Sun Jun 29 17:21:29 2008 @@ -1188,12 +1188,7 @@ static int decode_spectral_data(AACConte const int cur_cb = cb[g][i]; const int dim = cur_cb >= FIRST_PAIR_HCB ? 2 : 4; int group; - if (cur_cb == NOISE_HCB) { - for (group = 0; group < ics->group_len[g]; group++) { - for (k = offsets[i]; k < offsets[i+1]; k++) - icoef[group*128+k] = av_random(&ac->random_state) & 0x0000FFFF; - } - }else if (cur_cb == ZERO_HCB) { + if (cur_cb == ZERO_HCB) { for (group = 0; group < ics->group_len[g]; group++) { memset(icoef + group * 128 + offsets[i], 0, (offsets[i+1] - offsets[i])*sizeof(int)); } @@ -1261,13 +1256,9 @@ static void quant_to_spec_tool(AACContex for (i = 0; i < ics->max_sfb; i++) { if (cb[g][i] == NOISE_HCB) { for (group = 0; group < ics->group_len[g]; group++) { - float energy = 0; - float scale = 1.;// / (float)(offsets[i+1] - offsets[i]); - for (k = offsets[i]; k < offsets[i+1]; k++) - energy += (float)icoef[group*128+k] * icoef[group*128+k]; - scale *= sf[g][i] / sqrt(energy); + float scale = sf[g][i] / ((offsets[i+1] - offsets[i]) * PNS_MEAN_ENERGY); for (k = offsets[i]; k < offsets[i+1]; k++) - coef[group*128+k] = icoef[group*128+k] * scale; + coef[group*128+k] = (int32_t)av_random(&ac->random_state) * scale; } } else if (cb[g][i] != INTENSITY_HCB && cb[g][i] != INTENSITY_HCB2) { for (group = 0; group < ics->group_len[g]; group++) { Modified: aac/aactab.h ============================================================================== --- aac/aactab.h (original) +++ aac/aactab.h Sun Jun 29 17:21:29 2008 @@ -31,6 +31,7 @@ #define FFMPEG_AACTAB_H #define TNS_MAX_ORDER 20 +#define PNS_MEAN_ENERGY 3719550720.0f // sqrt(3.0) * 1<<31 static const uint16_t swb_offset_1024_96[] = { 0, 4, 8, 12, 16, 20, 24, 28, 32, 36, 40, 44, 48, 52, 56,

1 0

[soc]: r2588 - mxf
by banan 29 Jun '08

29 Jun '08

Author: banan Date: Sun Jun 29 12:02:46 2008 New Revision: 2588 Log: Added mxf subdir Added: mxf/

1 0

[soc]: r2578 - mlp/mlpdec.c
by ramiro 29 Jun '08

29 Jun '08

Author: ramiro Date: Thu Jun 26 19:33:28 2008 New Revision: 2578 Log: More checks to see if there is enough data. Modified: mlp/mlpdec.c Modified: mlp/mlpdec.c ============================================================================== --- mlp/mlpdec.c (original) +++ mlp/mlpdec.c Thu Jun 26 19:33:28 2008 @@ -1009,6 +1009,9 @@ static int read_access_unit(AVCodecConte for (substr = 0; substr < m->num_substreams; substr++) { int extraword_present, checkdata_present, end; + if (bytes_left < 2) + return -1; + extraword_present = get_bits1(&gb); skip_bits1(&gb); checkdata_present = get_bits1(&gb); @@ -1022,6 +1025,8 @@ static int read_access_unit(AVCodecConte bytes_left -= 2; if (extraword_present) { + if (bytes_left < 2) + return -1; skip_bits(&gb, 16); parity_bits ^= *buf++; parity_bits ^= *buf++;

3 6

[soc]: r2587 - alacenc/alacenc.c
by jai_menon 28 Jun '08

28 Jun '08

Author: jai_menon Date: Sat Jun 28 18:10:46 2008 New Revision: 2587 Log: indentation fix after last commit Modified: alacenc/alacenc.c Modified: alacenc/alacenc.c ============================================================================== --- alacenc/alacenc.c (original) +++ alacenc/alacenc.c Sat Jun 28 18:10:46 2008 @@ -144,12 +144,12 @@ static void alac_linear_predictor(AlacEn int i; if(s->lpc.lpc_order == 31) { - i = s->avctx->frame_size - 1; - while(i > 0) { - s->sample_buf[ch][i] -= s->sample_buf[ch][i-1]; - i--; - } - return; + i = s->avctx->frame_size - 1; + while(i > 0) { + s->sample_buf[ch][i] -= s->sample_buf[ch][i-1]; + i--; + } + return; } }

1 0

[soc]: r2586 - alacenc/alacenc.c
by jai_menon 28 Jun '08

28 Jun '08

Author: jai_menon Date: Sat Jun 28 18:04:27 2008 New Revision: 2586 Log: rename lpc function and generalize existing code Modified: alacenc/alacenc.c Modified: alacenc/alacenc.c ============================================================================== --- alacenc/alacenc.c (original) +++ alacenc/alacenc.c Sat Jun 28 18:04:27 2008 @@ -139,15 +139,18 @@ static void write_frame_header(AlacEncod put_bits(&s->pbctx, 32, s->avctx->frame_size); // No. of samples in the frame } -static void first_order_predictor(AlacEncodeContext *s, int ch) +static void alac_linear_predictor(AlacEncodeContext *s, int ch) { int i; + if(s->lpc.lpc_order == 31) { i = s->avctx->frame_size - 1; while(i > 0) { s->sample_buf[ch][i] -= s->sample_buf[ch][i-1]; i--; } + return; + } } static void alac_entropy_coder(AlacEncodeContext *s, int ch) @@ -219,7 +222,7 @@ static void write_compressed_frame(AlacE // apply lpc and entropy coding to audio samples for(i=0;i<s->channels;i++) { - first_order_predictor(s, i); + alac_linear_predictor(s, i); alac_entropy_coder(s, i); } }

1 0

[soc]: r2585 - mlp/mlpdec.c
by ramiro 28 Jun '08

28 Jun '08

Author: ramiro Date: Sat Jun 28 13:56:35 2008 New Revision: 2585 Log: Use a macro to calculate parity over 2 bytes. Modified: mlp/mlpdec.c Modified: mlp/mlpdec.c ============================================================================== --- mlp/mlpdec.c (original) +++ mlp/mlpdec.c Sat Jun 28 13:56:35 2008 @@ -965,6 +965,12 @@ static uint8_t calculate_parity(const ui return scratch; } +#define PARITY_2BYTES do { \ + parity_bits ^= *buf++; \ + parity_bits ^= *buf++; \ + header_size += 2; \ + } while(0) + /** * Read an access unit from the stream. * Returns -1 on error, 0 if not enough data is present in the input stream @@ -978,11 +984,10 @@ static int read_access_unit(AVCodecConte GetBitContext gb; unsigned int length, substr; unsigned int substream_start; - unsigned int header_size = 4; + unsigned int header_size = 0; uint8_t substream_parity_present[MAX_SUBSTREAMS]; uint16_t substream_data_len[MAX_SUBSTREAMS]; uint8_t parity_bits = 0; - int i; if (buf_size < 4) return 0; @@ -992,8 +997,8 @@ static int read_access_unit(AVCodecConte if (length > buf_size) return -1; - for(i = 0; i < 4; i++) - parity_bits ^= *buf++; + PARITY_2BYTES; + PARITY_2BYTES; init_get_bits(&gb, buf, (length - 4) * 8); @@ -1024,15 +1029,11 @@ static int read_access_unit(AVCodecConte end = get_bits(&gb, 12) * 2; - parity_bits ^= *buf++; - parity_bits ^= *buf++; - header_size += 2; + PARITY_2BYTES; if (extraword_present) { skip_bits(&gb, 16); - parity_bits ^= *buf++; - parity_bits ^= *buf++; - header_size += 2; + PARITY_2BYTES; } if (end + header_size > length) {

1 0

[soc]: r2584 - mlp/mlpdec.c
by ramiro 28 Jun '08

28 Jun '08

Author: ramiro Date: Sat Jun 28 13:42:19 2008 New Revision: 2584 Log: Cosmetics: vertically align. Modified: mlp/mlpdec.c Modified: mlp/mlpdec.c ============================================================================== --- mlp/mlpdec.c (original) +++ mlp/mlpdec.c Sat Jun 28 13:42:19 2008 @@ -381,14 +381,14 @@ static int read_major_sync(MLPDecodeCont return -1; } - m->access_unit_size = mh.access_unit_size; + m->access_unit_size = mh.access_unit_size; m->access_unit_size_pow2 = mh.access_unit_size_pow2; - m->num_substreams = mh.num_substreams; + m->num_substreams = mh.num_substreams; m->max_decoded_substream = m->num_substreams - 1; - m->avctx->sample_rate = mh.group1_samplerate; - m->avctx->frame_size = mh.access_unit_size; + m->avctx->sample_rate = mh.group1_samplerate; + m->avctx->frame_size = mh.access_unit_size; #ifdef CONFIG_AUDIO_NONSHORT m->avctx->bits_per_sample = mh.group1_bits; @@ -428,8 +428,8 @@ static int read_restart_header(MLPDecode skip_bits(gbp, 16); /* Output timestamp */ - m->min_channel[substr] = get_bits(gbp, 4); - m->max_channel[substr] = get_bits(gbp, 4); + m->min_channel [substr] = get_bits(gbp, 4); + m->max_channel [substr] = get_bits(gbp, 4); m->max_matrix_channel[substr] = get_bits(gbp, 4); if (m->min_channel[substr] > m->max_channel[substr]) { @@ -450,7 +450,7 @@ static int read_restart_header(MLPDecode m->max_decoded_substream = substr; } - m->noise_shift[substr] = get_bits(gbp, 4); + m->noise_shift [substr] = get_bits(gbp, 4); m->noisegen_seed[substr] = get_bits(gbp, 23); skip_bits(gbp, 19); @@ -492,12 +492,12 @@ static int read_restart_header(MLPDecode av_log(m->avctx, AV_LOG_ERROR, "Restart header checksum error\n"); /* Set default decoding parameters */ - m->param_presence_flags[substr] = 0xff; + m->param_presence_flags [substr] = 0xff; m->num_primitive_matrices[substr] = 0; - m->blocksize[substr] = 8; - m->lossless_check_data[substr] = 0; + m->blocksize [substr] = 8; + m->lossless_check_data [substr] = 0; - memset(m->output_shift[substr], 0, sizeof(m->output_shift[substr])); + memset(m->output_shift [substr], 0, sizeof(m->output_shift [substr])); memset(m->quant_step_size[substr], 0, sizeof(m->quant_step_size[substr])); for (ch = m->min_channel[substr]; ch <= m->max_channel[substr]; ch++) { @@ -579,7 +579,7 @@ static int read_filter_params(MLPDecodeC return -1; } - state_bits = get_bits(gbp, 4); + state_bits = get_bits(gbp, 4); state_shift = get_bits(gbp, 4); /* TODO: check validity of state data */ @@ -706,7 +706,7 @@ static int read_decoding_params(MLPDecod if (get_bits1(gbp)) m->huff_offset[ch] = get_sbits(gbp, 15); - m->codebook[ch] = get_bits(gbp, 2); + m->codebook [ch] = get_bits(gbp, 2); m->huff_lsbs[ch] = get_bits(gbp, 5); calculate_sign_huff(m, substr, ch);

1 0