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

ALAC Benchmarks
by Jai Menon 09 Sep '08

09 Sep '08

Hi, Sorry for starting a new thread, I cleaned my inbox after the Great Modem Burnout of last month :-) Mike, did you by any chance get time to do the benchmarks with the alac encoder in FFmpeg-svn? I was thinking of posting a news item on Hydrogenaudio and it would be nice if I could link to that spreadsheet. I would have tried but I don't have the samples and know how of the methodology ;-). Thanks in advance. Regards, Jai Menon

8 21

FW: ffmpeg compilation problem against libavfilter (detailed)
by dmitry＠conft.org 09 Sep '08

09 Sep '08

Dmitry Sherman C.E.O INTERHOST - Network Solutions Phone: +972-543181182 Fax: +972-577976157 E-mail: <mailto:dmitry@interhost.co.il> dmitry(a)interhost.co.il web: <http://www.interhost.co.il/> http://www.interhost.co.il/ From: Dmitry Sherman [mailto:dmitry@interhost.co.il] On Behalf Of dmitry(a)conft.org Sent: Monday, August 18, 2008 8:51 PM To: 'ffmpeg-user(a)mplayerhq.hu' Subject: ffmpeg compilation problem against libavfilter (detailed) Hello, Just checked out latest svn of ffmpeg and libavfilter: Avfilter revision: Checked out revision 3450. Ffmpeg: Checked out external at revision 27471. Checked out revision 14825 Configuring as following: --enable-gpl --enable-libvorbis --enable-liba52 --enable-libdc1394 --enable-libgsm --enable-libmp3lame --enable-libfaad --enable-libfaac --enable-pthreads --enable-libx264 --enable-libxvid --enable-shared --enable-avfilter --enable-vhook --disable-ffserver When trying to make getting this error: vfilter/defaults.o libavfilter/defaults.c gcc -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -I. -I"/usr/local/src/ffmpeg" -D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200112 -fasm -std=c99 -fomit-frame-pointer -pthread -g -Wdeclaration-after-statement -Wall -Wno-switch -Wdisabled-optimization -Wpointer-arith -Wredundant-decls -Wno-pointer-sign -Wcast-qual -Wwrite-strings -O3 -fno-math-errno -c -o libavfilter/formats.o libavfilter/formats.c gcc -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -I. -I"/usr/local/src/ffmpeg" -D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200112 -fasm -std=c99 -fomit-frame-pointer -pthread -g -Wdeclaration-after-statement -Wall -Wno-switch -Wdisabled-optimization -Wpointer-arith -Wredundant-decls -Wno-pointer-sign -Wcast-qual -Wwrite-strings -O3 -fno-math-errno -c -o libavfilter/graphparser.o libavfilter/graphparser.c libavfilter/graphparser.c: In function ג€˜free_inoutג€™: libavfilter/graphparser.c:186: warning: passing argument 1 of ג€˜av_freeג€™ discards qualifiers from pointer target type libavfilter/graphparser.c: In function ג€˜link_filter_inoutsג€™: libavfilter/graphparser.c:233: warning: passing argument 1 of ג€˜av_freeג€™ discards qualifiers from pointer target type libavfilter/graphparser.c: In function ג€˜parse_outputsג€™: libavfilter/graphparser.c:316: warning: passing argument 1 of ג€˜av_freeג€™ discards qualifiers from pointer target type gcc -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -I. -I"/usr/local/src/ffmpeg" -D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200112 -fasm -std=c99 -fomit-frame-pointer -pthread -g -Wdeclaration-after-statement -Wall -Wno-switch -Wdisabled-optimization -Wpointer-arith -Wredundant-decls -Wno-pointer-sign -Wcast-qual -Wwrite-strings -O3 -fno-math-errno -c -o libavfilter/vf_crop.o libavfilter/vf_crop.c gcc -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -I. -I"/usr/local/src/ffmpeg" -D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200112 -fasm -std=c99 -fomit-frame-pointer -pthread -g -Wdeclaration-after-statement -Wall -Wno-switch -Wdisabled-optimization -Wpointer-arith -Wredundant-decls -Wno-pointer-sign -Wcast-qual -Wwrite-strings -O3 -fno-math-errno -c -o libavfilter/vf_drawbox.o libavfilter/vf_drawbox.c gcc -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -I. -I"/usr/local/src/ffmpeg" -D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200112 -fasm -std=c99 -fomit-frame-pointer -pthread -g -Wdeclaration-after-statement -Wall -Wno-switch -Wdisabled-optimization -Wpointer-arith -Wredundant-decls -Wno-pointer-sign -Wcast-qual -Wwrite-strings -O3 -fno-math-errno -c -o libavfilter/vf_fps.o libavfilter/vf_fps.c libavfilter/vf_fps.c:27: error: initializer element is not constant make: *** [libavfilter/vf_fps.o] Error 1 Dmitry Sherman C.E.O INTERHOST - Network Solutions Phone: +972-543181182 Fax: +972-577976157 E-mail: <mailto:dmitry@interhost.co.il> dmitry(a)interhost.co.il web: <http://www.interhost.co.il/> http://www.interhost.co.il/

3 2

[soc]: r3696 - mlp/mlpenc.c
by ramiro 01 Sep '08

01 Sep '08

Author: ramiro Date: Mon Sep 1 01:51:38 2008 New Revision: 3696 Log: There's no need to have 1 billion *_size variables that are only used once each. Modified: mlp/mlpenc.c Modified: mlp/mlpenc.c ============================================================================== --- mlp/mlpenc.c (original) +++ mlp/mlpenc.c Mon Sep 1 01:51:38 2008 @@ -458,14 +458,9 @@ static int mlp_sample_rate(int sample_ra static av_cold int mlp_encode_init(AVCodecContext *avctx) { MLPEncodeContext *ctx = avctx->priv_data; - unsigned int major_scratch_buffer_size; - unsigned int lossless_check_data_size; - unsigned int lpc_sample_buffer_size; - unsigned int decoding_params_size; - unsigned int channel_params_size; - unsigned int frame_size_size; unsigned int substr, index; unsigned int sum = 0; + unsigned int size; if (avctx->strict_std_compliance > -1 /* inofficial */) { av_log(avctx, AV_LOG_ERROR, "The bitstream generated by this encoder " @@ -526,27 +521,27 @@ static av_cold int mlp_encode_init(AVCod /* TODO Let user pass parameters for LPC filter. */ - lpc_sample_buffer_size = avctx->frame_size + size = avctx->frame_size * ctx->max_restart_interval * sizeof(int32_t); - ctx->lpc_sample_buffer = av_malloc(lpc_sample_buffer_size); + ctx->lpc_sample_buffer = av_malloc(size); if (!ctx->lpc_sample_buffer) { av_log(avctx, AV_LOG_ERROR, "Not enough memory for buffering samples.\n"); return -1; } - major_scratch_buffer_size = ctx->one_sample_buffer_size + size = ctx->one_sample_buffer_size * ctx->max_restart_interval * sizeof(int32_t); - ctx->major_scratch_buffer = av_malloc(major_scratch_buffer_size); + ctx->major_scratch_buffer = av_malloc(size); if (!ctx->major_scratch_buffer) { av_log(avctx, AV_LOG_ERROR, "Not enough memory for buffering samples.\n"); return -1; } - ctx->major_inout_buffer = av_malloc(major_scratch_buffer_size); + ctx->major_inout_buffer = av_malloc(size); if (!ctx->major_inout_buffer) { av_log(avctx, AV_LOG_ERROR, "Not enough memory for buffering samples.\n"); @@ -563,17 +558,17 @@ static av_cold int mlp_encode_init(AVCod ctx->mlp_channels3 = get_channels3_code(avctx->channels); ctx->num_substreams = 1; - frame_size_size = sizeof(unsigned int) + size = sizeof(unsigned int) * ctx->max_restart_interval; - ctx->frame_size = av_malloc(frame_size_size); + ctx->frame_size = av_malloc(size); if (!ctx->frame_size) return -1; - lossless_check_data_size = sizeof(int32_t) * ctx->num_substreams + size = sizeof(int32_t) * ctx->num_substreams * ctx->max_restart_interval; - ctx->lossless_check_data = av_malloc(lossless_check_data_size); + ctx->lossless_check_data = av_malloc(size); if (!ctx->lossless_check_data) return -1; @@ -583,18 +578,18 @@ static av_cold int mlp_encode_init(AVCod sum += ctx->seq_size[index]; } ctx->sequence_size = sum; - channel_params_size = ctx->restart_intervals * ctx->sequence_size + size = ctx->restart_intervals * ctx->sequence_size * ctx->avctx->channels * sizeof(ChannelParams); - ctx->channel_params = av_malloc(channel_params_size); + ctx->channel_params = av_malloc(size); if (!ctx->channel_params) { av_log(avctx, AV_LOG_ERROR, "Not enough memory for analysis context.\n"); return -1; } - decoding_params_size = ctx->restart_intervals * ctx->sequence_size + size = ctx->restart_intervals * ctx->sequence_size * ctx->num_substreams * sizeof(DecodingParams); - ctx->decoding_params = av_malloc(decoding_params_size); + ctx->decoding_params = av_malloc(size); if (!ctx->decoding_params) { av_log(avctx, AV_LOG_ERROR, "Not enough memory for analysis context.\n");

1 0

[soc]: r3695 - mlp/mlpenc.c
by ramiro 01 Sep '08

01 Sep '08

Author: ramiro Date: Mon Sep 1 01:37:52 2008 New Revision: 3695 Log: Dynamically allocate just enough memory for decoding_params. Modified: mlp/mlpenc.c Modified: mlp/mlpenc.c ============================================================================== --- mlp/mlpenc.c (original) +++ mlp/mlpenc.c Mon Sep 1 01:37:52 2008 @@ -141,7 +141,7 @@ typedef struct { BestOffset best_offset[MAJOR_HEADER_INTERVAL+1][MAX_CHANNELS][NUM_CODEBOOKS]; - DecodingParams decoding_params[MAJOR_HEADER_INTERVAL][MAJOR_HEADER_INTERVAL][MAJOR_HEADER_INTERVAL+1][MAX_SUBSTREAMS]; + DecodingParams *decoding_params; RestartHeader restart_header [MAX_SUBSTREAMS]; ChannelParams major_channel_params[MAJOR_HEADER_INTERVAL+1][MAX_CHANNELS]; ///< ChannelParams to be written to bitstream. @@ -163,6 +163,7 @@ typedef struct { DecodingParams *prev_decoding_params; ChannelParams *seq_channel_params; + DecodingParams *seq_decoding_params; unsigned int max_codebook_search; @@ -336,10 +337,11 @@ static void copy_restart_frame_params(ML unsigned int substr) { ChannelParams (*seq_cp)[ctx->avctx->channels] = (ChannelParams (*)[ctx->avctx->channels]) ctx->seq_channel_params; + DecodingParams (*seq_dp)[ctx->num_substreams] = (DecodingParams (*)[ctx->num_substreams]) ctx->seq_decoding_params; unsigned int index; for (index = 0; index < ctx->number_of_frames + 1; index++) { - DecodingParams *dp = &ctx->decoding_params[ctx->seq_index][ctx->frame_index][index][substr]; + DecodingParams *dp = &seq_dp[index][substr]; unsigned int channel; copy_matrix_params(&dp->matrix_params, &ctx->cur_decoding_params->matrix_params); @@ -459,6 +461,7 @@ static av_cold int mlp_encode_init(AVCod unsigned int major_scratch_buffer_size; unsigned int lossless_check_data_size; unsigned int lpc_sample_buffer_size; + unsigned int decoding_params_size; unsigned int channel_params_size; unsigned int frame_size_size; unsigned int substr, index; @@ -589,6 +592,15 @@ static av_cold int mlp_encode_init(AVCod return -1; } + decoding_params_size = ctx->restart_intervals * ctx->sequence_size + * ctx->num_substreams * sizeof(DecodingParams); + ctx->decoding_params = av_malloc(decoding_params_size); + if (!ctx->decoding_params) { + av_log(avctx, AV_LOG_ERROR, + "Not enough memory for analysis context.\n"); + return -1; + } + for (substr = 0; substr < ctx->num_substreams; substr++) { RestartHeader *rh = &ctx->restart_header [substr]; @@ -2037,9 +2049,18 @@ static void set_major_params(MLPEncodeCo { ChannelParams (*channel_params)[ctx->sequence_size][ctx->avctx->channels] = (ChannelParams (*)[ctx->sequence_size][ctx->avctx->channels]) ctx->channel_params; + DecodingParams (*decoding_params)[ctx->sequence_size][ctx->num_substreams] = + (DecodingParams (*)[ctx->sequence_size][ctx->num_substreams]) ctx->decoding_params; unsigned int index; unsigned int substr; + for (substr = 0; substr < ctx->num_substreams; substr++) { + DecodingParams (*seq_dp)[ctx->num_substreams] = + (DecodingParams (*)[ctx->num_substreams]) &decoding_params[ctx->restart_intervals - 1][ctx->seq_offset[ctx->restart_intervals - 1]]; + for (index = 0; index < ctx->seq_size[ctx->restart_intervals-1]; index++) + memcpy(&ctx->major_decoding_params[index][substr], &seq_dp[index][substr], sizeof(DecodingParams)); + } + { ChannelParams (*seq_cp)[ctx->avctx->channels] = (ChannelParams (*)[ctx->avctx->channels]) &channel_params[ctx->restart_intervals - 1][ctx->seq_offset[ctx->restart_intervals - 1]]; @@ -2050,7 +2071,6 @@ static void set_major_params(MLPEncodeCo } } } - memcpy(ctx->major_decoding_params, ctx->decoding_params[ctx->restart_intervals-1][MAJOR_HEADER_INTERVAL-1], sizeof(ctx->major_decoding_params)); for (substr = 0; substr < ctx->num_substreams; substr++) { @@ -2060,7 +2080,7 @@ static void set_major_params(MLPEncodeCo ctx->prev_channel_params = restart_channel_params; for (index = 0; index < MAJOR_HEADER_INTERVAL + 1; index++) { - ctx->cur_decoding_params = &ctx->decoding_params[ctx->restart_intervals-1][MAJOR_HEADER_INTERVAL-1][index][substr]; + ctx->cur_decoding_params = &ctx->major_decoding_params[index][substr]; ctx->cur_channel_params = ctx->major_channel_params[index]; ctx->major_params_changed[index][substr] = compare_decoding_params(ctx); @@ -2074,6 +2094,7 @@ static void set_major_params(MLPEncodeCo static void analyze_sample_buffer(MLPEncodeContext *ctx) { ChannelParams (*seq_cp)[ctx->avctx->channels] = (ChannelParams (*)[ctx->avctx->channels]) ctx->seq_channel_params; + DecodingParams (*seq_dp)[ctx->num_substreams] = (DecodingParams (*)[ctx->num_substreams]) ctx->seq_decoding_params; unsigned int index; unsigned int substr; @@ -2082,13 +2103,13 @@ static void analyze_sample_buffer(MLPEnc ctx->cur_restart_header = &ctx->restart_header[substr]; for (index = 0; index < ctx->number_of_frames; index++) { - DecodingParams *dp = &ctx->decoding_params[ctx->seq_index][ctx->frame_index][index + 1][substr]; + DecodingParams *dp = &seq_dp[index + 1][substr]; dp->blocksize = ctx->frame_size[index]; } - ctx->decoding_params[ctx->seq_index][ctx->frame_index][0][substr].blocksize = 8; - ctx->decoding_params[ctx->seq_index][ctx->frame_index][1][substr].blocksize -= 8; + seq_dp[0][substr].blocksize = 8; + seq_dp[1][substr].blocksize -= 8; - ctx->cur_decoding_params = &ctx->decoding_params[ctx->seq_index][ctx->frame_index][1][substr]; + ctx->cur_decoding_params = &seq_dp[1][substr]; ctx->cur_channel_params = seq_cp[1]; generate_2_noise_channels(ctx); @@ -2101,7 +2122,7 @@ static void analyze_sample_buffer(MLPEnc copy_restart_frame_params(ctx, substr); for (index = 0; index < ctx->number_of_frames + 1; index++) { - ctx->cur_decoding_params = &ctx->decoding_params[ctx->seq_index][ctx->frame_index][index][substr]; + ctx->cur_decoding_params = &seq_dp[index][substr]; ctx->cur_channel_params = seq_cp[index]; ctx->cur_best_offset = ctx->best_offset[index]; determine_bits(ctx); @@ -2215,12 +2236,15 @@ input_and_return: if (!restart_frame) { ChannelParams (*channel_params)[ctx->sequence_size][ctx->avctx->channels] = (ChannelParams (*)[ctx->sequence_size][ctx->avctx->channels]) ctx->channel_params; + DecodingParams (*decoding_params)[ctx->sequence_size][ctx->num_substreams] = + (DecodingParams (*)[ctx->sequence_size][ctx->num_substreams]) ctx->decoding_params; int seq_index; for (seq_index = 0; seq_index < ctx->restart_intervals && (seq_index * ctx->min_restart_interval) <= ctx->avctx->frame_number; seq_index++) { ChannelParams (*seq_cp)[ctx->avctx->channels] = &channel_params[(ctx->frame_index / ctx->min_restart_interval)][ctx->seq_offset[seq_index]]; + DecodingParams (*seq_dp)[ctx->num_substreams] = &decoding_params[(ctx->frame_index / ctx->min_restart_interval)][ctx->seq_offset[seq_index]]; unsigned int number_of_samples = 0; unsigned int index; @@ -2232,6 +2256,7 @@ input_and_return: - (seq_index * ctx->min_restart_interval)) % ctx->max_restart_interval; ctx->number_of_frames = ctx->seq_size[seq_index] - 1; ctx->seq_channel_params = (ChannelParams *) seq_cp; + ctx->seq_decoding_params = (DecodingParams *) seq_dp; for (index = 0; index < ctx->number_of_frames; index++) { number_of_samples += ctx->frame_size[(ctx->starting_frame_index + index) % ctx->max_restart_interval]; @@ -2240,7 +2265,7 @@ input_and_return: for (index = 0; index < ctx->seq_size[seq_index]; index++) { clear_channel_params(ctx, seq_cp[index]); - default_decoding_params(ctx, ctx->decoding_params[ctx->seq_index][ctx->frame_index][index]); + default_decoding_params(ctx, seq_dp[index]); } input_to_sample_buffer(ctx); @@ -2270,6 +2295,7 @@ static av_cold int mlp_encode_close(AVCo av_freep(&ctx->major_scratch_buffer); av_freep(&ctx->major_inout_buffer); av_freep(&ctx->lpc_sample_buffer); + av_freep(&ctx->decoding_params); av_freep(&ctx->channel_params); av_freep(&avctx->coded_frame); av_freep(&ctx->frame_size);

1 0

[soc]: r3694 - mlp/mlpenc.c
by ramiro 01 Sep '08

01 Sep '08

Author: ramiro Date: Mon Sep 1 01:35:20 2008 New Revision: 3694 Log: Only clear params for substreams that are used. Modified: mlp/mlpenc.c Modified: mlp/mlpenc.c ============================================================================== --- mlp/mlpenc.c (original) +++ mlp/mlpenc.c Mon Sep 1 01:35:20 2008 @@ -359,11 +359,11 @@ static void copy_restart_frame_params(ML } /** Clears a DecodingParams struct the way it should be after a restart header. */ -static void clear_decoding_params(DecodingParams decoding_params[MAX_SUBSTREAMS]) +static void clear_decoding_params(MLPEncodeContext *ctx, DecodingParams decoding_params[MAX_SUBSTREAMS]) { unsigned int substr; - for (substr = 0; substr < MAX_SUBSTREAMS; substr++) { + for (substr = 0; substr < ctx->num_substreams; substr++) { DecodingParams *dp = &decoding_params[substr]; dp->param_presence_flags = 0xff; @@ -397,9 +397,9 @@ static void default_decoding_params(MLPE { unsigned int substr; - clear_decoding_params(decoding_params); + clear_decoding_params(ctx, decoding_params); - for (substr = 0; substr < MAX_SUBSTREAMS; substr++) { + for (substr = 0; substr < ctx->num_substreams; substr++) { DecodingParams *dp = &decoding_params[substr]; uint8_t param_presence_flags = 0; @@ -601,7 +601,7 @@ static av_cold int mlp_encode_init(AVCod } clear_channel_params(ctx, restart_channel_params); - clear_decoding_params(restart_decoding_params); + clear_decoding_params(ctx, restart_decoding_params); dsputil_init(&ctx->dsp, avctx);

1 0

[soc]: r3693 - mlp/mlpenc.c
by ramiro 01 Sep '08

01 Sep '08

Author: ramiro Date: Sun Aug 31 22:56:06 2008 New Revision: 3693 Log: Dynamically allocate just enough memory for channel_params. Modified: mlp/mlpenc.c Modified: mlp/mlpenc.c ============================================================================== --- mlp/mlpenc.c (original) +++ mlp/mlpenc.c Sun Aug 31 22:56:06 2008 @@ -134,8 +134,10 @@ typedef struct { * These values are correct for mono and stereo. */ unsigned int seq_size [MAJOR_HEADER_INTERVAL]; + unsigned int seq_offset[MAJOR_HEADER_INTERVAL]; + unsigned int sequence_size; - ChannelParams channel_params[MAJOR_HEADER_INTERVAL][MAJOR_HEADER_INTERVAL][MAJOR_HEADER_INTERVAL+1][MAX_CHANNELS]; + ChannelParams *channel_params; BestOffset best_offset[MAJOR_HEADER_INTERVAL+1][MAX_CHANNELS][NUM_CODEBOOKS]; @@ -160,6 +162,8 @@ typedef struct { ChannelParams *prev_channel_params; DecodingParams *prev_decoding_params; + ChannelParams *seq_channel_params; + unsigned int max_codebook_search; DSPContext dsp; @@ -331,6 +335,7 @@ static void copy_matrix_params(MatrixPar static void copy_restart_frame_params(MLPEncodeContext *ctx, unsigned int substr) { + ChannelParams (*seq_cp)[ctx->avctx->channels] = (ChannelParams (*)[ctx->avctx->channels]) ctx->seq_channel_params; unsigned int index; for (index = 0; index < ctx->number_of_frames + 1; index++) { @@ -340,7 +345,7 @@ static void copy_restart_frame_params(ML copy_matrix_params(&dp->matrix_params, &ctx->cur_decoding_params->matrix_params); for (channel = 0; channel < ctx->avctx->channels; channel++) { - ChannelParams *cp = &ctx->channel_params[ctx->seq_index][ctx->frame_index][index][channel]; + ChannelParams *cp = &seq_cp[index][channel]; unsigned int filter; dp->quant_step_size[channel] = ctx->cur_decoding_params->quant_step_size[channel]; @@ -454,8 +459,10 @@ static av_cold int mlp_encode_init(AVCod unsigned int major_scratch_buffer_size; unsigned int lossless_check_data_size; unsigned int lpc_sample_buffer_size; + unsigned int channel_params_size; unsigned int frame_size_size; unsigned int substr, index; + unsigned int sum = 0; if (avctx->strict_std_compliance > -1 /* inofficial */) { av_log(avctx, AV_LOG_ERROR, "The bitstream generated by this encoder " @@ -568,7 +575,18 @@ static av_cold int mlp_encode_init(AVCod return -1; for (index = 0; index < ctx->restart_intervals; index++) { + ctx->seq_offset[index] = sum; ctx->seq_size [index] = ((index + 1) * ctx->min_restart_interval) + 1; + sum += ctx->seq_size[index]; + } + ctx->sequence_size = sum; + channel_params_size = ctx->restart_intervals * ctx->sequence_size + * ctx->avctx->channels * sizeof(ChannelParams); + ctx->channel_params = av_malloc(channel_params_size); + if (!ctx->channel_params) { + av_log(avctx, AV_LOG_ERROR, + "Not enough memory for analysis context.\n"); + return -1; } for (substr = 0; substr < ctx->num_substreams; substr++) { @@ -1933,6 +1951,7 @@ static int best_codebook_path_cost(MLPEn static void set_best_codebook(MLPEncodeContext *ctx) { + ChannelParams (*seq_cp)[ctx->avctx->channels] = (ChannelParams (*)[ctx->avctx->channels]) ctx->seq_channel_params; DecodingParams *dp = ctx->cur_decoding_params; RestartHeader *rh = ctx->cur_restart_header; unsigned int channel; @@ -1998,7 +2017,7 @@ static void set_best_codebook(MLPEncodeC /* Update context. */ for (index = 0; index < ctx->number_of_frames + 1; index++) { - ChannelParams *cp = &ctx->channel_params[ctx->seq_index][ctx->frame_index][index][channel]; + ChannelParams *cp = &seq_cp[index][channel]; best_codebook = *best_path++ - ZERO_PATH; cur_bo = &ctx->best_offset[index][channel][best_codebook]; @@ -2016,10 +2035,21 @@ static void set_best_codebook(MLPEncodeC */ static void set_major_params(MLPEncodeContext *ctx) { + ChannelParams (*channel_params)[ctx->sequence_size][ctx->avctx->channels] = + (ChannelParams (*)[ctx->sequence_size][ctx->avctx->channels]) ctx->channel_params; unsigned int index; unsigned int substr; - memcpy(ctx->major_channel_params, ctx->channel_params[ctx->restart_intervals-1][MAJOR_HEADER_INTERVAL-1], sizeof(ctx->major_channel_params)); + { + ChannelParams (*seq_cp)[ctx->avctx->channels] = + (ChannelParams (*)[ctx->avctx->channels]) &channel_params[ctx->restart_intervals - 1][ctx->seq_offset[ctx->restart_intervals - 1]]; + unsigned int channel; + for (index = 0; index < ctx->seq_size[ctx->restart_intervals-1]; index++) { + for (channel = 0; channel < ctx->avctx->channels; channel++) { + memcpy(&ctx->major_channel_params[index][channel], &seq_cp[index][channel], sizeof(ChannelParams)); + } + } + } memcpy(ctx->major_decoding_params, ctx->decoding_params[ctx->restart_intervals-1][MAJOR_HEADER_INTERVAL-1], sizeof(ctx->major_decoding_params)); for (substr = 0; substr < ctx->num_substreams; substr++) { @@ -2043,6 +2073,7 @@ static void set_major_params(MLPEncodeCo static void analyze_sample_buffer(MLPEncodeContext *ctx) { + ChannelParams (*seq_cp)[ctx->avctx->channels] = (ChannelParams (*)[ctx->avctx->channels]) ctx->seq_channel_params; unsigned int index; unsigned int substr; @@ -2058,7 +2089,7 @@ static void analyze_sample_buffer(MLPEnc ctx->decoding_params[ctx->seq_index][ctx->frame_index][1][substr].blocksize -= 8; ctx->cur_decoding_params = &ctx->decoding_params[ctx->seq_index][ctx->frame_index][1][substr]; - ctx->cur_channel_params = ctx->channel_params[ctx->seq_index][ctx->frame_index][1]; + ctx->cur_channel_params = seq_cp[1]; generate_2_noise_channels(ctx); lossless_matrix_coeffs (ctx); @@ -2071,7 +2102,7 @@ static void analyze_sample_buffer(MLPEnc for (index = 0; index < ctx->number_of_frames + 1; index++) { ctx->cur_decoding_params = &ctx->decoding_params[ctx->seq_index][ctx->frame_index][index][substr]; - ctx->cur_channel_params = ctx->channel_params[ctx->seq_index][ctx->frame_index][index]; + ctx->cur_channel_params = seq_cp[index]; ctx->cur_best_offset = ctx->best_offset[index]; determine_bits(ctx); ctx->sample_buffer += ctx->cur_decoding_params->blocksize * ctx->num_channels; @@ -2182,11 +2213,14 @@ input_and_return: restart_frame = (ctx->frame_index + 1) % ctx->min_restart_interval; if (!restart_frame) { + ChannelParams (*channel_params)[ctx->sequence_size][ctx->avctx->channels] = + (ChannelParams (*)[ctx->sequence_size][ctx->avctx->channels]) ctx->channel_params; int seq_index; for (seq_index = 0; seq_index < ctx->restart_intervals && (seq_index * ctx->min_restart_interval) <= ctx->avctx->frame_number; seq_index++) { + ChannelParams (*seq_cp)[ctx->avctx->channels] = &channel_params[(ctx->frame_index / ctx->min_restart_interval)][ctx->seq_offset[seq_index]]; unsigned int number_of_samples = 0; unsigned int index; @@ -2197,6 +2231,7 @@ input_and_return: ctx->starting_frame_index = (ctx->avctx->frame_number - (ctx->avctx->frame_number % ctx->min_restart_interval) - (seq_index * ctx->min_restart_interval)) % ctx->max_restart_interval; ctx->number_of_frames = ctx->seq_size[seq_index] - 1; + ctx->seq_channel_params = (ChannelParams *) seq_cp; for (index = 0; index < ctx->number_of_frames; index++) { number_of_samples += ctx->frame_size[(ctx->starting_frame_index + index) % ctx->max_restart_interval]; @@ -2204,7 +2239,7 @@ input_and_return: ctx->number_of_samples = number_of_samples; for (index = 0; index < ctx->seq_size[seq_index]; index++) { - clear_channel_params(ctx, ctx->channel_params[ctx->seq_index][ctx->frame_index][index]); + clear_channel_params(ctx, seq_cp[index]); default_decoding_params(ctx, ctx->decoding_params[ctx->seq_index][ctx->frame_index][index]); } @@ -2235,6 +2270,7 @@ static av_cold int mlp_encode_close(AVCo av_freep(&ctx->major_scratch_buffer); av_freep(&ctx->major_inout_buffer); av_freep(&ctx->lpc_sample_buffer); + av_freep(&ctx->channel_params); av_freep(&avctx->coded_frame); av_freep(&ctx->frame_size);

1 0

[soc]: r3692 - mlp/mlpenc.c
by ramiro 01 Sep '08

01 Sep '08

Author: ramiro Date: Sun Aug 31 22:32:51 2008 New Revision: 3692 Log: Simplify using new seq_size array. Modified: mlp/mlpenc.c Modified: mlp/mlpenc.c ============================================================================== --- mlp/mlpenc.c (original) +++ mlp/mlpenc.c Sun Aug 31 22:32:51 2008 @@ -2203,7 +2203,7 @@ input_and_return: } ctx->number_of_samples = number_of_samples; - for (index = 0; index < ctx->number_of_frames + 1; index++) { + for (index = 0; index < ctx->seq_size[seq_index]; index++) { clear_channel_params(ctx, ctx->channel_params[ctx->seq_index][ctx->frame_index][index]); default_decoding_params(ctx, ctx->decoding_params[ctx->seq_index][ctx->frame_index][index]); }

1 0

[soc]: r3691 - mlp/mlpenc.c
by ramiro 01 Sep '08

01 Sep '08

Author: ramiro Date: Sun Aug 31 22:21:26 2008 New Revision: 3691 Log: Only clear and compare params for channels that are used. Modified: mlp/mlpenc.c Modified: mlp/mlpenc.c ============================================================================== --- mlp/mlpenc.c (original) +++ mlp/mlpenc.c Sun Aug 31 22:21:26 2008 @@ -339,7 +339,7 @@ static void copy_restart_frame_params(ML copy_matrix_params(&dp->matrix_params, &ctx->cur_decoding_params->matrix_params); - for (channel = 0; channel < MAX_CHANNELS; channel++) { + for (channel = 0; channel < ctx->avctx->channels; channel++) { ChannelParams *cp = &ctx->channel_params[ctx->seq_index][ctx->frame_index][index][channel]; unsigned int filter; @@ -370,11 +370,11 @@ static void clear_decoding_params(Decodi } /** Clears a ChannelParams struct the way it should be after a restart header. */ -static void clear_channel_params(ChannelParams channel_params[MAX_CHANNELS]) +static void clear_channel_params(MLPEncodeContext *ctx, ChannelParams channel_params[MAX_CHANNELS]) { unsigned int channel; - for (channel = 0; channel < MAX_CHANNELS; channel++) { + for (channel = 0; channel < ctx->avctx->channels; channel++) { ChannelParams *cp = &channel_params[channel]; memset(&cp->filter_params, 0, sizeof(cp->filter_params)); @@ -582,7 +582,7 @@ static av_cold int mlp_encode_init(AVCod rh->max_matrix_channel = 1; } - clear_channel_params(restart_channel_params); + clear_channel_params(ctx, restart_channel_params); clear_decoding_params(restart_decoding_params); dsputil_init(&ctx->dsp, avctx); @@ -2204,7 +2204,7 @@ input_and_return: ctx->number_of_samples = number_of_samples; for (index = 0; index < ctx->number_of_frames + 1; index++) { - clear_channel_params(ctx->channel_params[ctx->seq_index][ctx->frame_index][index]); + clear_channel_params(ctx, ctx->channel_params[ctx->seq_index][ctx->frame_index][index]); default_decoding_params(ctx, ctx->decoding_params[ctx->seq_index][ctx->frame_index][index]); }

1 0

[soc]: r3690 - mlp/mlpenc.c
by ramiro 01 Sep '08

01 Sep '08

Author: ramiro Date: Sun Aug 31 22:19:13 2008 New Revision: 3690 Log: Compare channel parameters against chosen values. Modified: mlp/mlpenc.c Modified: mlp/mlpenc.c ============================================================================== --- mlp/mlpenc.c (original) +++ mlp/mlpenc.c Sun Aug 31 22:19:13 2008 @@ -2031,7 +2031,7 @@ static void set_major_params(MLPEncodeCo for (index = 0; index < MAJOR_HEADER_INTERVAL + 1; index++) { ctx->cur_decoding_params = &ctx->decoding_params[ctx->restart_intervals-1][MAJOR_HEADER_INTERVAL-1][index][substr]; - ctx->cur_channel_params = ctx->channel_params[ctx->restart_intervals-1][MAJOR_HEADER_INTERVAL-1][index]; + ctx->cur_channel_params = ctx->major_channel_params[index]; ctx->major_params_changed[index][substr] = compare_decoding_params(ctx);

1 0

[soc]: r3689 - mlp/mlpenc.c
by ramiro 01 Sep '08

01 Sep '08

Author: ramiro Date: Sun Aug 31 22:11:15 2008 New Revision: 3689 Log: Rework the way parameter buffers are used and always analyze up to max_restart_interval access units. Modified: mlp/mlpenc.c Modified: mlp/mlpenc.c ============================================================================== --- mlp/mlpenc.c (original) +++ mlp/mlpenc.c Sun Aug 31 22:11:15 2008 @@ -123,6 +123,7 @@ typedef struct { unsigned int max_restart_interval; ///< Max interval of access units in between two major frames. unsigned int min_restart_interval; ///< Min interval of access units in between two major frames. + unsigned int restart_intervals; ///< Number of possible major frame sizes. uint16_t timestamp; ///< Timestamp of current access unit. @@ -132,6 +133,8 @@ typedef struct { uint8_t mlp_channels3; /**< TODO unknown channel-related field * These values are correct for mono and stereo. */ + unsigned int seq_size [MAJOR_HEADER_INTERVAL]; + ChannelParams channel_params[MAJOR_HEADER_INTERVAL][MAJOR_HEADER_INTERVAL][MAJOR_HEADER_INTERVAL+1][MAX_CHANNELS]; BestOffset best_offset[MAJOR_HEADER_INTERVAL+1][MAX_CHANNELS][NUM_CODEBOOKS]; @@ -452,7 +455,7 @@ static av_cold int mlp_encode_init(AVCod unsigned int lossless_check_data_size; unsigned int lpc_sample_buffer_size; unsigned int frame_size_size; - unsigned int substr; + unsigned int substr, index; if (avctx->strict_std_compliance > -1 /* inofficial */) { av_log(avctx, AV_LOG_ERROR, "The bitstream generated by this encoder " @@ -509,6 +512,7 @@ static av_cold int mlp_encode_init(AVCod if (!ctx->min_restart_interval) ctx->min_restart_interval = 1; } + ctx->restart_intervals = ctx->max_restart_interval / ctx->min_restart_interval; /* TODO Let user pass parameters for LPC filter. */ @@ -563,6 +567,10 @@ static av_cold int mlp_encode_init(AVCod if (!ctx->lossless_check_data) return -1; + for (index = 0; index < ctx->restart_intervals; index++) { + ctx->seq_size [index] = ((index + 1) * ctx->min_restart_interval) + 1; + } + for (substr = 0; substr < ctx->num_substreams; substr++) { RestartHeader *rh = &ctx->restart_header [substr]; @@ -2011,8 +2019,8 @@ static void set_major_params(MLPEncodeCo unsigned int index; unsigned int substr; - memcpy(ctx->major_channel_params, ctx->channel_params[MAJOR_HEADER_INTERVAL-1][MAJOR_HEADER_INTERVAL-1], sizeof(ctx->major_channel_params)); - memcpy(ctx->major_decoding_params, ctx->decoding_params[MAJOR_HEADER_INTERVAL-1][MAJOR_HEADER_INTERVAL-1], sizeof(ctx->major_decoding_params)); + memcpy(ctx->major_channel_params, ctx->channel_params[ctx->restart_intervals-1][MAJOR_HEADER_INTERVAL-1], sizeof(ctx->major_channel_params)); + memcpy(ctx->major_decoding_params, ctx->decoding_params[ctx->restart_intervals-1][MAJOR_HEADER_INTERVAL-1], sizeof(ctx->major_decoding_params)); for (substr = 0; substr < ctx->num_substreams; substr++) { @@ -2022,8 +2030,8 @@ static void set_major_params(MLPEncodeCo ctx->prev_channel_params = restart_channel_params; for (index = 0; index < MAJOR_HEADER_INTERVAL + 1; index++) { - ctx->cur_decoding_params = &ctx->decoding_params[MAJOR_HEADER_INTERVAL-1][MAJOR_HEADER_INTERVAL-1][index][substr]; - ctx->cur_channel_params = ctx->channel_params[MAJOR_HEADER_INTERVAL-1][MAJOR_HEADER_INTERVAL-1][index]; + ctx->cur_decoding_params = &ctx->decoding_params[ctx->restart_intervals-1][MAJOR_HEADER_INTERVAL-1][index][substr]; + ctx->cur_channel_params = ctx->channel_params[ctx->restart_intervals-1][MAJOR_HEADER_INTERVAL-1][index]; ctx->major_params_changed[index][substr] = compare_decoding_params(ctx); @@ -2176,9 +2184,9 @@ input_and_return: if (!restart_frame) { int seq_index; - for (seq_index = ctx->frame_index; - seq_index > 0; - seq_index -= ctx->min_restart_interval) { + for (seq_index = 0; + seq_index < ctx->restart_intervals && (seq_index * ctx->min_restart_interval) <= ctx->avctx->frame_number; + seq_index++) { unsigned int number_of_samples = 0; unsigned int index; @@ -2186,8 +2194,9 @@ input_and_return: ctx->inout_buffer = ctx->major_inout_buffer; ctx->seq_index = seq_index; - ctx->starting_frame_index = ctx->frame_index - seq_index; - ctx->number_of_frames = seq_index + 1; + ctx->starting_frame_index = (ctx->avctx->frame_number - (ctx->avctx->frame_number % ctx->min_restart_interval) + - (seq_index * ctx->min_restart_interval)) % ctx->max_restart_interval; + ctx->number_of_frames = ctx->seq_size[seq_index] - 1; for (index = 0; index < ctx->number_of_frames; index++) { number_of_samples += ctx->frame_size[(ctx->starting_frame_index + index) % ctx->max_restart_interval];

1 0