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

[soc]: r4014 - wmapro/wma3dec.c
by faust3 01 Feb '09

01 Feb '09

Author: faust3 Date: Sat Jan 31 19:08:18 2009 New Revision: 4014 Log: use vector_fmul_window for the windowing Modified: wmapro/wma3dec.c Modified: wmapro/wma3dec.c ============================================================================== --- wmapro/wma3dec.c Tue Jan 27 21:57:50 2009 (r4013) +++ wmapro/wma3dec.c Sat Jan 31 19:08:18 2009 (r4014) @@ -1074,43 +1074,22 @@ static void wma_window(WMA3DecodeContext for(i=0;i<s->channels_for_cur_subframe;i++){ int c = s->channel_indexes_for_cur_subframe[i]; int j = s->channel[c].cur_subframe; - int x; - // FIXME: use dsp.vector_fmul_window float* start; - float* end; float* window; int prev_block_len = s->channel[c].prev_block_len; int block_len = s->channel[c].subframe_len[j]; - int len; - int winlen; + int winlen = prev_block_len; start = &s->channel[c].out[s->samples_per_frame/2 + s->channel[c].subframe_offset[j] - prev_block_len /2 ]; - end = &s->channel[c].out[s->samples_per_frame/2 + s->channel[c].subframe_offset[j] + block_len /2 - 1]; if(block_len <= prev_block_len){ start += (prev_block_len - block_len)/2; - len = block_len/2; winlen = block_len; - }else{ - end -= (block_len - prev_block_len)/2; - len = prev_block_len /2; - winlen = prev_block_len; } -// float* rs = &s->channel[c].out[s->samples_per_frame/2 + s->channel[c].subframe_offset[i]]; -// printf("Dstart %i %i end %i win %i prev %i\n",s->frame_num+1, start - rs,end -rs,winlen,prev_block_len); - - // FIXME: untangle the windowing so DSP functions can be used window = s->windows[av_log2(winlen)-BLOCK_MIN_BITS]; - for(x=0;x<len;x++){ - float ts = *start; - float te = *end; - float sin_v = window[x]; - float cos_v = window[winlen - x -1]; - *start = cos_v * ts - sin_v * te; - *end = cos_v * te + sin_v * ts; - ++start; - --end; - } + + s->dsp.vector_fmul_window(start, start, start + winlen/2, window, 0, winlen/2); + s->channel[c].prev_block_len = block_len; } }

3 2

[soc]: r4013 - libavfilter/diffs/02_ffmpeg_filters.diff
by vitor 27 Jan '09

27 Jan '09

Author: vitor Date: Tue Jan 27 21:57:50 2009 New Revision: 4013 Log: Fix build when not using --enable-avfilter. Patch by Cédric Schieli - cschieli <> gmail com Modified: libavfilter/diffs/02_ffmpeg_filters.diff Modified: libavfilter/diffs/02_ffmpeg_filters.diff ============================================================================== --- libavfilter/diffs/02_ffmpeg_filters.diff Tue Jan 27 06:34:33 2009 (r4012) +++ libavfilter/diffs/02_ffmpeg_filters.diff Tue Jan 27 21:57:50 2009 (r4013) @@ -250,15 +250,17 @@ Index: ffmpeg.c if (ost->video_pad) { av_picture_pad((AVPicture*)final_picture, (AVPicture *)padding_src, -@@ -1190,6 +1383,7 @@ +@@ -1190,6 +1383,9 @@ static short *samples= NULL; AVSubtitle subtitle, *subtitle_to_free; int got_subtitle; ++#if CONFIG_AVFILTER + int loop; ++#endif if(ist->next_pts == AV_NOPTS_VALUE) ist->next_pts= ist->pts; -@@ -1307,6 +1501,15 @@ +@@ -1307,6 +1503,15 @@ &buffer_to_free); } @@ -274,13 +276,15 @@ Index: ffmpeg.c // preprocess audio (volume) if (ist->st->codec->codec_type == CODEC_TYPE_AUDIO) { if (audio_volume != 256) { -@@ -1328,10 +1531,16 @@ +@@ -1328,10 +1533,18 @@ if (pts > now) usleep(pts - now); } - ++#if CONFIG_AVFILTER + loop = ist->st->codec->codec_type != CODEC_TYPE_VIDEO || + !ist->out_video_filter || avfilter_poll_frame(ist->out_video_filter->inputs[0]); ++#endif /* if output time reached then transcode raw format, encode packets and output them */ if (start_time == 0 || ist->pts >= start_time) @@ -302,12 +306,14 @@ Index: ffmpeg.c do_video_out(os, ost, ist, &picture, &frame_size); if (vstats_filename && frame_size) do_video_stats(os, ost, frame_size); -@@ -1411,7 +1623,15 @@ +@@ -1411,7 +1627,17 @@ av_free_packet(&opkt); } } ++#if CONFIG_AVFILTER + loop = (ist->st->codec->codec_type == CODEC_TYPE_VIDEO) && + ist->out_video_filter && avfilter_poll_frame(ist->out_video_filter->inputs[0]); ++#endif } + +#if CONFIG_AVFILTER

1 0

[soc]: r1195 - in jpeg2000: j2k.c j2k.h j2kdec.c j2kenc.c
by Stefan Walter Klein 27 Jan '09

27 Jan '09

Hi! I just read about your efforts, including jpeg2000 in ffmpeg. Sadly I could neither find a downloadable version, nor sth. like 'comming soon'..:-( Would you tell me, how far things are?! Is the development going on? Can I help in any way!? All the best and keep on rokkin'! Stefan Klein -- Beste Grüße!

2 1

[soc]: r4012 - amr/amrnbfloatdec.c
by kmalaussene 27 Jan '09

27 Jan '09

Author: kmalaussene Date: Tue Jan 27 06:34:33 2009 New Revision: 4012 Log: Fix decoding of pitch lag frac to match reference implementation. Some of its value were widely out of bound. Modified: amr/amrnbfloatdec.c Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Mon Jan 26 22:44:11 2009 (r4011) +++ amr/amrnbfloatdec.c Tue Jan 27 06:34:33 2009 (r4012) @@ -501,8 +501,9 @@ static void decode_pitch_lag_3(AMRContex p->pitch_lag_frac = 0; }else if(pitch_index < 12) { // 1/3 fractional precision for [t1_temp-1 2/3, t1_temp+2/3] - p->pitch_lag_int = ( ((pitch_index - 5)*10923)>>15 ) + t1_temp - 1; + p->pitch_lag_int = ( ((pitch_index - 5)*10923)>>15 ) - 1; p->pitch_lag_frac = pitch_index - p->pitch_lag_int*3 - 9; + p->pitch_lag_int += t1_temp; }else { // integer only precision for [t1_temp+1, t1_temp+4] p->pitch_lag_int = pitch_index + t1_temp - 11;

1 0

[soc]: r4011 - in libavfilter/diffs: 01_ffplay_filters.diff 02_ffmpeg_filters.diff
by stefano 26 Jan '09

26 Jan '09

Author: stefano Date: Mon Jan 26 22:44:11 2009 New Revision: 4011 Log: Add checks for the validity of the parsed graph, fix crashes. Modified: libavfilter/diffs/01_ffplay_filters.diff libavfilter/diffs/02_ffmpeg_filters.diff Modified: libavfilter/diffs/01_ffplay_filters.diff ============================================================================== --- libavfilter/diffs/01_ffplay_filters.diff Mon Jan 26 22:28:54 2009 (r4010) +++ libavfilter/diffs/01_ffplay_filters.diff Mon Jan 26 22:44:11 2009 (r4011) @@ -211,7 +211,7 @@ Index: ffplay.c /* update the bitmap content */ SDL_UnlockYUVOverlay(vp->bmp); -@@ -1335,54 +1406,264 @@ +@@ -1335,54 +1406,266 @@ return queue_picture(is, src_frame, pts); } @@ -435,6 +435,8 @@ Index: ffplay.c + } + avfilter_graph_add_filter(graph, filt_src); + avfilter_graph_add_filter(graph, filt_out); ++ ++ if(avfilter_graph_check_validity(graph, NULL)) goto the_end; + if(avfilter_graph_config_formats(graph)) goto the_end; + if(avfilter_config_links(filt_out)) goto the_end; + @@ -507,7 +509,7 @@ Index: ffplay.c av_free(frame); return 0; } -@@ -2168,6 +2449,12 @@ +@@ -2168,6 +2451,12 @@ /* free all pictures */ for(i=0;i<VIDEO_PICTURE_QUEUE_SIZE; i++) { vp = &is->pictq[i]; @@ -520,7 +522,7 @@ Index: ffplay.c if (vp->bmp) { SDL_FreeYUVOverlay(vp->bmp); vp->bmp = NULL; -@@ -2505,6 +2792,9 @@ +@@ -2505,6 +2794,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" }, @@ -530,7 +532,7 @@ Index: ffplay.c { "default", OPT_FUNC2 | HAS_ARG | OPT_AUDIO | OPT_VIDEO | OPT_EXPERT, {(void*)opt_default}, "generic catch all option", "" }, { NULL, }, }; -@@ -2553,7 +2843,9 @@ +@@ -2553,7 +2845,9 @@ avctx_opts[i]= avcodec_alloc_context2(i); } avformat_opts = av_alloc_format_context(); Modified: libavfilter/diffs/02_ffmpeg_filters.diff ============================================================================== --- libavfilter/diffs/02_ffmpeg_filters.diff Mon Jan 26 22:28:54 2009 (r4010) +++ libavfilter/diffs/02_ffmpeg_filters.diff Mon Jan 26 22:44:11 2009 (r4011) @@ -40,7 +40,7 @@ Index: ffmpeg.c } AVInputStream; typedef struct AVInputFile { -@@ -301,6 +318,174 @@ +@@ -301,6 +318,176 @@ static struct termios oldtty; #endif @@ -200,6 +200,8 @@ Index: ffmpeg.c + } + + /* configure all the filter links */ ++ if(avfilter_graph_check_validity(filt_graph_all, NULL)) ++ return -1; + if(avfilter_graph_config_formats(filt_graph_all)) + return -1; + if(avfilter_config_links(ist->out_video_filter)) @@ -215,7 +217,7 @@ Index: ffmpeg.c static void term_exit(void) { #if HAVE_TERMIOS_H -@@ -886,6 +1071,9 @@ +@@ -886,6 +1073,9 @@ if (nb_frames <= 0) return; @@ -225,7 +227,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) { av_log(NULL, AV_LOG_ERROR, "error cropping picture\n"); -@@ -897,6 +1085,7 @@ +@@ -897,6 +1087,7 @@ } else { formatted_picture = in_picture; } @@ -233,7 +235,7 @@ Index: ffmpeg.c final_picture = formatted_picture; padding_src = formatted_picture; -@@ -914,12 +1103,14 @@ +@@ -914,12 +1105,14 @@ } } @@ -248,7 +250,7 @@ Index: ffmpeg.c if (ost->video_pad) { av_picture_pad((AVPicture*)final_picture, (AVPicture *)padding_src, -@@ -1190,6 +1381,7 @@ +@@ -1190,6 +1383,7 @@ static short *samples= NULL; AVSubtitle subtitle, *subtitle_to_free; int got_subtitle; @@ -256,7 +258,7 @@ Index: ffmpeg.c if(ist->next_pts == AV_NOPTS_VALUE) ist->next_pts= ist->pts; -@@ -1307,6 +1499,15 @@ +@@ -1307,6 +1501,15 @@ &buffer_to_free); } @@ -272,7 +274,7 @@ Index: ffmpeg.c // preprocess audio (volume) if (ist->st->codec->codec_type == CODEC_TYPE_AUDIO) { if (audio_volume != 256) { -@@ -1328,10 +1529,16 @@ +@@ -1328,10 +1531,16 @@ if (pts > now) usleep(pts - now); } @@ -290,7 +292,7 @@ Index: ffmpeg.c for(i=0;i<nb_ostreams;i++) { int frame_size; -@@ -1354,6 +1561,9 @@ +@@ -1354,6 +1563,9 @@ do_audio_out(os, ost, ist, data_buf, data_size); break; case CODEC_TYPE_VIDEO: @@ -300,7 +302,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); -@@ -1411,7 +1621,15 @@ +@@ -1411,7 +1623,15 @@ av_free_packet(&opkt); } } @@ -316,7 +318,7 @@ Index: ffmpeg.c av_free(buffer_to_free); /* XXX: allocate the subtitles in the codec ? */ if (subtitle_to_free) { -@@ -1842,10 +2060,21 @@ +@@ -1842,10 +2062,21 @@ fprintf(stderr, "Cannot get resampling context\n"); av_exit(1); } @@ -338,7 +340,7 @@ Index: ffmpeg.c break; case CODEC_TYPE_SUBTITLE: ost->encoding_needed = 1; -@@ -3835,6 +4064,9 @@ +@@ -3835,6 +4066,9 @@ #if CONFIG_VHOOK { "vhook", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)add_frame_hooker}, "insert video processing module", "module" }, #endif

1 0

[soc]: r4010 - in libavfilter: allfilters.c checkout.sh diffs/01_ffplay_filters.diff diffs/02_ffmpeg_filters.diff
by stefano 26 Jan '09

26 Jan '09

Author: stefano Date: Mon Jan 26 22:28:54 2009 New Revision: 4010 Log: Update to FFmpeg r16809. Modified: libavfilter/allfilters.c libavfilter/checkout.sh libavfilter/diffs/01_ffplay_filters.diff libavfilter/diffs/02_ffmpeg_filters.diff Modified: libavfilter/allfilters.c ============================================================================== --- libavfilter/allfilters.c Mon Jan 26 20:20:40 2009 (r4009) +++ libavfilter/allfilters.c Mon Jan 26 22:28:54 2009 (r4010) @@ -24,7 +24,7 @@ #define REGISTER_FILTER(X,x,y) { \ extern AVFilter avfilter_##y##_##x ; \ - if(ENABLE_##X##_FILTER ) avfilter_register(&avfilter_##y##_##x ); } + if(CONFIG_##X##_FILTER ) avfilter_register(&avfilter_##y##_##x ); } void avfilter_register_all(void) { Modified: libavfilter/checkout.sh ============================================================================== --- libavfilter/checkout.sh Mon Jan 26 20:20:40 2009 (r4009) +++ libavfilter/checkout.sh Mon Jan 26 22:28:54 2009 (r4010) @@ -1,7 +1,7 @@ #! /bin/sh echo "checking out pristine ffmpeg" -svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r16562 +svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r16809 echo "patching ffmpeg" for diff in $(ls $(pwd)/diffs/*.diff); do patch -d ffmpeg -p0 -i $diff; done Modified: libavfilter/diffs/01_ffplay_filters.diff ============================================================================== --- libavfilter/diffs/01_ffplay_filters.diff Mon Jan 26 20:20:40 2009 (r4009) +++ libavfilter/diffs/01_ffplay_filters.diff Mon Jan 26 22:28:54 2009 (r4010) @@ -1,12 +1,12 @@ Index: ffplay.c =================================================================== ---- ffplay.c (revision 16562) +--- ffplay.c (revision 16809) +++ ffplay.c (working copy) @@ -29,6 +29,12 @@ #include "libavcodec/audioconvert.h" #include "libavcodec/opt.h" -+#if ENABLE_AVFILTER ++#if CONFIG_AVFILTER +# include "libavfilter/avfilter.h" +# include "libavfilter/avfiltergraph.h" +# include "libavfilter/graphparser.h" @@ -19,7 +19,7 @@ Index: ffplay.c /* NOTE: the size must be big enough to compensate the hardware audio buffersize size */ #define SAMPLE_ARRAY_SIZE (2*65536) -+#if !ENABLE_AVFILTER ++#if !CONFIG_AVFILTER static int sws_flags = SWS_BICUBIC; +#endif @@ -32,7 +32,7 @@ Index: ffplay.c + enum PixelFormat pix_fmt; int allocated; + -+#if ENABLE_AVFILTER ++#if CONFIG_AVFILTER + AVFilterPicRef *picref; +#endif } VideoPicture; @@ -43,7 +43,7 @@ Index: ffplay.c char filename[1024]; int width, height, xleft, ytop; + -+#if ENABLE_AVFILTER ++#if CONFIG_AVFILTER + AVFilterContext *out_video_filter; ///<the last filter in the video chain +#endif } VideoState; @@ -53,7 +53,7 @@ Index: ffplay.c static int error_recognition = FF_ER_CAREFUL; static int error_concealment = 3; static int decoder_reorder_pts= 0; -+#if ENABLE_AVFILTER ++#if CONFIG_AVFILTER +static char *vfilters = NULL; +#endif @@ -63,7 +63,7 @@ Index: ffplay.c vp = &is->pictq[is->pictq_rindex]; if (vp->bmp) { -+#if ENABLE_AVFILTER ++#if CONFIG_AVFILTER + if (vp->picref->pixel_aspect.num == 0) + aspect_ratio = 0; + else @@ -89,7 +89,7 @@ Index: ffplay.c } else if(!is_full_screen && screen_width){ w = screen_width; h = screen_height; -+#if ENABLE_AVFILTER ++#if CONFIG_AVFILTER + }else if (is->out_video_filter && is->out_video_filter->inputs[0]){ + w = is->out_video_filter->inputs[0]->w; + h = is->out_video_filter->inputs[0]->h; @@ -105,7 +105,7 @@ Index: ffplay.c if (vp->bmp) SDL_FreeYUVOverlay(vp->bmp); -+#if ENABLE_AVFILTER ++#if CONFIG_AVFILTER + if (vp->picref) + avfilter_unref_pic(vp->picref); + vp->picref = NULL; @@ -140,7 +140,7 @@ Index: ffplay.c VideoPicture *vp; int dst_pix_fmt; AVPicture pict; -+#if ENABLE_AVFILTER ++#if CONFIG_AVFILTER + AVPicture pict_src; +#else static struct SwsContext *img_convert_ctx; @@ -153,7 +153,7 @@ Index: ffplay.c /* alloc or resize hardware picture buffer */ if (!vp->bmp || -+#if ENABLE_AVFILTER ++#if CONFIG_AVFILTER + vp->width != is->out_video_filter->inputs[0]->w || + vp->height != is->out_video_filter->inputs[0]->h) { +#else @@ -167,7 +167,7 @@ Index: ffplay.c /* if the frame is not skipped, then display it */ if (vp->bmp) { -+#if ENABLE_AVFILTER ++#if CONFIG_AVFILTER + if(vp->picref) + avfilter_unref_pic(vp->picref); + vp->picref = src_frame->opaque; @@ -181,7 +181,7 @@ Index: ffplay.c pict.linesize[1] = vp->bmp->pitches[2]; pict.linesize[2] = vp->bmp->pitches[1]; + -+#if ENABLE_AVFILTER ++#if CONFIG_AVFILTER + pict_src.data[0] = src_frame->data[0]; + pict_src.data[1] = src_frame->data[1]; + pict_src.data[2] = src_frame->data[2]; @@ -253,7 +253,7 @@ Index: ffplay.c + return 0; +} + -+#if ENABLE_AVFILTER ++#if CONFIG_AVFILTER +typedef struct { + VideoState *is; + AVFrame *frame; @@ -388,7 +388,7 @@ Index: ffplay.c + { .name = NULL }}, + .outputs = (AVFilterPad[]) {{ .name = NULL }}, +}; -+#endif /* ENABLE_AVFILTER */ ++#endif /* CONFIG_AVFILTER */ + static int video_thread(void *arg) { @@ -401,7 +401,7 @@ Index: ffplay.c + int ret; + -+#if ENABLE_AVFILTER ++#if CONFIG_AVFILTER + AVFilterContext *filt_src = NULL, *filt_out = NULL; + AVFilterGraph *graph = av_mallocz(sizeof(AVFilterGraph)); + @@ -443,7 +443,7 @@ Index: ffplay.c + for(;;) { - while (is->paused && !is->videoq.abort_request) { -+#if !ENABLE_AVFILTER ++#if !CONFIG_AVFILTER + AVPacket pkt; +#endif + while (is->paused && !is->videoq.abort_request) @@ -451,7 +451,7 @@ Index: ffplay.c - } - if (packet_queue_get(&is->videoq, pkt, 1) < 0) - break; -+#if ENABLE_AVFILTER ++#if CONFIG_AVFILTER + ret = get_filtered_video_frame(filt_out, frame, &pts_int); +#else + ret = get_video_frame(is, frame, &pts_int, &pkt); @@ -474,7 +474,7 @@ Index: ffplay.c + pts = pts_int; + pts /= AV_TIME_BASE; + ret = output_picture2(is, frame, pts); -+#if !ENABLE_AVFILTER ++#if !CONFIG_AVFILTER + av_free_packet(&pkt); +#endif + if (ret < 0) @@ -501,17 +501,17 @@ Index: ffplay.c stream_pause(cur_stream); } the_end: -+ #if ENABLE_AVFILTER ++ #if CONFIG_AVFILTER + avfilter_destroy_graph(graph); + #endif av_free(frame); return 0; } -@@ -2170,6 +2451,12 @@ +@@ -2168,6 +2449,12 @@ /* free all pictures */ for(i=0;i<VIDEO_PICTURE_QUEUE_SIZE; i++) { vp = &is->pictq[i]; -+#if ENABLE_AVFILTER ++#if CONFIG_AVFILTER + if (vp->picref) { + avfilter_unref_pic(vp->picref); + vp->picref = NULL; @@ -520,21 +520,21 @@ Index: ffplay.c if (vp->bmp) { SDL_FreeYUVOverlay(vp->bmp); vp->bmp = NULL; -@@ -2507,6 +2794,9 @@ +@@ -2505,6 +2792,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" }, -+#if ENABLE_AVFILTER ++#if CONFIG_AVFILTER + { "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", "" }, { NULL, }, }; -@@ -2555,7 +2845,9 @@ +@@ -2553,7 +2843,9 @@ avctx_opts[i]= avcodec_alloc_context2(i); } avformat_opts = av_alloc_format_context(); -+#if !ENABLE_AVFILTER ++#if !CONFIG_AVFILTER sws_opts = sws_getContext(16,16,0, 16,16,0, sws_flags, NULL,NULL,NULL); +#endif Modified: libavfilter/diffs/02_ffmpeg_filters.diff ============================================================================== --- libavfilter/diffs/02_ffmpeg_filters.diff Mon Jan 26 20:20:40 2009 (r4009) +++ libavfilter/diffs/02_ffmpeg_filters.diff Mon Jan 26 22:28:54 2009 (r4010) @@ -1,26 +1,26 @@ Index: ffmpeg.c =================================================================== ---- ffmpeg.c (revision 16562) +--- ffmpeg.c (revision 16809) +++ ffmpeg.c (working copy) @@ -41,6 +41,13 @@ #include "libavutil/avstring.h" #include "libavformat/os_support.h" -+#if ENABLE_AVFILTER ++#if CONFIG_AVFILTER +# include "libavfilter/avfilter.h" +# include "libavfilter/avfiltergraph.h" +# include "libavfilter/graphparser.h" +# include "libavfilter/vsrc_buffer.h" +#endif + - #ifdef HAVE_SYS_RESOURCE_H + #if HAVE_SYS_RESOURCE_H #include <sys/types.h> #include <sys/resource.h> @@ -148,6 +155,9 @@ static int loop_input = 0; static int loop_output = AVFMT_NOOUTPUTLOOP; static int qp_hist = 0; -+#if ENABLE_AVFILTER ++#if CONFIG_AVFILTER +static char *vfilters = NULL; +#endif @@ -30,7 +30,7 @@ Index: ffmpeg.c is not defined */ int64_t pts; /* current pts */ int is_start; /* is 1 at the start and after a discontinuity */ -+#if ENABLE_AVFILTER ++#if CONFIG_AVFILTER + AVFilterContext *out_video_filter; + AVFilterContext *input_video_filter; + AVFrame *filter_frame; @@ -44,7 +44,7 @@ Index: ffmpeg.c static struct termios oldtty; #endif -+#if ENABLE_AVFILTER ++#if CONFIG_AVFILTER +typedef struct { + int pix_fmt; +} FilterOutPriv; @@ -210,16 +210,16 @@ Index: ffmpeg.c + + return 0; +} -+#endif /* ENABLE_AVFILTER */ ++#endif /* CONFIG_AVFILTER */ + static void term_exit(void) { - #ifdef HAVE_TERMIOS_H + #if HAVE_TERMIOS_H @@ -886,6 +1071,9 @@ if (nb_frames <= 0) return; -+#if ENABLE_AVFILTER ++#if CONFIG_AVFILTER + formatted_picture = in_picture; +#else if (ost->video_crop) { @@ -237,7 +237,7 @@ Index: ffmpeg.c } } -+#if !ENABLE_AVFILTER ++#if !CONFIG_AVFILTER if (ost->video_resample) { padding_src = NULL; final_picture = &ost->pict_tmp; @@ -260,7 +260,7 @@ Index: ffmpeg.c &buffer_to_free); } -+#if ENABLE_AVFILTER ++#if CONFIG_AVFILTER + if (ist->st->codec->codec_type == CODEC_TYPE_VIDEO && ist->input_video_filter) { + // add it to be filtered + av_vsrc_buffer_add_frame(ist->input_video_filter, &picture, @@ -282,7 +282,7 @@ Index: ffmpeg.c /* if output time reached then transcode raw format, encode packets and output them */ if (start_time == 0 || ist->pts >= start_time) -+#if ENABLE_AVFILTER ++#if CONFIG_AVFILTER + while(loop) { + if (ist->st->codec->codec_type == CODEC_TYPE_VIDEO && ist->out_video_filter) + get_filtered_video_pic(ist->out_video_filter, &ist->picref, &picture, &ist->pts); @@ -294,7 +294,7 @@ Index: ffmpeg.c do_audio_out(os, ost, ist, data_buf, data_size); break; case CODEC_TYPE_VIDEO: -+#if ENABLE_AVFILTER ++#if CONFIG_AVFILTER + ost->st->codec->sample_aspect_ratio = ist->picref->pixel_aspect; +#endif do_video_out(os, ost, ist, &picture, &frame_size); @@ -308,7 +308,7 @@ Index: ffmpeg.c + ist->out_video_filter && avfilter_poll_frame(ist->out_video_filter->inputs[0]); } + -+#if ENABLE_AVFILTER ++#if CONFIG_AVFILTER + if(ist->picref) + avfilter_unref_pic(ist->picref); + } @@ -316,11 +316,11 @@ Index: ffmpeg.c av_free(buffer_to_free); /* XXX: allocate the subtitles in the codec ? */ if (subtitle_to_free) { -@@ -1840,10 +2058,21 @@ +@@ -1842,10 +2060,21 @@ fprintf(stderr, "Cannot get resampling context\n"); av_exit(1); } -+#if ENABLE_AVFILTER ++#if CONFIG_AVFILTER + ost->resample_height = icodec->height; +#else ost->resample_height = icodec->height - (frame_topBand + frame_bottomBand); @@ -329,7 +329,7 @@ Index: ffmpeg.c ost->encoding_needed = 1; ist->decoding_needed = 1; + -+#if ENABLE_AVFILTER ++#if CONFIG_AVFILTER + if (configure_filters(ist, ost)) { + fprintf(stderr, "Error opening filters!\n"); + exit(1); @@ -338,11 +338,11 @@ Index: ffmpeg.c break; case CODEC_TYPE_SUBTITLE: ost->encoding_needed = 1; -@@ -3831,6 +4060,9 @@ - #ifdef CONFIG_VHOOK +@@ -3835,6 +4064,9 @@ + #if CONFIG_VHOOK { "vhook", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)add_frame_hooker}, "insert video processing module", "module" }, #endif -+#if ENABLE_AVFILTER ++#if CONFIG_AVFILTER + { "vfilters", OPT_STRING | HAS_ARG, {(void*)&vfilters}, "video filters", "filter list" }, +#endif { "intra_matrix", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_intra_matrix}, "specify intra matrix coeffs", "matrix" },

1 0

[soc]: r4009 - libavfilter/diffs/02_ffmpeg_filters.diff
by vitor 26 Jan '09

26 Jan '09

Author: vitor Date: Mon Jan 26 20:20:40 2009 New Revision: 4009 Log: Fix "-vcodec copy" when using a libavfilter patched ffmpeg. Patch by Cédric Schieli cschieli ! gmail ! com Modified: libavfilter/diffs/02_ffmpeg_filters.diff Modified: libavfilter/diffs/02_ffmpeg_filters.diff ============================================================================== --- libavfilter/diffs/02_ffmpeg_filters.diff Mon Jan 26 15:07:28 2009 (r4008) +++ libavfilter/diffs/02_ffmpeg_filters.diff Mon Jan 26 20:20:40 2009 (r4009) @@ -261,7 +261,7 @@ Index: ffmpeg.c } +#if ENABLE_AVFILTER -+ if (ist->st->codec->codec_type == CODEC_TYPE_VIDEO) { ++ if (ist->st->codec->codec_type == CODEC_TYPE_VIDEO && ist->input_video_filter) { + // add it to be filtered + av_vsrc_buffer_add_frame(ist->input_video_filter, &picture, + ist->pts, @@ -278,13 +278,13 @@ Index: ffmpeg.c } - + loop = ist->st->codec->codec_type != CODEC_TYPE_VIDEO || -+ avfilter_poll_frame(ist->out_video_filter->inputs[0]); ++ !ist->out_video_filter || avfilter_poll_frame(ist->out_video_filter->inputs[0]); /* if output time reached then transcode raw format, encode packets and output them */ if (start_time == 0 || ist->pts >= start_time) +#if ENABLE_AVFILTER + while(loop) { -+ if (ist->st->codec->codec_type == CODEC_TYPE_VIDEO) ++ if (ist->st->codec->codec_type == CODEC_TYPE_VIDEO && ist->out_video_filter) + get_filtered_video_pic(ist->out_video_filter, &ist->picref, &picture, &ist->pts); +#endif for(i=0;i<nb_ostreams;i++) { @@ -305,7 +305,7 @@ Index: ffmpeg.c } } + loop = (ist->st->codec->codec_type == CODEC_TYPE_VIDEO) && -+ avfilter_poll_frame(ist->out_video_filter->inputs[0]); ++ ist->out_video_filter && avfilter_poll_frame(ist->out_video_filter->inputs[0]); } + +#if ENABLE_AVFILTER

1 0

[soc]: r4008 - in aacenc: aac_enc.patch aaccoder.c aacenc.c aacenc.h
by kostya 26 Jan '09

26 Jan '09

Author: kostya Date: Mon Jan 26 15:07:28 2009 New Revision: 4008 Log: Split out from AAC encoder core file all functions with heuristics for selecting scalefactors, band codebooks, etc. Added: aacenc/aaccoder.c - copied, changed from r4006, aacenc/aacenc.c aacenc/aacenc.h - copied, changed from r4006, aacenc/aacenc.c Modified: aacenc/aac_enc.patch aacenc/aacenc.c Modified: aacenc/aac_enc.patch ============================================================================== --- aacenc/aac_enc.patch Mon Jan 26 15:00:57 2009 (r4007) +++ aacenc/aac_enc.patch Mon Jan 26 15:07:28 2009 (r4008) @@ -2,14 +2,14 @@ diff --git a/libavcodec/Makefile b/libav index d4f6d1c..0ed9057 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile -@@ -25,6 +25,7 @@ - - OBJS-$(CONFIG_ENCODERS) += faandct.o jfdctfst.o jfdctint.o +@@ -33,6 +33,7 @@ -+OBJS-$(CONFIG_AAC_ENCODER) += aacenc.o aacpsy.o aactab.o psymodel.o iirfilter.o mdct.o fft.o mpeg4audio.o - OBJS-$(CONFIG_AAC_DECODER) += aac.o aactab.o mdct.o fft.o - OBJS-$(CONFIG_AASC_DECODER) += aasc.o - OBJS-$(CONFIG_AC3_DECODER) += ac3dec.o ac3tab.o ac3dec_data.o ac3.o mdct.o fft.o + # decoders/encoders + OBJS-$(CONFIG_AAC_DECODER) += aac.o aactab.o ++OBJS-$(CONFIG_AAC_ENCODER) += aacenc.o aaccoder.o aacpsy.o aactab.o psymodel.o iirfilter.o mdct.o fft.o mpeg4audio.o + OBJS-$(CONFIG_AASC_DECODER) += aasc.o msrledec.o + OBJS-$(CONFIG_AC3_DECODER) += eac3dec.o ac3dec.o ac3tab.o ac3dec_data.o ac3.o + OBJS-$(CONFIG_AC3_ENCODER) += ac3enc.o ac3tab.o ac3.o diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 33a4242..6871496 100644 --- a/libavcodec/allcodecs.c Copied and modified: aacenc/aaccoder.c (from r4006, aacenc/aacenc.c) ============================================================================== --- aacenc/aacenc.c Mon Jan 26 14:37:36 2009 (r4006, copy source) +++ aacenc/aaccoder.c Mon Jan 26 15:07:28 2009 (r4008) @@ -1,6 +1,6 @@ /* - * AAC encoder - * Copyright (C) 2008 Konstantin Shishkov + * AAC coefficients encoder + * Copyright (C) 2008-2009 Konstantin Shishkov * * This file is part of FFmpeg. * @@ -20,106 +20,16 @@ */ /** - * @file aacenc.c - * AAC encoder + * @file aaccoder.c + * AAC coefficients encoder */ -/*********************************** - * TODOs: - * speedup quantizer selection - * add sane pulse detection - * add temporal noise shaping - ***********************************/ - #include "avcodec.h" #include "bitstream.h" -#include "dsputil.h" -#include "mpeg4audio.h" - #include "aac.h" +#include "aacenc.h" #include "aactab.h" -#include "psymodel.h" - -static const uint8_t swb_size_1024_96[] = { - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 8, 8, 8, 8, 8, - 12, 12, 12, 12, 12, 16, 16, 24, 28, 36, 44, - 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64 -}; - -static const uint8_t swb_size_1024_64[] = { - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 8, 8, 8, 8, - 12, 12, 12, 16, 16, 16, 20, 24, 24, 28, 36, - 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40 -}; - -static const uint8_t swb_size_1024_48[] = { - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 8, 8, 8, 8, 8, 8, 8, - 12, 12, 12, 12, 16, 16, 20, 20, 24, 24, 28, 28, - 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, - 96 -}; - -static const uint8_t swb_size_1024_32[] = { - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 8, 8, 8, 8, 8, 8, 8, - 12, 12, 12, 12, 16, 16, 20, 20, 24, 24, 28, 28, - 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32 -}; - -static const uint8_t swb_size_1024_24[] = { - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 12, 12, 12, 12, 16, 16, 16, 20, 20, 24, 24, 28, 28, - 32, 36, 36, 40, 44, 48, 52, 52, 64, 64, 64, 64, 64 -}; - -static const uint8_t swb_size_1024_16[] = { - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 12, 12, 12, 12, 12, 12, 12, 12, 12, 16, 16, 16, 16, 20, 20, 20, 24, 24, 28, 28, - 32, 36, 40, 40, 44, 48, 52, 56, 60, 64, 64, 64 -}; - -static const uint8_t swb_size_1024_8[] = { - 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, - 16, 16, 16, 16, 16, 16, 16, 20, 20, 20, 20, 24, 24, 24, 28, 28, - 32, 36, 36, 40, 44, 48, 52, 56, 60, 64, 80 -}; - -static const uint8_t *swb_size_1024[] = { - swb_size_1024_96, swb_size_1024_96, swb_size_1024_64, - swb_size_1024_48, swb_size_1024_48, swb_size_1024_32, - swb_size_1024_24, swb_size_1024_24, swb_size_1024_16, - swb_size_1024_16, swb_size_1024_16, swb_size_1024_8 -}; - -static const uint8_t swb_size_128_96[] = { - 4, 4, 4, 4, 4, 4, 8, 8, 8, 16, 28, 36 -}; - -static const uint8_t swb_size_128_48[] = { - 4, 4, 4, 4, 4, 8, 8, 8, 12, 12, 12, 16, 16, 16 -}; - -static const uint8_t swb_size_128_24[] = { - 4, 4, 4, 4, 4, 4, 4, 8, 8, 8, 12, 12, 16, 16, 20 -}; - -static const uint8_t swb_size_128_16[] = { - 4, 4, 4, 4, 4, 4, 4, 4, 8, 8, 12, 12, 16, 20, 20 -}; - -static const uint8_t swb_size_128_8[] = { - 4, 4, 4, 4, 4, 4, 4, 8, 8, 8, 8, 12, 16, 20, 20 -}; - -static const uint8_t *swb_size_128[] = { - /* the last entry on the following row is swb_size_128_64 but is a - duplicate of swb_size_128_96 */ - swb_size_128_96, swb_size_128_96, swb_size_128_96, - swb_size_128_48, swb_size_128_48, swb_size_128_48, - swb_size_128_24, swb_size_128_24, swb_size_128_16, - swb_size_128_16, swb_size_128_16, swb_size_128_8 -}; - /** bits needed to code codebook run value for long windows */ static const uint8_t run_value_bits_long[64] = { 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, @@ -137,199 +47,6 @@ static const uint8_t* run_value_bits[2] run_value_bits_long, run_value_bits_short }; -/** default channel configurations */ -static const uint8_t aac_chan_configs[6][5] = { - {1, TYPE_SCE}, // 1 channel - single channel element - {1, TYPE_CPE}, // 2 channels - channel pair - {2, TYPE_SCE, TYPE_CPE}, // 3 channels - center + stereo - {3, TYPE_SCE, TYPE_CPE, TYPE_SCE}, // 4 channels - front center + stereo + back center - {3, TYPE_SCE, TYPE_CPE, TYPE_CPE}, // 5 channels - front center + stereo + back stereo - {4, TYPE_SCE, TYPE_CPE, TYPE_CPE, TYPE_LFE}, // 6 channels - front center + stereo + back stereo + LFE -}; - -/** - * AAC encoder context - */ -typedef struct { - PutBitContext pb; - MDCTContext mdct1024; ///< long (1024 samples) frame transform context - MDCTContext mdct128; ///< short (128 samples) frame transform context - DSPContext dsp; - DECLARE_ALIGNED_16(FFTSample, output[2048]); ///< temporary buffer for MDCT input coefficients - int16_t* samples; ///< saved preprocessed input - - int samplerate_index; ///< MPEG-4 samplerate index - - ChannelElement *cpe; ///< channel elements - FFPsyContext psy; - struct FFPsyPreprocessContext* psypp; - int cur_channel; - int last_frame; - float lambda; -} AACEncContext; - -/** - * Make AAC audio config object. - * @see 1.6.2.1 "Syntax - AudioSpecificConfig" - */ -static void put_audio_specific_config(AVCodecContext *avctx) -{ - PutBitContext pb; - AACEncContext *s = avctx->priv_data; - - init_put_bits(&pb, avctx->extradata, avctx->extradata_size*8); - put_bits(&pb, 5, 2); //object type - AAC-LC - put_bits(&pb, 4, s->samplerate_index); //sample rate index - put_bits(&pb, 4, avctx->channels); - //GASpecificConfig - put_bits(&pb, 1, 0); //frame length - 1024 samples - put_bits(&pb, 1, 0); //does not depend on core coder - put_bits(&pb, 1, 0); //is not extension - flush_put_bits(&pb); -} - -static av_cold int aac_encode_init(AVCodecContext *avctx) -{ - AACEncContext *s = avctx->priv_data; - int i; - const uint8_t *sizes[2]; - int lengths[2]; - - avctx->frame_size = 1024; - - for(i = 0; i < 16; i++) - if(avctx->sample_rate == ff_mpeg4audio_sample_rates[i]) - break; - if(i == 16){ - av_log(avctx, AV_LOG_ERROR, "Unsupported sample rate %d\n", avctx->sample_rate); - return -1; - } - if(avctx->channels > 6){ - av_log(avctx, AV_LOG_ERROR, "Unsupported number of channels: %d\n", avctx->channels); - return -1; - } - s->samplerate_index = i; - - dsputil_init(&s->dsp, avctx); - ff_mdct_init(&s->mdct1024, 11, 0); - ff_mdct_init(&s->mdct128, 8, 0); - // window init - ff_kbd_window_init(ff_aac_kbd_long_1024, 4.0, 1024); - ff_kbd_window_init(ff_aac_kbd_short_128, 6.0, 128); - ff_sine_window_init(ff_sine_1024, 1024); - ff_sine_window_init(ff_sine_128, 128); - - s->samples = av_malloc(2 * 1024 * avctx->channels * sizeof(s->samples[0])); - s->cpe = av_mallocz(sizeof(ChannelElement) * aac_chan_configs[avctx->channels-1][0]); - avctx->extradata = av_malloc(2); - avctx->extradata_size = 2; - put_audio_specific_config(avctx); - - sizes[0] = swb_size_1024[i]; - sizes[1] = swb_size_128[i]; - lengths[0] = ff_aac_num_swb_1024[i]; - lengths[1] = ff_aac_num_swb_128[i]; - ff_psy_init(&s->psy, avctx, 2, sizes, lengths); - s->psypp = ff_psy_preprocess_init(avctx); - -#if !CONFIG_HARDCODED_TABLES - for (i = 0; i < 316; i++) - ff_aac_pow2sf_tab[i] = pow(2, (i - 200)/4.); -#endif /* CONFIG_HARDCODED_TABLES */ - - return 0; -} - -static void apply_window_and_mdct(AVCodecContext *avctx, AACEncContext *s, - SingleChannelElement *sce, short *audio, int channel) -{ - int i, j, k; - const float * lwindow = sce->ics.use_kb_window[0] ? ff_aac_kbd_long_1024 : ff_sine_1024; - const float * swindow = sce->ics.use_kb_window[0] ? ff_aac_kbd_short_128 : ff_sine_128; - const float * pwindow = sce->ics.use_kb_window[1] ? ff_aac_kbd_short_128 : ff_sine_128; - - if (sce->ics.window_sequence[0] != EIGHT_SHORT_SEQUENCE) { - memcpy(s->output, sce->saved, sizeof(float)*1024); - if(sce->ics.window_sequence[0] == LONG_STOP_SEQUENCE){ - memset(s->output, 0, sizeof(s->output[0]) * 448); - for(i = 448; i < 576; i++) - s->output[i] = sce->saved[i] * pwindow[i - 448]; - for(i = 576; i < 704; i++) - s->output[i] = sce->saved[i]; - } - if(sce->ics.window_sequence[0] != LONG_START_SEQUENCE){ - j = channel; - for (i = 0; i < 1024; i++, j += avctx->channels){ - s->output[i+1024] = audio[j] * lwindow[1024 - i - 1]; - sce->saved[i] = audio[j] * lwindow[i]; - } - }else{ - j = channel; - for(i = 0; i < 448; i++, j += avctx->channels) - s->output[i+1024] = audio[j]; - for(i = 448; i < 576; i++, j += avctx->channels) - s->output[i+1024] = audio[j] * swindow[576 - i - 1]; - memset(s->output+1024+576, 0, sizeof(s->output[0]) * 448); - j = channel; - for(i = 0; i < 1024; i++, j += avctx->channels) - sce->saved[i] = audio[j]; - } - ff_mdct_calc(&s->mdct1024, sce->coeffs, s->output); - }else{ - j = channel; - for (k = 0; k < 1024; k += 128) { - for(i = 448 + k; i < 448 + k + 256; i++) - s->output[i - 448 - k] = (i < 1024) - ? sce->saved[i] - : audio[channel + (i-1024)*avctx->channels]; - s->dsp.vector_fmul (s->output, k ? swindow : pwindow, 128); - s->dsp.vector_fmul_reverse(s->output+128, s->output+128, swindow, 128); - ff_mdct_calc(&s->mdct128, sce->coeffs + k, s->output); - } - j = channel; - for(i = 0; i < 1024; i++, j += avctx->channels) - sce->saved[i] = audio[j]; - } -} - -/** - * Encode ics_info element. - * @see Table 4.6 (syntax of ics_info) - */ -static void put_ics_info(AACEncContext *s, IndividualChannelStream *info) -{ - int w; - - put_bits(&s->pb, 1, 0); // ics_reserved bit - put_bits(&s->pb, 2, info->window_sequence[0]); - put_bits(&s->pb, 1, info->use_kb_window[0]); - if(info->window_sequence[0] != EIGHT_SHORT_SEQUENCE){ - put_bits(&s->pb, 6, info->max_sfb); - put_bits(&s->pb, 1, 0); // no prediction - }else{ - put_bits(&s->pb, 4, info->max_sfb); - for(w = 1; w < 8; w++){ - put_bits(&s->pb, 1, !info->group_len[w]); - } - } -} - -/** - * Encode MS data. - * @see 4.6.8.1 "Joint Coding - M/S Stereo" - */ -static void encode_ms_info(PutBitContext *pb, ChannelElement *cpe) -{ - int i, w; - - put_bits(pb, 2, cpe->ms_mode); - if(cpe->ms_mode == 1){ - for(w = 0; w < cpe->ch[0].ics.num_windows; w += cpe->ch[0].ics.group_len[w]){ - for(i = 0; i < cpe->ch[0].ics.max_sfb; i++) - put_bits(pb, 1, cpe->ms_mask[w*16 + i]); - } - } -} /** * Quantize one coefficient. @@ -381,13 +98,13 @@ static float quantize_band_cost(const fl float mincost; int minidx = 0; int minbits = 0; - int quants[4][2], realquants[4][2]; + int quants[4][2]; mincost = 0.0f; for(j = 0; j < dim; j++){ - realquants[j][0] = quant2(in[i+j], Q); - realquants[j][1] = quant (in[i+j], Q); + quants[j][0] = quant2(in[i+j], Q); + quants[j][1] = quant (in[i+j], Q); for(k = 0; k < 2; k++){ - quants[j][k] = FFMIN(realquants[j][k], maxval); + quants[j][k] = FFMIN(quants[j][k], maxval); if(!IS_CODEBOOK_UNSIGNED(cb) && in[i+j] < 0.0f) quants[j][k] = -quants[j][k]; } @@ -428,7 +145,7 @@ static float quantize_band_cost(const fl di = t - 165140.0f; curbits += 21; }else{ - int c = realquants[k]; + int c = quant(t, Q); di = t - c*cbrt(c)*IQ; curbits += av_log2(c)*2 - 4 + 1; } @@ -664,7 +381,7 @@ static void quantize_and_encode_band(Put const float IQ = ff_aac_pow2sf_tab[200 - scale_idx + SCALE_ONE_POS - SCALE_DIV_512]; int i, j, k; const int dim = cb < FIRST_PAIR_BT ? 4 : 2; - +//START_TIMER if(!cb) return; @@ -731,6 +448,7 @@ static void quantize_and_encode_band(Put } } } +//STOP_TIMER("quantize_and_encode") } #endif @@ -844,65 +562,6 @@ static void encode_window_bands_info(AAC } } -/** - * Produce integer coefficients from scalefactors provided by the model. - */ -static void adjust_frame_information(AACEncContext *apc, ChannelElement *cpe, int chans) -{ - int i, w, w2, g, ch; - int start, sum, maxsfb, cmaxsfb; - - for(ch = 0; ch < chans; ch++){ - IndividualChannelStream *ics = &cpe->ch[ch].ics; - start = 0; - maxsfb = 0; - cpe->ch[ch].pulse.num_pulse = 0; - for(w = 0; w < ics->num_windows*16; w += 16){ - for(g = 0; g < ics->num_swb; g++){ - sum = 0; - //apply M/S - if(!ch && cpe->ms_mask[w + g]){ - for(i = 0; i < ics->swb_sizes[g]; i++){ - cpe->ch[0].coeffs[start+i] = (cpe->ch[0].coeffs[start+i] + cpe->ch[1].coeffs[start+i]) / 2.0; - cpe->ch[1].coeffs[start+i] = cpe->ch[0].coeffs[start+i] - cpe->ch[1].coeffs[start+i]; - } - } - start += ics->swb_sizes[g]; - } - for(cmaxsfb = ics->num_swb; cmaxsfb > 0 && cpe->ch[ch].zeroes[w+cmaxsfb-1]; cmaxsfb--); - maxsfb = FFMAX(maxsfb, cmaxsfb); - } - ics->max_sfb = maxsfb; - - //adjust zero bands for window groups - for(w = 0; w < ics->num_windows; w += ics->group_len[w]){ - for(g = 0; g < ics->max_sfb; g++){ - i = 1; - for(w2 = w; w2 < w + ics->group_len[w]; w2++){ - if(!cpe->ch[ch].zeroes[w2*16 + g]){ - i = 0; - break; - } - } - cpe->ch[ch].zeroes[w*16 + g] = i; - } - } - } - - if(chans > 1 && cpe->common_window){ - IndividualChannelStream *ics0 = &cpe->ch[0].ics; - IndividualChannelStream *ics1 = &cpe->ch[1].ics; - int msc = 0; - ics0->max_sfb = FFMAX(ics0->max_sfb, ics1->max_sfb); - ics1->max_sfb = ics0->max_sfb; - for(w = 0; w < ics0->num_windows*16; w += 16) - for(i = 0; i < ics0->max_sfb; i++) - if(cpe->ms_mask[w+i]) msc++; - if(msc == 0 || ics0->max_sfb == 0) cpe->ms_mode = 0; - else cpe->ms_mode = msc < ics0->max_sfb ? 1 : 2; - } -} - typedef struct TrellisPath { float cost; int prev; @@ -910,7 +569,8 @@ typedef struct TrellisPath { int max_val; } TrellisPath; -static void search_for_quantizers_anmr(AACEncContext *s, SingleChannelElement *sce, const float lambda) +static void search_for_quantizers_anmr(AVCodecContext *avctx, AACEncContext *s, + SingleChannelElement *sce, const float lambda) { int q, w, w2, g, start = 0; int i; @@ -1186,7 +846,8 @@ static void search_for_quantizers_twoloo }while(fflag && its < 10); } -static void search_for_quantizers_faac(AACEncContext *s, SingleChannelElement *sce, const float lambda) +static void search_for_quantizers_faac(AVCodecContext *avctx, AACEncContext *s, + SingleChannelElement *sce, const float lambda) { int start = 0, i, w, w2, g; float uplim[128], maxq[128]; @@ -1351,7 +1012,8 @@ static void search_for_quantizers_faac(A } } -static void search_for_quantizers_fast(AACEncContext *s, SingleChannelElement *sce) +static void search_for_quantizers_fast(AVCodecContext *avctx, AACEncContext *s, + SingleChannelElement *sce, const float lambda) { int start = 0, i, w, w2, g; int minq = 255; @@ -1374,7 +1036,7 @@ static void search_for_quantizers_fast(A } } for(i = 0; i < 128; i++){ - sce->sf_idx[i] = av_clip(sce->sf_idx[i], minq, minq + SCALE_MAX_DIFF - 1); + sce->sf_idx[i] = 140;//av_clip(sce->sf_idx[i], minq, minq + SCALE_MAX_DIFF - 1); } //set the same quantizers inside window groups for(w = 0; w < sce->ics.num_windows; w += sce->ics.group_len[w]) @@ -1383,15 +1045,6 @@ static void search_for_quantizers_fast(A sce->sf_idx[(w+w2)*16+g] = sce->sf_idx[w*16+g]; } -static void search_for_quantizers(AVCodecContext *avctx, AACEncContext *s, - SingleChannelElement *sce) -{ - search_for_quantizers_anmr(s, sce, s->lambda); -// search_for_quantizers_twoloop(avctx, s, sce, s->lambda); -// search_for_quantizers_faac(s, sce, av_clipf(s->lambda * 2e8, 50.0f, 300.0f)); -// search_for_quantizers_fast(s, sce); -} - static void search_for_ms(AACEncContext *s, ChannelElement *cpe, const float lambda) { int start = 0, i, w, w2, g; @@ -1443,246 +1096,29 @@ static void search_for_ms(AACEncContext } } -/** - * Encode scalefactor band coding type. - */ -static void encode_band_info(AACEncContext *s, SingleChannelElement *sce) -{ - int w; - - for(w = 0; w < sce->ics.num_windows; w += sce->ics.group_len[w]){ - encode_window_bands_info(s, sce, w, sce->ics.group_len[w]); - } -} - -/** - * Encode scalefactors. - */ -static void encode_scale_factors(AVCodecContext *avctx, AACEncContext *s, SingleChannelElement *sce) -{ - int off = sce->sf_idx[0], diff; - int i, w; - - for(w = 0; w < sce->ics.num_windows; w += sce->ics.group_len[w]){ - for(i = 0; i < sce->ics.max_sfb; i++){ - if(!sce->zeroes[w*16 + i]){ - diff = sce->sf_idx[w*16 + i] - off + SCALE_DIFF_ZERO; - if(diff < 0 || diff > 120) av_log(avctx, AV_LOG_ERROR, "Scalefactor difference is too big to be coded\n"); - off = sce->sf_idx[w*16 + i]; - put_bits(&s->pb, ff_aac_scalefactor_bits[diff], ff_aac_scalefactor_code[diff]); - } - } - } -} - -/** - * Encode pulse data. - */ -static void encode_pulses(AACEncContext *s, Pulse *pulse) -{ - int i; - - put_bits(&s->pb, 1, !!pulse->num_pulse); - if(!pulse->num_pulse) return; - - put_bits(&s->pb, 2, pulse->num_pulse - 1); - put_bits(&s->pb, 6, pulse->start); - for(i = 0; i < pulse->num_pulse; i++){ - put_bits(&s->pb, 5, pulse->pos[i]); - put_bits(&s->pb, 4, pulse->amp[i]); - } -} - -/** - * Encode spectral coefficients processed by psychoacoustic model. - */ -static void encode_spectral_coeffs(AACEncContext *s, SingleChannelElement *sce) -{ - int start, i, w, w2; - - for(w = 0; w < sce->ics.num_windows; w += sce->ics.group_len[w]){ - start = 0; - for(i = 0; i < sce->ics.max_sfb; i++){ - if(sce->zeroes[w*16 + i]){ - start += sce->ics.swb_sizes[i]; - continue; - } - for(w2 = w; w2 < w + sce->ics.group_len[w]; w2++){ - quantize_and_encode_band(&s->pb, sce->coeffs + start + w2*128, - sce->ics.swb_sizes[i], - sce->sf_idx[w*16 + i], - sce->band_type[w*16 + i], - s->lambda); - } - start += sce->ics.swb_sizes[i]; - } - } -} - -/** - * Encode one channel of audio data. - */ -static int encode_individual_channel(AVCodecContext *avctx, AACEncContext *s, SingleChannelElement *sce, int common_window) -{ - put_bits(&s->pb, 8, sce->sf_idx[0]); - if(!common_window) put_ics_info(s, &sce->ics); - encode_band_info(s, sce); - encode_scale_factors(avctx, s, sce); - encode_pulses(s, &sce->pulse); - put_bits(&s->pb, 1, 0); //tns - put_bits(&s->pb, 1, 0); //ssr - encode_spectral_coeffs(s, sce); - return 0; -} - -/** - * Write some auxiliary information about the created AAC file. - */ -static void put_bitstream_info(AVCodecContext *avctx, AACEncContext *s, const char *name) -{ - int i, namelen, padbits; - - namelen = strlen(name) + 2; - put_bits(&s->pb, 3, TYPE_FIL); - put_bits(&s->pb, 4, FFMIN(namelen, 15)); - if(namelen >= 15) - put_bits(&s->pb, 8, namelen - 16); - put_bits(&s->pb, 4, 0); //extension type - filler - padbits = 8 - (put_bits_count(&s->pb) & 7); - align_put_bits(&s->pb); - for(i = 0; i < namelen - 2; i++) - put_bits(&s->pb, 8, name[i]); - put_bits(&s->pb, 12 - padbits, 0); -} - -static int aac_encode_frame(AVCodecContext *avctx, - uint8_t *frame, int buf_size, void *data) -{ - AACEncContext *s = avctx->priv_data; - int16_t *samples = s->samples, *samples2, *la; - ChannelElement *cpe; - int i, j, chans, tag, start_ch; - const uint8_t *chan_map = aac_chan_configs[avctx->channels-1]; - int chan_el_counter[4]; - - if(s->last_frame) - return 0; - if(data){ - if(!s->psypp){ - memcpy(s->samples + 1024 * avctx->channels, data, 1024 * avctx->channels * sizeof(s->samples[0])); - }else{ - start_ch = 0; - samples2 = s->samples + 1024 * avctx->channels; - for(i = 0; i < chan_map[0]; i++){ - tag = chan_map[i+1]; - chans = tag == TYPE_CPE ? 2 : 1; - ff_psy_preprocess(s->psypp, (uint16_t*)data + start_ch, samples2 + start_ch, start_ch + i, chans); - start_ch += chans; - } - } - } - if(!avctx->frame_number){ - memcpy(s->samples, s->samples + 1024 * avctx->channels, 1024 * avctx->channels * sizeof(s->samples[0])); - return 0; - } - - init_put_bits(&s->pb, frame, buf_size*8); - if((avctx->frame_number & 0xFF)==1 && !(avctx->flags & CODEC_FLAG_BITEXACT)){ - put_bitstream_info(avctx, s, LIBAVCODEC_IDENT); - } - start_ch = 0; - memset(chan_el_counter, 0, sizeof(chan_el_counter)); - for(i = 0; i < chan_map[0]; i++){ - FFPsyWindowInfo wi[2]; - tag = chan_map[i+1]; - chans = tag == TYPE_CPE ? 2 : 1; - cpe = &s->cpe[i]; - samples2 = samples + start_ch; - la = samples2 + 1024 * avctx->channels + start_ch; - if(!data) la = NULL; - s->lambda = 5e-7f; - for(j = 0; j < chans; j++){ - IndividualChannelStream *ics = &cpe->ch[j].ics; - int k; - wi[j] = ff_psy_suggest_window(&s->psy, samples2, la, start_ch + j, ics->window_sequence[0]); - ics->window_sequence[1] = ics->window_sequence[0]; - ics->window_sequence[0] = wi[j].window_type[0]; - ics->use_kb_window[1] = ics->use_kb_window[0]; - ics->use_kb_window[0] = wi[j].window_shape; - ics->num_windows = wi[j].num_windows; - ics->swb_sizes = s->psy.bands [ics->num_windows == 8]; - ics->num_swb = s->psy.num_bands[ics->num_windows == 8]; - for(k = 0; k < ics->num_windows; k++) - ics->group_len[k] = wi[j].grouping[k]; - - s->cur_channel = start_ch + j; - apply_window_and_mdct(avctx, s, &cpe->ch[j], samples2, j); - search_for_quantizers(avctx, s, &cpe->ch[j]); - } - cpe->common_window = 0; - if(chans > 1 - && wi[0].window_type[0] == wi[1].window_type[0] - && wi[0].window_shape == wi[1].window_shape){ - - cpe->common_window = 1; - for(j = 0; j < wi[0].num_windows; j++){ - if(wi[0].grouping[j] != wi[1].grouping[j]){ - cpe->common_window = 0; - break; - } - } - } -// search_for_ms(s, cpe, s->lambda); - adjust_frame_information(s, cpe, chans); - put_bits(&s->pb, 3, tag); - put_bits(&s->pb, 4, chan_el_counter[tag]++); - if(chans == 2){ - put_bits(&s->pb, 1, cpe->common_window); - if(cpe->common_window){ - put_ics_info(s, &cpe->ch[0].ics); - encode_ms_info(&s->pb, cpe); - } - } - for(j = 0; j < chans; j++){ - s->cur_channel = start_ch + j; - ff_psy_set_band_info(&s->psy, s->cur_channel, cpe->ch[j].coeffs, &wi[j]); - encode_individual_channel(avctx, s, &cpe->ch[j], cpe->common_window); - } - start_ch += chans; - } - - put_bits(&s->pb, 3, TYPE_END); - flush_put_bits(&s->pb); - avctx->frame_bits = put_bits_count(&s->pb); - - if(!data) - s->last_frame = 1; - memcpy(s->samples, s->samples + 1024 * avctx->channels, 1024 * avctx->channels * sizeof(s->samples[0])); - return put_bits_count(&s->pb)>>3; -} - -static av_cold int aac_encode_end(AVCodecContext *avctx) -{ - AACEncContext *s = avctx->priv_data; - - ff_mdct_end(&s->mdct1024); - ff_mdct_end(&s->mdct128); - ff_psy_end(&s->psy); - ff_psy_preprocess_end(s->psypp); - av_freep(&s->samples); - av_freep(&s->cpe); - return 0; -} - -AVCodec aac_encoder = { - "aac", - CODEC_TYPE_AUDIO, - CODEC_ID_AAC, - sizeof(AACEncContext), - aac_encode_init, - aac_encode_frame, - aac_encode_end, - .capabilities = CODEC_CAP_SMALL_LAST_FRAME | CODEC_CAP_DELAY, - .sample_fmts = (enum SampleFormat[]){SAMPLE_FMT_S16,SAMPLE_FMT_NONE}, - .long_name = NULL_IF_CONFIG_SMALL("Advanced Audio Coding"), +AACCoefficientsEncoder ff_aac_coders[] = { + { + search_for_quantizers_anmr, + encode_window_bands_info, + quantize_and_encode_band, +// search_for_ms, + }, + { + search_for_quantizers_faac, + encode_window_bands_info, + quantize_and_encode_band, +// search_for_ms, + }, + { + search_for_quantizers_twoloop, + encode_window_bands_info, + quantize_and_encode_band, +// search_for_ms, + }, + { + search_for_quantizers_fast, + encode_window_bands_info, + quantize_and_encode_band, +// search_for_ms, + }, }; Modified: aacenc/aacenc.c ============================================================================== --- aacenc/aacenc.c Mon Jan 26 15:00:57 2009 (r4007) +++ aacenc/aacenc.c Mon Jan 26 15:07:28 2009 (r4008) @@ -38,6 +38,7 @@ #include "aac.h" #include "aactab.h" +#include "aacenc.h" #include "psymodel.h" @@ -120,23 +121,6 @@ static const uint8_t *swb_size_128[] = { swb_size_128_16, swb_size_128_16, swb_size_128_8 }; -/** bits needed to code codebook run value for long windows */ -static const uint8_t run_value_bits_long[64] = { - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 10, - 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 15 -}; - -/** bits needed to code codebook run value for short windows */ -static const uint8_t run_value_bits_short[16] = { - 3, 3, 3, 3, 3, 3, 3, 6, 6, 6, 6, 6, 6, 6, 6, 9 -}; - -static const uint8_t* run_value_bits[2] = { - run_value_bits_long, run_value_bits_short -}; - /** default channel configurations */ static const uint8_t aac_chan_configs[6][5] = { {1, TYPE_SCE}, // 1 channel - single channel element @@ -148,27 +132,6 @@ static const uint8_t aac_chan_configs[6] }; /** - * AAC encoder context - */ -typedef struct { - PutBitContext pb; - MDCTContext mdct1024; ///< long (1024 samples) frame transform context - MDCTContext mdct128; ///< short (128 samples) frame transform context - DSPContext dsp; - DECLARE_ALIGNED_16(FFTSample, output[2048]); ///< temporary buffer for MDCT input coefficients - int16_t* samples; ///< saved preprocessed input - - int samplerate_index; ///< MPEG-4 samplerate index - - ChannelElement *cpe; ///< channel elements - FFPsyContext psy; - struct FFPsyPreprocessContext* psypp; - int cur_channel; - int last_frame; - float lambda; -} AACEncContext; - -/** * Make AAC audio config object. * @see 1.6.2.1 "Syntax - AudioSpecificConfig" */ @@ -231,6 +194,7 @@ static av_cold int aac_encode_init(AVCod lengths[1] = ff_aac_num_swb_128[i]; ff_psy_init(&s->psy, avctx, 2, sizes, lengths); s->psypp = ff_psy_preprocess_init(avctx); + s->coder = &ff_aac_coders[0]; #if !CONFIG_HARDCODED_TABLES for (i = 0; i < 316; i++) @@ -332,519 +296,6 @@ static void encode_ms_info(PutBitContext } /** - * Quantize one coefficient. - * @return absolute value of the quantized coefficient - * @see 3GPP TS26.403 5.6.2 "Scalefactor determination" - */ -static av_always_inline int quant(float coef, const float Q) -{ - return av_clip((int)(pow(fabsf(coef) * Q, 0.75) + 0.4054), 0, 8191); -} - -#if 1 - -static av_always_inline int quant2(float coef, const float Q) -{ - return av_clip((int)(pow(fabsf(coef) * Q, 0.75)), 0, 8191); -} - -static const float aac_cb_range[12] = { 0, 3, 3, 3, 3, 9, 9, 8, 8, 13, 13, 17}; -static const float aac_cb_maxval[12] = {0, 1, 1, 2, 2, 4, 4, 7, 7, 12, 12, 16}; - -/** - * Calculate rate distortion cost for quantizing with given codebook - * - * @return quantization distortion - */ -static float quantize_band_cost(const float *in, int size, int scale_idx, int cb, - const float lambda, const float uplim, int *bits) -{ - const float IQ = ff_aac_pow2sf_tab[200 + scale_idx - SCALE_ONE_POS + SCALE_DIV_512]; - const float Q = ff_aac_pow2sf_tab[200 - scale_idx + SCALE_ONE_POS - SCALE_DIV_512]; - int i, j, k; - float cost = 0; - const int dim = cb < FIRST_PAIR_BT ? 4 : 2; - int resbits = 0; - const int range = aac_cb_range[cb]; - const int maxval = aac_cb_maxval[cb]; - int offs[4]; - - if(!cb){ - for(i = 0; i < size; i++) - cost += in[i]*in[i]*lambda; - return cost; - } - offs[0] = 1; - for(i = 1; i < dim; i++) - offs[i] = offs[i-1]*range; - for(i = 0; i < size; i += dim){ - float mincost; - int minidx = 0; - int minbits = 0; - int quants[4][2], realquants[4][2]; - mincost = 0.0f; - for(j = 0; j < dim; j++){ - realquants[j][0] = quant2(in[i+j], Q); - realquants[j][1] = quant (in[i+j], Q); - for(k = 0; k < 2; k++){ - quants[j][k] = FFMIN(realquants[j][k], maxval); - if(!IS_CODEBOOK_UNSIGNED(cb) && in[i+j] < 0.0f) - quants[j][k] = -quants[j][k]; - } - mincost += in[i+j]*in[i+j]*lambda; - } - minidx = IS_CODEBOOK_UNSIGNED(cb) ? 0 : 40; - minbits = ff_aac_spectral_bits[cb-1][minidx]; - mincost += minbits; - for(j = 0; j < (1<<dim); j++){ - float rd = 0.0f; - int curbits; - int curidx = IS_CODEBOOK_UNSIGNED(cb) ? 0 : 40; - const float *vec; - int same = 0; - for(k = 0; k < dim; k++){ - if((j & (1 << k)) && quants[k][0] == quants[k][1]){ - same = 1; - break; - } - } - if(same) - continue; - for(k = 0; k < dim; k++) - curidx += quants[k][!!(j & (1 << k))] * offs[dim - 1 - k]; - curbits = ff_aac_spectral_bits[cb-1][curidx]; - vec = &ff_aac_codebook_vectors[cb-1][curidx*dim]; - if(IS_CODEBOOK_UNSIGNED(cb)){ - for(k = 0; k < dim; k++){ - float t = fabsf(in[i+k]); - float di; - //do not code with escape sequence small values - if(vec[k] == 64.0f && t < 39.0f*IQ){ - rd = INFINITY; - break; - } - if(vec[k] == 64.0f){//FIXME: slow - if(t >= 165140.0f*IQ){ // clipped value - di = t - 165140.0f; - curbits += 21; - }else{ - int c = realquants[k]; - di = t - c*cbrt(c)*IQ; - curbits += av_log2(c)*2 - 4 + 1; - } - }else{ - di = t - vec[k]*IQ; - } - if(vec[k] != 0.0f) - curbits++; - rd += di*di*lambda; - } - }else{ - for(k = 0; k < dim; k++){ - float di = in[i+k] - vec[k]*IQ; - rd += di*di*lambda; - } - } - rd += curbits; - if(rd < mincost){ - mincost = rd; - minidx = j; - minbits = curbits; - } - } - cost += mincost; - resbits += minbits; - if(cost >= uplim) - return uplim; - } - - if(bits) - *bits = resbits; - return cost; -} - -static void quantize_and_encode_band(PutBitContext *pb, const float *in, int size, - int scale_idx, int cb, const float lambda) -{ - const float IQ = ff_aac_pow2sf_tab[200 + scale_idx - SCALE_ONE_POS + SCALE_DIV_512]; - const float Q = ff_aac_pow2sf_tab[200 - scale_idx + SCALE_ONE_POS - SCALE_DIV_512]; - const int range = aac_cb_range[cb]; - const int maxval = aac_cb_maxval[cb]; - const int dim = (cb < FIRST_PAIR_BT) ? 4 : 2; - int i, j, k; - int offs[4]; - - if(!cb) - return; - - offs[0] = 1; - for(i = 1; i < dim; i++) - offs[i] = offs[i-1]*range; - for(i = 0; i < size; i += dim){ - float mincost; - int minidx = 0; - int minbits = 0; - int quants[4][2]; - mincost = 0.0f; - for(j = 0; j < dim; j++){ - quants[j][0] = av_clip(quant2(in[i+j], Q), -maxval, maxval); - quants[j][1] = av_clip(quant (in[i+j], Q), -maxval, maxval); - for(k = 0; k < 2; k++){ - quants[j][k] = FFMIN(quants[j][k], maxval); - if(!IS_CODEBOOK_UNSIGNED(cb) && in[i+j] < 0.0f) - quants[j][k] = -quants[j][k]; - } - mincost += in[i+j]*in[i+j]*lambda; - } - minidx = IS_CODEBOOK_UNSIGNED(cb) ? 0 : 40; - minbits = ff_aac_spectral_bits[cb-1][minidx]; - mincost += minbits; - for(j = 0; j < (1<<dim); j++){ - float rd = 0.0f; - int curbits; - int curidx = IS_CODEBOOK_UNSIGNED(cb) ? 0 : 40; - const float *vec; - int same = 0; - for(k = 0; k < dim; k++){ - if((j & (1 << k)) && quants[k][0] == quants[k][1]){ - same = 1; - break; - } - } - if(same) - continue; - for(k = 0; k < dim; k++) - curidx += quants[k][!!(j & (1 << k))] * offs[dim - 1 - k]; - curbits = ff_aac_spectral_bits[cb-1][curidx]; - vec = &ff_aac_codebook_vectors[cb-1][curidx*dim]; - if(IS_CODEBOOK_UNSIGNED(cb)){ - for(k = 0; k < dim; k++){ - float t = fabsf(in[i+k]); - float di; - //do not code with escape sequence small values - if(vec[k] == 64.0f && t < 39.0f*IQ){ - rd = INFINITY; - break; - } - if(vec[k] == 64.0f){//FIXME: slow - if(t >= 165140.0f*IQ){ // clipped value - di = t - 165140.0f; - curbits += 21; - }else{ - int c = quant(t, Q); - di = t - c*cbrt(c)*IQ; - curbits += av_log2(c)*2 - 4 + 1; - } - }else{ - di = t - vec[k]*IQ; - } - if(vec[k] != 0.0f) - curbits++; - rd += di*di*lambda; - } - }else{ - for(k = 0; k < dim; k++){ - float di = in[i+k] - vec[k]*IQ; - rd += di*di*lambda; - } - } - rd += curbits; - if(rd < mincost){ - mincost = rd; - minidx = curidx; - minbits = curbits; - } - } - put_bits(pb, ff_aac_spectral_bits[cb-1][minidx], ff_aac_spectral_codes[cb-1][minidx]); - if(IS_CODEBOOK_UNSIGNED(cb)) - for(j = 0; j < dim; j++) - if(ff_aac_codebook_vectors[cb-1][minidx*dim+j] != 0.0f) - put_bits(pb, 1, in[i+j] < 0.0f); - if(cb == ESC_BT){ - for(j = 0; j < 2; j++){ - if(ff_aac_codebook_vectors[cb-1][minidx*2+j] == 64.0f){ - int coef = quant(in[i+j], Q); - int len = av_log2(coef); - - put_bits(pb, len - 4 + 1, (1 << (len - 4 + 1)) - 2); - put_bits(pb, len, coef & ((1 << len) - 1)); - } - } - } - } -} - -#else - -/** - * Calculate rate distortion cost for quantizing with given codebook - * - * @return quantization distortion - */ -static float quantize_band_cost(const float *in, int size, int scale_idx, int cb, - const float lambda, const float uplim, int *bits) -{ - const float Q = ff_aac_pow2sf_tab[200 + scale_idx - SCALE_ONE_POS + SCALE_DIV_512]; - int i, j, k; - float cost = 0; - const int dim = cb < FIRST_PAIR_BT ? 4 : 2; - int resbits = 0; - - if(!cb){ - for(i = 0; i < size; i++) - cost += in[i]*in[i]*lambda; - return cost; - } - for(i = 0; i < size; i += dim){ - float mincost = INFINITY; - int minidx = 0; - int minbits = 0; - const float *vec = ff_aac_codebook_vectors[cb-1]; - for(j = 0; j < ff_aac_spectral_sizes[cb-1]; j++, vec += dim){ - float rd = 0.0f; - int curbits = ff_aac_spectral_bits[cb-1][j]; - if(IS_CODEBOOK_UNSIGNED(cb)){ - for(k = 0; k < dim; k++){ - float t = fabsf(in[i+k]); - float di; - //do not code with escape sequence small values - if(vec[k] == 64.0f && t < 39.0f*Q){ - rd = INFINITY; - break; - } - if(vec[k] == 64.0f){//FIXME: slow - if(t >= 165140.0f*Q){ // clipped value - di = t - 165140.0f; - curbits += 21; - }else{ - int c = quant(t, 1.0/Q); - di = t - c*cbrt(c)*Q; - curbits += av_log2(c)*2 - 4 + 1; - } - }else{ - di = t - vec[k]*Q; - } - if(vec[k] != 0.0f) - curbits++; - rd += di*di*lambda; - } - }else{ - for(k = 0; k < dim; k++){ - float di = in[i+k] - vec[k]*Q; - rd += di*di*lambda; - } - } - rd += curbits; - if(rd < mincost){ - mincost = rd; - minidx = j; - minbits = curbits; - } - } - cost += mincost; - resbits += minbits; - if(cost >= uplim) - return uplim; - } - - if(bits) - *bits = resbits; - return cost; -} - -/** - * Prepare coefficients for encoding. - * - * @return sum of coefficient absolute values - */ -static void quantize_and_encode_band(PutBitContext *pb, const float *in, int size, - int scale_idx, int cb, const float lambda) -{ - const float Q = ff_aac_pow2sf_tab[200 + scale_idx - SCALE_ONE_POS + SCALE_DIV_512]; - const float IQ = ff_aac_pow2sf_tab[200 - scale_idx + SCALE_ONE_POS - SCALE_DIV_512]; - int i, j, k; - const int dim = cb < FIRST_PAIR_BT ? 4 : 2; - - if(!cb) - return; - - for(i = 0; i < size; i += dim){ - float mincost = INFINITY; - int minidx = 0; - int minbits = 0; - const float *vec = ff_aac_codebook_vectors[cb-1]; - for(j = 0; j < ff_aac_spectral_sizes[cb-1]; j++, vec += dim){ - float rd = 0.0f; - int curbits = ff_aac_spectral_bits[cb-1][j]; - if(IS_CODEBOOK_UNSIGNED(cb)){ - for(k = 0; k < dim; k++){ - float t = fabsf(in[i+k]); - float di; - //do not code with escape sequence small values - if(vec[k] == 64.0f && t < 39.0f*Q){ - rd = INFINITY; - break; - } - if(vec[k] == 64.0f){//FIXME: slow - if(t >= 165140.0f*Q){ // clipped value - di = t - 165140.0f; - curbits += 21; - }else{ - int c = quant(t, IQ); - di = t - c*cbrt(c)*Q; - curbits += av_log2(c)*2 - 4 + 1; - } - }else{ - di = t - vec[k]*Q; - } - if(vec[k] != 0.0f) - curbits++; - rd += di*di*lambda; - } - }else{ - for(k = 0; k < dim; k++){ - float di = in[i+k] - vec[k]*Q; - rd += di*di*lambda; - } - } - rd += curbits; - if(rd < mincost){ - mincost = rd; - minidx = j; - minbits = curbits; - } - } - put_bits(pb, ff_aac_spectral_bits[cb-1][minidx], ff_aac_spectral_codes[cb-1][minidx]); - if(IS_CODEBOOK_UNSIGNED(cb)) - for(j = 0; j < dim; j++) - if(ff_aac_codebook_vectors[cb-1][minidx*dim+j] != 0.0f) - put_bits(pb, 1, in[i+j] < 0.0f); - if(cb == ESC_BT){ - for(j = 0; j < 2; j++){ - if(ff_aac_codebook_vectors[cb-1][minidx*2+j] == 64.0f){ - int coef = quant(in[i+j], IQ); - int len = av_log2(coef); - - put_bits(pb, len - 4 + 1, (1 << (len - 4 + 1)) - 2); - put_bits(pb, len, coef & ((1 << len) - 1)); - } - } - } - } -} - -#endif - -/** - * structure used in optimal codebook search - */ -typedef struct BandCodingPath { - int prev_idx; ///< pointer to the previous path point - int codebook; ///< codebook for coding band run - float cost; ///< path cost - int run; -} BandCodingPath; - -/** - * Encode band info for single window group bands. - */ -static void encode_window_bands_info(AACEncContext *s, SingleChannelElement *sce, - int win, int group_len) -{ - BandCodingPath path[120][12]; - int w, swb, cb, start, start2, size; - int i, j; - const int max_sfb = sce->ics.max_sfb; - const int run_bits = sce->ics.num_windows == 1 ? 5 : 3; - const int run_esc = (1 << run_bits) - 1; - int idx, ppos, count; - int stackrun[120], stackcb[120], stack_len; - - start = win*128; - for(cb = 0; cb < 12; cb++){ - path[0][cb].cost = 0.0f; - path[0][cb].prev_idx = -1; - path[0][cb].run = 0; - } - for(swb = 0; swb < max_sfb; swb++){ - start2 = start; - size = sce->ics.swb_sizes[swb]; - if(sce->zeroes[win*16 + swb]){ - for(cb = 0; cb < 12; cb++){ - path[swb+1][cb].prev_idx = cb; - path[swb+1][cb].cost = path[swb][cb].cost; - path[swb+1][cb].run = path[swb][cb].run + 1; - } - }else{ - float minrd = INFINITY; - int mincb = 0; - for(cb = 0; cb < 12; cb++){ - float rd = 0.0f; - for(w = 0; w < group_len; w++){ - FFPsyBand *band = &s->psy.psy_bands[s->cur_channel*PSY_MAX_BANDS+(win+w)*16+swb]; - rd += quantize_band_cost(sce->coeffs + start + w*128, size, - sce->sf_idx[(win+w)*16+swb], cb, - s->lambda / band->threshold, INFINITY, NULL); - } - if( run_value_bits[sce->ics.num_windows == 8][path[swb][cb].run] - != run_value_bits[sce->ics.num_windows == 8][path[swb][cb].run+1]) - rd += run_bits; - path[swb+1][cb].prev_idx = cb; - path[swb+1][cb].cost = path[swb][cb].cost + rd; - path[swb+1][cb].run = path[swb][cb].run + 1; - if(rd < minrd){ - minrd = rd; - mincb = cb; - } - } - for(cb = 0; cb < 12; cb++){ - float cost = path[swb][cb].cost + minrd + run_bits + 4; - if(cost < path[swb+1][cb].cost){ - path[swb+1][cb].prev_idx = mincb; - path[swb+1][cb].cost = cost; - path[swb+1][cb].run = 1; - } - } - } - start += sce->ics.swb_sizes[swb]; - } - - //convert resulting path from backward-linked list - stack_len = 0; - idx = 0; - for(cb = 1; cb < 12; cb++){ - if(path[max_sfb][cb].cost < path[max_sfb][idx].cost) - idx = cb; - } - ppos = max_sfb; - while(ppos > 0){ - cb = idx; - stackrun[stack_len] = path[ppos][cb].run; - stackcb [stack_len] = cb; - idx = path[ppos][cb].prev_idx; - ppos -= path[ppos][cb].run; - stack_len++; - } - //perform actual band info encoding - start = 0; - for(i = stack_len - 1; i >= 0; i--){ - put_bits(&s->pb, 4, stackcb[i]); - count = stackrun[i]; - memset(sce->zeroes + win*16 + start, !stackcb[i], count); - //XXX: memset when band_type is also uint8_t - for(j = 0; j < count; j++){ - sce->band_type[win*16 + start] = stackcb[i]; - start++; - } - while(count >= run_esc){ - put_bits(&s->pb, run_bits, run_esc); - count -= run_esc; - } - put_bits(&s->pb, run_bits, count); - } -} - -/** * Produce integer coefficients from scalefactors provided by the model. */ static void adjust_frame_information(AACEncContext *apc, ChannelElement *cpe, int chans) @@ -903,546 +354,6 @@ static void adjust_frame_information(AAC } } -typedef struct TrellisPath { - float cost; - int prev; - int min_val; - int max_val; -} TrellisPath; - -static void search_for_quantizers_anmr(AACEncContext *s, SingleChannelElement *sce, const float lambda) -{ - int q, w, w2, g, start = 0; - int i; - int idx; - TrellisPath paths[256*121]; - int bandaddr[121]; - int minq; - float mincost; - - for(i = 0; i < 256; i++){ - paths[i].cost = 0.0f; - paths[i].prev = -1; - paths[i].min_val = i; - paths[i].max_val = i; - } - for(i = 256; i < 256*121; i++){ - paths[i].cost = INFINITY; - paths[i].prev = -2; - paths[i].min_val = INT_MAX; - paths[i].max_val = 0; - } - idx = 256; - for(w = 0; w < sce->ics.num_windows; w += sce->ics.group_len[w]){ - start = w*128; - for(g = 0; g < sce->ics.num_swb; g++){ - const float *coefs = sce->coeffs + start; - float qmin, qmax; - int nz = 0; - - bandaddr[idx >> 8] = w*16+g; - qmin = INT_MAX; - qmax = 0.0f; - for(w2 = 0; w2 < sce->ics.group_len[w]; w2++){ - FFPsyBand *band = &s->psy.psy_bands[s->cur_channel*PSY_MAX_BANDS+(w+w2)*16+g]; - if(band->energy <= band->threshold || band->threshold == 0.0f){ - sce->zeroes[(w+w2)*16+g] = 1; - continue; - } - sce->zeroes[(w+w2)*16+g] = 0; - nz = 1; - for(i = 0; i < sce->ics.swb_sizes[g]; i++){ - float t = fabsf(coefs[w2*128+i]); - if(t > 0.0f) qmin = fminf(qmin, t); - qmax = fmaxf(qmax, t); - } - } - if(nz){ - int minscale, maxscale; - float minrd = INFINITY; - //minimum scalefactor index is when minimum nonzero coefficient after quantizing is not clipped - minscale = av_clip_uint8(log2(qmin)*4 - 69 + SCALE_ONE_POS - SCALE_DIV_512); - //maximum scalefactor index is when maximum coefficient after quantizing is still not zero - maxscale = av_clip_uint8(log2(qmax)*4 + 6 + SCALE_ONE_POS - SCALE_DIV_512); - for(q = minscale; q < maxscale; q++){ - float dists[12], dist; - memset(dists, 0, sizeof(dists)); - for(w2 = 0; w2 < sce->ics.group_len[w]; w2++){ - FFPsyBand *band = &s->psy.psy_bands[s->cur_channel*PSY_MAX_BANDS+(w+w2)*16+g]; - int cb; - for(cb = 0; cb <= ESC_BT; cb++){ - dists[cb] += quantize_band_cost(coefs + w2*128, sce->ics.swb_sizes[g], - q, cb, s->lambda / band->threshold, INFINITY, NULL); - } - } - dist = dists[0]; - for(i = 1; i <= ESC_BT; i++) - dist = fminf(dist, dists[i]); - minrd = fminf(minrd, dist); - - for(i = FFMAX(q - SCALE_MAX_DIFF, 0); i < FFMIN(q + SCALE_MAX_DIFF, 256); i++){ - float cost; - int minv, maxv; - if(isinf(paths[idx - 256 + i].cost)) - continue; - cost = paths[idx - 256 + i].cost + dist - + ff_aac_scalefactor_bits[q - i + SCALE_DIFF_ZERO]; - minv = FFMIN(paths[idx - 256 + i].min_val, q); - maxv = FFMAX(paths[idx - 256 + i].max_val, q); - if(cost < paths[idx + q].cost && maxv-minv < SCALE_MAX_DIFF){ - paths[idx + q].cost = cost; - paths[idx + q].prev = idx - 256 + i; - paths[idx + q].min_val = minv; - paths[idx + q].max_val = maxv; - } - } - } - }else{ - for(q = 0; q < 256; q++){ - if(!isinf(paths[idx - 256 + q].cost)){ - paths[idx + q].cost = paths[idx - 256 + q].cost + 1; - paths[idx + q].prev = idx - 256 + q; - paths[idx + q].min_val = FFMIN(paths[idx - 256 + q].min_val, q); - paths[idx + q].max_val = FFMAX(paths[idx - 256 + q].max_val, q); - continue; - } - for(i = FFMAX(q - SCALE_MAX_DIFF, 0); i < FFMIN(q + SCALE_MAX_DIFF, 256); i++){ - float cost; - int minv, maxv; - if(isinf(paths[idx - 256 + i].cost)) - continue; - cost = paths[idx - 256 + i].cost + ff_aac_scalefactor_bits[q - i + SCALE_DIFF_ZERO]; - minv = FFMIN(paths[idx - 256 + i].min_val, q); - maxv = FFMAX(paths[idx - 256 + i].max_val, q); - if(cost < paths[idx + q].cost && maxv-minv < SCALE_MAX_DIFF){ - paths[idx + q].cost = cost; - paths[idx + q].prev = idx - 256 + i; - paths[idx + q].min_val = minv; - paths[idx + q].max_val = maxv; - } - } - } - } - sce->zeroes[w*16+g] = !nz; - start += sce->ics.swb_sizes[g]; - idx += 256; - } - } - idx -= 256; - mincost = paths[idx].cost; - minq = idx; - for(i = 1; i < 256; i++){ - if(paths[idx + i].cost < mincost){ - mincost = paths[idx + i].cost; - minq = idx + i; - } - } - while(minq >= 256){ - sce->sf_idx[bandaddr[minq>>8]] = minq & 0xFF; - minq = paths[minq].prev; - } - //set the same quantizers inside window groups - for(w = 0; w < sce->ics.num_windows; w += sce->ics.group_len[w]) - for(g = 0; g < sce->ics.num_swb; g++) - for(w2 = 1; w2 < sce->ics.group_len[w]; w2++) - sce->sf_idx[(w+w2)*16+g] = sce->sf_idx[w*16+g]; -} - -/** - * two-loop quantizers search taken from ISO 13818-7 Appendix C - */ -static void search_for_quantizers_twoloop(AVCodecContext *avctx, AACEncContext *s, - SingleChannelElement *sce, const float lambda) -{ - int start = 0, i, w, w2, g; - int destbits = avctx->bit_rate * 1024.0 / avctx->sample_rate / avctx->channels; - float dists[128], uplims[128]; - int fflag, minscaler; - int its = 0; - int allz = 0; - float minthr = INFINITY; - - //XXX: some heuristic to determine initial quantizers will reduce search time - memset(dists, 0, sizeof(dists)); - //determine zero bands and upper limits - for(w = 0; w < sce->ics.num_windows; w += sce->ics.group_len[w]){ - for(g = 0; g < sce->ics.num_swb; g++){ - int nz = 0; - float uplim = 0.0f; - for(w2 = 0; w2 < sce->ics.group_len[w]; w2++){ - FFPsyBand *band = &s->psy.psy_bands[s->cur_channel*PSY_MAX_BANDS+(w+w2)*16+g]; - uplim += band->threshold; - if(band->energy <= band->threshold || band->threshold == 0.0f){ - sce->zeroes[(w+w2)*16+g] = 1; - continue; - } - nz = 1; - } - uplims[w*16+g] = uplim *512; - sce->zeroes[w*16+g] = !nz; - if(nz) - minthr = fminf(minthr, uplim); - allz = FFMAX(allz, nz); - } - } - for(w = 0; w < sce->ics.num_windows; w += sce->ics.group_len[w]){ - for(g = 0; g < sce->ics.num_swb; g++){ - if(sce->zeroes[w*16+g]){ - sce->sf_idx[w*16+g] = SCALE_ONE_POS; - continue; - } - sce->sf_idx[w*16+g] = SCALE_ONE_POS + fminf(log2(uplims[w*16+g]/minthr)*4,59); - } - } - - if(!allz) - return; - //perform two-loop search - //outer loop - improve quality - do{ - int tbits, qstep; - minscaler = sce->sf_idx[0]; - //inner loop - quantize spectrum to fit into given number of bits - qstep = its ? 1 : 32; - do{ - int prev = -1; - tbits = 0; - fflag = 0; - for(w = 0; w < sce->ics.num_windows; w += sce->ics.group_len[w]){ - start = w*128; - for(g = 0; g < sce->ics.num_swb; g++){ - const float *coefs = sce->coeffs + start; - int bits = 0; - int cb; - float mindist = INFINITY; - int minbits = 0; - - if(sce->zeroes[w*16+g] || sce->sf_idx[w*16+g] >= 218) - continue; - minscaler = FFMIN(minscaler, sce->sf_idx[w*16+g]); - for(cb = 0; cb <= ESC_BT; cb++){ - float dist = 0.0f; - int bb = 0; - for(w2 = 0; w2 < sce->ics.group_len[w]; w2++){ - int b; - dist += quantize_band_cost(coefs + w2*128, - sce->ics.swb_sizes[g], - sce->sf_idx[w*16+g], - ESC_BT, - 1.0, - INFINITY, - &b); - bb += b; - } - if(dist < mindist){ - mindist = dist; - minbits = bb; - } - } - dists[w*16+g] = mindist - minbits; - bits = minbits; - if(prev != -1){ - bits += ff_aac_scalefactor_bits[sce->sf_idx[w*16+g] - prev + SCALE_DIFF_ZERO]; - } - tbits += bits; - start += sce->ics.swb_sizes[g]; - prev = sce->sf_idx[w*16+g]; - } - } - if(tbits > destbits){ - for(i = 0; i < 128; i++){ - if(sce->sf_idx[i] < 218 - qstep){ - sce->sf_idx[i] += qstep; - } - } - }else{ - for(i = 0; i < 128; i++){ - if(sce->sf_idx[i] > 60 - qstep){ - sce->sf_idx[i] -= qstep; - } - } - } - qstep >>= 1; - if(!qstep && tbits > destbits*1.02) - qstep = 1; - if(sce->sf_idx[0] >= 217)break; - }while(qstep); - - fflag = 0; - minscaler = av_clip(minscaler, 60, 255 - SCALE_MAX_DIFF); - for(w = 0; w < sce->ics.num_windows; w += sce->ics.group_len[w]){ - start = w*128; - for(g = 0; g < sce->ics.num_swb; g++){ - int prevsc = sce->sf_idx[w*16+g]; - if(dists[w*16+g] > uplims[w*16+g] && sce->sf_idx[w*16+g] > 60) - sce->sf_idx[w*16+g]--; - sce->sf_idx[w*16+g] = av_clip(sce->sf_idx[w*16+g], minscaler, minscaler + SCALE_MAX_DIFF); - sce->sf_idx[w*16+g] = FFMIN(sce->sf_idx[w*16+g], 219); - if(sce->sf_idx[w*16+g] != prevsc) - fflag = 1; - } - } - its++; - }while(fflag && its < 10); -} - -static void search_for_quantizers_faac(AACEncContext *s, SingleChannelElement *sce, const float lambda) -{ - int start = 0, i, w, w2, g; - float uplim[128], maxq[128]; - int minq; -#if 0 - float distfact = ((sce->ics.num_windows > 1) ? 85.80 : 147.84) / lambda; - int last = 0, lastband = 0, curband = 0; - float avg_energy = 0.0; - if(sce->ics.num_windows == 1){ - start = 0; - for(i = 0; i < 1024; i++){ - if(i - start >= sce->ics.swb_sizes[curband]){ - start += sce->ics.swb_sizes[curband]; - curband++; - } - if(sce->coeffs[i]){ - avg_energy += sce->coeffs[i] * sce->coeffs[i]; - last = i; - lastband = curband; - } - } - }else{ - for(w = 0; w < 8; w++){ - const float *coeffs = sce->coeffs + w*128; - start = 0; - for(i = 0; i < 128; i++){ - if(i - start >= sce->ics.swb_sizes[curband]){ - start += sce->ics.swb_sizes[curband]; - curband++; - } - if(coeffs[i]){ - avg_energy += coeffs[i] * coeffs[i]; - last = FFMAX(last, i); - lastband = FFMAX(lastband, curband); - } - } - } - } - last++; - avg_energy /= last; - for(w = 0; w < sce->ics.num_windows; w += sce->ics.group_len[w]){ - start = w*128; - for(g = 0; g < sce->ics.num_swb; g++){ - float *coefs = sce->coeffs + start; - const int size = sce->ics.swb_sizes[g]; - int start2 = start, end2 = start + size, peakpos = start; - float maxval = -1, thr = 0.0f, t; - maxq[w*16+g] = 0.0f; - if(g > lastband){ - maxq[w*16+g] = 0.0f; - start += size; - for(w2 = 0; w2 < sce->ics.group_len[w]; w2++) - memset(coefs + w2*128, 0, sizeof(coefs[0])*size); - continue; - } - for(w2 = 0; w2 < sce->ics.group_len[w]; w2++){ - for(i = 0; i < size; i++){ - float t = coefs[w2*128+i]*coefs[w2*128+i]; - maxq[w*16+g] = fmaxf(maxq[w*16+g], coefs[w2*128 + i]); - thr += t; - if(sce->ics.num_windows == 1 && maxval < t){ - maxval = t; - peakpos = start+i; - } - } - } - if(sce->ics.num_windows == 1){ - start2 = FFMAX(peakpos - 2, start2); - end2 = FFMIN(peakpos + 3, end2); - } - start += size; - thr = pow(thr / (avg_energy * (end2 - start2)), 0.3 + 0.1*(lastband - g) / lastband); - t = 1.0 - (1.0 * start2 / last); - uplim[w*16+g] = distfact / (1.4 * thr + t*t*t + 0.075); - } - } -#else - memset(maxq, 0, sizeof(maxq)); - for(w = 0; w < sce->ics.num_windows; w += sce->ics.group_len[w]){ - start = w*128; - for(g = 0; g < sce->ics.num_swb; g++){ - float *coefs = sce->coeffs + start; - const int size = sce->ics.swb_sizes[g]; - float thr = 0.0f; - for(w2 = 0; w2 < sce->ics.group_len[w]; w2++){ - FFPsyBand *band = &s->psy.psy_bands[s->cur_channel*PSY_MAX_BANDS+(w+w2)*16+g]; - thr += band->threshold; - for(i = 0; i < size; i++){ - maxq[w*16+g] = fmaxf(maxq[w*16+g], fabsf(coefs[w2*128 + i])); - } - } - uplim[w*16+g] = thr / lambda; - start += size; - } - } -#endif - memset(sce->sf_idx, 0, sizeof(sce->sf_idx)); - for(w = 0; w < sce->ics.num_windows; w += sce->ics.group_len[w]){ - start = w*128; - for(g = 0; g < sce->ics.num_swb; g++){ - const float *coefs = sce->coeffs + start; - const int size = sce->ics.swb_sizes[g]; - int scf, prev_scf, step; - if(maxq[w*16+g] < 21.544){ - sce->zeroes[w*16+g] = 1; - continue; - } - sce->zeroes[w*16+g] = 0; - scf = prev_scf = av_clip(SCALE_ONE_POS + log2(1/maxq[w*16+g])*16/3, 60, 218); - step = 16; - for(;;){ - float dist = 0.0f, t; - int quant_max; - - for(w2 = 0; w2 < sce->ics.group_len[w]; w2++){ - int b; - dist += quantize_band_cost(coefs + w2*128, - sce->ics.swb_sizes[g], - scf, - ESC_BT, - 1.0, - INFINITY, - &b); - dist -= b; - } - quant_max = quant(maxq[w*16+g], ff_aac_pow2sf_tab[200 - scf + SCALE_ONE_POS]); - if(quant_max >= 8191){ // too much, return to the previous quantizer - sce->sf_idx[w*16+g] = prev_scf; - break; - } - prev_scf = scf; - t = pow(dist / size, -2.0/3.0); - if(FFABS(step) > 4){ - int newstep = 4*log(t / maxq[w*16+g])/log(2) - 2; - step = av_clip(-newstep, -4, 4); - } - if(FFABS(step) >= 4){ - step = 1 - step; - scf += step; - }else if(t >= uplim[w*16+g]){ - scf -= FFABS(step); - }else{ - sce->sf_idx[w*16+g] = scf; - break; - } - } - start += size; - } - } - minq = sce->sf_idx[0] ? sce->sf_idx[0] : INT_MAX; - for(i = 1; i < 128; i++){ - if(!sce->sf_idx[i]) - sce->sf_idx[i] = sce->sf_idx[i-1]; - else - minq = FFMIN(minq, sce->sf_idx[i]); - } - if(minq == INT_MAX) minq = 0; - for(i = 126; i >= 0; i--){ - if(!sce->sf_idx[i]) - sce->sf_idx[i] = sce->sf_idx[i+1]; - sce->sf_idx[i] = av_clip(sce->sf_idx[i], minq, minq + SCALE_MAX_DIFF); - } -} - -static void search_for_quantizers_fast(AACEncContext *s, SingleChannelElement *sce) -{ - int start = 0, i, w, w2, g; - int minq = 255; - - memset(sce->sf_idx, 0, sizeof(sce->sf_idx)); - for(w = 0; w < sce->ics.num_windows; w += sce->ics.group_len[w]){ - start = w*128; - for(g = 0; g < sce->ics.num_swb; g++){ - for(w2 = 0; w2 < sce->ics.group_len[w]; w2++){ - FFPsyBand *band = &s->psy.psy_bands[s->cur_channel*PSY_MAX_BANDS+(w+w2)*16+g]; - if(band->energy <= band->threshold){ - sce->sf_idx[(w+w2)*16+g] = 218; - sce->zeroes[(w+w2)*16+g] = 1; - }else{ - sce->sf_idx[(w+w2)*16+g] = av_clip(SCALE_ONE_POS - SCALE_DIV_512 + log2(band->threshold), 80, 218); - sce->zeroes[(w+w2)*16+g] = 0; - } - minq = FFMIN(minq, sce->sf_idx[(w+w2)*16+g]); - } - } - } - for(i = 0; i < 128; i++){ - sce->sf_idx[i] = av_clip(sce->sf_idx[i], minq, minq + SCALE_MAX_DIFF - 1); - } - //set the same quantizers inside window groups - for(w = 0; w < sce->ics.num_windows; w += sce->ics.group_len[w]) - for(g = 0; g < sce->ics.num_swb; g++) - for(w2 = 1; w2 < sce->ics.group_len[w]; w2++) - sce->sf_idx[(w+w2)*16+g] = sce->sf_idx[w*16+g]; -} - -static void search_for_quantizers(AVCodecContext *avctx, AACEncContext *s, - SingleChannelElement *sce) -{ - search_for_quantizers_anmr(s, sce, s->lambda); -// search_for_quantizers_twoloop(avctx, s, sce, s->lambda); -// search_for_quantizers_faac(s, sce, av_clipf(s->lambda * 2e8, 50.0f, 300.0f)); -// search_for_quantizers_fast(s, sce); -} - -static void search_for_ms(AACEncContext *s, ChannelElement *cpe, const float lambda) -{ - int start = 0, i, w, w2, g; - float M[128], S[128]; - SingleChannelElement *sce0 = &cpe->ch[0]; - SingleChannelElement *sce1 = &cpe->ch[1]; - if(!cpe->common_window) - return; - for(w = 0; w < sce0->ics.num_windows; w += sce0->ics.group_len[w]){ - for(g = 0; g < sce0->ics.num_swb; g++){ - if(!cpe->ch[0].zeroes[w*16+g] && !cpe->ch[1].zeroes[w*16+g]){ - float dist1 = 0.0f, dist2 = 0.0f; - for(w2 = 0; w2 < sce0->ics.group_len[w]; w2++){ - FFPsyBand *band0 = &s->psy.psy_bands[(s->cur_channel+0)*PSY_MAX_BANDS+(w+w2)*16+g]; - FFPsyBand *band1 = &s->psy.psy_bands[(s->cur_channel+1)*PSY_MAX_BANDS+(w+w2)*16+g]; - float minthr = fminf(band0->threshold, band1->threshold); - float maxthr = fmaxf(band0->threshold, band1->threshold); - for(i = 0; i < sce0->ics.swb_sizes[g]; i++){ - M[i] = (sce0->coeffs[start+w2*128+i] - + sce1->coeffs[start+w2*128+i])*0.5; - S[i] = sce0->coeffs[start+w2*128+i] - - sce1->coeffs[start+w2*128+i]; - } - dist1 += quantize_band_cost(sce0->coeffs + start + w2*128, - sce0->ics.swb_sizes[g], - sce0->sf_idx[(w+w2)*16+g], - sce0->band_type[(w+w2)*16+g], - lambda / band0->threshold, INFINITY, NULL); - dist1 += quantize_band_cost(sce1->coeffs + start + w2*128, - sce1->ics.swb_sizes[g], - sce1->sf_idx[(w+w2)*16+g], - sce1->band_type[(w+w2)*16+g], - lambda / band1->threshold, INFINITY, NULL); - dist2 += quantize_band_cost(M, - sce0->ics.swb_sizes[g], - sce0->sf_idx[(w+w2)*16+g], - sce0->band_type[(w+w2)*16+g], - lambda / maxthr, INFINITY, NULL); - dist2 += quantize_band_cost(S, - sce1->ics.swb_sizes[g], - sce1->sf_idx[(w+w2)*16+g], - sce1->band_type[(w+w2)*16+g], - lambda / minthr, INFINITY, NULL); - } - cpe->ms_mask[w*16+g] = dist2 < dist1; - } - start += sce0->ics.swb_sizes[g]; - } - } -} - /** * Encode scalefactor band coding type. */ @@ -1451,7 +362,7 @@ static void encode_band_info(AACEncConte int w; for(w = 0; w < sce->ics.num_windows; w += sce->ics.group_len[w]){ - encode_window_bands_info(s, sce, w, sce->ics.group_len[w]); + s->coder->encode_window_bands_info(s, sce, w, sce->ics.group_len[w]); } } @@ -1508,7 +419,7 @@ static void encode_spectral_coeffs(AACEn continue; } for(w2 = w; w2 < w + sce->ics.group_len[w]; w2++){ - quantize_and_encode_band(&s->pb, sce->coeffs + start + w2*128, + s->coder->quantize_and_encode_band(&s->pb, sce->coeffs + start + w2*128, sce->ics.swb_sizes[i], sce->sf_idx[w*16 + i], sce->band_type[w*16 + i], @@ -1617,7 +528,7 @@ static int aac_encode_frame(AVCodecConte s->cur_channel = start_ch + j; apply_window_and_mdct(avctx, s, &cpe->ch[j], samples2, j); - search_for_quantizers(avctx, s, &cpe->ch[j]); + s->coder->search_for_quantizers(avctx, s, &cpe->ch[j], s->lambda); } cpe->common_window = 0; if(chans > 1 @@ -1632,7 +543,8 @@ static int aac_encode_frame(AVCodecConte } } } -// search_for_ms(s, cpe, s->lambda); + if(cpe->common_window && s->coder->search_for_ms) + s->coder->search_for_ms(s, cpe, s->lambda); adjust_frame_information(s, cpe, chans); put_bits(&s->pb, 3, tag); put_bits(&s->pb, 4, chan_el_counter[tag]++); Copied and modified: aacenc/aacenc.h (from r4006, aacenc/aacenc.c) ============================================================================== --- aacenc/aacenc.c Mon Jan 26 14:37:36 2009 (r4006, copy source) +++ aacenc/aacenc.h Mon Jan 26 15:07:28 2009 (r4008) @@ -19,138 +19,35 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -/** - * @file aacenc.c - * AAC encoder - */ - -/*********************************** - * TODOs: - * speedup quantizer selection - * add sane pulse detection - * add temporal noise shaping - ***********************************/ +#ifndef AVCODEC_AACENC_H +#define AVCODEC_AACENC_H #include "avcodec.h" #include "bitstream.h" #include "dsputil.h" -#include "mpeg4audio.h" #include "aac.h" -#include "aactab.h" #include "psymodel.h" -static const uint8_t swb_size_1024_96[] = { - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 8, 8, 8, 8, 8, - 12, 12, 12, 12, 12, 16, 16, 24, 28, 36, 44, - 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64 -}; - -static const uint8_t swb_size_1024_64[] = { - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 8, 8, 8, 8, - 12, 12, 12, 16, 16, 16, 20, 24, 24, 28, 36, - 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40 -}; - -static const uint8_t swb_size_1024_48[] = { - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 8, 8, 8, 8, 8, 8, 8, - 12, 12, 12, 12, 16, 16, 20, 20, 24, 24, 28, 28, - 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, - 96 -}; - -static const uint8_t swb_size_1024_32[] = { - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 8, 8, 8, 8, 8, 8, 8, - 12, 12, 12, 12, 16, 16, 20, 20, 24, 24, 28, 28, - 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32 -}; - -static const uint8_t swb_size_1024_24[] = { - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 12, 12, 12, 12, 16, 16, 16, 20, 20, 24, 24, 28, 28, - 32, 36, 36, 40, 44, 48, 52, 52, 64, 64, 64, 64, 64 -}; - -static const uint8_t swb_size_1024_16[] = { - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 12, 12, 12, 12, 12, 12, 12, 12, 12, 16, 16, 16, 16, 20, 20, 20, 24, 24, 28, 28, - 32, 36, 40, 40, 44, 48, 52, 56, 60, 64, 64, 64 -}; - -static const uint8_t swb_size_1024_8[] = { - 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, - 16, 16, 16, 16, 16, 16, 16, 20, 20, 20, 20, 24, 24, 24, 28, 28, - 32, 36, 36, 40, 44, 48, 52, 56, 60, 64, 80 -}; - -static const uint8_t *swb_size_1024[] = { - swb_size_1024_96, swb_size_1024_96, swb_size_1024_64, - swb_size_1024_48, swb_size_1024_48, swb_size_1024_32, - swb_size_1024_24, swb_size_1024_24, swb_size_1024_16, - swb_size_1024_16, swb_size_1024_16, swb_size_1024_8 -}; - -static const uint8_t swb_size_128_96[] = { - 4, 4, 4, 4, 4, 4, 8, 8, 8, 16, 28, 36 -}; - -static const uint8_t swb_size_128_48[] = { - 4, 4, 4, 4, 4, 8, 8, 8, 12, 12, 12, 16, 16, 16 -}; - -static const uint8_t swb_size_128_24[] = { - 4, 4, 4, 4, 4, 4, 4, 8, 8, 8, 12, 12, 16, 16, 20 -}; - -static const uint8_t swb_size_128_16[] = { - 4, 4, 4, 4, 4, 4, 4, 4, 8, 8, 12, 12, 16, 20, 20 -}; - -static const uint8_t swb_size_128_8[] = { - 4, 4, 4, 4, 4, 4, 4, 8, 8, 8, 8, 12, 16, 20, 20 -}; - -static const uint8_t *swb_size_128[] = { - /* the last entry on the following row is swb_size_128_64 but is a - duplicate of swb_size_128_96 */ - swb_size_128_96, swb_size_128_96, swb_size_128_96, - swb_size_128_48, swb_size_128_48, swb_size_128_48, - swb_size_128_24, swb_size_128_24, swb_size_128_16, - swb_size_128_16, swb_size_128_16, swb_size_128_8 -}; - -/** bits needed to code codebook run value for long windows */ -static const uint8_t run_value_bits_long[64] = { - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 10, - 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 15 -}; - -/** bits needed to code codebook run value for short windows */ -static const uint8_t run_value_bits_short[16] = { - 3, 3, 3, 3, 3, 3, 3, 6, 6, 6, 6, 6, 6, 6, 6, 9 -}; +struct AACEncContext; -static const uint8_t* run_value_bits[2] = { - run_value_bits_long, run_value_bits_short -}; +typedef struct AACCoefficientsEncoder{ + void (*search_for_quantizers)(AVCodecContext *avctx, struct AACEncContext *s, + SingleChannelElement *sce, const float lambda); + void (*encode_window_bands_info)(struct AACEncContext *s, SingleChannelElement *sce, + int win, int group_len); + void (*quantize_and_encode_band)(PutBitContext *pb, const float *in, int size, + int scale_idx, int cb, const float lambda); + void (*search_for_ms)(struct AACEncContext *s, ChannelElement *cpe, const float lambda); +}AACCoefficientsEncoder; -/** default channel configurations */ -static const uint8_t aac_chan_configs[6][5] = { - {1, TYPE_SCE}, // 1 channel - single channel element - {1, TYPE_CPE}, // 2 channels - channel pair - {2, TYPE_SCE, TYPE_CPE}, // 3 channels - center + stereo - {3, TYPE_SCE, TYPE_CPE, TYPE_SCE}, // 4 channels - front center + stereo + back center - {3, TYPE_SCE, TYPE_CPE, TYPE_CPE}, // 5 channels - front center + stereo + back stereo - {4, TYPE_SCE, TYPE_CPE, TYPE_CPE, TYPE_LFE}, // 6 channels - front center + stereo + back stereo + LFE -}; +extern AACCoefficientsEncoder ff_aac_coders[]; /** * AAC encoder context */ -typedef struct { +typedef struct AACEncContext { PutBitContext pb; MDCTContext mdct1024; ///< long (1024 samples) frame transform context MDCTContext mdct128; ///< short (128 samples) frame transform context @@ -163,1526 +60,10 @@ typedef struct { ChannelElement *cpe; ///< channel elements FFPsyContext psy; struct FFPsyPreprocessContext* psypp; + AACCoefficientsEncoder *coder; int cur_channel; int last_frame; float lambda; } AACEncContext; -/** - * Make AAC audio config object. - * @see 1.6.2.1 "Syntax - AudioSpecificConfig" - */ -static void put_audio_specific_config(AVCodecContext *avctx) -{ - PutBitContext pb; - AACEncContext *s = avctx->priv_data; - - init_put_bits(&pb, avctx->extradata, avctx->extradata_size*8); - put_bits(&pb, 5, 2); //object type - AAC-LC - put_bits(&pb, 4, s->samplerate_index); //sample rate index - put_bits(&pb, 4, avctx->channels); - //GASpecificConfig - put_bits(&pb, 1, 0); //frame length - 1024 samples - put_bits(&pb, 1, 0); //does not depend on core coder - put_bits(&pb, 1, 0); //is not extension - flush_put_bits(&pb); -} - -static av_cold int aac_encode_init(AVCodecContext *avctx) -{ - AACEncContext *s = avctx->priv_data; - int i; - const uint8_t *sizes[2]; - int lengths[2]; - - avctx->frame_size = 1024; - - for(i = 0; i < 16; i++) - if(avctx->sample_rate == ff_mpeg4audio_sample_rates[i]) - break; - if(i == 16){ - av_log(avctx, AV_LOG_ERROR, "Unsupported sample rate %d\n", avctx->sample_rate); - return -1; - } - if(avctx->channels > 6){ - av_log(avctx, AV_LOG_ERROR, "Unsupported number of channels: %d\n", avctx->channels); - return -1; - } - s->samplerate_index = i; - - dsputil_init(&s->dsp, avctx); - ff_mdct_init(&s->mdct1024, 11, 0); - ff_mdct_init(&s->mdct128, 8, 0); - // window init - ff_kbd_window_init(ff_aac_kbd_long_1024, 4.0, 1024); - ff_kbd_window_init(ff_aac_kbd_short_128, 6.0, 128); - ff_sine_window_init(ff_sine_1024, 1024); - ff_sine_window_init(ff_sine_128, 128); - - s->samples = av_malloc(2 * 1024 * avctx->channels * sizeof(s->samples[0])); - s->cpe = av_mallocz(sizeof(ChannelElement) * aac_chan_configs[avctx->channels-1][0]); - avctx->extradata = av_malloc(2); - avctx->extradata_size = 2; - put_audio_specific_config(avctx); - - sizes[0] = swb_size_1024[i]; - sizes[1] = swb_size_128[i]; - lengths[0] = ff_aac_num_swb_1024[i]; - lengths[1] = ff_aac_num_swb_128[i]; - ff_psy_init(&s->psy, avctx, 2, sizes, lengths); - s->psypp = ff_psy_preprocess_init(avctx); - -#if !CONFIG_HARDCODED_TABLES - for (i = 0; i < 316; i++) - ff_aac_pow2sf_tab[i] = pow(2, (i - 200)/4.); -#endif /* CONFIG_HARDCODED_TABLES */ - - return 0; -} - -static void apply_window_and_mdct(AVCodecContext *avctx, AACEncContext *s, - SingleChannelElement *sce, short *audio, int channel) -{ - int i, j, k; - const float * lwindow = sce->ics.use_kb_window[0] ? ff_aac_kbd_long_1024 : ff_sine_1024; - const float * swindow = sce->ics.use_kb_window[0] ? ff_aac_kbd_short_128 : ff_sine_128; - const float * pwindow = sce->ics.use_kb_window[1] ? ff_aac_kbd_short_128 : ff_sine_128; - - if (sce->ics.window_sequence[0] != EIGHT_SHORT_SEQUENCE) { - memcpy(s->output, sce->saved, sizeof(float)*1024); - if(sce->ics.window_sequence[0] == LONG_STOP_SEQUENCE){ - memset(s->output, 0, sizeof(s->output[0]) * 448); - for(i = 448; i < 576; i++) - s->output[i] = sce->saved[i] * pwindow[i - 448]; - for(i = 576; i < 704; i++) - s->output[i] = sce->saved[i]; - } - if(sce->ics.window_sequence[0] != LONG_START_SEQUENCE){ - j = channel; - for (i = 0; i < 1024; i++, j += avctx->channels){ - s->output[i+1024] = audio[j] * lwindow[1024 - i - 1]; - sce->saved[i] = audio[j] * lwindow[i]; - } - }else{ - j = channel; - for(i = 0; i < 448; i++, j += avctx->channels) - s->output[i+1024] = audio[j]; - for(i = 448; i < 576; i++, j += avctx->channels) - s->output[i+1024] = audio[j] * swindow[576 - i - 1]; - memset(s->output+1024+576, 0, sizeof(s->output[0]) * 448); - j = channel; - for(i = 0; i < 1024; i++, j += avctx->channels) - sce->saved[i] = audio[j]; - } - ff_mdct_calc(&s->mdct1024, sce->coeffs, s->output); - }else{ - j = channel; - for (k = 0; k < 1024; k += 128) { - for(i = 448 + k; i < 448 + k + 256; i++) - s->output[i - 448 - k] = (i < 1024) - ? sce->saved[i] - : audio[channel + (i-1024)*avctx->channels]; - s->dsp.vector_fmul (s->output, k ? swindow : pwindow, 128); - s->dsp.vector_fmul_reverse(s->output+128, s->output+128, swindow, 128); - ff_mdct_calc(&s->mdct128, sce->coeffs + k, s->output); - } - j = channel; - for(i = 0; i < 1024; i++, j += avctx->channels) - sce->saved[i] = audio[j]; - } -} - -/** - * Encode ics_info element. - * @see Table 4.6 (syntax of ics_info) - */ -static void put_ics_info(AACEncContext *s, IndividualChannelStream *info) -{ - int w; - - put_bits(&s->pb, 1, 0); // ics_reserved bit - put_bits(&s->pb, 2, info->window_sequence[0]); - put_bits(&s->pb, 1, info->use_kb_window[0]); - if(info->window_sequence[0] != EIGHT_SHORT_SEQUENCE){ - put_bits(&s->pb, 6, info->max_sfb); - put_bits(&s->pb, 1, 0); // no prediction - }else{ - put_bits(&s->pb, 4, info->max_sfb); - for(w = 1; w < 8; w++){ - put_bits(&s->pb, 1, !info->group_len[w]); - } - } -} - -/** - * Encode MS data. - * @see 4.6.8.1 "Joint Coding - M/S Stereo" - */ -static void encode_ms_info(PutBitContext *pb, ChannelElement *cpe) -{ - int i, w; - - put_bits(pb, 2, cpe->ms_mode); - if(cpe->ms_mode == 1){ - for(w = 0; w < cpe->ch[0].ics.num_windows; w += cpe->ch[0].ics.group_len[w]){ - for(i = 0; i < cpe->ch[0].ics.max_sfb; i++) - put_bits(pb, 1, cpe->ms_mask[w*16 + i]); - } - } -} - -/** - * Quantize one coefficient. - * @return absolute value of the quantized coefficient - * @see 3GPP TS26.403 5.6.2 "Scalefactor determination" - */ -static av_always_inline int quant(float coef, const float Q) -{ - return av_clip((int)(pow(fabsf(coef) * Q, 0.75) + 0.4054), 0, 8191); -} - -#if 1 - -static av_always_inline int quant2(float coef, const float Q) -{ - return av_clip((int)(pow(fabsf(coef) * Q, 0.75)), 0, 8191); -} - -static const float aac_cb_range[12] = { 0, 3, 3, 3, 3, 9, 9, 8, 8, 13, 13, 17}; -static const float aac_cb_maxval[12] = {0, 1, 1, 2, 2, 4, 4, 7, 7, 12, 12, 16}; - -/** - * Calculate rate distortion cost for quantizing with given codebook - * - * @return quantization distortion - */ -static float quantize_band_cost(const float *in, int size, int scale_idx, int cb, - const float lambda, const float uplim, int *bits) -{ - const float IQ = ff_aac_pow2sf_tab[200 + scale_idx - SCALE_ONE_POS + SCALE_DIV_512]; - const float Q = ff_aac_pow2sf_tab[200 - scale_idx + SCALE_ONE_POS - SCALE_DIV_512]; - int i, j, k; - float cost = 0; - const int dim = cb < FIRST_PAIR_BT ? 4 : 2; - int resbits = 0; - const int range = aac_cb_range[cb]; - const int maxval = aac_cb_maxval[cb]; - int offs[4]; - - if(!cb){ - for(i = 0; i < size; i++) - cost += in[i]*in[i]*lambda; - return cost; - } - offs[0] = 1; - for(i = 1; i < dim; i++) - offs[i] = offs[i-1]*range; - for(i = 0; i < size; i += dim){ - float mincost; - int minidx = 0; - int minbits = 0; - int quants[4][2], realquants[4][2]; - mincost = 0.0f; - for(j = 0; j < dim; j++){ - realquants[j][0] = quant2(in[i+j], Q); - realquants[j][1] = quant (in[i+j], Q); - for(k = 0; k < 2; k++){ - quants[j][k] = FFMIN(realquants[j][k], maxval); - if(!IS_CODEBOOK_UNSIGNED(cb) && in[i+j] < 0.0f) - quants[j][k] = -quants[j][k]; - } - mincost += in[i+j]*in[i+j]*lambda; - } - minidx = IS_CODEBOOK_UNSIGNED(cb) ? 0 : 40; - minbits = ff_aac_spectral_bits[cb-1][minidx]; - mincost += minbits; - for(j = 0; j < (1<<dim); j++){ - float rd = 0.0f; - int curbits; - int curidx = IS_CODEBOOK_UNSIGNED(cb) ? 0 : 40; - const float *vec; - int same = 0; - for(k = 0; k < dim; k++){ - if((j & (1 << k)) && quants[k][0] == quants[k][1]){ - same = 1; - break; - } - } - if(same) - continue; - for(k = 0; k < dim; k++) - curidx += quants[k][!!(j & (1 << k))] * offs[dim - 1 - k]; - curbits = ff_aac_spectral_bits[cb-1][curidx]; - vec = &ff_aac_codebook_vectors[cb-1][curidx*dim]; - if(IS_CODEBOOK_UNSIGNED(cb)){ - for(k = 0; k < dim; k++){ - float t = fabsf(in[i+k]); - float di; - //do not code with escape sequence small values - if(vec[k] == 64.0f && t < 39.0f*IQ){ - rd = INFINITY; - break; - } - if(vec[k] == 64.0f){//FIXME: slow - if(t >= 165140.0f*IQ){ // clipped value - di = t - 165140.0f; - curbits += 21; - }else{ - int c = realquants[k]; - di = t - c*cbrt(c)*IQ; - curbits += av_log2(c)*2 - 4 + 1; - } - }else{ - di = t - vec[k]*IQ; - } - if(vec[k] != 0.0f) - curbits++; - rd += di*di*lambda; - } - }else{ - for(k = 0; k < dim; k++){ - float di = in[i+k] - vec[k]*IQ; - rd += di*di*lambda; - } - } - rd += curbits; - if(rd < mincost){ - mincost = rd; - minidx = j; - minbits = curbits; - } - } - cost += mincost; - resbits += minbits; - if(cost >= uplim) - return uplim; - } - - if(bits) - *bits = resbits; - return cost; -} - -static void quantize_and_encode_band(PutBitContext *pb, const float *in, int size, - int scale_idx, int cb, const float lambda) -{ - const float IQ = ff_aac_pow2sf_tab[200 + scale_idx - SCALE_ONE_POS + SCALE_DIV_512]; - const float Q = ff_aac_pow2sf_tab[200 - scale_idx + SCALE_ONE_POS - SCALE_DIV_512]; - const int range = aac_cb_range[cb]; - const int maxval = aac_cb_maxval[cb]; - const int dim = (cb < FIRST_PAIR_BT) ? 4 : 2; - int i, j, k; - int offs[4]; - - if(!cb) - return; - - offs[0] = 1; - for(i = 1; i < dim; i++) - offs[i] = offs[i-1]*range; - for(i = 0; i < size; i += dim){ - float mincost; - int minidx = 0; - int minbits = 0; - int quants[4][2]; - mincost = 0.0f; - for(j = 0; j < dim; j++){ - quants[j][0] = av_clip(quant2(in[i+j], Q), -maxval, maxval); - quants[j][1] = av_clip(quant (in[i+j], Q), -maxval, maxval); - for(k = 0; k < 2; k++){ - quants[j][k] = FFMIN(quants[j][k], maxval); - if(!IS_CODEBOOK_UNSIGNED(cb) && in[i+j] < 0.0f) - quants[j][k] = -quants[j][k]; - } - mincost += in[i+j]*in[i+j]*lambda; - } - minidx = IS_CODEBOOK_UNSIGNED(cb) ? 0 : 40; - minbits = ff_aac_spectral_bits[cb-1][minidx]; - mincost += minbits; - for(j = 0; j < (1<<dim); j++){ - float rd = 0.0f; - int curbits; - int curidx = IS_CODEBOOK_UNSIGNED(cb) ? 0 : 40; - const float *vec; - int same = 0; - for(k = 0; k < dim; k++){ - if((j & (1 << k)) && quants[k][0] == quants[k][1]){ - same = 1; - break; - } - } - if(same) - continue; - for(k = 0; k < dim; k++) - curidx += quants[k][!!(j & (1 << k))] * offs[dim - 1 - k]; - curbits = ff_aac_spectral_bits[cb-1][curidx]; - vec = &ff_aac_codebook_vectors[cb-1][curidx*dim]; - if(IS_CODEBOOK_UNSIGNED(cb)){ - for(k = 0; k < dim; k++){ - float t = fabsf(in[i+k]); - float di; - //do not code with escape sequence small values - if(vec[k] == 64.0f && t < 39.0f*IQ){ - rd = INFINITY; - break; - } - if(vec[k] == 64.0f){//FIXME: slow - if(t >= 165140.0f*IQ){ // clipped value - di = t - 165140.0f; - curbits += 21; - }else{ - int c = quant(t, Q); - di = t - c*cbrt(c)*IQ; - curbits += av_log2(c)*2 - 4 + 1; - } - }else{ - di = t - vec[k]*IQ; - } - if(vec[k] != 0.0f) - curbits++; - rd += di*di*lambda; - } - }else{ - for(k = 0; k < dim; k++){ - float di = in[i+k] - vec[k]*IQ; - rd += di*di*lambda; - } - } - rd += curbits; - if(rd < mincost){ - mincost = rd; - minidx = curidx; - minbits = curbits; - } - } - put_bits(pb, ff_aac_spectral_bits[cb-1][minidx], ff_aac_spectral_codes[cb-1][minidx]); - if(IS_CODEBOOK_UNSIGNED(cb)) - for(j = 0; j < dim; j++) - if(ff_aac_codebook_vectors[cb-1][minidx*dim+j] != 0.0f) - put_bits(pb, 1, in[i+j] < 0.0f); - if(cb == ESC_BT){ - for(j = 0; j < 2; j++){ - if(ff_aac_codebook_vectors[cb-1][minidx*2+j] == 64.0f){ - int coef = quant(in[i+j], Q); - int len = av_log2(coef); - - put_bits(pb, len - 4 + 1, (1 << (len - 4 + 1)) - 2); - put_bits(pb, len, coef & ((1 << len) - 1)); - } - } - } - } -} - -#else - -/** - * Calculate rate distortion cost for quantizing with given codebook - * - * @return quantization distortion - */ -static float quantize_band_cost(const float *in, int size, int scale_idx, int cb, - const float lambda, const float uplim, int *bits) -{ - const float Q = ff_aac_pow2sf_tab[200 + scale_idx - SCALE_ONE_POS + SCALE_DIV_512]; - int i, j, k; - float cost = 0; - const int dim = cb < FIRST_PAIR_BT ? 4 : 2; - int resbits = 0; - - if(!cb){ - for(i = 0; i < size; i++) - cost += in[i]*in[i]*lambda; - return cost; - } - for(i = 0; i < size; i += dim){ - float mincost = INFINITY; - int minidx = 0; - int minbits = 0; - const float *vec = ff_aac_codebook_vectors[cb-1]; - for(j = 0; j < ff_aac_spectral_sizes[cb-1]; j++, vec += dim){ - float rd = 0.0f; - int curbits = ff_aac_spectral_bits[cb-1][j]; - if(IS_CODEBOOK_UNSIGNED(cb)){ - for(k = 0; k < dim; k++){ - float t = fabsf(in[i+k]); - float di; - //do not code with escape sequence small values - if(vec[k] == 64.0f && t < 39.0f*Q){ - rd = INFINITY; - break; - } - if(vec[k] == 64.0f){//FIXME: slow - if(t >= 165140.0f*Q){ // clipped value - di = t - 165140.0f; - curbits += 21; - }else{ - int c = quant(t, 1.0/Q); - di = t - c*cbrt(c)*Q; - curbits += av_log2(c)*2 - 4 + 1; - } - }else{ - di = t - vec[k]*Q; - } - if(vec[k] != 0.0f) - curbits++; - rd += di*di*lambda; - } - }else{ - for(k = 0; k < dim; k++){ - float di = in[i+k] - vec[k]*Q; - rd += di*di*lambda; - } - } - rd += curbits; - if(rd < mincost){ - mincost = rd; - minidx = j; - minbits = curbits; - } - } - cost += mincost; - resbits += minbits; - if(cost >= uplim) - return uplim; - } - - if(bits) - *bits = resbits; - return cost; -} - -/** - * Prepare coefficients for encoding. - * - * @return sum of coefficient absolute values - */ -static void quantize_and_encode_band(PutBitContext *pb, const float *in, int size, - int scale_idx, int cb, const float lambda) -{ - const float Q = ff_aac_pow2sf_tab[200 + scale_idx - SCALE_ONE_POS + SCALE_DIV_512]; - const float IQ = ff_aac_pow2sf_tab[200 - scale_idx + SCALE_ONE_POS - SCALE_DIV_512]; - int i, j, k; - const int dim = cb < FIRST_PAIR_BT ? 4 : 2; - - if(!cb) - return; - - for(i = 0; i < size; i += dim){ - float mincost = INFINITY; - int minidx = 0; - int minbits = 0; - const float *vec = ff_aac_codebook_vectors[cb-1]; - for(j = 0; j < ff_aac_spectral_sizes[cb-1]; j++, vec += dim){ - float rd = 0.0f; - int curbits = ff_aac_spectral_bits[cb-1][j]; - if(IS_CODEBOOK_UNSIGNED(cb)){ - for(k = 0; k < dim; k++){ - float t = fabsf(in[i+k]); - float di; - //do not code with escape sequence small values - if(vec[k] == 64.0f && t < 39.0f*Q){ - rd = INFINITY; - break; - } - if(vec[k] == 64.0f){//FIXME: slow - if(t >= 165140.0f*Q){ // clipped value - di = t - 165140.0f; - curbits += 21; - }else{ - int c = quant(t, IQ); - di = t - c*cbrt(c)*Q; - curbits += av_log2(c)*2 - 4 + 1; - } - }else{ - di = t - vec[k]*Q; - } - if(vec[k] != 0.0f) - curbits++; - rd += di*di*lambda; - } - }else{ - for(k = 0; k < dim; k++){ - float di = in[i+k] - vec[k]*Q; - rd += di*di*lambda; - } - } - rd += curbits; - if(rd < mincost){ - mincost = rd; - minidx = j; - minbits = curbits; - } - } - put_bits(pb, ff_aac_spectral_bits[cb-1][minidx], ff_aac_spectral_codes[cb-1][minidx]); - if(IS_CODEBOOK_UNSIGNED(cb)) - for(j = 0; j < dim; j++) - if(ff_aac_codebook_vectors[cb-1][minidx*dim+j] != 0.0f) - put_bits(pb, 1, in[i+j] < 0.0f); - if(cb == ESC_BT){ - for(j = 0; j < 2; j++){ - if(ff_aac_codebook_vectors[cb-1][minidx*2+j] == 64.0f){ - int coef = quant(in[i+j], IQ); - int len = av_log2(coef); - - put_bits(pb, len - 4 + 1, (1 << (len - 4 + 1)) - 2); - put_bits(pb, len, coef & ((1 << len) - 1)); - } - } - } - } -} - -#endif - -/** - * structure used in optimal codebook search - */ -typedef struct BandCodingPath { - int prev_idx; ///< pointer to the previous path point - int codebook; ///< codebook for coding band run - float cost; ///< path cost - int run; -} BandCodingPath; - -/** - * Encode band info for single window group bands. - */ -static void encode_window_bands_info(AACEncContext *s, SingleChannelElement *sce, - int win, int group_len) -{ - BandCodingPath path[120][12]; - int w, swb, cb, start, start2, size; - int i, j; - const int max_sfb = sce->ics.max_sfb; - const int run_bits = sce->ics.num_windows == 1 ? 5 : 3; - const int run_esc = (1 << run_bits) - 1; - int idx, ppos, count; - int stackrun[120], stackcb[120], stack_len; - - start = win*128; - for(cb = 0; cb < 12; cb++){ - path[0][cb].cost = 0.0f; - path[0][cb].prev_idx = -1; - path[0][cb].run = 0; - } - for(swb = 0; swb < max_sfb; swb++){ - start2 = start; - size = sce->ics.swb_sizes[swb]; - if(sce->zeroes[win*16 + swb]){ - for(cb = 0; cb < 12; cb++){ - path[swb+1][cb].prev_idx = cb; - path[swb+1][cb].cost = path[swb][cb].cost; - path[swb+1][cb].run = path[swb][cb].run + 1; - } - }else{ - float minrd = INFINITY; - int mincb = 0; - for(cb = 0; cb < 12; cb++){ - float rd = 0.0f; - for(w = 0; w < group_len; w++){ - FFPsyBand *band = &s->psy.psy_bands[s->cur_channel*PSY_MAX_BANDS+(win+w)*16+swb]; - rd += quantize_band_cost(sce->coeffs + start + w*128, size, - sce->sf_idx[(win+w)*16+swb], cb, - s->lambda / band->threshold, INFINITY, NULL); - } - if( run_value_bits[sce->ics.num_windows == 8][path[swb][cb].run] - != run_value_bits[sce->ics.num_windows == 8][path[swb][cb].run+1]) - rd += run_bits; - path[swb+1][cb].prev_idx = cb; - path[swb+1][cb].cost = path[swb][cb].cost + rd; - path[swb+1][cb].run = path[swb][cb].run + 1; - if(rd < minrd){ - minrd = rd; - mincb = cb; - } - } - for(cb = 0; cb < 12; cb++){ - float cost = path[swb][cb].cost + minrd + run_bits + 4; - if(cost < path[swb+1][cb].cost){ - path[swb+1][cb].prev_idx = mincb; - path[swb+1][cb].cost = cost; - path[swb+1][cb].run = 1; - } - } - } - start += sce->ics.swb_sizes[swb]; - } - - //convert resulting path from backward-linked list - stack_len = 0; - idx = 0; - for(cb = 1; cb < 12; cb++){ - if(path[max_sfb][cb].cost < path[max_sfb][idx].cost) - idx = cb; - } - ppos = max_sfb; - while(ppos > 0){ - cb = idx; - stackrun[stack_len] = path[ppos][cb].run; - stackcb [stack_len] = cb; - idx = path[ppos][cb].prev_idx; - ppos -= path[ppos][cb].run; - stack_len++; - } - //perform actual band info encoding - start = 0; - for(i = stack_len - 1; i >= 0; i--){ - put_bits(&s->pb, 4, stackcb[i]); - count = stackrun[i]; - memset(sce->zeroes + win*16 + start, !stackcb[i], count); - //XXX: memset when band_type is also uint8_t - for(j = 0; j < count; j++){ - sce->band_type[win*16 + start] = stackcb[i]; - start++; - } - while(count >= run_esc){ - put_bits(&s->pb, run_bits, run_esc); - count -= run_esc; - } - put_bits(&s->pb, run_bits, count); - } -} - -/** - * Produce integer coefficients from scalefactors provided by the model. - */ -static void adjust_frame_information(AACEncContext *apc, ChannelElement *cpe, int chans) -{ - int i, w, w2, g, ch; - int start, sum, maxsfb, cmaxsfb; - - for(ch = 0; ch < chans; ch++){ - IndividualChannelStream *ics = &cpe->ch[ch].ics; - start = 0; - maxsfb = 0; - cpe->ch[ch].pulse.num_pulse = 0; - for(w = 0; w < ics->num_windows*16; w += 16){ - for(g = 0; g < ics->num_swb; g++){ - sum = 0; - //apply M/S - if(!ch && cpe->ms_mask[w + g]){ - for(i = 0; i < ics->swb_sizes[g]; i++){ - cpe->ch[0].coeffs[start+i] = (cpe->ch[0].coeffs[start+i] + cpe->ch[1].coeffs[start+i]) / 2.0; - cpe->ch[1].coeffs[start+i] = cpe->ch[0].coeffs[start+i] - cpe->ch[1].coeffs[start+i]; - } - } - start += ics->swb_sizes[g]; - } - for(cmaxsfb = ics->num_swb; cmaxsfb > 0 && cpe->ch[ch].zeroes[w+cmaxsfb-1]; cmaxsfb--); - maxsfb = FFMAX(maxsfb, cmaxsfb); - } - ics->max_sfb = maxsfb; - - //adjust zero bands for window groups - for(w = 0; w < ics->num_windows; w += ics->group_len[w]){ - for(g = 0; g < ics->max_sfb; g++){ - i = 1; - for(w2 = w; w2 < w + ics->group_len[w]; w2++){ - if(!cpe->ch[ch].zeroes[w2*16 + g]){ - i = 0; - break; - } - } - cpe->ch[ch].zeroes[w*16 + g] = i; - } - } - } - - if(chans > 1 && cpe->common_window){ - IndividualChannelStream *ics0 = &cpe->ch[0].ics; - IndividualChannelStream *ics1 = &cpe->ch[1].ics; - int msc = 0; - ics0->max_sfb = FFMAX(ics0->max_sfb, ics1->max_sfb); - ics1->max_sfb = ics0->max_sfb; - for(w = 0; w < ics0->num_windows*16; w += 16) - for(i = 0; i < ics0->max_sfb; i++) - if(cpe->ms_mask[w+i]) msc++; - if(msc == 0 || ics0->max_sfb == 0) cpe->ms_mode = 0; - else cpe->ms_mode = msc < ics0->max_sfb ? 1 : 2; - } -} - -typedef struct TrellisPath { - float cost; - int prev; - int min_val; - int max_val; -} TrellisPath; - -static void search_for_quantizers_anmr(AACEncContext *s, SingleChannelElement *sce, const float lambda) -{ - int q, w, w2, g, start = 0; - int i; - int idx; - TrellisPath paths[256*121]; - int bandaddr[121]; - int minq; - float mincost; - - for(i = 0; i < 256; i++){ - paths[i].cost = 0.0f; - paths[i].prev = -1; - paths[i].min_val = i; - paths[i].max_val = i; - } - for(i = 256; i < 256*121; i++){ - paths[i].cost = INFINITY; - paths[i].prev = -2; - paths[i].min_val = INT_MAX; - paths[i].max_val = 0; - } - idx = 256; - for(w = 0; w < sce->ics.num_windows; w += sce->ics.group_len[w]){ - start = w*128; - for(g = 0; g < sce->ics.num_swb; g++){ - const float *coefs = sce->coeffs + start; - float qmin, qmax; - int nz = 0; - - bandaddr[idx >> 8] = w*16+g; - qmin = INT_MAX; - qmax = 0.0f; - for(w2 = 0; w2 < sce->ics.group_len[w]; w2++){ - FFPsyBand *band = &s->psy.psy_bands[s->cur_channel*PSY_MAX_BANDS+(w+w2)*16+g]; - if(band->energy <= band->threshold || band->threshold == 0.0f){ - sce->zeroes[(w+w2)*16+g] = 1; - continue; - } - sce->zeroes[(w+w2)*16+g] = 0; - nz = 1; - for(i = 0; i < sce->ics.swb_sizes[g]; i++){ - float t = fabsf(coefs[w2*128+i]); - if(t > 0.0f) qmin = fminf(qmin, t); - qmax = fmaxf(qmax, t); - } - } - if(nz){ - int minscale, maxscale; - float minrd = INFINITY; - //minimum scalefactor index is when minimum nonzero coefficient after quantizing is not clipped - minscale = av_clip_uint8(log2(qmin)*4 - 69 + SCALE_ONE_POS - SCALE_DIV_512); - //maximum scalefactor index is when maximum coefficient after quantizing is still not zero - maxscale = av_clip_uint8(log2(qmax)*4 + 6 + SCALE_ONE_POS - SCALE_DIV_512); - for(q = minscale; q < maxscale; q++){ - float dists[12], dist; - memset(dists, 0, sizeof(dists)); - for(w2 = 0; w2 < sce->ics.group_len[w]; w2++){ - FFPsyBand *band = &s->psy.psy_bands[s->cur_channel*PSY_MAX_BANDS+(w+w2)*16+g]; - int cb; - for(cb = 0; cb <= ESC_BT; cb++){ - dists[cb] += quantize_band_cost(coefs + w2*128, sce->ics.swb_sizes[g], - q, cb, s->lambda / band->threshold, INFINITY, NULL); - } - } - dist = dists[0]; - for(i = 1; i <= ESC_BT; i++) - dist = fminf(dist, dists[i]); - minrd = fminf(minrd, dist); - - for(i = FFMAX(q - SCALE_MAX_DIFF, 0); i < FFMIN(q + SCALE_MAX_DIFF, 256); i++){ - float cost; - int minv, maxv; - if(isinf(paths[idx - 256 + i].cost)) - continue; - cost = paths[idx - 256 + i].cost + dist - + ff_aac_scalefactor_bits[q - i + SCALE_DIFF_ZERO]; - minv = FFMIN(paths[idx - 256 + i].min_val, q); - maxv = FFMAX(paths[idx - 256 + i].max_val, q); - if(cost < paths[idx + q].cost && maxv-minv < SCALE_MAX_DIFF){ - paths[idx + q].cost = cost; - paths[idx + q].prev = idx - 256 + i; - paths[idx + q].min_val = minv; - paths[idx + q].max_val = maxv; - } - } - } - }else{ - for(q = 0; q < 256; q++){ - if(!isinf(paths[idx - 256 + q].cost)){ - paths[idx + q].cost = paths[idx - 256 + q].cost + 1; - paths[idx + q].prev = idx - 256 + q; - paths[idx + q].min_val = FFMIN(paths[idx - 256 + q].min_val, q); - paths[idx + q].max_val = FFMAX(paths[idx - 256 + q].max_val, q); - continue; - } - for(i = FFMAX(q - SCALE_MAX_DIFF, 0); i < FFMIN(q + SCALE_MAX_DIFF, 256); i++){ - float cost; - int minv, maxv; - if(isinf(paths[idx - 256 + i].cost)) - continue; - cost = paths[idx - 256 + i].cost + ff_aac_scalefactor_bits[q - i + SCALE_DIFF_ZERO]; - minv = FFMIN(paths[idx - 256 + i].min_val, q); - maxv = FFMAX(paths[idx - 256 + i].max_val, q); - if(cost < paths[idx + q].cost && maxv-minv < SCALE_MAX_DIFF){ - paths[idx + q].cost = cost; - paths[idx + q].prev = idx - 256 + i; - paths[idx + q].min_val = minv; - paths[idx + q].max_val = maxv; - } - } - } - } - sce->zeroes[w*16+g] = !nz; - start += sce->ics.swb_sizes[g]; - idx += 256; - } - } - idx -= 256; - mincost = paths[idx].cost; - minq = idx; - for(i = 1; i < 256; i++){ - if(paths[idx + i].cost < mincost){ - mincost = paths[idx + i].cost; - minq = idx + i; - } - } - while(minq >= 256){ - sce->sf_idx[bandaddr[minq>>8]] = minq & 0xFF; - minq = paths[minq].prev; - } - //set the same quantizers inside window groups - for(w = 0; w < sce->ics.num_windows; w += sce->ics.group_len[w]) - for(g = 0; g < sce->ics.num_swb; g++) - for(w2 = 1; w2 < sce->ics.group_len[w]; w2++) - sce->sf_idx[(w+w2)*16+g] = sce->sf_idx[w*16+g]; -} - -/** - * two-loop quantizers search taken from ISO 13818-7 Appendix C - */ -static void search_for_quantizers_twoloop(AVCodecContext *avctx, AACEncContext *s, - SingleChannelElement *sce, const float lambda) -{ - int start = 0, i, w, w2, g; - int destbits = avctx->bit_rate * 1024.0 / avctx->sample_rate / avctx->channels; - float dists[128], uplims[128]; - int fflag, minscaler; - int its = 0; - int allz = 0; - float minthr = INFINITY; - - //XXX: some heuristic to determine initial quantizers will reduce search time - memset(dists, 0, sizeof(dists)); - //determine zero bands and upper limits - for(w = 0; w < sce->ics.num_windows; w += sce->ics.group_len[w]){ - for(g = 0; g < sce->ics.num_swb; g++){ - int nz = 0; - float uplim = 0.0f; - for(w2 = 0; w2 < sce->ics.group_len[w]; w2++){ - FFPsyBand *band = &s->psy.psy_bands[s->cur_channel*PSY_MAX_BANDS+(w+w2)*16+g]; - uplim += band->threshold; - if(band->energy <= band->threshold || band->threshold == 0.0f){ - sce->zeroes[(w+w2)*16+g] = 1; - continue; - } - nz = 1; - } - uplims[w*16+g] = uplim *512; - sce->zeroes[w*16+g] = !nz; - if(nz) - minthr = fminf(minthr, uplim); - allz = FFMAX(allz, nz); - } - } - for(w = 0; w < sce->ics.num_windows; w += sce->ics.group_len[w]){ - for(g = 0; g < sce->ics.num_swb; g++){ - if(sce->zeroes[w*16+g]){ - sce->sf_idx[w*16+g] = SCALE_ONE_POS; - continue; - } - sce->sf_idx[w*16+g] = SCALE_ONE_POS + fminf(log2(uplims[w*16+g]/minthr)*4,59); - } - } - - if(!allz) - return; - //perform two-loop search - //outer loop - improve quality - do{ - int tbits, qstep; - minscaler = sce->sf_idx[0]; - //inner loop - quantize spectrum to fit into given number of bits - qstep = its ? 1 : 32; - do{ - int prev = -1; - tbits = 0; - fflag = 0; - for(w = 0; w < sce->ics.num_windows; w += sce->ics.group_len[w]){ - start = w*128; - for(g = 0; g < sce->ics.num_swb; g++){ - const float *coefs = sce->coeffs + start; - int bits = 0; - int cb; - float mindist = INFINITY; - int minbits = 0; - - if(sce->zeroes[w*16+g] || sce->sf_idx[w*16+g] >= 218) - continue; - minscaler = FFMIN(minscaler, sce->sf_idx[w*16+g]); - for(cb = 0; cb <= ESC_BT; cb++){ - float dist = 0.0f; - int bb = 0; - for(w2 = 0; w2 < sce->ics.group_len[w]; w2++){ - int b; - dist += quantize_band_cost(coefs + w2*128, - sce->ics.swb_sizes[g], - sce->sf_idx[w*16+g], - ESC_BT, - 1.0, - INFINITY, - &b); - bb += b; - } - if(dist < mindist){ - mindist = dist; - minbits = bb; - } - } - dists[w*16+g] = mindist - minbits; - bits = minbits; - if(prev != -1){ - bits += ff_aac_scalefactor_bits[sce->sf_idx[w*16+g] - prev + SCALE_DIFF_ZERO]; - } - tbits += bits; - start += sce->ics.swb_sizes[g]; - prev = sce->sf_idx[w*16+g]; - } - } - if(tbits > destbits){ - for(i = 0; i < 128; i++){ - if(sce->sf_idx[i] < 218 - qstep){ - sce->sf_idx[i] += qstep; - } - } - }else{ - for(i = 0; i < 128; i++){ - if(sce->sf_idx[i] > 60 - qstep){ - sce->sf_idx[i] -= qstep; - } - } - } - qstep >>= 1; - if(!qstep && tbits > destbits*1.02) - qstep = 1; - if(sce->sf_idx[0] >= 217)break; - }while(qstep); - - fflag = 0; - minscaler = av_clip(minscaler, 60, 255 - SCALE_MAX_DIFF); - for(w = 0; w < sce->ics.num_windows; w += sce->ics.group_len[w]){ - start = w*128; - for(g = 0; g < sce->ics.num_swb; g++){ - int prevsc = sce->sf_idx[w*16+g]; - if(dists[w*16+g] > uplims[w*16+g] && sce->sf_idx[w*16+g] > 60) - sce->sf_idx[w*16+g]--; - sce->sf_idx[w*16+g] = av_clip(sce->sf_idx[w*16+g], minscaler, minscaler + SCALE_MAX_DIFF); - sce->sf_idx[w*16+g] = FFMIN(sce->sf_idx[w*16+g], 219); - if(sce->sf_idx[w*16+g] != prevsc) - fflag = 1; - } - } - its++; - }while(fflag && its < 10); -} - -static void search_for_quantizers_faac(AACEncContext *s, SingleChannelElement *sce, const float lambda) -{ - int start = 0, i, w, w2, g; - float uplim[128], maxq[128]; - int minq; -#if 0 - float distfact = ((sce->ics.num_windows > 1) ? 85.80 : 147.84) / lambda; - int last = 0, lastband = 0, curband = 0; - float avg_energy = 0.0; - if(sce->ics.num_windows == 1){ - start = 0; - for(i = 0; i < 1024; i++){ - if(i - start >= sce->ics.swb_sizes[curband]){ - start += sce->ics.swb_sizes[curband]; - curband++; - } - if(sce->coeffs[i]){ - avg_energy += sce->coeffs[i] * sce->coeffs[i]; - last = i; - lastband = curband; - } - } - }else{ - for(w = 0; w < 8; w++){ - const float *coeffs = sce->coeffs + w*128; - start = 0; - for(i = 0; i < 128; i++){ - if(i - start >= sce->ics.swb_sizes[curband]){ - start += sce->ics.swb_sizes[curband]; - curband++; - } - if(coeffs[i]){ - avg_energy += coeffs[i] * coeffs[i]; - last = FFMAX(last, i); - lastband = FFMAX(lastband, curband); - } - } - } - } - last++; - avg_energy /= last; - for(w = 0; w < sce->ics.num_windows; w += sce->ics.group_len[w]){ - start = w*128; - for(g = 0; g < sce->ics.num_swb; g++){ - float *coefs = sce->coeffs + start; - const int size = sce->ics.swb_sizes[g]; - int start2 = start, end2 = start + size, peakpos = start; - float maxval = -1, thr = 0.0f, t; - maxq[w*16+g] = 0.0f; - if(g > lastband){ - maxq[w*16+g] = 0.0f; - start += size; - for(w2 = 0; w2 < sce->ics.group_len[w]; w2++) - memset(coefs + w2*128, 0, sizeof(coefs[0])*size); - continue; - } - for(w2 = 0; w2 < sce->ics.group_len[w]; w2++){ - for(i = 0; i < size; i++){ - float t = coefs[w2*128+i]*coefs[w2*128+i]; - maxq[w*16+g] = fmaxf(maxq[w*16+g], coefs[w2*128 + i]); - thr += t; - if(sce->ics.num_windows == 1 && maxval < t){ - maxval = t; - peakpos = start+i; - } - } - } - if(sce->ics.num_windows == 1){ - start2 = FFMAX(peakpos - 2, start2); - end2 = FFMIN(peakpos + 3, end2); - } - start += size; - thr = pow(thr / (avg_energy * (end2 - start2)), 0.3 + 0.1*(lastband - g) / lastband); - t = 1.0 - (1.0 * start2 / last); - uplim[w*16+g] = distfact / (1.4 * thr + t*t*t + 0.075); - } - } -#else - memset(maxq, 0, sizeof(maxq)); - for(w = 0; w < sce->ics.num_windows; w += sce->ics.group_len[w]){ - start = w*128; - for(g = 0; g < sce->ics.num_swb; g++){ - float *coefs = sce->coeffs + start; - const int size = sce->ics.swb_sizes[g]; - float thr = 0.0f; - for(w2 = 0; w2 < sce->ics.group_len[w]; w2++){ - FFPsyBand *band = &s->psy.psy_bands[s->cur_channel*PSY_MAX_BANDS+(w+w2)*16+g]; - thr += band->threshold; - for(i = 0; i < size; i++){ - maxq[w*16+g] = fmaxf(maxq[w*16+g], fabsf(coefs[w2*128 + i])); - } - } - uplim[w*16+g] = thr / lambda; - start += size; - } - } -#endif - memset(sce->sf_idx, 0, sizeof(sce->sf_idx)); - for(w = 0; w < sce->ics.num_windows; w += sce->ics.group_len[w]){ - start = w*128; - for(g = 0; g < sce->ics.num_swb; g++){ - const float *coefs = sce->coeffs + start; - const int size = sce->ics.swb_sizes[g]; - int scf, prev_scf, step; - if(maxq[w*16+g] < 21.544){ - sce->zeroes[w*16+g] = 1; - continue; - } - sce->zeroes[w*16+g] = 0; - scf = prev_scf = av_clip(SCALE_ONE_POS + log2(1/maxq[w*16+g])*16/3, 60, 218); - step = 16; - for(;;){ - float dist = 0.0f, t; - int quant_max; - - for(w2 = 0; w2 < sce->ics.group_len[w]; w2++){ - int b; - dist += quantize_band_cost(coefs + w2*128, - sce->ics.swb_sizes[g], - scf, - ESC_BT, - 1.0, - INFINITY, - &b); - dist -= b; - } - quant_max = quant(maxq[w*16+g], ff_aac_pow2sf_tab[200 - scf + SCALE_ONE_POS]); - if(quant_max >= 8191){ // too much, return to the previous quantizer - sce->sf_idx[w*16+g] = prev_scf; - break; - } - prev_scf = scf; - t = pow(dist / size, -2.0/3.0); - if(FFABS(step) > 4){ - int newstep = 4*log(t / maxq[w*16+g])/log(2) - 2; - step = av_clip(-newstep, -4, 4); - } - if(FFABS(step) >= 4){ - step = 1 - step; - scf += step; - }else if(t >= uplim[w*16+g]){ - scf -= FFABS(step); - }else{ - sce->sf_idx[w*16+g] = scf; - break; - } - } - start += size; - } - } - minq = sce->sf_idx[0] ? sce->sf_idx[0] : INT_MAX; - for(i = 1; i < 128; i++){ - if(!sce->sf_idx[i]) - sce->sf_idx[i] = sce->sf_idx[i-1]; - else - minq = FFMIN(minq, sce->sf_idx[i]); - } - if(minq == INT_MAX) minq = 0; - for(i = 126; i >= 0; i--){ - if(!sce->sf_idx[i]) - sce->sf_idx[i] = sce->sf_idx[i+1]; - sce->sf_idx[i] = av_clip(sce->sf_idx[i], minq, minq + SCALE_MAX_DIFF); - } -} - -static void search_for_quantizers_fast(AACEncContext *s, SingleChannelElement *sce) -{ - int start = 0, i, w, w2, g; - int minq = 255; - - memset(sce->sf_idx, 0, sizeof(sce->sf_idx)); - for(w = 0; w < sce->ics.num_windows; w += sce->ics.group_len[w]){ - start = w*128; - for(g = 0; g < sce->ics.num_swb; g++){ - for(w2 = 0; w2 < sce->ics.group_len[w]; w2++){ - FFPsyBand *band = &s->psy.psy_bands[s->cur_channel*PSY_MAX_BANDS+(w+w2)*16+g]; - if(band->energy <= band->threshold){ - sce->sf_idx[(w+w2)*16+g] = 218; - sce->zeroes[(w+w2)*16+g] = 1; - }else{ - sce->sf_idx[(w+w2)*16+g] = av_clip(SCALE_ONE_POS - SCALE_DIV_512 + log2(band->threshold), 80, 218); - sce->zeroes[(w+w2)*16+g] = 0; - } - minq = FFMIN(minq, sce->sf_idx[(w+w2)*16+g]); - } - } - } - for(i = 0; i < 128; i++){ - sce->sf_idx[i] = av_clip(sce->sf_idx[i], minq, minq + SCALE_MAX_DIFF - 1); - } - //set the same quantizers inside window groups - for(w = 0; w < sce->ics.num_windows; w += sce->ics.group_len[w]) - for(g = 0; g < sce->ics.num_swb; g++) - for(w2 = 1; w2 < sce->ics.group_len[w]; w2++) - sce->sf_idx[(w+w2)*16+g] = sce->sf_idx[w*16+g]; -} - -static void search_for_quantizers(AVCodecContext *avctx, AACEncContext *s, - SingleChannelElement *sce) -{ - search_for_quantizers_anmr(s, sce, s->lambda); -// search_for_quantizers_twoloop(avctx, s, sce, s->lambda); -// search_for_quantizers_faac(s, sce, av_clipf(s->lambda * 2e8, 50.0f, 300.0f)); -// search_for_quantizers_fast(s, sce); -} - -static void search_for_ms(AACEncContext *s, ChannelElement *cpe, const float lambda) -{ - int start = 0, i, w, w2, g; - float M[128], S[128]; - SingleChannelElement *sce0 = &cpe->ch[0]; - SingleChannelElement *sce1 = &cpe->ch[1]; - if(!cpe->common_window) - return; - for(w = 0; w < sce0->ics.num_windows; w += sce0->ics.group_len[w]){ - for(g = 0; g < sce0->ics.num_swb; g++){ - if(!cpe->ch[0].zeroes[w*16+g] && !cpe->ch[1].zeroes[w*16+g]){ - float dist1 = 0.0f, dist2 = 0.0f; - for(w2 = 0; w2 < sce0->ics.group_len[w]; w2++){ - FFPsyBand *band0 = &s->psy.psy_bands[(s->cur_channel+0)*PSY_MAX_BANDS+(w+w2)*16+g]; - FFPsyBand *band1 = &s->psy.psy_bands[(s->cur_channel+1)*PSY_MAX_BANDS+(w+w2)*16+g]; - float minthr = fminf(band0->threshold, band1->threshold); - float maxthr = fmaxf(band0->threshold, band1->threshold); - for(i = 0; i < sce0->ics.swb_sizes[g]; i++){ - M[i] = (sce0->coeffs[start+w2*128+i] - + sce1->coeffs[start+w2*128+i])*0.5; - S[i] = sce0->coeffs[start+w2*128+i] - - sce1->coeffs[start+w2*128+i]; - } - dist1 += quantize_band_cost(sce0->coeffs + start + w2*128, - sce0->ics.swb_sizes[g], - sce0->sf_idx[(w+w2)*16+g], - sce0->band_type[(w+w2)*16+g], - lambda / band0->threshold, INFINITY, NULL); - dist1 += quantize_band_cost(sce1->coeffs + start + w2*128, - sce1->ics.swb_sizes[g], - sce1->sf_idx[(w+w2)*16+g], - sce1->band_type[(w+w2)*16+g], - lambda / band1->threshold, INFINITY, NULL); - dist2 += quantize_band_cost(M, - sce0->ics.swb_sizes[g], - sce0->sf_idx[(w+w2)*16+g], - sce0->band_type[(w+w2)*16+g], - lambda / maxthr, INFINITY, NULL); - dist2 += quantize_band_cost(S, - sce1->ics.swb_sizes[g], - sce1->sf_idx[(w+w2)*16+g], - sce1->band_type[(w+w2)*16+g], - lambda / minthr, INFINITY, NULL); - } - cpe->ms_mask[w*16+g] = dist2 < dist1; - } - start += sce0->ics.swb_sizes[g]; - } - } -} - -/** - * Encode scalefactor band coding type. - */ -static void encode_band_info(AACEncContext *s, SingleChannelElement *sce) -{ - int w; - - for(w = 0; w < sce->ics.num_windows; w += sce->ics.group_len[w]){ - encode_window_bands_info(s, sce, w, sce->ics.group_len[w]); - } -} - -/** - * Encode scalefactors. - */ -static void encode_scale_factors(AVCodecContext *avctx, AACEncContext *s, SingleChannelElement *sce) -{ - int off = sce->sf_idx[0], diff; - int i, w; - - for(w = 0; w < sce->ics.num_windows; w += sce->ics.group_len[w]){ - for(i = 0; i < sce->ics.max_sfb; i++){ - if(!sce->zeroes[w*16 + i]){ - diff = sce->sf_idx[w*16 + i] - off + SCALE_DIFF_ZERO; - if(diff < 0 || diff > 120) av_log(avctx, AV_LOG_ERROR, "Scalefactor difference is too big to be coded\n"); - off = sce->sf_idx[w*16 + i]; - put_bits(&s->pb, ff_aac_scalefactor_bits[diff], ff_aac_scalefactor_code[diff]); - } - } - } -} - -/** - * Encode pulse data. - */ -static void encode_pulses(AACEncContext *s, Pulse *pulse) -{ - int i; - - put_bits(&s->pb, 1, !!pulse->num_pulse); - if(!pulse->num_pulse) return; - - put_bits(&s->pb, 2, pulse->num_pulse - 1); - put_bits(&s->pb, 6, pulse->start); - for(i = 0; i < pulse->num_pulse; i++){ - put_bits(&s->pb, 5, pulse->pos[i]); - put_bits(&s->pb, 4, pulse->amp[i]); - } -} - -/** - * Encode spectral coefficients processed by psychoacoustic model. - */ -static void encode_spectral_coeffs(AACEncContext *s, SingleChannelElement *sce) -{ - int start, i, w, w2; - - for(w = 0; w < sce->ics.num_windows; w += sce->ics.group_len[w]){ - start = 0; - for(i = 0; i < sce->ics.max_sfb; i++){ - if(sce->zeroes[w*16 + i]){ - start += sce->ics.swb_sizes[i]; - continue; - } - for(w2 = w; w2 < w + sce->ics.group_len[w]; w2++){ - quantize_and_encode_band(&s->pb, sce->coeffs + start + w2*128, - sce->ics.swb_sizes[i], - sce->sf_idx[w*16 + i], - sce->band_type[w*16 + i], - s->lambda); - } - start += sce->ics.swb_sizes[i]; - } - } -} - -/** - * Encode one channel of audio data. - */ -static int encode_individual_channel(AVCodecContext *avctx, AACEncContext *s, SingleChannelElement *sce, int common_window) -{ - put_bits(&s->pb, 8, sce->sf_idx[0]); - if(!common_window) put_ics_info(s, &sce->ics); - encode_band_info(s, sce); - encode_scale_factors(avctx, s, sce); - encode_pulses(s, &sce->pulse); - put_bits(&s->pb, 1, 0); //tns - put_bits(&s->pb, 1, 0); //ssr - encode_spectral_coeffs(s, sce); - return 0; -} - -/** - * Write some auxiliary information about the created AAC file. - */ -static void put_bitstream_info(AVCodecContext *avctx, AACEncContext *s, const char *name) -{ - int i, namelen, padbits; - - namelen = strlen(name) + 2; - put_bits(&s->pb, 3, TYPE_FIL); - put_bits(&s->pb, 4, FFMIN(namelen, 15)); - if(namelen >= 15) - put_bits(&s->pb, 8, namelen - 16); - put_bits(&s->pb, 4, 0); //extension type - filler - padbits = 8 - (put_bits_count(&s->pb) & 7); - align_put_bits(&s->pb); - for(i = 0; i < namelen - 2; i++) - put_bits(&s->pb, 8, name[i]); - put_bits(&s->pb, 12 - padbits, 0); -} - -static int aac_encode_frame(AVCodecContext *avctx, - uint8_t *frame, int buf_size, void *data) -{ - AACEncContext *s = avctx->priv_data; - int16_t *samples = s->samples, *samples2, *la; - ChannelElement *cpe; - int i, j, chans, tag, start_ch; - const uint8_t *chan_map = aac_chan_configs[avctx->channels-1]; - int chan_el_counter[4]; - - if(s->last_frame) - return 0; - if(data){ - if(!s->psypp){ - memcpy(s->samples + 1024 * avctx->channels, data, 1024 * avctx->channels * sizeof(s->samples[0])); - }else{ - start_ch = 0; - samples2 = s->samples + 1024 * avctx->channels; - for(i = 0; i < chan_map[0]; i++){ - tag = chan_map[i+1]; - chans = tag == TYPE_CPE ? 2 : 1; - ff_psy_preprocess(s->psypp, (uint16_t*)data + start_ch, samples2 + start_ch, start_ch + i, chans); - start_ch += chans; - } - } - } - if(!avctx->frame_number){ - memcpy(s->samples, s->samples + 1024 * avctx->channels, 1024 * avctx->channels * sizeof(s->samples[0])); - return 0; - } - - init_put_bits(&s->pb, frame, buf_size*8); - if((avctx->frame_number & 0xFF)==1 && !(avctx->flags & CODEC_FLAG_BITEXACT)){ - put_bitstream_info(avctx, s, LIBAVCODEC_IDENT); - } - start_ch = 0; - memset(chan_el_counter, 0, sizeof(chan_el_counter)); - for(i = 0; i < chan_map[0]; i++){ - FFPsyWindowInfo wi[2]; - tag = chan_map[i+1]; - chans = tag == TYPE_CPE ? 2 : 1; - cpe = &s->cpe[i]; - samples2 = samples + start_ch; - la = samples2 + 1024 * avctx->channels + start_ch; - if(!data) la = NULL; - s->lambda = 5e-7f; - for(j = 0; j < chans; j++){ - IndividualChannelStream *ics = &cpe->ch[j].ics; - int k; - wi[j] = ff_psy_suggest_window(&s->psy, samples2, la, start_ch + j, ics->window_sequence[0]); - ics->window_sequence[1] = ics->window_sequence[0]; - ics->window_sequence[0] = wi[j].window_type[0]; - ics->use_kb_window[1] = ics->use_kb_window[0]; - ics->use_kb_window[0] = wi[j].window_shape; - ics->num_windows = wi[j].num_windows; - ics->swb_sizes = s->psy.bands [ics->num_windows == 8]; - ics->num_swb = s->psy.num_bands[ics->num_windows == 8]; - for(k = 0; k < ics->num_windows; k++) - ics->group_len[k] = wi[j].grouping[k]; - - s->cur_channel = start_ch + j; - apply_window_and_mdct(avctx, s, &cpe->ch[j], samples2, j); - search_for_quantizers(avctx, s, &cpe->ch[j]); - } - cpe->common_window = 0; - if(chans > 1 - && wi[0].window_type[0] == wi[1].window_type[0] - && wi[0].window_shape == wi[1].window_shape){ - - cpe->common_window = 1; - for(j = 0; j < wi[0].num_windows; j++){ - if(wi[0].grouping[j] != wi[1].grouping[j]){ - cpe->common_window = 0; - break; - } - } - } -// search_for_ms(s, cpe, s->lambda); - adjust_frame_information(s, cpe, chans); - put_bits(&s->pb, 3, tag); - put_bits(&s->pb, 4, chan_el_counter[tag]++); - if(chans == 2){ - put_bits(&s->pb, 1, cpe->common_window); - if(cpe->common_window){ - put_ics_info(s, &cpe->ch[0].ics); - encode_ms_info(&s->pb, cpe); - } - } - for(j = 0; j < chans; j++){ - s->cur_channel = start_ch + j; - ff_psy_set_band_info(&s->psy, s->cur_channel, cpe->ch[j].coeffs, &wi[j]); - encode_individual_channel(avctx, s, &cpe->ch[j], cpe->common_window); - } - start_ch += chans; - } - - put_bits(&s->pb, 3, TYPE_END); - flush_put_bits(&s->pb); - avctx->frame_bits = put_bits_count(&s->pb); - - if(!data) - s->last_frame = 1; - memcpy(s->samples, s->samples + 1024 * avctx->channels, 1024 * avctx->channels * sizeof(s->samples[0])); - return put_bits_count(&s->pb)>>3; -} - -static av_cold int aac_encode_end(AVCodecContext *avctx) -{ - AACEncContext *s = avctx->priv_data; - - ff_mdct_end(&s->mdct1024); - ff_mdct_end(&s->mdct128); - ff_psy_end(&s->psy); - ff_psy_preprocess_end(s->psypp); - av_freep(&s->samples); - av_freep(&s->cpe); - return 0; -} - -AVCodec aac_encoder = { - "aac", - CODEC_TYPE_AUDIO, - CODEC_ID_AAC, - sizeof(AACEncContext), - aac_encode_init, - aac_encode_frame, - aac_encode_end, - .capabilities = CODEC_CAP_SMALL_LAST_FRAME | CODEC_CAP_DELAY, - .sample_fmts = (enum SampleFormat[]){SAMPLE_FMT_S16,SAMPLE_FMT_NONE}, - .long_name = NULL_IF_CONFIG_SMALL("Advanced Audio Coding"), -}; +#endif /* AVCODEC_AACENC_H */

1 0

[soc]: r4007 - aacenc/aac.h
by kostya 26 Jan '09

26 Jan '09

Author: kostya Date: Mon Jan 26 15:00:57 2009 New Revision: 4007 Log: Sync aac.h to the current FFmpeg SVN Modified: aacenc/aac.h Modified: aacenc/aac.h ============================================================================== --- aacenc/aac.h Mon Jan 26 14:37:36 2009 (r4006) +++ aacenc/aac.h Mon Jan 26 15:00:57 2009 (r4007) @@ -46,7 +46,6 @@ #define MAX_ELEM_ID 16 #define TNS_MAX_ORDER 20 -#define PNS_MEAN_ENERGY 3719550720.0f // sqrt(3.0) * 1<<31 enum AudioObjectType { AOT_NULL, @@ -133,6 +132,20 @@ enum CouplingPoint { AFTER_IMDCT = 3, }; +/** + * Predictor State + */ +typedef struct { + float cor0; + float cor1; + float var0; + float var1; + float r0; + float r1; +} PredictorState; + +#define MAX_PREDICTORS 672 + #define SCALE_DIV_512 36 ///< scalefactor difference that corresponds to scale difference in 512 times #define SCALE_ONE_POS 140 ///< scalefactor index that corresponds to scale=1.0 #define SCALE_MAX_POS 255 ///< scalefactor index maximum value @@ -153,6 +166,10 @@ typedef struct { int num_swb; ///< number of scalefactor window bands int num_windows; int tns_max_bands; + int predictor_present; + int predictor_initialized; + int predictor_reset_group; + uint8_t prediction_used[41]; } IndividualChannelStream; /** @@ -198,8 +215,8 @@ typedef struct { int num_coupled; ///< number of target elements enum RawDataBlockType type[8]; ///< Type of channel element to be coupled - SCE or CPE. int id_select[8]; ///< element id - int ch_select[8]; /**< [0] shared list of gains; [1] list of gains for left channel; - * [2] list of gains for right channel; [3] lists of gains for both channels + int ch_select[8]; /**< [0] shared list of gains; [1] list of gains for right channel; + * [2] list of gains for left channel; [3] lists of gains for both channels */ float gain[16][120]; } ChannelCoupling; @@ -220,6 +237,7 @@ typedef struct { DECLARE_ALIGNED_16(float, saved[1024]); ///< overlap DECLARE_ALIGNED_16(float, ret[1024]); ///< PCM output DECLARE_ALIGNED_16(int, icoefs[1024]); ///< integer coefficients for encoding + PredictorState predictor_state[MAX_PREDICTORS]; } SingleChannelElement; /** @@ -284,6 +302,7 @@ typedef struct { int sf_offset; ///< offset into pow2sf_tab as appropriate for dsp.float_to_int16 /** @} */ + DECLARE_ALIGNED(16, float, temp[128]); } AACContext; #endif /* AVCODEC_AAC_H */

1 0

[soc]: r4006 - aacenc/aacenc.c
by kostya 26 Jan '09

26 Jan '09

Author: kostya Date: Mon Jan 26 14:37:36 2009 New Revision: 4006 Log: Sync AAC encoder to current FFmpeg CONFIG_ handling policy Modified: aacenc/aacenc.c Modified: aacenc/aacenc.c ============================================================================== --- aacenc/aacenc.c Sun Jan 25 16:56:43 2009 (r4005) +++ aacenc/aacenc.c Mon Jan 26 14:37:36 2009 (r4006) @@ -232,7 +232,7 @@ static av_cold int aac_encode_init(AVCod ff_psy_init(&s->psy, avctx, 2, sizes, lengths); s->psypp = ff_psy_preprocess_init(avctx); -#ifndef CONFIG_HARDCODED_TABLES +#if !CONFIG_HARDCODED_TABLES for (i = 0; i < 316; i++) ff_aac_pow2sf_tab[i] = pow(2, (i - 200)/4.); #endif /* CONFIG_HARDCODED_TABLES */

1 0

[soc]: r4005 - in jpeg2000: j2kdec.c j2kenc.c
by diego 25 Jan '09

25 Jan '09

Author: diego Date: Sun Jan 25 16:56:43 2009 New Revision: 4005 Log: Add av_cold to initialization functions. Modified: jpeg2000/j2kdec.c jpeg2000/j2kenc.c Modified: jpeg2000/j2kdec.c ============================================================================== --- jpeg2000/j2kdec.c Sun Jan 25 16:55:31 2009 (r4004) +++ jpeg2000/j2kdec.c Sun Jan 25 16:56:43 2009 (r4005) @@ -924,7 +924,7 @@ static int decode_frame(AVCodecContext * return s->buf - s->buf_start; } -static int j2kdec_init(AVCodecContext *avctx) +static av_cold int j2kdec_init(AVCodecContext *avctx) { J2kDecoderContext *s = avctx->priv_data; Modified: jpeg2000/j2kenc.c ============================================================================== --- jpeg2000/j2kenc.c Sun Jan 25 16:55:31 2009 (r4004) +++ jpeg2000/j2kenc.c Sun Jan 25 16:56:43 2009 (r4005) @@ -960,7 +960,7 @@ static int encode_frame(AVCodecContext * return s->buf - s->buf_start; } -static int j2kenc_init(AVCodecContext *avctx) +static av_cold int j2kenc_init(AVCodecContext *avctx) { int i, ret; J2kEncoderContext *s = avctx->priv_data;

1 0

[soc]: r4004 - in dirac/libavcodec: diracdec.c diracenc.c
by diego 25 Jan '09

25 Jan '09

Author: diego Date: Sun Jan 25 16:55:31 2009 New Revision: 4004 Log: Add av_cold to initialization functions. Modified: dirac/libavcodec/diracdec.c dirac/libavcodec/diracenc.c Modified: dirac/libavcodec/diracdec.c ============================================================================== --- dirac/libavcodec/diracdec.c Sun Jan 25 16:54:19 2009 (r4003) +++ dirac/libavcodec/diracdec.c Sun Jan 25 16:55:31 2009 (r4004) @@ -79,7 +79,7 @@ static int add_frame(AVFrame *(*framelis return -1; } -static int decode_init(AVCodecContext *avctx) +static av_cold int decode_init(AVCodecContext *avctx) { DiracContext *s = avctx->priv_data; Modified: dirac/libavcodec/diracenc.c ============================================================================== --- dirac/libavcodec/diracenc.c Sun Jan 25 16:54:19 2009 (r4003) +++ dirac/libavcodec/diracenc.c Sun Jan 25 16:55:31 2009 (r4004) @@ -37,7 +37,7 @@ #include "dirac_wavelet.h" #include "mpeg12data.h" -static int encode_init(AVCodecContext *avctx) +static av_cold int encode_init(AVCodecContext *avctx) { DiracContext *s = avctx->priv_data; av_log_set_level(AV_LOG_DEBUG);

1 0

[soc]: r4003 - in amr: amrnbdec.c amrnbfloatdec.c
by diego 25 Jan '09

25 Jan '09

Author: diego Date: Sun Jan 25 16:54:19 2009 New Revision: 4003 Log: Add av_cold to initialization functions. Modified: amr/amrnbdec.c amr/amrnbfloatdec.c Modified: amr/amrnbdec.c ============================================================================== --- amr/amrnbdec.c Sun Jan 25 16:41:13 2009 (r4002) +++ amr/amrnbdec.c Sun Jan 25 16:54:19 2009 (r4003) @@ -1286,7 +1286,7 @@ static int amrnb_decode_frame(AVCodecCon } -static int amrnb_decode_close(AVCodecContext *avctx) +static av_cold int amrnb_decode_close(AVCodecContext *avctx) { AMRContext *p = avctx->priv_data; Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Sun Jan 25 16:41:13 2009 (r4002) +++ amr/amrnbfloatdec.c Sun Jan 25 16:54:19 2009 (r4003) @@ -122,7 +122,7 @@ static void reset_state(AMRContext *p) } } -static int amrnb_decode_init(AVCodecContext *avctx) +static av_cold int amrnb_decode_init(AVCodecContext *avctx) { AMRContext *p = avctx->priv_data;

1 0

[soc]: r4002 - amr/amrnbdec.c
by diego 25 Jan '09

25 Jan '09

Author: diego Date: Sun Jan 25 16:41:13 2009 New Revision: 4002 Log: Add missing codec long_name declaration. Modified: amr/amrnbdec.c Modified: amr/amrnbdec.c ============================================================================== --- amr/amrnbdec.c Sun Jan 25 16:40:55 2009 (r4001) +++ amr/amrnbdec.c Sun Jan 25 16:41:13 2009 (r4002) @@ -1308,4 +1308,5 @@ AVCodec amrnb_decoder = { .init = amrnb_decode_init, .close = amrnb_decode_close, .decode = amrnb_decode_frame, + .long_name = NULL_IF_CONFIG_SMALL("Adaptive Multi-Rate NarrowBand"), };

1 0

[soc]: r4001 - amr/amrnbfloatdec.c
by diego 25 Jan '09

25 Jan '09

Author: diego Date: Sun Jan 25 16:40:55 2009 New Revision: 4001 Log: Add missing NULL_IF_CONFIG_SMALL to codec long_name declaration. Modified: amr/amrnbfloatdec.c Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Sun Jan 25 16:38:52 2009 (r4000) +++ amr/amrnbfloatdec.c Sun Jan 25 16:40:55 2009 (r4001) @@ -1330,6 +1330,6 @@ AVCodec amrnb_decoder = { .init = amrnb_decode_init, .close = amrnb_decode_close, .decode = amrnb_decode_frame, - .long_name = "Adaptive Multi-Rate NarrowBand", + .long_name = NULL_IF_CONFIG_SMALL("Adaptive Multi-Rate NarrowBand"), };

1 0

[soc]: r4000 - in amr: amrdata.h amrnbdec.c amrnbfloatdata.h amrnbfloatdec.c
by diego 25 Jan '09

25 Jan '09

Author: diego Date: Sun Jan 25 16:38:52 2009 New Revision: 4000 Log: spelling/wording/grammar cosmetics Modified: amr/amrdata.h amr/amrnbdec.c amr/amrnbfloatdata.h amr/amrnbfloatdec.c Modified: amr/amrdata.h ============================================================================== --- amr/amrdata.h Sun Jan 25 16:35:48 2009 (r3999) +++ amr/amrdata.h Sun Jan 25 16:38:52 2009 (r4000) @@ -108,7 +108,8 @@ int16_t cos_table[65]; // cosine table u #define TRACKS_MODE_102 4 // number of tracks for MODE_102 -// FIXME - not quite sure how i'm going to implement this yet and some other variables may be moved around later +/* FIXME - not quite sure how i'm going to implement this yet + * and some other variables may be moved around later */ typedef struct AMRDecoderState { // Bad frame int state; @@ -244,7 +245,7 @@ static const AMROrder order_MODE_DTX[35] // encoder homing frame pattern #define EHF_MASK 0x0008 -// Homing frames for the decoder +// homing frames for the decoder static const int16_t dhf_MODE_475[PRMS_MODE_475] = { 0x00F8,0x009D,0x001C,0x0066,0x0000,0x0003,0x0028,0x000F,0x0038,0x0001, 0x000F,0x0031,0x0002,0x0008,0x000F,0x0026,0x0003 @@ -376,7 +377,7 @@ static const uint16_t pred_fac[10] = { 11651, 10588, 9767, 8593, 6484 }; -// vector quantised lsf tables +// vector quantized lsf tables static const int16_t lsf_3_MODE_515[128][4] = { { 419, 163, -30, -262}, { -455, -789,-1430, -721}, { 1006, 664, 269, 25}, { 619, 260, 183, 96}, { -968,-1358, -388, 135}, { -693, 835, 456, 154}, { 1105, 703, 569, 363}, { 1625, 1326, 985, 748}, @@ -1157,7 +1158,7 @@ static const uint16_t pitch_gain_attenua 6553 }; -// quantisation table for the adaptive codebook gain (MODE_795, MODE_122) +// quantization table for the adaptive codebook gain (MODE_795, MODE_122) #define N_PITCH_QUANTS 16 static const uint16_t pitch_gain_quant[N_PITCH_QUANTS] = { 0, Modified: amr/amrnbdec.c ============================================================================== --- amr/amrnbdec.c Sun Jan 25 16:35:48 2009 (r3999) +++ amr/amrnbdec.c Sun Jan 25 16:38:52 2009 (r4000) @@ -41,18 +41,18 @@ typedef struct AMRContext { GetBitContext gb; int16_t *sample_buffer; - int16_t *amr_prms; ///< pointer to the decoded amr parameters (lsf coefficients, codebook indices, etc) + int16_t *amr_prms; ///< pointer to the decoded AMR parameters (lsf coefficients, codebook indexes, etc) int bad_frame_indicator; ///< bad frame ? 1 : 0 int prev_frame_homing; ///< previous frame was a homing frame ? 1 : 0 enum RXFrameType prev_frame_type; ///< frame type of previous frame enum Mode prev_frame_mode; ///< mode of previous frame - int *prev_lsf_dq; ///< previous dequantised lsfs - int *prev_residual_q; ///< previous quantised residual + int *prev_lsf_dq; ///< previous dequantized lsfs + int *prev_residual_q; ///< previous quantized residual - int lsp1_q[LP_FILTER_ORDER]; ///< vector of quantised lsps - int lsp2_q[LP_FILTER_ORDER]; ///< vector of quantised lsps + int lsp1_q[LP_FILTER_ORDER]; ///< vector of quantized lsps + int lsp2_q[LP_FILTER_ORDER]; ///< vector of quantized lsps int cur_frame_homing; ///< current frame homing ? 1 : 0 enum RXFrameType cur_frame_type; ///< current frame type @@ -96,7 +96,7 @@ static int amrnb_decode_init(AVCodecCont // allocate and zero the sample buffer p->sample_buffer = av_mallocz(sizeof(int16_t)*AMR_BLOCK_SIZE); - // allocate and zero the amr parameters + // allocate and zero the AMR parameters p->amr_prms = av_mallocz(sizeof(int16_t)*PRMS_MODE_122); // allocate and zero the decoder state p->state = av_mallocz(sizeof(AMRDecoderState)); @@ -117,13 +117,13 @@ static int amrnb_decode_init(AVCodecCont /** - * Decode the bitstream into the AMR parameters and discover the frame mode + * Decode the bitstream into the AMR parameters and discover the frame mode. * * @param buf pointer to the input buffer * @param buf_size size of the input buffer * @param speech_mode pointer to the speech mode * - * @return Returns the frame mode + * @return the frame mode */ enum Mode decode_bitstream(AVCodecContext *avctx, uint8_t *buf, int buf_size, @@ -134,7 +134,7 @@ enum Mode decode_bitstream(AVCodecContex int i; const AMROrder *order; - // initialise get_bits + // initialize get_bits init_get_bits(&p->gb, buf, buf_size*8); skip_bits1(&p->gb); // set the mode @@ -207,8 +207,8 @@ enum Mode decode_bitstream(AVCodecContex /** - * DESCRIPTION FROM REF SOURCE: - * Make sure that the LSFs are properly ordered and to keep a certain minimum + * DESCRIPTION FROM REFERENCE SOURCE: + * Make sure that the LSFs are properly ordered and keep a certain minimum * distance between adjacent LSFs. * * @param lsf a vector of lsfs (range: 0<=val<=0.5) @@ -230,7 +230,7 @@ static void reorder_lsf(int *lsf, int mi /** - * Convert a vector of lsfs into the corresponding, cosine domain lsps + * Convert a vector of lsfs into the corresponding cosine domain lsps. * * @param lsf a vector of lsfs * @param lsp a vector of lsps @@ -250,7 +250,7 @@ static void lsf2lsp(int *lsf, int *lsp) /** - * Convert a set of 3 lsf quantisation indices into lsp parameters + * Convert a set of 3 lsf quantization indexes into lsp parameters. * * @param avctx pointer to the AVCodecContext for AMR */ @@ -260,12 +260,13 @@ static void decode_lsf2lsp_3(AVCodecCont AMRContext *p = avctx->priv_data; int lsf1_r[LP_FILTER_ORDER]; // vector of residual lsfs - int lsf1_q[LP_FILTER_ORDER]; // vector of quantised lsfs + int lsf1_q[LP_FILTER_ORDER]; // vector of quantized lsfs const int16_t (*lsf_3_temp1)[3], (*lsf_3_temp3)[4]; // temp ptrs for switching tables depending on mode int index_temp; // temp lsf index int i; // counter - // if the current frame is bad estimate the past quantised residual based on the past lsf shifted slightly towards the mean + /* if the current frame is bad, estimate the past quantized residual + * based on the past lsf shifted slightly towards the mean */ if(p->bad_frame_indicator) { for(i=0; i<LP_FILTER_ORDER; i++) { lsf1_q[i] = ( (p->prev_lsf_dq[i]*ALPHA)>>15 ) + ( (lsf_3_mean[i]*ONE_ALPHA)>>15 ); @@ -292,13 +293,14 @@ static void decode_lsf2lsp_3(AVCodecCont lsf_3_temp3 = lsf_3_3; } - // decode lsf residuals from lsf tables using the indices from the bitstream + // decode lsf residuals from lsf tables using the bitstream indexes lsf1_r[0] = lsf_3_temp1[ p->amr_prms[0] ][0]; lsf1_r[1] = lsf_3_temp1[ p->amr_prms[0] ][1]; lsf1_r[2] = lsf_3_temp1[ p->amr_prms[0] ][2]; index_temp = p->amr_prms[1]; - // MODE_475, MODE_515 only use every second entry - NOTE : not quite sure what they mean and the spec doesn't mention this + /* MODE_475, MODE_515 only use every second entry + * NOTE: unsure what they mean and the spec doesn't mention this */ if((p->cur_frame_mode == MODE_475) || (p->cur_frame_mode == MODE_515)) { index_temp = index_temp << 1; } @@ -325,7 +327,7 @@ static void decode_lsf2lsp_3(AVCodecCont } } - /* verification that LSFs has minimum distance of LSF_GAP Hz */ + /* verification that LSFs have minimum distance of LSF_GAP Hz */ reorder_lsf(lsf1_q, LSF_GAP); memcpy(p->prev_lsf_dq, lsf1_q, LP_FILTER_ORDER<<2); @@ -335,7 +337,7 @@ static void decode_lsf2lsp_3(AVCodecCont /** - * Convert a set of 5 lsf quantisation indices into lsp parameters + * Convert a set of 5 lsf quantization indexes into lsp parameters. * * @param avctx pointer to the AVCodecContext for AMR */ @@ -345,11 +347,12 @@ static void decode_lsf2lsp_5(AVCodecCont AMRContext *p = avctx->priv_data; int lsf1_r[LP_FILTER_ORDER], lsf2_r[LP_FILTER_ORDER]; // vectors of residual lsfs - int lsf1_q[LP_FILTER_ORDER], lsf2_q[LP_FILTER_ORDER]; // vectors of quantised lsfs + int lsf1_q[LP_FILTER_ORDER], lsf2_q[LP_FILTER_ORDER]; // vectors of quantized lsfs int temp; int i, sign; // counter and sign of 3rd lsf table - // if the current frame is bad estimate the past quantised residual based on the past lsf shifted slightly towards the mean + /* if the current frame is bad, estimate the past quantized residual + * based on the past lsf shifted slightly towards the mean */ if(p->bad_frame_indicator) { for(i=0; i<LP_FILTER_ORDER; i++) { lsf1_q[i] = ( (p->prev_lsf_dq[i]*ALPHA_122)>>15 ) + ( (lsf_5_mean[i]*ONE_ALPHA_122)>>15 ); @@ -359,7 +362,7 @@ static void decode_lsf2lsp_5(AVCodecCont p->prev_residual_q[i] = lsf2_q[i] - lsf_5_mean[i] - ( (p->prev_residual_q[i]*LSP_PRED_FAC_MODE_122)>>15 ); } }else { - /* decode prediction residuals from 5 received indices */ + /* decode prediction residuals from 5 received indexes */ lsf1_r[0] = lsf_5_1[ p->amr_prms[0] ][0]; lsf1_r[1] = lsf_5_1[ p->amr_prms[0] ][1]; lsf2_r[0] = lsf_5_1[ p->amr_prms[0] ][2]; @@ -436,7 +439,8 @@ static void lsp2poly(int *lsp, int *f) f[1] -= lsp[2*i-2]<<10; } } -/* FIXME - check rounding sensitivity of F1(z) and F2(z) as the code below is faster but rounds differently +/* FIXME - check rounding sensitivity of F1(z) and F2(z) + * as the code below is faster but rounds differently static void lsp2poly(int *lsp, int *f) { int i, j; f[0] = 1<<24; @@ -452,7 +456,7 @@ static void lsp2poly(int *lsp, int *f) { /** - * Convert a vector of lsps to lpc coefficients for a 10th order filter + * Convert a vector of lsps to lpc coefficients for a 10th order filter. * * @param lsp vector of lsps * @param lpc_coeffs pointer to a subframe of lpc coefficients @@ -494,7 +498,7 @@ static void lsp2lpc(int *lsp, int *lpc_c /** - * Interpolate lsps for subframes 1 and 3 and convert them to lpc coefficients + * Interpolate lsps for subframes 1 and 3 and convert them to lpc coefficients. * * @param avctx pointer to AVCodecContext * @param lpc_coeffs array of lpc coefficients for the four subframes @@ -531,7 +535,7 @@ static void lpc_interp_13(AVCodecContext /** - * Interpolate lsps for subframes 1, 2 and 3 and convert them to lpc coefficients + * Interpolate lsps for subframes 1, 2 and 3 and convert them to lpc coefficients. * * @param avctx pointer to AVCodecContext * @param lpc_coeffs array of lpc coefficients for the four subframes @@ -573,10 +577,10 @@ static void lpc_interp_123(AVCodecContex /** - * Decode the adaptive codebook index to the integer and fractional pitch lags for one subframe - * at 1/3 resolution + * Decode the adaptive codebook index to the integer and fractional + * pitch lags for one subframe at 1/3 resolution. * - * Description from ref source: + * Description from reference source: * The fractional lag in 1st and 3rd subframes is encoded with 8 bits * while that in 2nd and 4th subframes is relatively encoded with 4, 5 * and 6 bits depending on the mode. @@ -593,16 +597,17 @@ static void decode_pitch_lag_3(AVCodecCo AMRContext *p = avctx->priv_data; int tmp_lag; - // FIXME - find out where these constants come from and add appropriate comments - // such that people reading the code can understand why these particular values - // are used + // FIXME: find out where these constants come from and add appropriate + // comments such that people reading the code can understand why these + // particular values are used // subframe 1 or 3 if(p->cur_subframe & 1) { if(pitch_index < 197) { *pitch_lag_int = (( (pitch_index + 2)*10923 )>>15) + 19; *pitch_lag_frac = pitch_index - *pitch_lag_int*3 + 58; - // For the sake of deciphering where this comes from, the above code probably means: + // For the sake of deciphering where this comes from, + // the above code probably means: // *pitch_lag_int = (pitch_index + 2)/3 + 19; // *pitch_lag_frac = (pitch_index + 2)%3 + 56; }else { @@ -639,16 +644,16 @@ static void decode_pitch_lag_3(AVCodecCo /** - * Decode the adaptive codebook index to the integer and fractional pitch lag for one subframe - * at 1/6 resolution + * Decode the adaptive codebook index to the integer and fractional + * pitch lag for one subframe at 1/6 resolution. * - * Description from ref source: + * Description from reference source: * The fractional lag in 1st and 3rd subframes is encoded with 9 bits * while that in 2nd and 4th subframes is relatively encoded with 6 bits. * Note that in relative encoding only 61 values are used. If the * decoder receives 61, 62, or 63 as the relative pitch index, it means * that a transmission error occurred. In this case, the pitch lag from - * previous subframe (actually from previous frame) is used. + * the previous subframe (actually from the previous frame) is used. * * @param avctx pointer to AVCodecContext * @param pitch_index received adaptive codebook (pitch) index @@ -662,9 +667,9 @@ static void decode_pitch_lag_6(AVCodecCo AMRContext *p = avctx->priv_data; int temp; - // FIXME - find out where these constants come from and add appropriate comments - // such that people reading the code can understand why these particular values - // are used + // FIXME - find out where these constants come from and add appropriate + // comments such that people reading the code can understand why these + // particular values are used. // subframe 1 or 3 if(p->cur_subframe & 1) { @@ -694,11 +699,12 @@ static void decode_pitch_lag_6(AVCodecCo /** - * Find the adaptive codebook (pitch) vector from interpolating the past excitation at the - * decoded pitch lag with corresponding resolution of 1/3 or 1/6 + * Find the adaptive codebook (pitch) vector from interpolating the past + * excitation at the decoded pitch lag with corresponding resolution + * of 1/3 or 1/6. * * See the specification for details of the underlying mathematics and the used - * FIR filter + * FIR filter. * * @param avctx pointer to AVCodecContext * @param excitation pointer to the excitation buffer @@ -732,7 +738,7 @@ static void decode_pitch_vector(AVCodecC /** - * Reconstruct the algebraic codebook vector + * Reconstruct the algebraic codebook vector. * * @param fixed_code algebraic codebook vector * @param pulse_position vector of pulse positions @@ -755,7 +761,7 @@ static void reconstruct_fixed_code(int * /** - * Decode the algebraic codebook index to pulse position indices for MODE_102 + * Decode the algebraic codebook index to pulse position indexes for MODE_102. * * @param fixed_index positions of the eight pulses (encoded) * @param position_index position index of the eight pulses @@ -765,7 +771,7 @@ static void fixed2position(int16_t *fixe { int MSBs, LSBs, MSBs0_24, divMSB; - // indices from track 1 (7+3 bits) + // indexes from track 1 (7+3 bits) MSBs= FFMIN(fixed_index[0] >> 3, 124); // LSBs = fixed_index[0]%8; LSBs = fixed_index[0] & 0x7; @@ -777,7 +783,7 @@ static void fixed2position(int16_t *fixe position_index[4] = (( (MSBs - 25*divMSB)/5 )<<1) + ((LSBs & 0x2)>>1); position_index[1] = (divMSB<<1) + (LSBs>>2); - // indices from track 2 (7+3 bits) + // indexes from track 2 (7+3 bits) MSBs= FFMIN(fixed_index[1] >> 3, 124); // LSBs = fixed_index[1]%8; LSBs = fixed_index[1] & 0x7; @@ -789,7 +795,7 @@ static void fixed2position(int16_t *fixe position_index[6] = (( (MSBs - 25*divMSB)/5 )<<1) + ((LSBs & 0x2)>>1); position_index[5] = (divMSB<<1) + (LSBs>>2); - // indices from track 3 (5+2 bits) + // indexes from track 3 (5+2 bits) MSBs = fixed_index[2] >> 2; // LSBs = fixed_index[2]%4; LSBs = fixed_index[2] & 0x3; @@ -806,8 +812,8 @@ static void fixed2position(int16_t *fixe /** - * Decode the algebraic codebook index to pulse positions and signs and construct - * the algebraic codebook vector for MODE_475 and MODE_515 + * Decode the algebraic codebook index to pulse positions and signs and + * construct the algebraic codebook vector for MODE_475 and MODE_515. * * @param avctx pointer to AVCodecContext * @param sign signs of the two pulses @@ -835,8 +841,8 @@ static void decode_2_pulses_9bits(AVCode /** - * Decode the algebraic codebook index to pulse positions and signs and construct - * the algebraic codebook vector for MODE_59 + * Decode the algebraic codebook index to pulse positions and signs + * and construct the algebraic codebook vector for MODE_59. * * @param sign signs of the two pulses * @param fixed_index positions of the two pulses @@ -867,8 +873,8 @@ static void decode_2_pulses_11bits(int s /** - * Decode the algebraic codebook index to pulse positions and signs and construct - * the algebraic codebook vector for MODE_67 + * Decode the algebraic codebook index to pulse positions and signs + * and construct the algebraic codebook vector for MODE_67. * * @param sign signs of the three pulses * @param fixed_index positions of the three pulses @@ -897,8 +903,8 @@ static void decode_3_pulses_14bits(int s /** - * Decode the algebraic codebook index to pulse positions and signs and construct - * the algebraic codebook vector for MODE_74 and MODE_795 + * Decode the algebraic codebook index to pulse positions and signs and + * construct the algebraic codebook vector for MODE_74 and MODE_795. * * @param sign signs of the four pulses * @param fixed_index positions of the four pulses @@ -927,8 +933,8 @@ static void decode_4_pulses_17bits(int s /** - * Decode the algebraic codebook index to pulse positions and signs and construct - * the algebraic codebook vector for MODE_102 + * Decode the algebraic codebook index to pulse positions and signs + * and construct the algebraic codebook vector for MODE_102. * * @param fixed_index positions of the eight pulses * @param fixed_code pointer to the algebraic codebook vector @@ -961,8 +967,8 @@ static void decode_8_pulses_31bits(int16 /** - * Decode the algebraic codebook index to pulse positions and signs and construct - * the algebraic codebook vector for MODE_122 + * Decode the algebraic codebook index to pulse positions and signs + * and construct the algebraic codebook vector for MODE_122. * * @param fixed_index positions of the ten pulses * @param fixed_code pointer to the algebraic codebook vector @@ -979,7 +985,7 @@ static void decode_10_pulses_35bits(int1 // find the position of the ith pulse pos1 = dgray[fixed_index[i ] & 7]*5 + i; // find the sign of the ith pulse - sign = (fixed_index[i] & 8) ? -4096 : 4096; // +/-1 : 4096 is used here in the ref source + sign = (fixed_index[i] & 8) ? -4096 : 4096; // +/-1 : 4096 is used here in the reference source // find the position of the i+5th pulse pos2 = dgray[fixed_index[i+5] & 7]*5 + i; // assign the ith pulse (+/-1) to its appropriate position @@ -995,10 +1001,10 @@ static void decode_10_pulses_35bits(int1 // general functions FIXME - useful enough to put into libavutil? /** - * Comparison function for use with qsort + * Comparison function for use with qsort. * - * @param a First value for comparison - * @param b Second value for comparison + * @param a first value for comparison + * @param b second value for comparison * @return a-b : the result of the comparison */ @@ -1008,11 +1014,11 @@ int qsort_compare(const int *a, const in } /** - * Find the median of some values + * Find the median of some values. * * @param values pointer to the values of which to find the median * @param n number of values - * @return Returns the median value + * @return the median value */ static int median(int *values, int n) @@ -1030,10 +1036,10 @@ static int median(int *values, int n) // gain functions /** - * Calculate the pitch gain from previous values + * Calculate the pitch gain from previous values. * * @param state_ptr pointer to the current state - * @return Returns the pitch gain + * @return the pitch gain */ static int find_pitch_gain(AMRDecoderState *state_ptr) @@ -1052,11 +1058,11 @@ static int find_pitch_gain(AMRDecoderSta /** - * Decode the pitch gain using the received index + * Decode the pitch gain using the received index. * * @param mode current mode - * @param index quantisation index - * @return Returns the pitch gain + * @param index quantization index + * @return the pitch gain */ static int decode_pitch_gain(enum Mode mode, int index) @@ -1075,7 +1081,7 @@ static int decode_pitch_gain(enum Mode m /** - * Update the pitch gain and limit pitch_gain if the previous frame was bad + * Update the pitch gain and limit pitch_gain if the previous frame was bad. * * @param state_ptr pointer to the current state * @param bad_frame_indicator bad frame indicator @@ -1113,7 +1119,7 @@ static void pitch_gain_update(AMRDecoder /** - * Reset the AMR frame parameters + * Reset the AMR frame parameters. * * @param avctx pointer to the AVCodecContext for AMR */ @@ -1139,7 +1145,7 @@ static int amrnb_decode_frame(AVCodecCon const int16_t *homing_frame; // pointer to the homing frame int homing_frame_size; // homing frame size - // decode the bitstream to amr parameters + // decode the bitstream to AMR parameters p->cur_frame_mode = decode_bitstream(avctx, buf, buf_size, &speech_mode); // guess the mode from the previous frame if no data or bad data @@ -1267,14 +1273,15 @@ static int amrnb_decode_frame(AVCodecCon p->prev_frame_type = p->cur_frame_type; p->prev_frame_mode = p->cur_frame_mode; - /* To make it easy the stream can only be 16 bits mono, so let's convert it to that */ + /* To make it easy the stream can only be 16 bits mono, + * so let's convert it to that */ for (i=0 ; i<buf_size; i++) outbuffer[i] = (int16_t)p->sample_buffer[i]; /* Report how many samples we got */ *data_size = buf_size; - /* Return the amount of bytes consumed if everything was ok */ + /* Return the amount of bytes consumed if everything was OK */ return *data_size*sizeof(int16_t); } @@ -1288,7 +1295,7 @@ static int amrnb_decode_close(AVCodecCon av_free(p->amr_prms); av_free(p->state); - /* Return 0 if everything is ok, -1 if not */ + /* Return 0 if everything is OK, -1 if not */ return 0; } Modified: amr/amrnbfloatdata.h ============================================================================== --- amr/amrnbfloatdata.h Sun Jan 25 16:35:48 2009 (r3999) +++ amr/amrnbfloatdata.h Sun Jan 25 16:38:52 2009 (r4000) @@ -98,9 +98,9 @@ typedef struct AMROrder { /**************************** tables *****************************/ -// The following order* tables are used to reorder the bitstream into the bit allocation -// format as in the specification. The bits are grouped into three classes of importance. -// See the specification, for more information. +// The following order* tables are used to reorder the bitstream into the bit +// allocation format as in the specification. The bits are grouped into three +// classes of importance. See the specification for more information. static const AMROrder order_MODE_475[95] = { { 0, 7}, { 0, 6}, { 0, 5}, { 0, 4}, { 0, 3}, { 0, 2}, { 0, 1}, { 0, 0}, @@ -1814,7 +1814,7 @@ static const uint8_t gray_decode[8] = { #define MIN_ENERGY -14.0 -// scalar quantised pitch gain table for 7.95 and 12.2 kbps modes +// scalar quantized pitch gain table for 7.95 and 12.2 kbps modes static const float qua_gain_pit[16] = { 0.0 , 0.20001220703125, 0.400146484375 , 0.5 , 0.5999755859375 , 0.70001220703125, 0.75 , 0.79998779296875, @@ -1822,10 +1822,11 @@ static const float qua_gain_pit[16] = { 1.04998779296875, 1.0999755859375 , 1.1500244140625 , 1.20001220703125, }; -// scalar quantised fixed gain table for 7.95 and 12.2 kbps modes -// note: this table was generated from the integer qua_gain_code tables in the -// ref source that store Q10 qua_ener = 20*log10(g_fac). The table below stores -// g_fac as a float from printf("%10.6f,\n", powf(10.0, qua_ener/(20.0*(1<<10)))) +// scalar quantized fixed gain table for 7.95 and 12.2 kbps modes +// NOTE: This table was generated from the integer qua_gain_code tables +// in the reference source that store Q10 qua_ener = 20*log10(g_fac). +// The table below stores g_fac as a float from +// printf("%10.6f,\n", powf(10.0, qua_ener/(20.0*(1<<10)))). static const float qua_gain_code[32] = { 0.077640, 0.100586, 0.130857, 0.170410, 0.204592, 0.235358, 0.270507, 0.311044, 0.357898, 0.411116, 0.473151, 0.543935, 0.625519, 0.719258, 0.827138, 0.951199, @@ -1841,7 +1842,7 @@ static const float energy_mean[8] = { 33 static const float energy_pred_fac[4] = { 0.68, 0.58, 0.34, 0.19 }; // gain table for 4.75 kbps mode -// first index has even/odd indices for subframes 0,2/1,3 +// first index has even/odd indexes for subframes 0,2/1,3 // second index is {pitch_gain, fixed_gain_factor} static const float gains_MODE_475[512][2] = { {0.049561, 0.031250}, {0.033081, 0.034180}, {0.175354, 0.277100}, {0.138306, 0.830566}, Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Sun Jan 25 16:35:48 2009 (r3999) +++ amr/amrnbfloatdec.c Sun Jan 25 16:38:52 2009 (r4000) @@ -41,7 +41,7 @@ typedef struct AMRContext { GetBitContext gb; - int16_t amr_prms[PRMS_MODE_122]; ///< decoded amr parameters (lsf coefficients, codebook indices, etc) + int16_t amr_prms[PRMS_MODE_122]; ///< decoded AMR parameters (lsf coefficients, codebook indexes, etc) int bad_frame_indicator; ///< bad frame ? 1 : 0 int cur_frame_mode; ///< current frame mode int cur_frame_type; ///< current frame type @@ -52,7 +52,7 @@ typedef struct AMRContext { float lsp_avg[LP_FILTER_ORDER]; ///< vector of averaged lsp coefficients - float lpc[4][LP_FILTER_ORDER]; ///< vectors of lpc coefficients for 4 subframes + float lpc[4][LP_FILTER_ORDER]; ///< lpc coefficient vectors for 4 subframes int search_range_min; ///< minimum pitch lag search range int search_range_max; ///< maximum pitch lag search range @@ -90,9 +90,9 @@ static void reset_state(AMRContext *p) { int i; - // initialise values for the lsp vector from the 4th subframe of the - // previous subframe values - // taken from Decoder_amr_reset using val/(float)(1<<15) + // Initialize values for the lsp vector from the 4th subframe of the + // previous subframe values. + // Taken from Decoder_amr_reset using val/(float)(1<<15). p->prev_lsp_sub4[0] = 0.91552734375; p->prev_lsp_sub4[1] = 0.79345703125; p->prev_lsp_sub4[2] = 0.640869140625; @@ -104,8 +104,8 @@ static void reset_state(AMRContext *p) p->prev_lsp_sub4[8] = -0.640869140625; p->prev_lsp_sub4[9] = -0.79345703125; - // initialise mean lsp values - // taken from Decoder_amr_reset using val/(float)(1<<15) + // Initialize mean lsp values. + // Taken from Decoder_amr_reset using val/(float)(1<<15). p->lsp_avg[0] = 0.042236328125; p->lsp_avg[1] = 0.063385009765625; p->lsp_avg[2] = 0.1043701171875; @@ -148,13 +148,13 @@ static int amrnb_decode_init(AVCodecCont /** - * Decode the bitstream into the AMR parameters and discover the frame mode + * Decode the bitstream into the AMR parameters and discover the frame mode. * * @param buf pointer to the input buffer * @param buf_size size of the input buffer * @param speech_mode pointer to the speech mode * - * @return Returns the frame mode + * @return the frame mode */ enum Mode decode_bitstream(AMRContext *p, uint8_t *buf, int buf_size, @@ -167,7 +167,7 @@ enum Mode decode_bitstream(AMRContext *p // reset amr_prms memset(p->amr_prms, 0, PRMS_MODE_122 * sizeof(int16_t)); - // initialise get_bits + // initialize get_bits init_get_bits(&p->gb, buf, buf_size*8); skip_bits(&p->gb, 1); // set the mode @@ -242,7 +242,7 @@ enum Mode decode_bitstream(AMRContext *p /*** LPC coefficient decoding functions ***/ /** - * Convert an lsf vector into an lsp vector + * Convert an lsf vector into an lsp vector. * * @param lsf input lsf vector * @param lsp output lsp vector @@ -258,7 +258,7 @@ static void lsf2lsp(float *lsf, float *l } /** - * Decode a set of 5 split-matrix quantised lsf indices into an lsp vector + * Decode a set of 5 split-matrix quantized lsf indexes into an lsp vector. * * @param p pointer to the AMRContext */ @@ -319,7 +319,7 @@ static void lsf2lsp_5(AMRContext *p) } /** - * Decode a set of 3 split-matrix quantised lsf indices into an lsp vector + * Decode a set of 3 split-matrix quantized lsf indexes into an lsp vector. * * @param p pointer to the AMRContext */ @@ -351,8 +351,8 @@ static void lsf2lsp_3(AMRContext *p) lsf_r[2] = lsf_3_1_tmp[ idx ][2]; idx = p->amr_prms[1]; - // MODE_475, MODE_515 only use every other entry as their indices are stored - // using 1 less bit (8-bits vs 9-bits) + // MODE_475, MODE_515 only use every other entry as their indexes + // are stored using 1 less bit (8 bits vs 9 bits) if((p->cur_frame_mode == MODE_475) || (p->cur_frame_mode == MODE_515)) { idx <<= 1; } @@ -377,7 +377,7 @@ static void lsf2lsp_3(AMRContext *p) } /** - * Interpolate lsp vectors for subframes 1 and 3 + * Interpolate lsp vectors for subframes 1 and 3. * * @param p pointer to the AMRContext */ @@ -393,7 +393,7 @@ static void interp_lsp_13(AMRContext *p) } /** - * Interpolate lsp vectors for subframes 1, 2 and 3 + * Interpolate lsp vectors for subframes 1, 2 and 3. * * @param p pointer to the AMRContext */ @@ -410,7 +410,7 @@ static void interp_lsp_123(AMRContext *p } /** - * Find the polynomial F1(z) or F2(z) from the lsp vectors + * Find the polynomial F1(z) or F2(z) from the lsp vectors. * * @param lsp input lsp vector * @param f pointer to the polynomial F1(z) or F2(z) @@ -433,7 +433,7 @@ static void lsp2poly(float *lsp, float * } /** - * Convert an lsp vector to lpc coefficients + * Convert an lsp vector to lpc coefficients. * * @param lsp input lsp vector * @param lpc output lpc coefficients @@ -457,8 +457,8 @@ static void lsp2lpc(float *lsp, float *l // A(z) = ( F1'(z) + F2'(z) )/2 // note f1 and f2 are actually f1' and f2' for(i=0; i<5; i++) { - lpc_coeffs[i] = 0.5*(f1[i+2] + f2[i+2]); // lpc 0..4 uses indices to f, 2..6 - lpc_coeffs[i+5] = 0.5*(f1[6-i] - f2[6-i]); // lpc 5..9 uses indices to f, 6..2 + lpc_coeffs[i] = 0.5*(f1[i+2] + f2[i+2]); // lpc 0..4 uses indexes to f, 2..6 + lpc_coeffs[i+5] = 0.5*(f1[6-i] - f2[6-i]); // lpc 5..9 uses indexes to f, 6..2 } } @@ -468,8 +468,8 @@ static void lsp2lpc(float *lsp, float *l /*** pitch vector decoding functions ***/ /** - * Decode the adaptive codebook index to the integer and fractional parts of the - * pitch lag for one subframe at 1/3 resolution + * Decode the adaptive codebook index to the integer and fractional parts + * of the pitch lag for one subframe at 1/3 resolution. * * @param p pointer to the AMRContext * @param pitch_index parsed adaptive codebook (pitch) index @@ -492,7 +492,7 @@ static void decode_pitch_lag_3(AMRContex }else { if( (p->cur_frame_mode == MODE_475) || (p->cur_frame_mode == MODE_515) || (p->cur_frame_mode == MODE_59) || (p->cur_frame_mode == MODE_67) ) { - // decoding with 4 bit resolution + // decoding with 4-bit resolution int t1_temp = FFMAX(FFMIN(p->prev_pitch_lag_int, p->search_range_max-4), p->search_range_min+5); if(pitch_index < 4) { @@ -519,8 +519,8 @@ static void decode_pitch_lag_3(AMRContex } /** - * Decode the adaptive codebook index to the integer and fractional parts of the - * pitch lag for one subframe at 1/6 resolution + * Decode the adaptive codebook index to the integer and fractional parts + * of the pitch lag for one subframe at 1/6 resolution. * * @param p pointer to the AMRContext * @param pitch_index parsed adaptive codebook (pitch) index @@ -550,7 +550,7 @@ static void decode_pitch_lag_6(AMRContex /** * Calculate the pitch vector by interpolating the past excitation at the pitch - * pitch lag using a b60 hamming windowed sinc function + * pitch lag using a b60 hamming windowed sinc function. * * @param prev_excitation pointer to the element after the previous excitations * @param lag_int integer part of pitch lag @@ -599,7 +599,7 @@ static void interp_pitch_vector(float *p /*** algebraic code book (fixed) vector decoding functions ***/ /** - * Reconstruct the algebraic codebook vector + * Reconstruct the algebraic codebook vector. * * @param pulse_position vector of pulse positions * @param sign signs of the pulses @@ -620,8 +620,8 @@ static void reconstruct_fixed_vector(int } /** - * Decode the algebraic codebook index to pulse positions and signs and construct - * the algebraic codebook vector for MODE_475 and MODE_515 + * Decode the algebraic codebook index to pulse positions and signs and + * construct the algebraic codebook vector for MODE_475 and MODE_515. * * @param fixed_index positions of the two pulses * @param sign signs of the two pulses @@ -647,8 +647,8 @@ static void decode_2_pulses_9bits(int fi } /** - * Decode the algebraic codebook index to pulse positions and signs and construct - * the algebraic codebook vector for MODE_59 + * Decode the algebraic codebook index to pulse positions and signs and + * construct the algebraic codebook vector for MODE_59. * * @param fixed_index positions of the two pulses * @param sign signs of the two pulses @@ -676,8 +676,8 @@ static void decode_2_pulses_11bits(int f } /** - * Decode the algebraic codebook index to pulse positions and signs and construct - * the algebraic codebook vector for MODE_67 + * Decode the algebraic codebook index to pulse positions and signs and + * construct the algebraic codebook vector for MODE_67. * * @param fixed_index positions of the three pulses * @param sign signs of the three pulses @@ -706,8 +706,8 @@ static void decode_3_pulses_14bits(int f } /** - * Decode the algebraic codebook index to pulse positions and signs and construct - * the algebraic codebook vector for MODE_74 and MODE_795 + * Decode the algebraic codebook index to pulse positions and signs and + * construct the algebraic codebook vector for MODE_74 and MODE_795. * * @param fixed_index positions of the four pulses * @param sign signs of the four pulses @@ -736,8 +736,8 @@ static void decode_4_pulses_17bits(int f } /** - * Decode the algebraic codebook index to pulse positions and signs and construct - * the algebraic codebook vector for MODE_102 + * Decode the algebraic codebook index to pulse positions and signs and + * construct the algebraic codebook vector for MODE_102. * * @param fixed_index positions of the eight pulses * @param fixed_vector pointer to the algebraic codebook vector @@ -791,8 +791,8 @@ static void decode_8_pulses_31bits(int16 } /** - * Decode the algebraic codebook index to pulse positions and signs and construct - * the algebraic codebook vector for MODE_122 + * Decode the algebraic codebook index to pulse positions and signs and + * construct the algebraic codebook vector for MODE_122. * * @param fixed_index positions of the ten pulses * @param fixed_vector pointer to the algebraic codebook vector @@ -827,12 +827,12 @@ static void decode_10_pulses_35bits(int1 /*** gain decoding functions ***/ /** - * Predict the fixed gain + * Predict the fixed gain. * * @param fixed_vector pointer to the algebraic codebook vector * @param prev_pred_error pointer to the quantified prediction errors from the previous four subframes * - * @return Returns the predicted fixed gain + * @return the predicted fixed gain */ static float fixed_gain_prediction(float *fixed_vector, float *prev_pred_error, @@ -863,10 +863,10 @@ static float fixed_gain_prediction(float /*** pre-processing functions ***/ /** - * Comparison function for use with qsort + * Comparison function for use with qsort. * - * @param a First value for comparison - * @param b Second value for comparison + * @param a first value for comparison + * @param b second value for comparison * @return a-b : the result of the comparison */ @@ -881,11 +881,11 @@ int qsort_compare(const float *a, const } /** - * Find the median of some float values + * Find the median of some float values. * * @param values pointer to the values of which to find the median * @param n number of values - * @return Returns the median value + * @return the median value */ static float medianf(float *values, int n) @@ -905,7 +905,7 @@ static float medianf(float *values, int /** * Circularly convolve the fixed vector with a phase dispersion impulse response - * filter + * filter. * * @param fixed_vector pointer to the fixed vector * @param ir_filter pointer to the impulse response filter @@ -945,7 +945,7 @@ static void convolve_circ(float *fixed_v /*** synthesis functions ***/ /** - * Conduct 10th order linear predictive coding synthesis + * Conduct 10th order linear predictive coding synthesis. * * @param p pointer to the AMRContext * @param excitation pointer to the excitation vector @@ -980,7 +980,7 @@ static int synthesis(AMRContext *p, floa float eta, temp1 = 0.0, temp2 = 0.0; for(i=0; i<AMR_SUBFRAME_SIZE; i++) { - // emphasise pitch vector contribution + // emphasize pitch vector contribution excitation_temp[i] = excitation[i] + pitch_factor*p->pitch_vector[i]; // find gain scale temp1 += excitation[i]*excitation[i]; @@ -999,7 +999,7 @@ static int synthesis(AMRContext *p, floa for(j=0; j<LP_FILTER_ORDER; j++) { samples[i] -= lpc[j]*samples[i-j-1]; } - // Detect overflow + // detect overflow if(fabsf(samples[i])>1.0) { overflow_temp = 1; samples[i] = av_clipf(samples[i], -1.0, 1.0); @@ -1015,7 +1015,7 @@ static int synthesis(AMRContext *p, floa /*** update functions ***/ /** - * Update buffers and history at the end of decoding a subframe + * Update buffers and history at the end of decoding a subframe. * * @param p pointer to the AMRContext */ @@ -1066,20 +1066,20 @@ static int amrnb_decode_frame(AVCodecCon int gains_index_MODE_475 = 0; // MODE_475 gains index coded every other subframe enum Mode speech_mode = MODE_475; // ??? - // decode the bitstream to amr parameters + // decode the bitstream to AMR parameters p->cur_frame_mode = decode_bitstream(p, buf, buf_size, &speech_mode); /*** LPC coefficient decoding ***/ if(p->cur_frame_mode == MODE_122) { - // decode split-matrix quantised lsf vector indices to lsp vectors + // decode split-matrix quantized lsf vector indexes to lsp vectors lsf2lsp_5(p); // interpolate LSP vectors at subframes 1 and 3 interp_lsp_13(p); // advance index into amr_prms index += 5; }else { - // decode split-matrix quantised lsf vector indices to an lsp vector + // decode split-matrix quantized lsf vector indexes to an lsp vector lsf2lsp_3(p); // interpolate LSP vectors at subframes 1, 2 and 3 interp_lsp_123(p); @@ -1305,10 +1305,10 @@ static int amrnb_decode_frame(AVCodecCon } - /* Report how many samples we got */ + /* report how many samples we got */ *data_size = AMR_BLOCK_SIZE * sizeof(int16_t); - /* Return the amount of bytes consumed if everything was ok */ + /* return the amount of bytes consumed if everything was OK */ return (mode_bits[p->cur_frame_mode] + 15)>>3; // +7 for rounding and +8 for TOC } @@ -1317,7 +1317,7 @@ static int amrnb_decode_close(AVCodecCon { AMRContext *p = avctx->priv_data; - /* Return 0 if everything is ok, -1 if not */ + /* return 0 if everything is OK, -1 if not */ return 0; }

1 0

[soc]: r3999 - in amr: amrnbdec.c amrnbfloatdec.c
by diego 25 Jan '09

25 Jan '09

Author: diego Date: Sun Jan 25 16:35:48 2009 New Revision: 3999 Log: Remove nonsensical '@return void' Doxygen comments. Modified: amr/amrnbdec.c amr/amrnbfloatdec.c Modified: amr/amrnbdec.c ============================================================================== --- amr/amrnbdec.c Sun Jan 25 16:27:50 2009 (r3998) +++ amr/amrnbdec.c Sun Jan 25 16:35:48 2009 (r3999) @@ -420,8 +420,6 @@ static void decode_lsf2lsp_5(AVCodecCont * * @param lsp vector of lsps * @param f pointer to the polynomial F1(z) or F2(z) - * - * @return void */ static void lsp2poly(int *lsp, int *f) @@ -458,8 +456,6 @@ static void lsp2poly(int *lsp, int *f) { * * @param lsp vector of lsps * @param lpc_coeffs pointer to a subframe of lpc coefficients - * - * @return void */ static void lsp2lpc(int *lsp, int *lpc_coeffs) @@ -502,8 +498,6 @@ static void lsp2lpc(int *lsp, int *lpc_c * * @param avctx pointer to AVCodecContext * @param lpc_coeffs array of lpc coefficients for the four subframes - * - * @return void */ static void lpc_interp_13(AVCodecContext *avctx, int **lpc_coeffs) @@ -541,8 +535,6 @@ static void lpc_interp_13(AVCodecContext * * @param avctx pointer to AVCodecContext * @param lpc_coeffs array of lpc coefficients for the four subframes - * - * @return void */ static void lpc_interp_123(AVCodecContext *avctx, int **lpc_coeffs) @@ -593,8 +585,6 @@ static void lpc_interp_123(AVCodecContex * @param pitch_index received adaptive codebook (pitch) index * @param pitch_lag_int pointer to integer part of the subframe pitch lag * @param pitch_lag_frac pointer to fractional part of the subframe pitch lag - * - * @return void */ static void decode_pitch_lag_3(AVCodecContext *avctx, int pitch_index, @@ -664,8 +654,6 @@ static void decode_pitch_lag_3(AVCodecCo * @param pitch_index received adaptive codebook (pitch) index * @param pitch_lag_int pointer to integer part of the subframe pitch lag * @param pitch_lag_frac pointer to fractional part of the subframe pitch lag - * - * @return void */ static void decode_pitch_lag_6(AVCodecContext *avctx, int pitch_index, @@ -714,8 +702,6 @@ static void decode_pitch_lag_6(AVCodecCo * * @param avctx pointer to AVCodecContext * @param excitation pointer to the excitation buffer - * - * @return void */ static void decode_pitch_vector(AVCodecContext *avctx, int *excitation) @@ -752,8 +738,6 @@ static void decode_pitch_vector(AVCodecC * @param pulse_position vector of pulse positions * @param sign signs of the pulses * @param nr_pulses number of pulses - * - * @return void */ static void reconstruct_fixed_code(int *fixed_code, int *pulse_position, @@ -775,8 +759,6 @@ static void reconstruct_fixed_code(int * * * @param fixed_index positions of the eight pulses (encoded) * @param position_index position index of the eight pulses - * - * @return void */ static void fixed2position(int16_t *fixed_index, int *position_index) @@ -831,8 +813,6 @@ static void fixed2position(int16_t *fixe * @param sign signs of the two pulses * @param fixed_index positions of the two pulses * @param fixed_code pointer to the algebraic codebook vector - * - * @return void */ static void decode_2_pulses_9bits(AVCodecContext *avctx, int sign, @@ -861,8 +841,6 @@ static void decode_2_pulses_9bits(AVCode * @param sign signs of the two pulses * @param fixed_index positions of the two pulses * @param fixed_code pointer to the algebraic codebook vector - * - * @return void */ static void decode_2_pulses_11bits(int sign, int fixed_index, int *fixed_code) @@ -895,8 +873,6 @@ static void decode_2_pulses_11bits(int s * @param sign signs of the three pulses * @param fixed_index positions of the three pulses * @param fixed_code pointer to the algebraic codebook vector - * - * @return void */ static void decode_3_pulses_14bits(int sign, int fixed_index, int *fixed_code) @@ -927,8 +903,6 @@ static void decode_3_pulses_14bits(int s * @param sign signs of the four pulses * @param fixed_index positions of the four pulses * @param fixed_code pointer to the algebraic codebook vector - * - * @return void */ static void decode_4_pulses_17bits(int sign, int fixed_index, int *fixed_code) @@ -958,8 +932,6 @@ static void decode_4_pulses_17bits(int s * * @param fixed_index positions of the eight pulses * @param fixed_code pointer to the algebraic codebook vector - * - * @return void */ static void decode_8_pulses_31bits(int16_t *fixed_index, int *fixed_code) @@ -994,8 +966,6 @@ static void decode_8_pulses_31bits(int16 * * @param fixed_index positions of the ten pulses * @param fixed_code pointer to the algebraic codebook vector - * - * @return void */ static void decode_10_pulses_35bits(int16_t *fixed_index, int *fixed_code) Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Sun Jan 25 16:27:50 2009 (r3998) +++ amr/amrnbfloatdec.c Sun Jan 25 16:35:48 2009 (r3999) @@ -246,8 +246,6 @@ enum Mode decode_bitstream(AMRContext *p * * @param lsf input lsf vector * @param lsp output lsp vector - * - * @return void */ static void lsf2lsp(float *lsf, float *lsp) @@ -263,8 +261,6 @@ static void lsf2lsp(float *lsf, float *l * Decode a set of 5 split-matrix quantised lsf indices into an lsp vector * * @param p pointer to the AMRContext - * - * @return void */ static void lsf2lsp_5(AMRContext *p) @@ -326,8 +322,6 @@ static void lsf2lsp_5(AMRContext *p) * Decode a set of 3 split-matrix quantised lsf indices into an lsp vector * * @param p pointer to the AMRContext - * - * @return void */ static void lsf2lsp_3(AMRContext *p) @@ -386,8 +380,6 @@ static void lsf2lsp_3(AMRContext *p) * Interpolate lsp vectors for subframes 1 and 3 * * @param p pointer to the AMRContext - * - * @return void */ static void interp_lsp_13(AMRContext *p) @@ -404,8 +396,6 @@ static void interp_lsp_13(AMRContext *p) * Interpolate lsp vectors for subframes 1, 2 and 3 * * @param p pointer to the AMRContext - * - * @return void */ static void interp_lsp_123(AMRContext *p) @@ -424,8 +414,6 @@ static void interp_lsp_123(AMRContext *p * * @param lsp input lsp vector * @param f pointer to the polynomial F1(z) or F2(z) - * - * @return void */ static void lsp2poly(float *lsp, float *f) @@ -449,8 +437,6 @@ static void lsp2poly(float *lsp, float * * * @param lsp input lsp vector * @param lpc output lpc coefficients - * - * @return void */ static void lsp2lpc(float *lsp, float *lpc_coeffs) @@ -488,8 +474,6 @@ static void lsp2lpc(float *lsp, float *l * @param p pointer to the AMRContext * @param pitch_index parsed adaptive codebook (pitch) index * @param subframe current subframe - * - * @return void */ static void decode_pitch_lag_3(AMRContext *p, int pitch_index, int subframe) @@ -541,8 +525,6 @@ static void decode_pitch_lag_3(AMRContex * @param p pointer to the AMRContext * @param pitch_index parsed adaptive codebook (pitch) index * @param subframe current subframe - * - * @return void */ static void decode_pitch_lag_6(AMRContext *p, int pitch_index, int subframe) @@ -575,8 +557,6 @@ static void decode_pitch_lag_6(AMRContex * @param lag_frac fractional part of pitch lag * @param mode current frame mode * @param pitch_vector pointer to the pitch vector - * - * @return void */ static void interp_pitch_vector(float *prev_excitation, int lag_int, @@ -625,8 +605,6 @@ static void interp_pitch_vector(float *p * @param sign signs of the pulses * @param nr_pulses number of pulses * @param fixed_vector algebraic codebook vector - * - * @return void */ static void reconstruct_fixed_vector(int *pulse_position, int sign, @@ -649,8 +627,6 @@ static void reconstruct_fixed_vector(int * @param sign signs of the two pulses * @param subframe current subframe * @param fixed_vector pointer to the algebraic codebook vector - * - * @return void */ static void decode_2_pulses_9bits(int fixed_index, int sign, int subframe, @@ -677,8 +653,6 @@ static void decode_2_pulses_9bits(int fi * @param fixed_index positions of the two pulses * @param sign signs of the two pulses * @param fixed_vector pointer to the algebraic codebook vector - * - * @return void */ static void decode_2_pulses_11bits(int fixed_index, int sign, @@ -708,8 +682,6 @@ static void decode_2_pulses_11bits(int f * @param fixed_index positions of the three pulses * @param sign signs of the three pulses * @param fixed_vector pointer to the algebraic codebook vector - * - * @return void */ static void decode_3_pulses_14bits(int fixed_index, int sign, @@ -740,8 +712,6 @@ static void decode_3_pulses_14bits(int f * @param fixed_index positions of the four pulses * @param sign signs of the four pulses * @param fixed_vector pointer to the algebraic codebook vector - * - * @return void */ static void decode_4_pulses_17bits(int fixed_index, int sign, @@ -771,8 +741,6 @@ static void decode_4_pulses_17bits(int f * * @param fixed_index positions of the eight pulses * @param fixed_vector pointer to the algebraic codebook vector - * - * @return void */ static void decode_8_pulses_31bits(int16_t *fixed_index, float *fixed_vector) @@ -828,8 +796,6 @@ static void decode_8_pulses_31bits(int16 * * @param fixed_index positions of the ten pulses * @param fixed_vector pointer to the algebraic codebook vector - * - * @return void */ static void decode_10_pulses_35bits(int16_t *fixed_index, float *fixed_vector)

1 0

[soc]: r3998 - in wmapro: wma3.h wma3dec.c
by diego 25 Jan '09

25 Jan '09

Author: diego Date: Sun Jan 25 16:27:50 2009 New Revision: 3998 Log: Use American English throughout, even for variable names. Modified: wmapro/wma3.h wmapro/wma3dec.c Modified: wmapro/wma3.h ============================================================================== --- wmapro/wma3.h Sun Jan 25 16:27:18 2009 (r3997) +++ wmapro/wma3.h Sun Jan 25 16:27:50 2009 (r3998) @@ -136,7 +136,7 @@ typedef struct WMA3DecodeContext { /** subframe/block decode state */ int subframe_len; //< current subframe length int channels_for_cur_subframe; - int channel_indices_for_cur_subframe[MAX_CHANNELS]; + int channel_indexes_for_cur_subframe[MAX_CHANNELS]; int subwoofer_cutoff; //< subwoofer cutoff value int cValidBarkBand; int* rgiBarkIndex; Modified: wmapro/wma3dec.c ============================================================================== --- wmapro/wma3dec.c Sun Jan 25 16:27:18 2009 (r3997) +++ wmapro/wma3dec.c Sun Jan 25 16:27:50 2009 (r3998) @@ -613,7 +613,7 @@ static int wma_decode_channel_transform( if(remaining_channels > 2){ for(i=0;i<s->channels_for_cur_subframe;i++){ - int channel_idx = s->channel_indices_for_cur_subframe[i]; + int channel_idx = s->channel_indexes_for_cur_subframe[i]; if(!s->channel[channel_idx].grouped && get_bits(gb,1)){ ++chgroup->nb_channels; s->channel[channel_idx].grouped = 1; @@ -870,7 +870,7 @@ static int wma_decode_scale_factors(WMA3 { int i; for(i=0;i<s->channels_for_cur_subframe;i++){ - int c = s->channel_indices_for_cur_subframe[i]; + int c = s->channel_indexes_for_cur_subframe[i]; /** resample scale factors for the new block size */ if(s->channel[c].reuse_sf){ @@ -1033,7 +1033,7 @@ static void wma_inverse_channel_transfor wma_calc_decorrelation_matrix(s,&s->chgroup[i]); for(x=0;x<s->channels_for_cur_subframe;x++){ - int chan = s->channel_indices_for_cur_subframe[x]; + int chan = s->channel_indexes_for_cur_subframe[x]; if(s->chgroup[i].use_channel[chan] == 1){ // assign ptrs ch_data[cnt] = s->channel[chan].coeffs; ++cnt; @@ -1072,7 +1072,7 @@ static void wma_window(WMA3DecodeContext { int i; for(i=0;i<s->channels_for_cur_subframe;i++){ - int c = s->channel_indices_for_cur_subframe[i]; + int c = s->channel_indexes_for_cur_subframe[i]; int j = s->channel[c].cur_subframe; int x; // FIXME: use dsp.vector_fmul_window @@ -1150,7 +1150,7 @@ static int wma_decode_subframe(WMA3Decod if(offset == s->channel[i].decoded_samples && subframe_len == s->channel[i].subframe_len[s->channel[i].cur_subframe]){ total_samples -= s->channel[i].subframe_len[s->channel[i].cur_subframe]; s->channel[i].decoded_samples += s->channel[i].subframe_len[s->channel[i].cur_subframe]; - s->channel_indices_for_cur_subframe[s->channels_for_cur_subframe] = i; + s->channel_indexes_for_cur_subframe[s->channels_for_cur_subframe] = i; ++s->channels_for_cur_subframe; } } @@ -1164,7 +1164,7 @@ static int wma_decode_subframe(WMA3Decod /** configure the decoder for the current subframe */ for(i=0;i<s->channels_for_cur_subframe;i++){ - int c = s->channel_indices_for_cur_subframe[i]; + int c = s->channel_indexes_for_cur_subframe[i]; if(s->channel[c].num_subframes <= 1){ s->cValidBarkBand = s->num_sfb[0]; @@ -1214,7 +1214,7 @@ static int wma_decode_subframe(WMA3Decod for(i=0;i<s->channels_for_cur_subframe;i++){ - int c = s->channel_indices_for_cur_subframe[i]; + int c = s->channel_indexes_for_cur_subframe[i]; if((s->channel[c].transmit_coefs = get_bits(gb,1))) transmit_coeffs = 1; } @@ -1255,11 +1255,11 @@ static int wma_decode_subframe(WMA3Decod /** decode quantization step modifiers for every channel */ if(s->channels_for_cur_subframe == 1) - s->channel[s->channel_indices_for_cur_subframe[0]].quant_step_modifier = 0; + s->channel[s->channel_indexes_for_cur_subframe[0]].quant_step_modifier = 0; else{ int modifier_len = get_bits(gb,3); for(i=0;i<s->channels_for_cur_subframe;i++){ - int c = s->channel_indices_for_cur_subframe[i]; + int c = s->channel_indexes_for_cur_subframe[i]; s->channel[c].quant_step_modifier = 0; if(get_bits(gb,1)){ if(modifier_len) @@ -1281,7 +1281,7 @@ static int wma_decode_subframe(WMA3Decod /** parse coefficients */ for(i=0;i<s->channels_for_cur_subframe;i++){ - int c = s->channel_indices_for_cur_subframe[i]; + int c = s->channel_indexes_for_cur_subframe[i]; if(s->channel[c].transmit_coefs) decode_coeffs(s,gb,c); } @@ -1291,7 +1291,7 @@ static int wma_decode_subframe(WMA3Decod if(transmit_coeffs){ wma_inverse_channel_transform(s); for(i=0;i<s->channels_for_cur_subframe;i++){ - int c = s->channel_indices_for_cur_subframe[i]; + int c = s->channel_indexes_for_cur_subframe[i]; int b; float* dst; if(c == s->lfe_channel) @@ -1328,7 +1328,7 @@ static int wma_decode_subframe(WMA3Decod /** handled one subframe */ for(i=0;i<s->channels_for_cur_subframe;i++){ - int c = s->channel_indices_for_cur_subframe[i]; + int c = s->channel_indexes_for_cur_subframe[i]; if(s->channel[c].cur_subframe >= s->channel[c].num_subframes){ av_log(s->avctx,AV_LOG_ERROR,"broken subframe\n"); return 0;

1 0

[soc]: r3997 - jpeg2000/j2k.h
by diego 25 Jan '09

25 Jan '09

Author: diego Date: Sun Jan 25 16:27:18 2009 New Revision: 3997 Log: small wording/spellling fix Modified: jpeg2000/j2k.h Modified: jpeg2000/j2k.h ============================================================================== --- jpeg2000/j2k.h Fri Jan 23 01:38:23 2009 (r3996) +++ jpeg2000/j2k.h Sun Jan 25 16:27:18 2009 (r3997) @@ -136,7 +136,7 @@ typedef struct { } J2kCblk; ///< code block typedef struct { - uint16_t xi0, xi1, yi0, yi1; ///< indices of codeblocks ([xi0, xi1)) + uint16_t xi0, xi1, yi0, yi1; ///< codeblock indexes ([xi0, xi1)) J2kTgtNode *zerobits; J2kTgtNode *cblkincl; } J2kPrec; ///< precinct

1 0

[soc]: r3964 - in wmapro: wma3.h wma3data.h wma3dec.c
by faust3 25 Jan '09

25 Jan '09

Author: faust3 Date: Sat Jan 17 12:48:58 2009 New Revision: 3964 Log: renamed huffman tables of the vector coder so that their names contain the vectorsize Modified: wmapro/wma3.h wmapro/wma3data.h wmapro/wma3dec.c Modified: wmapro/wma3.h ============================================================================== --- wmapro/wma3.h Sat Jan 17 12:03:28 2009 (r3963) +++ wmapro/wma3.h Sat Jan 17 12:48:58 2009 (r3964) @@ -116,9 +116,9 @@ typedef struct WMA3DecodeContext { int* rgiBarkIndex; VLC exp_vlc; - VLC huff_0_vlc; - VLC huff_1_vlc; - VLC huff_2_vlc; + VLC vec4_vlc; + VLC vec2_vlc; + VLC vec1_vlc; VLC coef_vlc[2]; VLC rlc_vlc; int coef_max[2]; Modified: wmapro/wma3data.h ============================================================================== --- wmapro/wma3data.h Sat Jan 17 12:03:28 2009 (r3963) +++ wmapro/wma3data.h Sat Jan 17 12:48:58 2009 (r3964) @@ -239,9 +239,9 @@ static const uint8_t ff_wma3_coef1_huffb }; -#define FF_WMA3_HUFF_0_SIZE 127 -#define FF_WMA3_HUFF_0_MAXBITS 14 -static const uint32_t ff_wma3_huff_0_codes[FF_WMA3_HUFF_0_SIZE] = { +#define FF_WMA3_HUFF_VEC4_SIZE 127 +#define FF_WMA3_HUFF_VEC4_MAXBITS 14 +static const uint32_t ff_wma3_vec4_huffcodes[FF_WMA3_HUFF_VEC4_SIZE] = { 0x0019, 0x0027, 0x00F2, 0x03BA, 0x0930, 0x1267, 0x0031, 0x0030, 0x0097, 0x0221, 0x058B, 0x0124, 0x00EB, 0x01D4, 0x03D8, 0x0584, 0x0364, 0x045F, 0x0F66, 0x0931, 0x24CD, 0x002F, 0x0039, 0x00E8, @@ -260,7 +260,7 @@ static const uint32_t ff_wma3_huff_0_cod 0x03C4, 0x08B8, 0x078B, 0x0755, 0x0581, 0x0F67, 0x0000, }; -static const uint8_t ff_wma3_huff_0_bits[FF_WMA3_HUFF_0_SIZE] = { +static const uint8_t ff_wma3_vec4_huffbits[FF_WMA3_HUFF_VEC4_SIZE] = { 5, 6, 8, 10, 12, 13, 6, 6, 8, 10, 11, 9, 8, 9, 10, 11, 10, 11, 12, 12, 14, 6, 6, 8, @@ -280,9 +280,9 @@ static const uint8_t ff_wma3_huff_0_bits }; -#define FF_WMA3_HUFF_1_SIZE 137 -#define FF_WMA3_HUFF_1_MAXBITS 12 -static const uint32_t ff_wma3_huff_1_codes[FF_WMA3_HUFF_1_SIZE] = { +#define FF_WMA3_HUFF_VEC2_SIZE 137 +#define FF_WMA3_HUFF_VEC2_MAXBITS 12 +static const uint32_t ff_wma3_vec2_huffcodes[FF_WMA3_HUFF_VEC2_SIZE] = { 0x055, 0x01C, 0x01A, 0x02B, 0x028, 0x067, 0x08B, 0x039, 0x170, 0x10D, 0x2A5, 0x047, 0x464, 0x697, 0x523, 0x8CB, 0x01B, 0x00E, 0x000, 0x010, 0x012, 0x036, 0x048, 0x04C, @@ -303,7 +303,7 @@ static const uint32_t ff_wma3_huff_1_cod 0x001, }; -static const uint8_t ff_wma3_huff_1_bits[FF_WMA3_HUFF_1_SIZE] = { +static const uint8_t ff_wma3_vec2_huffbits[FF_WMA3_HUFF_VEC2_SIZE] = { 7, 6, 6, 6, 7, 7, 8, 9, 9, 10, 10, 11, 11, 11, 12, 12, 6, 4, 5, 5, 6, 6, 7, 8, @@ -325,9 +325,9 @@ static const uint8_t ff_wma3_huff_1_bits }; -#define FF_WMA3_HUFF_2_SIZE 101 -#define FF_WMA3_HUFF_2_MAXBITS 11 -static const uint32_t ff_wma3_huff_2_codes[FF_WMA3_HUFF_2_SIZE] = { +#define FF_WMA3_HUFF_VEC1_SIZE 101 +#define FF_WMA3_HUFF_VEC1_MAXBITS 11 +static const uint32_t ff_wma3_vec1_huffcodes[FF_WMA3_HUFF_VEC1_SIZE] = { 0x01A, 0x003, 0x017, 0x010, 0x00C, 0x009, 0x005, 0x000, 0x00D, 0x00A, 0x009, 0x00C, 0x00F, 0x002, 0x004, 0x007, 0x00B, 0x00F, 0x01C, 0x006, 0x010, 0x015, 0x01C, 0x022, @@ -343,7 +343,7 @@ static const uint32_t ff_wma3_huff_2_cod 0x297, 0x355, 0x372, 0x373, 0x016, }; -static const uint8_t ff_wma3_huff_2_bits[FF_WMA3_HUFF_2_SIZE] = { +static const uint8_t ff_wma3_vec1_huffbits[FF_WMA3_HUFF_VEC1_SIZE] = { 7, 6, 5, 5, 5, 5, 5, 5, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, Modified: wmapro/wma3dec.c ============================================================================== --- wmapro/wma3dec.c Sat Jan 17 12:03:28 2009 (r3963) +++ wmapro/wma3dec.c Sat Jan 17 12:48:58 2009 (r3964) @@ -112,9 +112,9 @@ static av_cold int wma3_decode_end(AVCod free_vlc(&s->exp_vlc); free_vlc(&s->coef_vlc[0]); free_vlc(&s->coef_vlc[1]); - free_vlc(&s->huff_0_vlc); - free_vlc(&s->huff_1_vlc); - free_vlc(&s->huff_2_vlc); + free_vlc(&s->vec4_vlc); + free_vlc(&s->vec2_vlc); + free_vlc(&s->vec1_vlc); free_vlc(&s->rlc_vlc); for(i=0 ; i<BLOCK_NB_SIZES ; i++) @@ -228,17 +228,17 @@ static av_cold int wma3_decode_init(AVCo s->coef_max[1] = ((21+VLCBITS-1)/VLCBITS); - init_vlc(&s->huff_0_vlc, VLCBITS, FF_WMA3_HUFF_0_SIZE, - ff_wma3_huff_0_bits, 1, 1, - ff_wma3_huff_0_codes, 4, 4, 0); + init_vlc(&s->vec4_vlc, VLCBITS, FF_WMA3_HUFF_VEC4_SIZE, + ff_wma3_vec4_huffbits, 1, 1, + ff_wma3_vec4_huffcodes, 4, 4, 0); - init_vlc(&s->huff_1_vlc, VLCBITS, FF_WMA3_HUFF_1_SIZE, - ff_wma3_huff_1_bits, 1, 1, - ff_wma3_huff_1_codes, 4, 4, 0); + init_vlc(&s->vec2_vlc, VLCBITS, FF_WMA3_HUFF_VEC2_SIZE, + ff_wma3_vec2_huffbits, 1, 1, + ff_wma3_vec2_huffcodes, 4, 4, 0); - init_vlc(&s->huff_2_vlc, VLCBITS, FF_WMA3_HUFF_2_SIZE, - ff_wma3_huff_2_bits, 1, 1, - ff_wma3_huff_2_codes, 4, 4, 0); + init_vlc(&s->vec1_vlc, VLCBITS, FF_WMA3_HUFF_VEC1_SIZE, + ff_wma3_vec1_huffbits, 1, 1, + ff_wma3_vec1_huffcodes, 4, 4, 0); init_vlc(&s->rlc_vlc, VLCBITS, FF_WMA3_HUFF_RLC_SIZE, ff_wma3_huff_rlc_bits, 1, 1, @@ -725,18 +725,18 @@ static inline void wma_get_vec4(WMA3Deco unsigned int idx; int i = 0; // read 4 values - idx = get_vlc2(s->getbit, s->huff_0_vlc.table, VLCBITS, ((FF_WMA3_HUFF_0_MAXBITS+VLCBITS-1)/VLCBITS)); + idx = get_vlc2(s->getbit, s->vec4_vlc.table, VLCBITS, ((FF_WMA3_HUFF_VEC4_MAXBITS+VLCBITS-1)/VLCBITS)); if ( idx == 126 ) { while(i < 4){ - idx = get_vlc2(s->getbit, s->huff_1_vlc.table, VLCBITS, ((FF_WMA3_HUFF_1_MAXBITS+VLCBITS-1)/VLCBITS)); + idx = get_vlc2(s->getbit, s->vec2_vlc.table, VLCBITS, ((FF_WMA3_HUFF_VEC2_MAXBITS+VLCBITS-1)/VLCBITS)); if ( idx == 136 ){ - vals[i] = get_vlc2(s->getbit, s->huff_2_vlc.table, VLCBITS, ((FF_WMA3_HUFF_2_MAXBITS+VLCBITS-1)/VLCBITS)); + vals[i] = get_vlc2(s->getbit, s->vec1_vlc.table, VLCBITS, ((FF_WMA3_HUFF_VEC1_MAXBITS+VLCBITS-1)/VLCBITS)); if(vals[i] == 100) vals[i] += wma_get_large_val(s); - vals[i+1] = get_vlc2(s->getbit, s->huff_2_vlc.table, VLCBITS, ((FF_WMA3_HUFF_2_MAXBITS+VLCBITS-1)/VLCBITS)); + vals[i+1] = get_vlc2(s->getbit, s->vec1_vlc.table, VLCBITS, ((FF_WMA3_HUFF_VEC1_MAXBITS+VLCBITS-1)/VLCBITS)); if(vals[i+1] == 100) vals[i+1] += wma_get_large_val(s); }else{

5 7

[soc]: r3970 - in wmapro: wma3data.h wma3dec.c
by faust3 24 Jan '09

24 Jan '09

Author: faust3 Date: Sat Jan 17 13:55:52 2009 New Revision: 3970 Log: moved scale factor run length level and run tables next to the huffman tables and renamed them to ff_wma3_scale_rl_level / run Modified: wmapro/wma3data.h wmapro/wma3dec.c Modified: wmapro/wma3data.h ============================================================================== --- wmapro/wma3data.h Sat Jan 17 13:46:01 2009 (r3969) +++ wmapro/wma3data.h Sat Jan 17 13:55:52 2009 (r3970) @@ -118,6 +118,27 @@ static const uint8_t ff_wma3_scale_rl_hu }; +static const uint8_t ff_wma3_scale_rl_run[] = { + 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, + 18, 19, 20, 21, 22, 23, 24, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, + 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 0, 1, 2, 3, 4, 5, + 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, + 19, 20, 21, 22, 23, 24, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 0, 1, + 0, 1, 0, 1, +}; + +static const uint8_t ff_wma3_scale_rl_level[] = { + 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, + 8, 8, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +}; + + #define FF_WMA3_COEF0_SIZE 244 #define FF_WMA3_COEF0_MAXBITS 22 static const uint32_t ff_wma3_coef0_huffcodes[FF_WMA3_COEF0_SIZE] = { @@ -521,27 +542,6 @@ static const uint8_t ff_wma3_level_1[] = }; -static const uint8_t ff_wma3_run_mask[] = { - 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, - 18, 19, 20, 21, 22, 23, 24, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, - 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 0, 1, 2, 3, 4, 5, - 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, - 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, - 19, 20, 21, 22, 23, 24, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 0, 1, - 0, 1, 0, 1, -}; - -static const uint8_t ff_wma3_level_mask[] = { - 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, - 8, 8, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -}; - - static const float ff_wma3_default_decorrelation_matrices[] = { 1.000000, 0.707031, -0.707031, 0.707031, 0.707031, 0.578125, 0.707031, 0.410156, 0.578125, -0.707031, 0.410156, 0.578125, 0.000000, -0.816406, Modified: wmapro/wma3dec.c ============================================================================== --- wmapro/wma3dec.c Sat Jan 17 13:46:01 2009 (r3969) +++ wmapro/wma3dec.c Sat Jan 17 13:55:52 2009 (r3970) @@ -914,8 +914,8 @@ static int wma_decode_scale_factors(WMA3 }else if(idx == 1){ break; }else{ - skip = ff_wma3_run_mask[idx-2]; - level_mask = ff_wma3_level_mask[idx-2]; + skip = ff_wma3_scale_rl_run[idx-2]; + level_mask = ff_wma3_scale_rl_level[idx-2]; val = get_bits(gb,1)-1; }

3 3

[soc]: r3977 - in wmapro: wma3.h wma3dec.c
by faust3 24 Jan '09

24 Jan '09

Author: faust3 Date: Sat Jan 17 16:56:55 2009 New Revision: 3977 Log: removed channel mask from the context Modified: wmapro/wma3.h wmapro/wma3dec.c Modified: wmapro/wma3.h ============================================================================== --- wmapro/wma3.h Sat Jan 17 16:29:58 2009 (r3976) +++ wmapro/wma3.h Sat Jan 17 16:56:55 2009 (r3977) @@ -143,7 +143,6 @@ typedef struct WMA3DecodeContext { /** extradata */ unsigned int decode_flags; //< used compression features - unsigned int dwChannelMask; uint8_t sample_bit_depth; //< bits per sample /** general frame info */ Modified: wmapro/wma3dec.c ============================================================================== --- wmapro/wma3dec.c Sat Jan 17 16:29:58 2009 (r3976) +++ wmapro/wma3dec.c Sat Jan 17 16:56:55 2009 (r3977) @@ -37,7 +37,6 @@ static void dump_context(WMA3DecodeConte #define PRINT(a,b) av_log(s->avctx,AV_LOG_ERROR," %s = %d\n", a, b); #define PRINT_HEX(a,b) av_log(s->avctx,AV_LOG_ERROR," %s = %x\n", a, b); - PRINT_HEX("ed channelmask",s->dwChannelMask); PRINT("ed sample bit depth",s->sample_bit_depth); PRINT_HEX("ed decode flags",s->decode_flags); PRINT("samples per frame",s->samples_per_frame); @@ -133,6 +132,7 @@ static av_cold int wma3_decode_init(AVCo WMA3DecodeContext *s = avctx->priv_data; uint8_t *edata_ptr = avctx->extradata; int* sfb_offsets; + unsigned int channel_mask; int i; s->avctx = avctx; @@ -142,7 +142,7 @@ static av_cold int wma3_decode_init(AVCo s->sample_bit_depth = 16; //avctx->bits_per_sample; if (avctx->extradata_size >= 18) { s->decode_flags = AV_RL16(edata_ptr+14); - s->dwChannelMask = AV_RL32(edata_ptr+2); + channel_mask = AV_RL32(edata_ptr+2); // s->sample_bit_depth = AV_RL16(edata_ptr); /** dump the extradata */ @@ -195,10 +195,10 @@ static av_cold int wma3_decode_init(AVCo /** extract lfe channel position */ s->lfe_channel = -1; - if(s->dwChannelMask & 8){ + if(channel_mask & 8){ unsigned int mask = 1; for(i=0;i<32;i++){ - if(s->dwChannelMask & mask) + if(channel_mask & mask) ++s->lfe_channel; if(mask & 8) break;

3 2

[soc]: r3996 - dvbmuxer/mpegenc.c
by diego 23 Jan '09

23 Jan '09

Author: diego Date: Fri Jan 23 01:38:23 2009 New Revision: 3996 Log: #ifdef --> #if where appropriate to sync with build system changes Modified: dvbmuxer/mpegenc.c Modified: dvbmuxer/mpegenc.c ============================================================================== --- dvbmuxer/mpegenc.c Fri Jan 23 01:35:26 2009 (r3995) +++ dvbmuxer/mpegenc.c Fri Jan 23 01:38:23 2009 (r3996) @@ -860,7 +860,7 @@ static int mpeg_mux_end(AVFormatContext return 0; } -#ifdef CONFIG_MPEG1SYSTEM_MUXER +#if CONFIG_MPEG1SYSTEM_MUXER AVOutputFormat mpeg1system_muxer = { "mpeg", NULL_IF_CONFIG_SMALL("MPEG-1 System format"), @@ -874,7 +874,8 @@ AVOutputFormat mpeg1system_muxer = { mpeg_mux_end, }; #endif -#ifdef CONFIG_MPEG1VCD_MUXER + +#if CONFIG_MPEG1VCD_MUXER AVOutputFormat mpeg1vcd_muxer = { "vcd", NULL_IF_CONFIG_SMALL("MPEG-1 System format (VCD)"), @@ -888,7 +889,8 @@ AVOutputFormat mpeg1vcd_muxer = { mpeg_mux_end, }; #endif -#ifdef CONFIG_MPEG2VOB_MUXER + +#if CONFIG_MPEG2VOB_MUXER AVOutputFormat mpeg2vob_muxer = { "vob", NULL_IF_CONFIG_SMALL("MPEG-2 PS format (VOB)"), @@ -904,7 +906,7 @@ AVOutputFormat mpeg2vob_muxer = { #endif /* Same as mpeg2vob_mux except that the pack size is 2324 */ -#ifdef CONFIG_MPEG2SVCD_MUXER +#if CONFIG_MPEG2SVCD_MUXER AVOutputFormat mpeg2svcd_muxer = { "svcd", NULL_IF_CONFIG_SMALL("MPEG-2 PS format (VOB)"), @@ -920,7 +922,7 @@ AVOutputFormat mpeg2svcd_muxer = { #endif /* Same as mpeg2vob_mux except the 'is_dvd' flag is set to produce NAV pkts */ -#ifdef CONFIG_MPEG2DVD_MUXER +#if CONFIG_MPEG2DVD_MUXER AVOutputFormat mpeg2dvd_muxer = { "dvd", NULL_IF_CONFIG_SMALL("MPEG-2 PS format (DVD VOB)"),

1 0

[soc]: r3995 - dirac/libavcodec/diracenc.c
by diego 23 Jan '09

23 Jan '09

Author: diego Date: Fri Jan 23 01:35:26 2009 New Revision: 3995 Log: Remove useless #ifdef. Modified: dirac/libavcodec/diracenc.c Modified: dirac/libavcodec/diracenc.c ============================================================================== --- dirac/libavcodec/diracenc.c Fri Jan 23 01:12:17 2009 (r3994) +++ dirac/libavcodec/diracenc.c Fri Jan 23 01:35:26 2009 (r3995) @@ -953,7 +953,6 @@ static int encode_frame(AVCodecContext * return size; } -#ifdef CONFIG_ENCODERS AVCodec dirac_encoder = { "dirac", CODEC_TYPE_VIDEO, @@ -964,4 +963,3 @@ AVCodec dirac_encoder = { encode_end, .pix_fmts = (enum PixelFormat[]) {PIX_FMT_YUV420P, -1} }; -#endif

1 0

[PATCH] [soc: dvbmuxer] Comply to trunk r16600
by Tomer Barletz 23 Jan '09

23 Jan '09

In r16600 all ENABLE_* was renamed to CONFIG_* in file mpegenc.c. Apply to soc branch too. Tomer

2 1

[soc]: r3994 - dvbmuxer/mpegenc.c
by diego 23 Jan '09

23 Jan '09

Author: diego Date: Fri Jan 23 01:12:17 2009 New Revision: 3994 Log: Rename ENABLE preprocessor directives to CONFIG_. patch by Tomer Barletz, barletz gmail com Modified: dvbmuxer/mpegenc.c Modified: dvbmuxer/mpegenc.c ============================================================================== --- dvbmuxer/mpegenc.c Tue Jan 20 22:14:32 2009 (r3993) +++ dvbmuxer/mpegenc.c Fri Jan 23 01:12:17 2009 (r3994) @@ -273,12 +273,12 @@ static int mpeg_mux_init(AVFormatContext int video_bitrate; s->packet_number = 0; - s->is_vcd = (ENABLE_MPEG1VCD_MUXER && ctx->oformat == &mpeg1vcd_muxer); - s->is_svcd = (ENABLE_MPEG2SVCD_MUXER && ctx->oformat == &mpeg2svcd_muxer); - s->is_mpeg2 = ((ENABLE_MPEG2VOB_MUXER && ctx->oformat == &mpeg2vob_muxer) || - (ENABLE_MPEG2DVD_MUXER && ctx->oformat == &mpeg2dvd_muxer) || - (ENABLE_MPEG2SVCD_MUXER && ctx->oformat == &mpeg2svcd_muxer)); - s->is_dvd = (ENABLE_MPEG2DVD_MUXER && ctx->oformat == &mpeg2dvd_muxer); + s->is_vcd = (CONFIG_MPEG1VCD_MUXER && ctx->oformat == &mpeg1vcd_muxer); + s->is_svcd = (CONFIG_MPEG2SVCD_MUXER && ctx->oformat == &mpeg2svcd_muxer); + s->is_mpeg2 = ((CONFIG_MPEG2VOB_MUXER && ctx->oformat == &mpeg2vob_muxer) || + (CONFIG_MPEG2DVD_MUXER && ctx->oformat == &mpeg2dvd_muxer) || + (CONFIG_MPEG2SVCD_MUXER && ctx->oformat == &mpeg2svcd_muxer)); + s->is_dvd = (CONFIG_MPEG2DVD_MUXER && ctx->oformat == &mpeg2dvd_muxer); if(ctx->packet_size) s->packet_size = ctx->packet_size;

1 0

[soc]: r3993 - libavfilter/vf_format.c
by stefano 20 Jan '09

20 Jan '09

Author: stefano Date: Tue Jan 20 22:14:32 2009 New Revision: 3993 Log: Fix the check for an unknown pixel format and the resulting buffer underflow/crash. Modified: libavfilter/vf_format.c Modified: libavfilter/vf_format.c ============================================================================== --- libavfilter/vf_format.c Mon Jan 19 19:08:16 2009 (r3992) +++ libavfilter/vf_format.c Tue Jan 20 22:14:32 2009 (r3993) @@ -53,7 +53,7 @@ static int init(AVFilterContext *ctx, co sep ++; } - if(fmt >= PIX_FMT_NB) { + if(fmt == PIX_FMT_NONE) { av_log(ctx, AV_LOG_ERROR, "unknown pixel format\n"); continue; }

1 0

[soc] [propchange]: r3970 - svn:log
by diego 20 Jan '09

20 Jan '09

Author: diego Revision: 3970 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1 +1,2 @@ -moved scale factor run length level and run tables next to the huffman tables and renamed them to ff_wma3_scale_rl_level / run \ No newline at end of file +Moved scale factor run length level and run tables next to the huffman +tables and renamed them to ff_wma3_scale_rl_level / run.

1 0

[soc]: r3992 - in wmapro: wma3.h wma3data.h wma3dec.c
by diego 19 Jan '09

19 Jan '09

Author: diego Date: Mon Jan 19 19:08:16 2009 New Revision: 3992 Log: spelling/grammar/whitespace cosmetics Modified: wmapro/wma3.h wmapro/wma3data.h wmapro/wma3dec.c Modified: wmapro/wma3.h ============================================================================== --- wmapro/wma3.h Mon Jan 19 17:43:27 2009 (r3991) +++ wmapro/wma3.h Mon Jan 19 19:08:16 2009 (r3992) @@ -30,7 +30,7 @@ #define MAX_SUBFRAMES 32 //< max number of subframes per channel #define MAX_BANDS 29 //< max number of scale factor bands -/* size of block defines taken from wma.h*/ +/* size of block defines taken from wma.h */ #define BLOCK_MIN_BITS 7 #define BLOCK_MAX_BITS 12 #define BLOCK_MAX_SIZE (1 << BLOCK_MAX_BITS) @@ -43,10 +43,10 @@ typedef struct { int prev_block_len; //< length of the previous block uint8_t transmit_coefs; //< transmit coefficients uint8_t num_subframes; //< number of subframes - uint16_t subframe_len[MAX_SUBFRAMES]; //< subframe len in samples + uint16_t subframe_len[MAX_SUBFRAMES]; //< subframe length in samples uint16_t subframe_offset[MAX_SUBFRAMES]; //< subframe position uint8_t cur_subframe; //< subframe index - uint16_t channel_len; //< channel len in samples + uint16_t channel_len; //< channel length in samples uint16_t decoded_samples; //< already processed samples uint8_t grouped; //< channel is part of a group int quant_step_modifier; @@ -56,7 +56,7 @@ typedef struct { int max_scale_factor; //< maximum scale factor int scale_factors[MAX_BANDS]; //< scale factor values int resampled_scale_factors[MAX_BANDS]; //< scale factors from a previous block - int scale_factor_block_len; //< sf reference block len + int scale_factor_block_len; //< sf reference block length DECLARE_ALIGNED_16(float, coeffs[BLOCK_MAX_SIZE]); //< decode buffer DECLARE_ALIGNED_16(float, out[2*BLOCK_MAX_SIZE]); //< output buffer } WMA3ChannelCtx; @@ -66,11 +66,11 @@ typedef struct { */ typedef struct { int nb_channels; - int no_rotation; //< controls the type of the transform - int transform; //< also controls the type of the transform + int no_rotation; //< controls the type of the transform + int transform; //< also controls the type of the transform char transform_band[MAX_BANDS]; //< controls if the transform is enabled for a certain band char rotation_offset[MAX_CHANNELS * MAX_CHANNELS]; - char positive[MAX_CHANNELS * MAX_CHANNELS]; //< fixme for what are these numbers used? + char positive[MAX_CHANNELS * MAX_CHANNELS]; //< FIXME: What are these numbers used for? float decorrelation_matrix[MAX_CHANNELS*MAX_CHANNELS]; char use_channel[MAX_CHANNELS]; } WMA3ChannelGroup; @@ -82,23 +82,23 @@ typedef struct WMA3DecodeContext { /** generic decoder variables */ AVCodecContext* avctx; //< codec context for av_log DSPContext dsp; - MDCTContext mdct_ctx[BLOCK_NB_SIZES]; //< mdct context per block size + MDCTContext mdct_ctx[BLOCK_NB_SIZES]; //< MDCT context per block size float* windows[BLOCK_NB_SIZES]; //< window per block size - VLC sf_vlc; //< scale factor dpcm vlc + VLC sf_vlc; //< scale factor DPCM vlc VLC sf_rl_vlc; //< scale factor run length vlc - VLC vec4_vlc; //< 4 coefs per symbol - VLC vec2_vlc; //< 2 coefs per symbol - VLC vec1_vlc; //< 1 coef per symbol - VLC coef_vlc[2]; //< coef run length vlc codes + VLC vec4_vlc; //< 4 coefficients per symbol + VLC vec2_vlc; //< 2 coefficients per symbol + VLC vec1_vlc; //< 1 coefficient per symbol + VLC coef_vlc[2]; //< coefficient run length vlc codes int coef_max[2]; //< max length of vlc codes - /** frame size dependant frame information (set during init) */ + /** frame size dependent frame information (set during initialization) */ uint8_t lossless; //< lossless mode unsigned int decode_flags; //< used compression features - uint8_t len_prefix; //< frame is prefixed with its len - uint8_t dynamic_range_compression;//< frame contains drc data + uint8_t len_prefix; //< frame is prefixed with its length + uint8_t dynamic_range_compression;//< frame contains DRC data uint8_t sample_bit_depth; //< bits per sample - uint16_t samples_per_frame; //< number of outputed samples + uint16_t samples_per_frame; //< number of samples to output uint16_t log2_frame_size; //< frame size int8_t nb_channels; //< number of channels int8_t lfe_channel; //< lfe channel index @@ -128,7 +128,7 @@ typedef struct WMA3DecodeContext { int buf_bit_size; //< buffer size in bits int16_t* samples; //< current samplebuffer pointer int16_t* samples_end; //< maximum samplebuffer pointer - uint8_t drc_gain; //< gain for the drc tool + uint8_t drc_gain; //< gain for the DRC tool uint8_t no_tiling; //< frames contain subframes int skip_frame; //< skip output step int parsed_all_subframes; //< all subframes decoded? Modified: wmapro/wma3data.h ============================================================================== --- wmapro/wma3data.h Mon Jan 19 17:43:27 2009 (r3991) +++ wmapro/wma3data.h Mon Jan 19 19:08:16 2009 (r3992) @@ -40,7 +40,7 @@ static const uint16_t ff_wma3_critical_f /** - * @name huffman tables for dpcm coded scale factors + * @name huffman tables for DPCM-coded scale factors * @{ */ #define FF_WMA3_HUFF_SCALE_SIZE 121 @@ -410,7 +410,7 @@ static const uint8_t ff_wma3_coef1_level /** - * @name huffman and vector lookup tables for vector coded coefficients + * @name huffman and vector lookup tables for vector-coded coefficients * @{ */ #define FF_WMA3_HUFF_VEC4_SIZE 127 Modified: wmapro/wma3dec.c ============================================================================== --- wmapro/wma3dec.c Mon Jan 19 17:43:27 2009 (r3991) +++ wmapro/wma3dec.c Mon Jan 19 19:08:16 2009 (r3992) @@ -91,7 +91,7 @@ static int get_samples_per_frame(int sam } /** - *@brief Uninitialize the decoder and free all ressources. + *@brief Uninitialize the decoder and free all resources. *@param avctx codec context *@return 0 on success, < 0 otherwise */ @@ -142,8 +142,8 @@ static av_cold int wma3_decode_init(AVCo s->avctx = avctx; dsputil_init(&s->dsp, avctx); - /* FIXME is this really the right thing todo for 24 bit? */ - s->sample_bit_depth = 16; //avctx->bits_per_sample; + /* FIXME: is this really the right thing to do for 24 bits? */ + s->sample_bit_depth = 16; // avctx->bits_per_sample; if (avctx->extradata_size >= 18) { s->decode_flags = AV_RL16(edata_ptr+14); channel_mask = AV_RL32(edata_ptr+2); @@ -161,7 +161,7 @@ static av_cold int wma3_decode_init(AVCo } /** generic init */ - s->packet_loss = 0; //FIXME unneeded + s->packet_loss = 0; // FIXME: unneeded s->log2_frame_size = av_log2(avctx->block_align*8)+1; /** frame info */ @@ -169,7 +169,7 @@ static av_cold int wma3_decode_init(AVCo s->len_prefix = s->decode_flags & 0x40; if(!s->len_prefix){ - av_log(avctx, AV_LOG_ERROR, "file has no len prefix please report\n"); + av_log(avctx, AV_LOG_ERROR, "file has no length prefix, please report\n"); return -1; } @@ -285,9 +285,9 @@ static av_cold int wma3_decode_init(AVCo } - /** scale factors can be shared between blocks of different size - as every block has a different scale factor band layout - the matrix sf_offsets is needed to find the correct scale factor + /** Scale factors can be shared between blocks of different size + as every block has a different scale factor band layout. + The matrix sf_offsets is needed to find the correct scale factor. */ for(i=0;i<s->num_possible_block_sizes;i++){ @@ -306,11 +306,11 @@ static av_cold int wma3_decode_init(AVCo } } - /** init MDCT, FIXME only init needed sizes */ + /** init MDCT, FIXME: only init needed sizes */ for(i = 0; i < BLOCK_NB_SIZES; i++) ff_mdct_init(&s->mdct_ctx[i], BLOCK_MIN_BITS+1+i, 1); - /** init MDCT windows : simple sinus window */ + /** init MDCT windows: simple sinus window */ for(i=0 ; i<BLOCK_NB_SIZES ; i++) { int n; n = 1 << (BLOCK_MAX_BITS - i); @@ -332,7 +332,7 @@ static av_cold int wma3_decode_init(AVCo s->subwoofer_cutoff = s->subwoofer_cutoffs[0]; - /** set up decorrelation matrices */ + /** set up decorrelation matrixes */ s->def_decorrelation_mat = av_mallocz(sizeof(int) * (s->nb_channels + 1)); if(!s->def_decorrelation_mat){ av_log(avctx, AV_LOG_ERROR, "failed to allocate decorrelation matrix\n"); @@ -345,7 +345,7 @@ static av_cold int wma3_decode_init(AVCo const float* tab = ff_wma3_default_decorrelation_matrices; s->def_decorrelation_mat[i] = av_mallocz(sizeof(float) * i); if(!s->def_decorrelation_mat[i]){ - av_log(avctx, AV_LOG_ERROR, "failed to setup decorrelation mat\n"); + av_log(avctx, AV_LOG_ERROR, "failed to set up decorrelation matrix\n"); wma3_decode_end(avctx); return -1; } @@ -391,26 +391,25 @@ static av_cold int wma3_decode_init(AVCo } /** - *@brief Decode how the data in the frame is split into subframes - * every WMA frame contains the encoded data for a fixed number of - * samples per channel the data for every channel might be split - * into several subframes this function will reconstruct the list of - * subframes for every channel + *@brief Decode how the data in the frame is split into subframes. + * Every WMA frame contains the encoded data for a fixed number of + * samples per channel. The data for every channel might be split + * into several subframes. This function will reconstruct the list of + * subframes for every channel. * - * If the subframes are not evenly split the algorithm estimates the + * If the subframes are not evenly split, the algorithm estimates the * channels with the lowest number of total samples. - * Afterwards for each of these channels a bit is read from the + * Afterwards, for each of these channels a bit is read from the * bitstream that indicates if the channel contains a frame with the * next subframe size that is going to be read from the bitstream or not. - * If a channel contains such a subframe the subframe size gets added to + * If a channel contains such a subframe, the subframe size gets added to * the channel's subframe list. * The algorithm repeats these steps until the frame is properly divided * between the individual channels. * - * *@param s context *@param gb current get bit context - *@return 0 on success < 0 in case of an error + *@return 0 on success, < 0 in case of an error */ static int wma_decode_tilehdr(WMA3DecodeContext *s, GetBitContext* gb) { @@ -423,16 +422,16 @@ static int wma_decode_tilehdr(WMA3Decode s->channel[c].channel_len = 0; } - /** handle the easy case whith one constant sized subframe per channel */ + /** handle the easy case with one constant-sized subframe per channel */ if(s->max_num_subframes == 1){ for(c=0;c<s->nb_channels;c++){ s->channel[c].num_subframes = 1; s->channel[c].subframe_len[0] = s->samples_per_frame; s->channel[c].channel_len = 0; } - }else{ /** subframe len and number of subframes is not constant */ - int subframe_len_bits = 0; /** bits needed for the subframe len */ - int subframe_len_zero_bit = 0; /** how many of the len bits indicate + }else{ /** subframe length and number of subframes is not constant */ + int subframe_len_bits = 0; /** bits needed for the subframe length */ + int subframe_len_zero_bit = 0; /** how many of the length bits indicate if the subframe is zero */ /** calculate subframe len bits */ @@ -452,7 +451,7 @@ static int wma_decode_tilehdr(WMA3Decode int num_channels = 0; int subframe_len = s->samples_per_frame / s->max_num_subframes; - /** find channel with the smallest overall len */ + /** find channel with the smallest overall length */ for(c=0;c<s->nb_channels;c++){ if(min_channel_len > s->channel[c].channel_len) min_channel_len = s->channel[c].channel_len; @@ -467,7 +466,7 @@ static int wma_decode_tilehdr(WMA3Decode num_subframes_per_channel = 1; num_channels = s->nb_channels; }else{ - /** count how many channels have the minimum len */ + /** count how many channels have the minimum length */ for(c=0;c<s->nb_channels;c++){ if(min_channel_len == s->channel[c].channel_len){ ++num_channels; @@ -486,9 +485,9 @@ static int wma_decode_tilehdr(WMA3Decode if(num_subframes_per_channel != 1){ int total_num_bits = num_channels; tileinfo = 0; - /** for every channel with the minimum len 1 bit is - transmitted that informs us if the channel - contains a subframe with the next subframe_len */ + /** For every channel with the minimum length, 1 bit + is transmitted that informs us if the channel + contains a subframe with the next subframe_len. */ while(total_num_bits){ int num_bits = total_num_bits; if(num_bits > 32) @@ -500,11 +499,11 @@ static int wma_decode_tilehdr(WMA3Decode } } - /** if the frames are not evenly split get the next subframe len - from the bitstream */ + /** if the frames are not evenly split, get the next subframe + length from the bitstream */ if(subframe_len != missing_samples / num_channels){ int log2_subframe_len = 0; - /* 1 bit indicates if the subframe len is zero */ + /* 1 bit indicates if the subframe length is zero */ if(subframe_len_zero_bit){ if(get_bits1(gb)){ log2_subframe_len = get_bits(gb,subframe_len_bits-1); @@ -522,7 +521,7 @@ static int wma_decode_tilehdr(WMA3Decode s->samples_per_frame / (1 << log2_subframe_len); } - /** sanity check the len */ + /** sanity check the length */ if(subframe_len < s->min_samples_per_subframe || subframe_len > s->samples_per_frame){ av_log(s->avctx, AV_LOG_ERROR, @@ -631,7 +630,9 @@ static int wma_decode_channel_transform( /** done decode channel mask */ - /* decide x form type FIXME port this to float, all rotations should lie on the unit circle*/ + /* decide x form type + FIXME: port this to float, all rotations should lie + on the unit circle */ if(chgroup->nb_channels == 1){ chgroup->no_rotation = 1; chgroup->transform = 2; @@ -650,7 +651,7 @@ static int wma_decode_channel_transform( }else{ chgroup->no_rotation = 1; chgroup->transform = 1; - chgroup->decorrelation_matrix[0] = 0.70703125; //FIXME cos(pi/4) + chgroup->decorrelation_matrix[0] = 0.70703125; // FIXME: cos(pi/4) chgroup->decorrelation_matrix[1] = -0.70703125; chgroup->decorrelation_matrix[2] = 0.70703125; chgroup->decorrelation_matrix[3] = 0.70703125; @@ -790,7 +791,7 @@ static int decode_coeffs(WMA3DecodeConte const uint8_t* run; const uint8_t* level; - av_log(s->avctx,AV_LOG_DEBUG,"decode coefs for channel %i\n",c); + av_log(s->avctx,AV_LOG_DEBUG,"decode coefficients for channel %i\n",c); s->getbit = gb; s->esc_len = av_log2(s->subframe_len -1) +1; @@ -855,7 +856,7 @@ static int decode_coeffs(WMA3DecodeConte } if( cur_coeff >= s->subframe_len ) // handled entire subframe -> quit return 0; - if ( last_write > s->subframe_len / 256 ) //switch to RL mode + if ( last_write > s->subframe_len / 256 ) // switch to RL mode rl_mode = 1; ++i; } @@ -900,13 +901,13 @@ static int wma_decode_scale_factors(WMA3 int i; s->channel[c].scale_factor_step = get_bits(gb,2) + 1; for(i=0;i<s->cValidBarkBand;i++){ - int val = get_vlc2(gb, s->sf_vlc.table, SCALEVLCBITS, ((FF_WMA3_HUFF_SCALE_MAXBITS+SCALEVLCBITS-1)/SCALEVLCBITS)); //dpcm coded + int val = get_vlc2(gb, s->sf_vlc.table, SCALEVLCBITS, ((FF_WMA3_HUFF_SCALE_MAXBITS+SCALEVLCBITS-1)/SCALEVLCBITS)); // DPCM-coded if(!i) s->channel[c].scale_factors[i] = 45 / s->channel[c].scale_factor_step + val - 60; else s->channel[c].scale_factors[i] = s->channel[c].scale_factors[i-1] + val - 60; } - }else{ // rl coded + }else{ // rl-coded int i; memcpy(s->channel[c].scale_factors,s->channel[c].resampled_scale_factors, 4 * s->cValidBarkBand); @@ -975,7 +976,7 @@ static void wma_calc_decorrelation_matri float v1 = tmp1[y]; float v2 = tmp2[y]; int n = chgroup->rotation_offset[offset + x]; - float cosv = sin(n*M_PI / 64.0); //FIXME use one table for this + float cosv = sin(n*M_PI / 64.0); // FIXME: use one table for this float sinv = -cos(n*M_PI / 64.0); chgroup->decorrelation_matrix[y + x * chgroup->nb_channels] = (v1 * cosv) + (v2 * sinv); @@ -1006,7 +1007,7 @@ static void wma_inverse_channel_transfor int b; for(b = 0; b < s->cValidBarkBand;b++){ int y; - if(s->chgroup[i].transform_band[b] == 1){ //M/S stereo + if(s->chgroup[i].transform_band[b] == 1){ // M/S stereo for(y=s->rgiBarkIndex[b];y<FFMIN(s->rgiBarkIndex[b+1], s->subframe_len);y++){ float v1 = s->channel[0].coeffs[y]; float v2 = s->channel[1].coeffs[y]; @@ -1042,7 +1043,7 @@ static void wma_inverse_channel_transfor for(b = 0; b < s->cValidBarkBand;b++){ int y; if(s->chgroup[i].transform_band[b] == 1){ - //multiply values with decorrelation_matrix + // multiply values with decorrelation_matrix for(y=s->rgiBarkIndex[b];y<FFMIN(s->rgiBarkIndex[b+1], s->subframe_len);y++){ float* matrix = s->chgroup[i].decorrelation_matrix; int m; @@ -1074,7 +1075,7 @@ static void wma_window(WMA3DecodeContext int c = s->channel_indices_for_cur_subframe[i]; int j = s->channel[c].cur_subframe; int x; - //FIXME use dsp.vector_fmul_window + // FIXME: use dsp.vector_fmul_window float* start; float* end; float* window; @@ -1098,7 +1099,7 @@ static void wma_window(WMA3DecodeContext // float* rs = &s->channel[c].out[s->samples_per_frame/2 + s->channel[c].subframe_offset[i]]; // printf("Dstart %i %i end %i win %i prev %i\n",s->frame_num+1, start - rs,end -rs,winlen,prev_block_len); - //FIXME untagle the windowing so dsp functions can be used + // FIXME: untangle the windowing so DSP functions can be used window = s->windows[av_log2(winlen)-BLOCK_MIN_BITS]; for(x=0;x<len;x++){ float ts = *start; @@ -1224,7 +1225,7 @@ static int wma_decode_subframe(WMA3Decod int quant; int sign = 1; int large_quant = 0; - if((get_bits(gb,1))){ /** FIXME might influence how often getvec4 may be called */ + if((get_bits(gb,1))){ /** FIXME: might influence how often getvec4 may be called */ av_log(s->avctx,AV_LOG_ERROR,"unsupported quant step coding\n"); return 0; } @@ -1317,9 +1318,9 @@ static int wma_decode_subframe(WMA3Decod } dst = &s->channel[c].out[s->samples_per_frame/2 + s->channel[c].subframe_offset[s->channel[c].cur_subframe]]; - ff_imdct_half(&s->mdct_ctx[av_log2(subframe_len)-BLOCK_MIN_BITS], dst, s->channel[c].coeffs); //DCTIV with reverse + ff_imdct_half(&s->mdct_ctx[av_log2(subframe_len)-BLOCK_MIN_BITS], dst, s->channel[c].coeffs); // DCTIV with reverse for(b=0;b<subframe_len;b++) - dst[b] /= subframe_len / 2; //FIXME try to remove this scaling + dst[b] /= subframe_len / 2; // FIXME: try to remove this scaling } } @@ -1366,7 +1367,7 @@ static int wma_decode_frame(WMA3DecodeCo if(s->len_prefix) len = get_bits(gb,s->log2_frame_size); - av_log(s->avctx,AV_LOG_DEBUG,"decoding frame with len %x\n",len); + av_log(s->avctx,AV_LOG_DEBUG,"decoding frame with length %x\n",len); /** decode tile information */ if(wma_decode_tilehdr(s,gb)){ @@ -1428,7 +1429,7 @@ static int wma_decode_frame(WMA3DecodeCo for(i = 0; i < s->nb_channels; i++) { int16_t* ptr; int incr = s->nb_channels; - /* FIXME what about other channel layouts? */ + /* FIXME: what about other channel layouts? */ const char layout[] = {0,1,4,5,2,3}; int chpos; float* iptr = s->channel[i].out; @@ -1446,7 +1447,7 @@ static int wma_decode_frame(WMA3DecodeCo ptr += incr; } - /** reuse second half of the imdct output for the next frame */ + /** reuse second half of the IMDCT output for the next frame */ memmove(&s->channel[i].out[0], &s->channel[i].out[s->samples_per_frame], s->samples_per_frame * sizeof(float)); } @@ -1457,7 +1458,7 @@ static int wma_decode_frame(WMA3DecodeCo s->samples += s->nb_channels * s->samples_per_frame; - //FIXME remove + // FIXME: remove av_log(s->avctx,AV_LOG_DEBUG,"frame[%i] skipping %i bits\n",s->frame_num,len - (get_bits_count(gb) - gb_start_count) - 1); if(len - (get_bits_count(gb) - gb_start_count) - 1 != 1) assert(0); @@ -1550,7 +1551,7 @@ static int wma3_decode_packet(AVCodecCon if(buf_size < avctx->block_align) return 0; - /** Parse packet header */ + /** parse packet header */ init_get_bits(&s->gb, buf, s->buf_bit_size); s->packet_sequence_number = get_bits(&s->gb, 4); s->bit5 = get_bits1(&s->gb); @@ -1569,7 +1570,7 @@ static int wma3_decode_packet(AVCodecCon } if (num_bits_prev_frame > 0) { - /** append the prev frame data to the remaining data from the + /** append the previous frame data to the remaining data from the previous packet to create a full frame */ save_bits(s,num_bits_prev_frame); av_log(avctx, AV_LOG_DEBUG, "accumulated %x bits of frame data\n", @@ -1587,7 +1588,7 @@ static int wma3_decode_packet(AVCodecCon s->prev_packet_bit_size); } - /** reset prev frame buffer */ + /** reset previous frame buffer */ s->prev_packet_bit_size = 0; s->packet_loss = 0; /** decode the rest of the packet */

1 0

[soc]: r3991 - nellyenc/nellymoserenc.c
by diego 19 Jan '09

19 Jan '09

Author: diego Date: Mon Jan 19 17:43:27 2009 New Revision: 3991 Log: samples.mplayerhq.hu --> samples.ffmpeg.org Modified: nellyenc/nellymoserenc.c Modified: nellyenc/nellymoserenc.c ============================================================================== --- nellyenc/nellymoserenc.c Mon Jan 19 16:55:47 2009 (r3990) +++ nellyenc/nellymoserenc.c Mon Jan 19 17:43:27 2009 (r3991) @@ -27,7 +27,7 @@ * by Bartlomiej Wolowiec * * Generic codec information: libavcodec/nellymoserdec.c - * Log search algorithm idea: http://samples.mplayerhq.hu/A-codecs/Nelly_Moser/ASAO/ASAO.zip + * Log search algorithm idea: http://samples.ffmpeg.org/A-codecs/Nelly_Moser/ASAO/ASAO.zip * (Copyright Joseph Artsimovich and UAB "DKD") * * for more information about nellymoser format, visit:

1 0

[soc]: r3990 - ac3/ac3_decoder.c dvbmuxer/mpegenc.c dvbmuxer/mpegtsenc.c eac3/ac3dec.c mxf/mxf.c mxf/mxf.h mxf/mxfdec.c
by diego 19 Jan '09

19 Jan '09

Author: diego Date: Mon Jan 19 16:55:47 2009 New Revision: 3990 Log: cosmetics: Remove pointless period after copyright statement non-sentences. Modified: ac3/ac3_decoder.c dvbmuxer/mpegenc.c dvbmuxer/mpegtsenc.c eac3/ac3dec.c mxf/mxf.c mxf/mxf.h mxf/mxfdec.c Modified: ac3/ac3_decoder.c ============================================================================== --- ac3/ac3_decoder.c Sat Jan 17 20:10:23 2009 (r3989) +++ ac3/ac3_decoder.c Mon Jan 19 16:55:47 2009 (r3990) @@ -13,7 +13,7 @@ * * Thanks Makoto Matsumoto and Takuji Nishimura for the Mersenne Twister. * - * Copyright (c) 2006 Kartikey Mahendra BHATT (bhattkm at gmail dot com). + * Copyright (c) 2006 Kartikey Mahendra BHATT (bhattkm at gmail dot com) * Something is wrong up on cloud # 9! * * This file is part of FFmpeg. Modified: dvbmuxer/mpegenc.c ============================================================================== --- dvbmuxer/mpegenc.c Sat Jan 17 20:10:23 2009 (r3989) +++ dvbmuxer/mpegenc.c Mon Jan 19 16:55:47 2009 (r3990) @@ -1,6 +1,6 @@ /* * MPEG1/2 muxer - * Copyright (c) 2000, 2001, 2002 Fabrice Bellard. + * Copyright (c) 2000, 2001, 2002 Fabrice Bellard * * This file is part of FFmpeg. * Modified: dvbmuxer/mpegtsenc.c ============================================================================== --- dvbmuxer/mpegtsenc.c Sat Jan 17 20:10:23 2009 (r3989) +++ dvbmuxer/mpegtsenc.c Mon Jan 19 16:55:47 2009 (r3990) @@ -1,6 +1,6 @@ /* * MPEG2 transport stream (aka DVB) muxer - * Copyright (c) 2003 Fabrice Bellard. + * Copyright (c) 2003 Fabrice Bellard * * This file is part of FFmpeg. * Modified: eac3/ac3dec.c ============================================================================== --- eac3/ac3dec.c Sat Jan 17 20:10:23 2009 (r3989) +++ eac3/ac3dec.c Mon Jan 19 16:55:47 2009 (r3990) @@ -3,7 +3,7 @@ * This code was developed as part of Google Summer of Code 2006. * E-AC-3 support was added as part of Google Summer of Code 2007. * - * Copyright (c) 2006 Kartikey Mahendra BHATT (bhattkm at gmail dot com). + * Copyright (c) 2006 Kartikey Mahendra BHATT (bhattkm at gmail dot com) * Copyright (c) 2007-2008 Bartlomiej Wolowiec <bartek.wolowiec(a)gmail.com> * Copyright (c) 2007 Justin Ruggles <justin.ruggles(a)gmail.com> * Modified: mxf/mxf.c ============================================================================== --- mxf/mxf.c Sat Jan 17 20:10:23 2009 (r3989) +++ mxf/mxf.c Mon Jan 19 16:55:47 2009 (r3990) @@ -1,6 +1,6 @@ /* * MXF - * Copyright (c) 2006 SmartJog S.A., Baptiste Coudurier <baptiste dot coudurier at smartjog dot com>. + * Copyright (c) 2006 SmartJog S.A., Baptiste Coudurier <baptiste dot coudurier at smartjog dot com> * * This file is part of FFmpeg. * Modified: mxf/mxf.h ============================================================================== --- mxf/mxf.h Sat Jan 17 20:10:23 2009 (r3989) +++ mxf/mxf.h Mon Jan 19 16:55:47 2009 (r3990) @@ -1,6 +1,6 @@ /* * MXF - * Copyright (c) 2006 SmartJog S.A., Baptiste Coudurier <baptiste dot coudurier at smartjog dot com>. + * Copyright (c) 2006 SmartJog S.A., Baptiste Coudurier <baptiste dot coudurier at smartjog dot com> * * This file is part of FFmpeg. * Modified: mxf/mxfdec.c ============================================================================== --- mxf/mxfdec.c Sat Jan 17 20:10:23 2009 (r3989) +++ mxf/mxfdec.c Mon Jan 19 16:55:47 2009 (r3990) @@ -1,6 +1,6 @@ /* * MXF demuxer. - * Copyright (c) 2006 SmartJog S.A., Baptiste Coudurier <baptiste dot coudurier at smartjog dot com>. + * Copyright (c) 2006 SmartJog S.A., Baptiste Coudurier <baptiste dot coudurier at smartjog dot com> * * This file is part of FFmpeg. *

1 0

[soc]: r3989 - in wmapro: wma3data.h wma3dec.c
by faust3 17 Jan '09

17 Jan '09

Author: faust3 Date: Sat Jan 17 20:10:23 2009 New Revision: 3989 Log: use FF_WMA3_HUFF_VECi_SIZE defines instead of hardcoded numbers Modified: wmapro/wma3data.h wmapro/wma3dec.c Modified: wmapro/wma3data.h ============================================================================== --- wmapro/wma3data.h Sat Jan 17 19:43:47 2009 (r3988) +++ wmapro/wma3data.h Sat Jan 17 20:10:23 2009 (r3989) @@ -534,7 +534,7 @@ static const uint8_t ff_wma3_vec1_huffbi }; -static const uint16_t ff_wma3_symbol_to_vec4[] = { +static const uint16_t ff_wma3_symbol_to_vec4[FF_WMA3_HUFF_VEC4_SIZE] = { 0, 1, 2, 3, 4, 5, 16, 17, 18, 19, 20, 32, 33, 34, 35, 48, 49, 50, 64, 65, 80, 256, 257, 258, 259, 260, 272, 273, 274, 275, @@ -547,11 +547,11 @@ static const uint16_t ff_wma3_symbol_to_ 5120, 8192, 8193, 8194, 8195, 8208, 8209, 8210, 8224, 8225, 8240, 8448, 8449, 8450, 8464, 8465, 8480, 8704, 8705, 8720, 8960, 12288, 12289, 12290, 12304, 12305, 12320, 12544, 12545, 12560, - 12800, 16384, 16385, 16400, 16640, 20480, 0, 0, + 12800, 16384, 16385, 16400, 16640, 20480, 0, }; -static const uint8_t ff_wma3_symbol_to_vec2[] = { +static const uint8_t ff_wma3_symbol_to_vec2[FF_WMA3_HUFF_VEC2_SIZE] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, @@ -561,8 +561,7 @@ static const uint8_t ff_wma3_symbol_to_v 105, 112, 113, 114, 115, 116, 117, 118, 119, 120, 128, 129, 130, 131, 132, 133, 134, 135, 144, 145, 146, 147, 148, 149, 150, 160, 161, 162, 163, 164, 165, 176, 177, 178, 179, 180, 192, 193, 194, 195, 208, 209, 210, 224, 225, - 240, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 240, 0, }; /** @} */ Modified: wmapro/wma3dec.c ============================================================================== --- wmapro/wma3dec.c Sat Jan 17 19:43:47 2009 (r3988) +++ wmapro/wma3dec.c Sat Jan 17 20:10:23 2009 (r3989) @@ -742,16 +742,16 @@ static inline void wma_get_vec4(WMA3Deco idx = get_vlc2(s->getbit, s->vec4_vlc.table, VLCBITS, ((FF_WMA3_HUFF_VEC4_MAXBITS+VLCBITS-1)/VLCBITS)); - if ( idx == 126 ) + if ( idx == FF_WMA3_HUFF_VEC4_SIZE - 1 ) { while(i < 4){ idx = get_vlc2(s->getbit, s->vec2_vlc.table, VLCBITS, ((FF_WMA3_HUFF_VEC2_MAXBITS+VLCBITS-1)/VLCBITS)); - if ( idx == 136 ){ + if ( idx == FF_WMA3_HUFF_VEC2_SIZE - 1 ){ vals[i] = get_vlc2(s->getbit, s->vec1_vlc.table, VLCBITS, ((FF_WMA3_HUFF_VEC1_MAXBITS+VLCBITS-1)/VLCBITS)); - if(vals[i] == 100) + if(vals[i] == FF_WMA3_HUFF_VEC1_SIZE - 1) vals[i] += wma_get_large_val(s); vals[i+1] = get_vlc2(s->getbit, s->vec1_vlc.table, VLCBITS, ((FF_WMA3_HUFF_VEC1_MAXBITS+VLCBITS-1)/VLCBITS)); - if(vals[i+1] == 100) + if(vals[i+1] == FF_WMA3_HUFF_VEC1_SIZE - 1) vals[i+1] += wma_get_large_val(s); }else{ vals[i] = (ff_wma3_symbol_to_vec2[idx] >> 4) & 0xF;

1 0

[soc]: r3988 - wmapro/wma3.h
by faust3 17 Jan '09

17 Jan '09

Author: faust3 Date: Sat Jan 17 19:43:47 2009 New Revision: 3988 Log: reorganized WMA3ChannelGroup and WMA3ChannelCtx a bit Modified: wmapro/wma3.h Modified: wmapro/wma3.h ============================================================================== --- wmapro/wma3.h Sat Jan 17 19:23:14 2009 (r3987) +++ wmapro/wma3.h Sat Jan 17 19:43:47 2009 (r3988) @@ -37,48 +37,46 @@ #define BLOCK_NB_SIZES (BLOCK_MAX_BITS - BLOCK_MIN_BITS + 1) /** - *@brief decoder context for a single channel + * @brief decoder context for a single channel */ typedef struct { - int prev_block_len; - uint8_t transmit_coefs; - uint8_t num_subframes; //< number of subframes for the current channel - uint16_t subframe_len[MAX_SUBFRAMES]; //< subframe len in samples - uint16_t subframe_offset[MAX_SUBFRAMES]; - uint16_t channel_len; //< channel len in samples - uint16_t decoded_samples; //< number of samples that have been processed already - uint8_t cur_subframe; - uint8_t grouped; //< true if the channel is contained in a channel group - - DECLARE_ALIGNED_16(float, coeffs[BLOCK_MAX_SIZE]); //< MAX_COEF - - int scale_factors[MAX_BANDS]; //< initial scale factor values - int resampled_scale_factors[MAX_BANDS]; //< resampled scale factors from the previous block - //< can be used in case no new scale factors are transmitted - - int reuse_sf; //< reuse scale factors from a previous subframe - int transmit_sf; - int scale_factor_step; - int quant_step_modifier; - int max_scale_factor; - int scale_factor_block_len; //< block len of the frame for which the scale factors were transmitted - DECLARE_ALIGNED_16(float, out[2*BLOCK_MAX_SIZE]); - + int prev_block_len; //< length of the previous block + uint8_t transmit_coefs; //< transmit coefficients + uint8_t num_subframes; //< number of subframes + uint16_t subframe_len[MAX_SUBFRAMES]; //< subframe len in samples + uint16_t subframe_offset[MAX_SUBFRAMES]; //< subframe position + uint8_t cur_subframe; //< subframe index + uint16_t channel_len; //< channel len in samples + uint16_t decoded_samples; //< already processed samples + uint8_t grouped; //< channel is part of a group + int quant_step_modifier; + int transmit_sf; //< transmit scale factors + int reuse_sf; //< share sfs between subframes + int scale_factor_step; //< scaling step + int max_scale_factor; //< maximum scale factor + int scale_factors[MAX_BANDS]; //< scale factor values + int resampled_scale_factors[MAX_BANDS]; //< scale factors from a previous block + int scale_factor_block_len; //< sf reference block len + DECLARE_ALIGNED_16(float, coeffs[BLOCK_MAX_SIZE]); //< decode buffer + DECLARE_ALIGNED_16(float, out[2*BLOCK_MAX_SIZE]); //< output buffer } WMA3ChannelCtx; +/** + * @brief channel group for channel transformations + */ typedef struct { - int nb_channels; - int no_rotation; //< controls the type of the transform - int transform; //< also controls the type of the transform - char transform_band[MAX_BANDS]; //< controls if the transform is enabled for a certain band - char rotation_offset[MAX_CHANNELS * MAX_CHANNELS]; - char positive[MAX_CHANNELS * MAX_CHANNELS]; //< fixme for what are these numbers used? + int nb_channels; + int no_rotation; //< controls the type of the transform + int transform; //< also controls the type of the transform + char transform_band[MAX_BANDS]; //< controls if the transform is enabled for a certain band + char rotation_offset[MAX_CHANNELS * MAX_CHANNELS]; + char positive[MAX_CHANNELS * MAX_CHANNELS]; //< fixme for what are these numbers used? float decorrelation_matrix[MAX_CHANNELS*MAX_CHANNELS]; - char use_channel[MAX_CHANNELS]; + char use_channel[MAX_CHANNELS]; } WMA3ChannelGroup; /** - *@brief main decoder context + * @brief main decoder context */ typedef struct WMA3DecodeContext { /** generic decoder variables */

1 0

[soc]: r3987 - wmapro/wma3.h
by faust3 17 Jan '09

17 Jan '09

Author: faust3 Date: Sat Jan 17 19:23:14 2009 New Revision: 3987 Log: fixed comment Modified: wmapro/wma3.h Modified: wmapro/wma3.h ============================================================================== --- wmapro/wma3.h Sat Jan 17 19:21:26 2009 (r3986) +++ wmapro/wma3.h Sat Jan 17 19:23:14 2009 (r3987) @@ -30,7 +30,7 @@ #define MAX_SUBFRAMES 32 //< max number of subframes per channel #define MAX_BANDS 29 //< max number of scale factor bands -/* size of blocks defines taken from wma.h*/ +/* size of block defines taken from wma.h*/ #define BLOCK_MIN_BITS 7 #define BLOCK_MAX_BITS 12 #define BLOCK_MAX_SIZE (1 << BLOCK_MAX_BITS)

1 0

[soc]: r3986 - wmapro/wma3.h
by faust3 17 Jan '09

17 Jan '09

Author: faust3 Date: Sat Jan 17 19:21:26 2009 New Revision: 3986 Log: use BLOCK_MAX_SIZE for the buffer declarations Modified: wmapro/wma3.h Modified: wmapro/wma3.h ============================================================================== --- wmapro/wma3.h Sat Jan 17 19:19:09 2009 (r3985) +++ wmapro/wma3.h Sat Jan 17 19:21:26 2009 (r3986) @@ -50,7 +50,7 @@ typedef struct { uint8_t cur_subframe; uint8_t grouped; //< true if the channel is contained in a channel group - DECLARE_ALIGNED_16(float, coeffs[4096]); //< MAX_COEF + DECLARE_ALIGNED_16(float, coeffs[BLOCK_MAX_SIZE]); //< MAX_COEF int scale_factors[MAX_BANDS]; //< initial scale factor values int resampled_scale_factors[MAX_BANDS]; //< resampled scale factors from the previous block @@ -62,7 +62,7 @@ typedef struct { int quant_step_modifier; int max_scale_factor; int scale_factor_block_len; //< block len of the frame for which the scale factors were transmitted - DECLARE_ALIGNED_16(float, out[8192]); + DECLARE_ALIGNED_16(float, out[2*BLOCK_MAX_SIZE]); } WMA3ChannelCtx;

1 0

[soc]: r3985 - in wmapro: wma3.h wma3dec.c
by faust3 17 Jan '09

17 Jan '09

Author: faust3 Date: Sat Jan 17 19:19:09 2009 New Revision: 3985 Log: moved VLCBITS and SCALEVLCBITS to wma3dec.c Modified: wmapro/wma3.h wmapro/wma3dec.c Modified: wmapro/wma3.h ============================================================================== --- wmapro/wma3.h Sat Jan 17 19:17:47 2009 (r3984) +++ wmapro/wma3.h Sat Jan 17 19:19:09 2009 (r3985) @@ -30,9 +30,6 @@ #define MAX_SUBFRAMES 32 //< max number of subframes per channel #define MAX_BANDS 29 //< max number of scale factor bands -#define VLCBITS 9 -#define SCALEVLCBITS 8 - /* size of blocks defines taken from wma.h*/ #define BLOCK_MIN_BITS 7 #define BLOCK_MAX_BITS 12 Modified: wmapro/wma3dec.c ============================================================================== --- wmapro/wma3dec.c Sat Jan 17 19:17:47 2009 (r3984) +++ wmapro/wma3dec.c Sat Jan 17 19:19:09 2009 (r3985) @@ -26,6 +26,10 @@ #undef NDEBUG #include <assert.h> +#define VLCBITS 9 +#define SCALEVLCBITS 8 + + unsigned int bitstreamcounter; /**

1 0

[soc]: r3984 - wmapro/wma3.h
by faust3 17 Jan '09

17 Jan '09

Author: faust3 Date: Sat Jan 17 19:17:47 2009 New Revision: 3984 Log: aligned the defines Modified: wmapro/wma3.h Modified: wmapro/wma3.h ============================================================================== --- wmapro/wma3.h Sat Jan 17 19:11:52 2009 (r3983) +++ wmapro/wma3.h Sat Jan 17 19:17:47 2009 (r3984) @@ -26,18 +26,18 @@ #include "wma3data.h" #include "dsputil.h" -#define MAX_CHANNELS 8 //< max number of handled channels -#define MAX_SUBFRAMES 32 //< max number of subframes per channel -#define MAX_BANDS 29 //< max number of scale factor bands -#define VLCBITS 9 +#define MAX_CHANNELS 8 //< max number of handled channels +#define MAX_SUBFRAMES 32 //< max number of subframes per channel +#define MAX_BANDS 29 //< max number of scale factor bands -#define SCALEVLCBITS 8 +#define VLCBITS 9 +#define SCALEVLCBITS 8 /* size of blocks defines taken from wma.h*/ -#define BLOCK_MIN_BITS 7 -#define BLOCK_MAX_BITS 12 -#define BLOCK_MAX_SIZE (1 << BLOCK_MAX_BITS) -#define BLOCK_NB_SIZES (BLOCK_MAX_BITS - BLOCK_MIN_BITS + 1) +#define BLOCK_MIN_BITS 7 +#define BLOCK_MAX_BITS 12 +#define BLOCK_MAX_SIZE (1 << BLOCK_MAX_BITS) +#define BLOCK_NB_SIZES (BLOCK_MAX_BITS - BLOCK_MIN_BITS + 1) /** *@brief decoder context for a single channel

1 0

[soc]: r3983 - wmapro/wma3dec.c
by faust3 17 Jan '09

17 Jan '09

Author: faust3 Date: Sat Jan 17 19:11:52 2009 New Revision: 3983 Log: catch out of memory errors during default decorrelation matrix setup Modified: wmapro/wma3dec.c Modified: wmapro/wma3dec.c ============================================================================== --- wmapro/wma3dec.c Sat Jan 17 18:49:46 2009 (r3982) +++ wmapro/wma3dec.c Sat Jan 17 19:11:52 2009 (r3983) @@ -328,13 +328,23 @@ static av_cold int wma3_decode_init(AVCo s->subwoofer_cutoff = s->subwoofer_cutoffs[0]; - //FIXME - /** init stuff for the postprocxform */ + /** set up decorrelation matrices */ s->def_decorrelation_mat = av_mallocz(sizeof(int) * (s->nb_channels + 1)); + if(!s->def_decorrelation_mat){ + av_log(avctx, AV_LOG_ERROR, "failed to allocate decorrelation matrix\n"); + wma3_decode_end(avctx); + return -1; + } + s->def_decorrelation_mat[0] = 0; for(i=1;i<=s->nb_channels;i++){ const float* tab = ff_wma3_default_decorrelation_matrices; s->def_decorrelation_mat[i] = av_mallocz(sizeof(float) * i); + if(!s->def_decorrelation_mat[i]){ + av_log(avctx, AV_LOG_ERROR, "failed to setup decorrelation mat\n"); + wma3_decode_end(avctx); + return -1; + } switch(i){ case 1: s->def_decorrelation_mat[i][0] = &tab[0];

1 0

[soc]: r3982 - in wmapro: wma3.h wma3dec.c
by faust3 17 Jan '09

17 Jan '09

Author: faust3 Date: Sat Jan 17 18:49:46 2009 New Revision: 3982 Log: renamed default_decorrelation_matrix to def_decorrelation_mat Modified: wmapro/wma3.h wmapro/wma3dec.c Modified: wmapro/wma3.h ============================================================================== --- wmapro/wma3.h Sat Jan 17 18:39:51 2009 (r3981) +++ wmapro/wma3.h Sat Jan 17 18:49:46 2009 (r3982) @@ -107,7 +107,7 @@ typedef struct WMA3DecodeContext { uint16_t log2_frame_size; //< frame size int8_t nb_channels; //< number of channels int8_t lfe_channel; //< lfe channel index - const float*** default_decorrelation_matrix; + const float*** def_decorrelation_mat; //< default decorrelation matrix uint8_t allow_subframes; //< frames may contain subframes uint8_t max_num_subframes; //< maximum number of subframes int8_t num_possible_block_sizes; //< nb of supported block sizes Modified: wmapro/wma3dec.c ============================================================================== --- wmapro/wma3dec.c Sat Jan 17 18:39:51 2009 (r3981) +++ wmapro/wma3dec.c Sat Jan 17 18:49:46 2009 (r3982) @@ -102,10 +102,10 @@ static av_cold int wma3_decode_end(AVCod av_free(s->subwoofer_cutoffs); av_free(s->sf_offsets); - if(s->default_decorrelation_matrix){ + if(s->def_decorrelation_mat){ for(i=1;i<=s->nb_channels;i++) - av_free(s->default_decorrelation_matrix[i]); - av_free(s->default_decorrelation_matrix); + av_free(s->def_decorrelation_mat[i]); + av_free(s->def_decorrelation_mat); } free_vlc(&s->sf_vlc); @@ -330,44 +330,44 @@ static av_cold int wma3_decode_init(AVCo //FIXME /** init stuff for the postprocxform */ - s->default_decorrelation_matrix = av_mallocz(sizeof(int) * (s->nb_channels + 1)); - s->default_decorrelation_matrix[0] = 0; + s->def_decorrelation_mat = av_mallocz(sizeof(int) * (s->nb_channels + 1)); + s->def_decorrelation_mat[0] = 0; for(i=1;i<=s->nb_channels;i++){ const float* tab = ff_wma3_default_decorrelation_matrices; - s->default_decorrelation_matrix[i] = av_mallocz(sizeof(float) * i); + s->def_decorrelation_mat[i] = av_mallocz(sizeof(float) * i); switch(i){ case 1: - s->default_decorrelation_matrix[i][0] = &tab[0]; + s->def_decorrelation_mat[i][0] = &tab[0]; break; case 2: - s->default_decorrelation_matrix[i][0] = &tab[1]; - s->default_decorrelation_matrix[i][1] = &tab[3]; + s->def_decorrelation_mat[i][0] = &tab[1]; + s->def_decorrelation_mat[i][1] = &tab[3]; break; case 3: - s->default_decorrelation_matrix[i][0] = &tab[5]; - s->default_decorrelation_matrix[i][1] = &tab[8]; - s->default_decorrelation_matrix[i][2] = &tab[11]; + s->def_decorrelation_mat[i][0] = &tab[5]; + s->def_decorrelation_mat[i][1] = &tab[8]; + s->def_decorrelation_mat[i][2] = &tab[11]; break; case 4: - s->default_decorrelation_matrix[i][0] = &tab[14]; - s->default_decorrelation_matrix[i][1] = &tab[18]; - s->default_decorrelation_matrix[i][2] = &tab[22]; - s->default_decorrelation_matrix[i][3] = &tab[26]; + s->def_decorrelation_mat[i][0] = &tab[14]; + s->def_decorrelation_mat[i][1] = &tab[18]; + s->def_decorrelation_mat[i][2] = &tab[22]; + s->def_decorrelation_mat[i][3] = &tab[26]; break; case 5: - s->default_decorrelation_matrix[i][0] = &tab[30]; - s->default_decorrelation_matrix[i][1] = &tab[35]; - s->default_decorrelation_matrix[i][2] = &tab[40]; - s->default_decorrelation_matrix[i][3] = &tab[45]; - s->default_decorrelation_matrix[i][4] = &tab[50]; + s->def_decorrelation_mat[i][0] = &tab[30]; + s->def_decorrelation_mat[i][1] = &tab[35]; + s->def_decorrelation_mat[i][2] = &tab[40]; + s->def_decorrelation_mat[i][3] = &tab[45]; + s->def_decorrelation_mat[i][4] = &tab[50]; break; case 6: - s->default_decorrelation_matrix[i][0] = &tab[55]; - s->default_decorrelation_matrix[i][1] = &tab[61]; - s->default_decorrelation_matrix[i][2] = &tab[67]; - s->default_decorrelation_matrix[i][3] = &tab[73]; - s->default_decorrelation_matrix[i][4] = &tab[79]; - s->default_decorrelation_matrix[i][5] = &tab[85]; + s->def_decorrelation_mat[i][0] = &tab[55]; + s->def_decorrelation_mat[i][1] = &tab[61]; + s->def_decorrelation_mat[i][2] = &tab[67]; + s->def_decorrelation_mat[i][3] = &tab[73]; + s->def_decorrelation_mat[i][4] = &tab[79]; + s->def_decorrelation_mat[i][5] = &tab[85]; break; } } @@ -653,7 +653,7 @@ static int wma_decode_channel_transform( for(x = 0; x < chgroup->nb_channels ; x++){ int y; for(y=0;y< chgroup->nb_channels ;y++){ - chgroup->decorrelation_matrix[y + x * chgroup->nb_channels] = s->default_decorrelation_matrix[chgroup->nb_channels][x][y]; + chgroup->decorrelation_matrix[y + x * chgroup->nb_channels] = s->def_decorrelation_mat[chgroup->nb_channels][x][y]; } } }

1 0

[soc]: r3981 - in wmapro: wma3.h wma3dec.c
by faust3 17 Jan '09

17 Jan '09

Author: faust3 Date: Sat Jan 17 18:39:51 2009 New Revision: 3981 Log: renamed bitreservoir buffer and size so that it is clear that it contains packet data Modified: wmapro/wma3.h wmapro/wma3dec.c Modified: wmapro/wma3.h ============================================================================== --- wmapro/wma3.h Sat Jan 17 18:32:06 2009 (r3980) +++ wmapro/wma3.h Sat Jan 17 18:39:51 2009 (r3981) @@ -119,8 +119,8 @@ typedef struct WMA3DecodeContext { /** packet decode state */ uint8_t packet_sequence_number; //< current packet number - int prev_frame_bit_size; //< saved number of bits - uint8_t* prev_frame; //< prev frame data + int prev_packet_bit_size; //< saved number of bits + uint8_t* prev_packet_data; //< prev frame data uint8_t bit5; //< padding bit? (CBR files) uint8_t bit6; uint8_t packet_loss; //< set in case of bitstream error Modified: wmapro/wma3dec.c ============================================================================== --- wmapro/wma3dec.c Sat Jan 17 18:32:06 2009 (r3980) +++ wmapro/wma3dec.c Sat Jan 17 18:39:51 2009 (r3981) @@ -96,7 +96,7 @@ static av_cold int wma3_decode_end(AVCod WMA3DecodeContext *s = avctx->priv_data; int i; - av_free(s->prev_frame); + av_free(s->prev_packet_data); av_free(s->num_sfb); av_free(s->sfb_offsets); av_free(s->subwoofer_cutoffs); @@ -1475,16 +1475,16 @@ static int remaining_bits(WMA3DecodeCont */ static void save_bits(WMA3DecodeContext *s,int len) { - int buflen = (s->prev_frame_bit_size + len + 8) / 8; - int bit_offset = s->prev_frame_bit_size % 8; - int pos = (s->prev_frame_bit_size - bit_offset) / 8; - s->prev_frame_bit_size += len; + int buflen = (s->prev_packet_bit_size + len + 8) / 8; + int bit_offset = s->prev_packet_bit_size % 8; + int pos = (s->prev_packet_bit_size - bit_offset) / 8; + s->prev_packet_bit_size += len; if(len <= 0) return; /** increase length if needed */ - s->prev_frame = av_realloc(s->prev_frame,buflen + + s->prev_packet_data = av_realloc(s->prev_packet_data,buflen + FF_INPUT_BUFFER_PADDING_SIZE); /** byte align prev_frame buffer */ @@ -1492,20 +1492,20 @@ static void save_bits(WMA3DecodeContext int missing = 8 - bit_offset; if(len < missing) missing = len; - s->prev_frame[pos++] |= + s->prev_packet_data[pos++] |= get_bits(&s->gb, missing) << (8 - bit_offset - missing); len -= missing; } /** copy full bytes */ while(len > 7){ - s->prev_frame[pos++] = get_bits(&s->gb,8); + s->prev_packet_data[pos++] = get_bits(&s->gb,8); len -= 8; } /** copy remaining bits */ if(len > 0) - s->prev_frame[pos++] = get_bits(&s->gb,len) << (8 - len); + s->prev_packet_data[pos++] = get_bits(&s->gb,len) << (8 - len); } /** @@ -1559,21 +1559,22 @@ static int wma3_decode_packet(AVCodecCon previous packet to create a full frame */ save_bits(s,num_bits_prev_frame); av_log(avctx, AV_LOG_DEBUG, "accumulated %x bits of frame data\n", - s->prev_frame_bit_size); + s->prev_packet_bit_size); /** decode the cross packet frame if it is valid */ if(!s->packet_loss){ GetBitContext gb_prev; - init_get_bits(&gb_prev, s->prev_frame, s->prev_frame_bit_size); + init_get_bits(&gb_prev, s->prev_packet_data, + s->prev_packet_bit_size); wma_decode_frame(s,&gb_prev); } - }else if(s->prev_frame_bit_size){ + }else if(s->prev_packet_bit_size){ av_log(avctx, AV_LOG_ERROR, "ignoring %x previously saved bits\n", - s->prev_frame_bit_size); + s->prev_packet_bit_size); } /** reset prev frame buffer */ - s->prev_frame_bit_size = 0; + s->prev_packet_bit_size = 0; s->packet_loss = 0; /** decode the rest of the packet */ while(more_frames && remaining_bits(s) > s->log2_frame_size){

1 0

[soc]: r3980 - in wmapro: wma3.h wma3dec.c
by faust3 17 Jan '09

17 Jan '09

Author: faust3 Date: Sat Jan 17 18:32:06 2009 New Revision: 3980 Log: renamed wma_channel_group to WMA3ChannelGroup Modified: wmapro/wma3.h wmapro/wma3dec.c Modified: wmapro/wma3.h ============================================================================== --- wmapro/wma3.h Sat Jan 17 18:29:29 2009 (r3979) +++ wmapro/wma3.h Sat Jan 17 18:32:06 2009 (r3980) @@ -78,7 +78,7 @@ typedef struct { char positive[MAX_CHANNELS * MAX_CHANNELS]; //< fixme for what are these numbers used? float decorrelation_matrix[MAX_CHANNELS*MAX_CHANNELS]; char use_channel[MAX_CHANNELS]; -} wma_channel_group; +} WMA3ChannelGroup; /** *@brief main decoder context @@ -148,8 +148,8 @@ typedef struct WMA3DecodeContext { int quant_step; int esc_len; - int nb_chgroups; //< number of channel groups - wma_channel_group chgroup[MAX_CHANNELS]; //< channel group information + uint8_t nb_chgroups; //< number of channel groups + WMA3ChannelGroup chgroup[MAX_CHANNELS]; //< channel group information WMA3ChannelCtx channel[MAX_CHANNELS]; //< per channel data } WMA3DecodeContext; Modified: wmapro/wma3dec.c ============================================================================== --- wmapro/wma3dec.c Sat Jan 17 18:29:29 2009 (r3979) +++ wmapro/wma3dec.c Sat Jan 17 18:32:06 2009 (r3980) @@ -590,7 +590,7 @@ static int wma_decode_channel_transform( } for(s->nb_chgroups = 0; remaining_channels && s->nb_chgroups < s->channels_for_cur_subframe;s->nb_chgroups++){ - wma_channel_group* chgroup = &s->chgroup[s->nb_chgroups]; + WMA3ChannelGroup* chgroup = &s->chgroup[s->nb_chgroups]; chgroup->nb_channels = 0; chgroup->no_rotation = 0; chgroup->transform = 0; @@ -939,7 +939,7 @@ static int wma_decode_scale_factors(WMA3 return 1; } -static void wma_calc_decorrelation_matrix(WMA3DecodeContext *s, wma_channel_group* chgroup) +static void wma_calc_decorrelation_matrix(WMA3DecodeContext *s, WMA3ChannelGroup* chgroup) { int i; int offset = 0;

1 0

[soc]: r3979 - in wmapro: wma3.h wma3dec.c
by faust3 17 Jan '09

17 Jan '09

Author: faust3 Date: Sat Jan 17 18:29:29 2009 New Revision: 3979 Log: renamed wma_channel to WMA3ChannelCtx Modified: wmapro/wma3.h wmapro/wma3dec.c Modified: wmapro/wma3.h ============================================================================== --- wmapro/wma3.h Sat Jan 17 18:23:03 2009 (r3978) +++ wmapro/wma3.h Sat Jan 17 18:29:29 2009 (r3979) @@ -67,7 +67,7 @@ typedef struct { int scale_factor_block_len; //< block len of the frame for which the scale factors were transmitted DECLARE_ALIGNED_16(float, out[8192]); -} wma_channel; +} WMA3ChannelCtx; typedef struct { int nb_channels; @@ -151,7 +151,7 @@ typedef struct WMA3DecodeContext { int nb_chgroups; //< number of channel groups wma_channel_group chgroup[MAX_CHANNELS]; //< channel group information - wma_channel channel[MAX_CHANNELS]; //< per channel data + WMA3ChannelCtx channel[MAX_CHANNELS]; //< per channel data } WMA3DecodeContext; #endif /* AVCODEC_WMA3_H */ Modified: wmapro/wma3dec.c ============================================================================== --- wmapro/wma3dec.c Sat Jan 17 18:23:03 2009 (r3978) +++ wmapro/wma3dec.c Sat Jan 17 18:29:29 2009 (r3979) @@ -516,7 +516,7 @@ static int wma_decode_tilehdr(WMA3Decode return -1; } for(c=0; c<s->nb_channels;c++){ - wma_channel* chan = &s->channel[c]; + WMA3ChannelCtx* chan = &s->channel[c]; if(chan->num_subframes > 32){ av_log(s->avctx, AV_LOG_ERROR, "broken frame: num subframes %i\n", @@ -769,7 +769,7 @@ static int decode_coeffs(WMA3DecodeConte int vlctable; VLC* vlc; int vlcmax; - wma_channel* ci = &s->channel[c]; + WMA3ChannelCtx* ci = &s->channel[c]; int rl_mode = 0; int cur_coeff = 0; int last_write = 0;

1 0

[soc]: r3978 - wmapro/wma3.h
by faust3 17 Jan '09

17 Jan '09

Author: faust3 Date: Sat Jan 17 18:23:03 2009 New Revision: 3978 Log: rearranged WMA3DecodeContext Modified: wmapro/wma3.h Modified: wmapro/wma3.h ============================================================================== --- wmapro/wma3.h Sat Jan 17 16:56:55 2009 (r3977) +++ wmapro/wma3.h Sat Jan 17 18:23:03 2009 (r3978) @@ -84,79 +84,74 @@ typedef struct { *@brief main decoder context */ typedef struct WMA3DecodeContext { - int16_t* samples; //< current samplebuffer pointer - int16_t* samples_end; //< maximum samplebuffer pointer - int skip_frame; //< do not output the current frame - DSPContext dsp; - - int num_possible_block_sizes; //< number of possible block sizes - int* num_sfb; //< number of scale factor bands for every block size - int* sfb_offsets; //< scale factor band offsets - int* sf_offsets; //< matrix to find the correct scale factor - int* subwoofer_cutoffs; //< subwoofer cutoff values for every block - int subwoofer_cutoff; //< current subwoofer cutoff value - int subframe_len; //< current subframe length - int nb_chgroups; //< number of channel groups for the current subframe - wma_channel_group chgroup[MAX_CHANNELS]; //< channel group information - - int lfe_channel; - int negative_quantstep; - int quant_step; - int channels_for_cur_subframe; - int channel_indices_for_cur_subframe[MAX_CHANNELS]; - const float*** default_decorrelation_matrix; - int esc_len; - - GetBitContext* getbit; - MDCTContext mdct_ctx[BLOCK_NB_SIZES]; - float *windows[BLOCK_NB_SIZES]; - - int cValidBarkBand; - int* rgiBarkIndex; - - VLC sf_vlc; - VLC vec4_vlc; - VLC vec2_vlc; - VLC vec1_vlc; - VLC coef_vlc[2]; - VLC sf_rl_vlc; - int coef_max[2]; - - int parsed_all_subframes; + /** generic decoder variables */ AVCodecContext* avctx; //< codec context for av_log - GetBitContext gb; //< getbitcontext for the packet - int buf_bit_size; //< buffer size in bits - - /** packet info */ - uint8_t packet_sequence_number; //< current packet number - uint8_t bit5; //< padding bit? (CBR files) - uint8_t bit6; - uint8_t packet_loss; //< set in case of bitstream error + DSPContext dsp; + MDCTContext mdct_ctx[BLOCK_NB_SIZES]; //< mdct context per block size + float* windows[BLOCK_NB_SIZES]; //< window per block size + VLC sf_vlc; //< scale factor dpcm vlc + VLC sf_rl_vlc; //< scale factor run length vlc + VLC vec4_vlc; //< 4 coefs per symbol + VLC vec2_vlc; //< 2 coefs per symbol + VLC vec1_vlc; //< 1 coef per symbol + VLC coef_vlc[2]; //< coef run length vlc codes + int coef_max[2]; //< max length of vlc codes - /** stream info */ - uint16_t samples_per_frame; //< number of outputed samples - uint16_t log2_frame_size; //< frame size + /** frame size dependant frame information (set during init) */ uint8_t lossless; //< lossless mode - uint8_t no_tiling; //< frames are split in subframes - int8_t nb_channels; //< number of channels - wma_channel channel[MAX_CHANNELS]; //< per channel data - - /** extradata */ unsigned int decode_flags; //< used compression features - uint8_t sample_bit_depth; //< bits per sample - - /** general frame info */ - unsigned int frame_num; //< current frame number uint8_t len_prefix; //< frame is prefixed with its len + uint8_t dynamic_range_compression;//< frame contains drc data + uint8_t sample_bit_depth; //< bits per sample + uint16_t samples_per_frame; //< number of outputed samples + uint16_t log2_frame_size; //< frame size + int8_t nb_channels; //< number of channels + int8_t lfe_channel; //< lfe channel index + const float*** default_decorrelation_matrix; uint8_t allow_subframes; //< frames may contain subframes uint8_t max_num_subframes; //< maximum number of subframes + int8_t num_possible_block_sizes; //< nb of supported block sizes uint16_t min_samples_per_subframe; //< minimum samples per subframe - uint8_t dynamic_range_compression;//< frame contains drc data - uint8_t drc_gain; //< gain for the drc tool + int* num_sfb; //< scale factor bands per block size + int* sfb_offsets; //< scale factor band offsets + int* sf_offsets; //< scale factor resample matrix + int* subwoofer_cutoffs; //< subwoofer cutoff values - /** buffered frame data */ + /** packet decode state */ + uint8_t packet_sequence_number; //< current packet number int prev_frame_bit_size; //< saved number of bits uint8_t* prev_frame; //< prev frame data + uint8_t bit5; //< padding bit? (CBR files) + uint8_t bit6; + uint8_t packet_loss; //< set in case of bitstream error + uint8_t negative_quantstep; //< packet loss due to negative quant step + + /** frame decode state */ + unsigned int frame_num; //< current frame number + GetBitContext* getbit; + GetBitContext gb; //< getbitcontext for the packet + int buf_bit_size; //< buffer size in bits + int16_t* samples; //< current samplebuffer pointer + int16_t* samples_end; //< maximum samplebuffer pointer + uint8_t drc_gain; //< gain for the drc tool + uint8_t no_tiling; //< frames contain subframes + int skip_frame; //< skip output step + int parsed_all_subframes; //< all subframes decoded? + + /** subframe/block decode state */ + int subframe_len; //< current subframe length + int channels_for_cur_subframe; + int channel_indices_for_cur_subframe[MAX_CHANNELS]; + int subwoofer_cutoff; //< subwoofer cutoff value + int cValidBarkBand; + int* rgiBarkIndex; + int quant_step; + int esc_len; + + int nb_chgroups; //< number of channel groups + wma_channel_group chgroup[MAX_CHANNELS]; //< channel group information + + wma_channel channel[MAX_CHANNELS]; //< per channel data } WMA3DecodeContext; #endif /* AVCODEC_WMA3_H */

1 0

[soc]: r3976 - wmapro/wma3data.h
by faust3 17 Jan '09

17 Jan '09

Author: faust3 Date: Sat Jan 17 16:29:58 2009 New Revision: 3976 Log: added doxygen comments to wma3data.h Modified: wmapro/wma3data.h Modified: wmapro/wma3data.h ============================================================================== --- wmapro/wma3data.h Sat Jan 17 15:42:53 2009 (r3975) +++ wmapro/wma3data.h Sat Jan 17 16:29:58 2009 (r3976) @@ -20,10 +20,17 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +/** + * @file wma3data.h + * @brief tables for wmapro decoding + */ + #ifndef AVCODEC_WMA3DATA_H #define AVCODEC_WMA3DATA_H -/* Bark frequencies */ +/** + * @brief frequencies to divide the frequency spectrum into scale factor bands + */ static const uint16_t ff_wma3_critical_freq[] = { 100, 200, 300, 400, 510, 630, 770, 920, 1080, 1270, 1480, 1720, 2000, 2320, @@ -32,6 +39,10 @@ static const uint16_t ff_wma3_critical_f }; +/** + * @name huffman tables for dpcm coded scale factors + * @{ + */ #define FF_WMA3_HUFF_SCALE_SIZE 121 #define FF_WMA3_HUFF_SCALE_MAXBITS 19 static const uint32_t ff_wma3_scale_huffcodes[FF_WMA3_HUFF_SCALE_SIZE] = { @@ -71,8 +82,13 @@ static const uint8_t ff_wma3_scale_huffb 19, 19, 19, 19, 19, 19, 19, 19, 19, }; +/** @} */ +/** + * @name huffman, run and level tables for run length coded scale factors + * @{ + */ #define FF_WMA3_HUFF_SCALE_RL_SIZE 120 #define FF_WMA3_HUFF_SCALE_RL_MAXBITS 21 static const uint32_t ff_wma3_scale_rl_huffcodes[FF_WMA3_HUFF_SCALE_RL_SIZE] = { @@ -137,8 +153,13 @@ static const uint8_t ff_wma3_scale_rl_le 5, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 8, 8, 9, 9, }; +/** @} */ +/** + * @name huffman, run and level codes for run length coded coefficients + * @{ + */ #define FF_WMA3_HUFF_COEF0_SIZE 272 #define FF_WMA3_HUFF_COEF0_MAXBITS 21 static const uint32_t ff_wma3_coef0_huffcodes[FF_WMA3_HUFF_COEF0_SIZE] = { @@ -385,8 +406,13 @@ static const uint8_t ff_wma3_coef1_level 37, 38, 38, 39, 39, 40, 40, 41, 41, 42, 42, 43, 43, 44, 44, 45, 45, 46, 46, 47, 47, 48, 48, 49, 49, 50, 51, 52, }; +/** @} */ +/** + * @name huffman and vector lookup tables for vector coded coefficients + * @{ + */ #define FF_WMA3_HUFF_VEC4_SIZE 127 #define FF_WMA3_HUFF_VEC4_MAXBITS 14 static const uint32_t ff_wma3_vec4_huffcodes[FF_WMA3_HUFF_VEC4_SIZE] = { @@ -538,8 +564,12 @@ static const uint8_t ff_wma3_symbol_to_v 240, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }; +/** @} */ +/** + * @brief decorrelation matrix for multichannel streams + **/ static const float ff_wma3_default_decorrelation_matrices[] = { 1.000000, 0.707031, -0.707031, 0.707031, 0.707031, 0.578125, 0.707031, 0.410156, 0.578125, -0.707031, 0.410156, 0.578125, 0.000000, -0.816406,

1 0

[soc]: r3975 - in wmapro: wma3data.h wma3dec.c
by faust3 17 Jan '09

17 Jan '09

Author: faust3 Date: Sat Jan 17 15:42:53 2009 New Revision: 3975 Log: fixed sizes of the run and level tables Modified: wmapro/wma3data.h wmapro/wma3dec.c Modified: wmapro/wma3data.h ============================================================================== --- wmapro/wma3data.h Sat Jan 17 14:50:36 2009 (r3974) +++ wmapro/wma3data.h Sat Jan 17 15:42:53 2009 (r3975) @@ -118,24 +118,24 @@ static const uint8_t ff_wma3_scale_rl_hu }; -static const uint8_t ff_wma3_scale_rl_run[] = { - 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, - 18, 19, 20, 21, 22, 23, 24, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, - 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 0, 1, 2, 3, 4, 5, - 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, - 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, - 19, 20, 21, 22, 23, 24, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 0, 1, - 0, 1, 0, 1, +static const uint8_t ff_wma3_scale_rl_run[FF_WMA3_HUFF_SCALE_RL_SIZE] = { + 0, 0, 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, + 16, 17, 18, 19, 20, 21, 22, 23, 24, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, + 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 0, 1, 2, 3, + 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, + 23, 24, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, + 17, 18, 19, 20, 21, 22, 23, 24, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, + 0, 1, 0, 1, 0, 1, }; -static const uint8_t ff_wma3_scale_rl_level[] = { - 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, +static const uint8_t ff_wma3_scale_rl_level[FF_WMA3_HUFF_SCALE_RL_SIZE] = { + 0, 0, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, - 8, 8, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 7, 7, 8, 8, 9, 9, }; @@ -305,31 +305,31 @@ static const uint8_t ff_wma3_coef1_huffb }; -static const uint8_t ff_wma3_coef0_run[] = { - 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, - 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, - 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, - 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, - 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, - 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, - 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, - 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, - 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, - 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, - 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 0, 1, 2, 3, +static const uint8_t ff_wma3_coef0_run[FF_WMA3_HUFF_COEF0_SIZE] = { + 0, 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, + 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, + 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, + 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, + 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, + 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, + 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, + 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, + 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, + 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, + 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 0, 1, + 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, + 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, + 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, - 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, - 32, 33, 34, 35, 36, 37, 38, 39, 0, 1, 2, 3, 4, 5, - 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, - 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, - 4, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, + 18, 19, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, + 2, 3, 4, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, - 1, 0, 1, 0, 0, 0, + 1, 0, 1, 0, 1, 0, }; -static const uint8_t ff_wma3_coef0_level[] = { - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, +static const uint8_t ff_wma3_coef0_level[FF_WMA3_HUFF_COEF0_SIZE] = { + 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -339,53 +339,51 @@ static const uint8_t ff_wma3_coef0_level 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, - 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, - 12, 13, 13, 14, 14, 15, 15, 16, 16, 17, 17, 18, 18, 19, - 19, 20, 20, 21, 21, 22, 22, 23, 23, 24, 24, 25, 25, 26, - 26, 27, 27, 28, 0, 0, + 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, + 5, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, + 11, 12, 12, 13, 13, 14, 14, 15, 15, 16, 16, 17, 17, 18, + 18, 19, 19, 20, 20, 21, 21, 22, 22, 23, 23, 24, 24, 25, + 25, 26, 26, 27, 27, 28, }; -static const uint8_t ff_wma3_coef1_run[] = { - 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, - 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, - 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, - 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, - 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, - 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 0, 1, 2, 3, 4, 5, 6, 7, - 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, - 26, 27, 28, 29, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, - 4, 5, 0, 1, 2, 0, 1, 2, 0, 1, 2, 0, 1, 0, 1, 0, 1, 0, +static const uint8_t ff_wma3_coef1_run[FF_WMA3_HUFF_COEF1_SIZE] = { + 0, 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, + 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, + 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, + 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, + 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, + 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 0, 1, 2, 3, 4, 5, + 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, + 24, 25, 26, 27, 28, 29, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, + 2, 3, 4, 5, 0, 1, 2, 0, 1, 2, 0, 1, 2, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, - 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, + 1, 0, 1, 0, 1, 0, 1, 0, 0, 0, }; -static const uint8_t ff_wma3_coef1_level[] = { - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, +static const uint8_t ff_wma3_coef1_level[FF_WMA3_HUFF_COEF1_SIZE] = { + 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, - 4, 4, 5, 5, 5, 6, 6, 6, 7, 7, 7, 8, 8, 9, 9, 10, 10, 11, - 11, 12, 12, 13, 13, 14, 14, 15, 15, 16, 16, 17, 17, 18, 18, 19, 19, 20, - 20, 21, 21, 22, 22, 23, 23, 24, 24, 25, 25, 26, 26, 27, 27, 28, 28, 29, - 29, 30, 30, 31, 31, 32, 32, 33, 33, 34, 34, 35, 35, 36, 36, 37, 37, 38, - 38, 39, 39, 40, 40, 41, 41, 42, 42, 43, 43, 44, 44, 45, 45, 46, 46, 47, - 47, 48, 48, 49, 49, 50, 51, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, + 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, + 4, 4, 4, 4, 5, 5, 5, 6, 6, 6, 7, 7, 7, 8, 8, 9, 9, 10, + 10, 11, 11, 12, 12, 13, 13, 14, 14, 15, 15, 16, 16, 17, 17, 18, 18, 19, + 19, 20, 20, 21, 21, 22, 22, 23, 23, 24, 24, 25, 25, 26, 26, 27, 27, 28, + 28, 29, 29, 30, 30, 31, 31, 32, 32, 33, 33, 34, 34, 35, 35, 36, 36, 37, + 37, 38, 38, 39, 39, 40, 40, 41, 41, 42, 42, 43, 43, 44, 44, 45, 45, 46, + 46, 47, 47, 48, 48, 49, 49, 50, 51, 52, }; Modified: wmapro/wma3dec.c ============================================================================== --- wmapro/wma3dec.c Sat Jan 17 14:50:36 2009 (r3974) +++ wmapro/wma3dec.c Sat Jan 17 15:42:53 2009 (r3975) @@ -815,8 +815,8 @@ static int decode_coeffs(WMA3DecodeConte cur_coeff += get_bits(s->getbit,2) + 1; } }else{ - cur_coeff += run[idx - 2]; - val = level[idx - 2]; + cur_coeff += run[idx]; + val = level[idx]; } mask = get_bits(s->getbit,1) - 1; ci->coeffs[cur_coeff] = (val^mask) - mask; @@ -913,8 +913,8 @@ static int wma_decode_scale_factors(WMA3 }else if(idx == 1){ break; }else{ - skip = ff_wma3_scale_rl_run[idx-2]; - level_mask = ff_wma3_scale_rl_level[idx-2]; + skip = ff_wma3_scale_rl_run[idx]; + level_mask = ff_wma3_scale_rl_level[idx]; val = get_bits(gb,1)-1; }

1 0

[soc]: r3974 - wmapro/wma3data.h
by faust3 17 Jan '09

17 Jan '09

Author: faust3 Date: Sat Jan 17 14:50:36 2009 New Revision: 3974 Log: rearranged tables Modified: wmapro/wma3data.h Modified: wmapro/wma3data.h ============================================================================== --- wmapro/wma3data.h Sat Jan 17 14:40:11 2009 (r3973) +++ wmapro/wma3data.h Sat Jan 17 14:50:36 2009 (r3974) @@ -139,85 +139,6 @@ static const uint8_t ff_wma3_scale_rl_le }; -#define FF_WMA3_HUFF_COEF1_SIZE 244 -#define FF_WMA3_HUFF_COEF1_MAXBITS 22 -static const uint32_t ff_wma3_coef1_huffcodes[FF_WMA3_HUFF_COEF1_SIZE] = { - 0x0001E2, 0x00007F, 0x000000, 0x000002, 0x000008, 0x00000E, 0x000019, - 0x00002F, 0x000037, 0x000060, 0x00006C, 0x000095, 0x0000C6, 0x0000F0, - 0x00012E, 0x000189, 0x0001A5, 0x0001F8, 0x000253, 0x00030A, 0x000344, - 0x00034D, 0x0003F2, 0x0004BD, 0x0005D7, 0x00062A, 0x00068B, 0x000693, - 0x000797, 0x00097D, 0x000BAB, 0x000C52, 0x000C5E, 0x000D21, 0x000D20, - 0x000F1A, 0x000FCE, 0x000FD1, 0x0012F1, 0x001759, 0x0018AC, 0x0018A7, - 0x0018BF, 0x001A2B, 0x001E52, 0x001E50, 0x001E31, 0x001FB8, 0x0025E6, - 0x0025E7, 0x002EB4, 0x002EB7, 0x003169, 0x00315B, 0x00317C, 0x00316C, - 0x0034CA, 0x00348D, 0x003F40, 0x003CA2, 0x003F76, 0x004BC3, 0x004BE5, - 0x003F73, 0x004BF8, 0x004BF9, 0x006131, 0x00628B, 0x006289, 0x0062DA, - 0x00628A, 0x0062D4, 0x006997, 0x0062B4, 0x006918, 0x00794D, 0x007E7B, - 0x007E87, 0x007EEA, 0x00794E, 0x00699D, 0x007967, 0x00699F, 0x0062DB, - 0x007E7A, 0x007EEB, 0x00BAC0, 0x0097C9, 0x00C537, 0x00C5AB, 0x00D233, - 0x00D338, 0x00BAC1, 0x00D23D, 0x012F91, 0x00D339, 0x00FDC8, 0x00D23C, - 0x00FDDC, 0x00FDC9, 0x00FDDD, 0x00D33C, 0x000003, 0x000016, 0x00003E, - 0x0000C3, 0x0001A1, 0x000347, 0x00062E, 0x000BAA, 0x000F2D, 0x001A2A, - 0x001E58, 0x00309B, 0x003CA3, 0x005D6A, 0x00629A, 0x006996, 0x00794F, - 0x007EE5, 0x00BAD7, 0x00C5AA, 0x00C5F4, 0x00FDDF, 0x00FDDE, 0x018A20, - 0x018A6D, 0x01A67B, 0x01A464, 0x025F21, 0x01F9E2, 0x01F9E3, 0x00000A, - 0x00003D, 0x000128, 0x0003C7, 0x000C24, 0x0018A3, 0x002EB1, 0x003CB2, - 0x00691F, 0x007E79, 0x000013, 0x0000BB, 0x00034E, 0x000D14, 0x0025FD, - 0x004BE7, 0x000024, 0x000188, 0x0007EF, 0x000035, 0x000308, 0x0012F2, - 0x00005C, 0x0003F6, 0x0025E0, 0x00006D, 0x000698, 0x000096, 0x000C25, - 0x0000C7, 0x000F1B, 0x0000F3, 0x0012FF, 0x000174, 0x001A66, 0x0001A0, - 0x003099, 0x0001E4, 0x00316B, 0x000252, 0x003F31, 0x00030B, 0x004BE6, - 0x000346, 0x0062FB, 0x00034F, 0x007966, 0x0003F5, 0x007E86, 0x0005D4, - 0x00C511, 0x00062C, 0x00C5F5, 0x000692, 0x00F299, 0x000795, 0x00F298, - 0x0007E9, 0x018A21, 0x00097E, 0x0175AD, 0x000C27, 0x01A67A, 0x000C57, - 0x02EB59, 0x000D22, 0x0314D9, 0x000F19, 0x03F3C2, 0x000FCD, 0x0348CB, - 0x0012F8, 0x04BE41, 0x0018A0, 0x03F3C1, 0x0018A1, 0x04BE40, 0x0018B7, - 0x0629B0, 0x001A64, 0x0D2329, 0x001E30, 0x03F3C3, 0x001F9F, 0x0BAD62, - 0x001F99, 0x0FCF00, 0x00309A, 0x0629B1, 0x002EB6, 0x175AC3, 0x00314C, - 0x069195, 0x003168, 0x0BAD63, 0x00348E, 0x175AC1, 0x003F30, 0x07E781, - 0x003F41, 0x0D2328, 0x003F42, 0x1F9E03, 0x004BC2, 0x175AC2, 0x003F74, - 0x175AC0, 0x005D61, 0x3F3C05, 0x006130, 0x3F3C04, 0x0062B5, -}; - -static const uint8_t ff_wma3_coef1_huffbits[FF_WMA3_HUFF_COEF1_SIZE] = { - 9, 7, 2, 3, 4, 4, 5, - 6, 6, 7, 7, 8, 8, 8, - 9, 9, 9, 9, 10, 10, 10, - 10, 10, 11, 11, 11, 11, 11, - 11, 12, 12, 12, 12, 12, 12, - 12, 12, 12, 13, 13, 13, 13, - 13, 13, 13, 13, 13, 13, 14, - 14, 14, 14, 14, 14, 14, 14, - 14, 14, 14, 14, 14, 15, 15, - 14, 15, 15, 15, 15, 15, 15, - 15, 15, 15, 15, 15, 15, 15, - 15, 15, 15, 15, 15, 15, 15, - 15, 15, 16, 16, 16, 16, 16, - 16, 16, 16, 17, 16, 16, 16, - 16, 16, 16, 16, 3, 5, 6, - 8, 9, 10, 11, 12, 12, 13, - 13, 14, 14, 15, 15, 15, 15, - 15, 16, 16, 16, 16, 16, 17, - 17, 17, 17, 18, 17, 17, 4, - 6, 9, 10, 12, 13, 14, 14, - 15, 15, 5, 8, 10, 12, 14, - 15, 6, 9, 11, 6, 10, 13, - 7, 10, 14, 7, 11, 8, 12, - 8, 12, 8, 13, 9, 13, 9, - 14, 9, 14, 10, 14, 10, 15, - 10, 15, 10, 15, 10, 15, 11, - 16, 11, 16, 11, 16, 11, 16, - 11, 17, 12, 17, 12, 17, 12, - 18, 12, 18, 12, 18, 12, 18, - 13, 19, 13, 18, 13, 19, 13, - 19, 13, 20, 13, 18, 13, 20, - 13, 20, 14, 19, 14, 21, 14, - 19, 14, 20, 14, 21, 14, 19, - 14, 20, 14, 21, 15, 21, 14, - 21, 15, 22, 15, 22, 15, -}; - - #define FF_WMA3_HUFF_COEF0_SIZE 272 #define FF_WMA3_HUFF_COEF0_MAXBITS 21 static const uint32_t ff_wma3_coef0_huffcodes[FF_WMA3_HUFF_COEF0_SIZE] = { @@ -305,6 +226,169 @@ static const uint8_t ff_wma3_coef0_huffb }; +#define FF_WMA3_HUFF_COEF1_SIZE 244 +#define FF_WMA3_HUFF_COEF1_MAXBITS 22 +static const uint32_t ff_wma3_coef1_huffcodes[FF_WMA3_HUFF_COEF1_SIZE] = { + 0x0001E2, 0x00007F, 0x000000, 0x000002, 0x000008, 0x00000E, 0x000019, + 0x00002F, 0x000037, 0x000060, 0x00006C, 0x000095, 0x0000C6, 0x0000F0, + 0x00012E, 0x000189, 0x0001A5, 0x0001F8, 0x000253, 0x00030A, 0x000344, + 0x00034D, 0x0003F2, 0x0004BD, 0x0005D7, 0x00062A, 0x00068B, 0x000693, + 0x000797, 0x00097D, 0x000BAB, 0x000C52, 0x000C5E, 0x000D21, 0x000D20, + 0x000F1A, 0x000FCE, 0x000FD1, 0x0012F1, 0x001759, 0x0018AC, 0x0018A7, + 0x0018BF, 0x001A2B, 0x001E52, 0x001E50, 0x001E31, 0x001FB8, 0x0025E6, + 0x0025E7, 0x002EB4, 0x002EB7, 0x003169, 0x00315B, 0x00317C, 0x00316C, + 0x0034CA, 0x00348D, 0x003F40, 0x003CA2, 0x003F76, 0x004BC3, 0x004BE5, + 0x003F73, 0x004BF8, 0x004BF9, 0x006131, 0x00628B, 0x006289, 0x0062DA, + 0x00628A, 0x0062D4, 0x006997, 0x0062B4, 0x006918, 0x00794D, 0x007E7B, + 0x007E87, 0x007EEA, 0x00794E, 0x00699D, 0x007967, 0x00699F, 0x0062DB, + 0x007E7A, 0x007EEB, 0x00BAC0, 0x0097C9, 0x00C537, 0x00C5AB, 0x00D233, + 0x00D338, 0x00BAC1, 0x00D23D, 0x012F91, 0x00D339, 0x00FDC8, 0x00D23C, + 0x00FDDC, 0x00FDC9, 0x00FDDD, 0x00D33C, 0x000003, 0x000016, 0x00003E, + 0x0000C3, 0x0001A1, 0x000347, 0x00062E, 0x000BAA, 0x000F2D, 0x001A2A, + 0x001E58, 0x00309B, 0x003CA3, 0x005D6A, 0x00629A, 0x006996, 0x00794F, + 0x007EE5, 0x00BAD7, 0x00C5AA, 0x00C5F4, 0x00FDDF, 0x00FDDE, 0x018A20, + 0x018A6D, 0x01A67B, 0x01A464, 0x025F21, 0x01F9E2, 0x01F9E3, 0x00000A, + 0x00003D, 0x000128, 0x0003C7, 0x000C24, 0x0018A3, 0x002EB1, 0x003CB2, + 0x00691F, 0x007E79, 0x000013, 0x0000BB, 0x00034E, 0x000D14, 0x0025FD, + 0x004BE7, 0x000024, 0x000188, 0x0007EF, 0x000035, 0x000308, 0x0012F2, + 0x00005C, 0x0003F6, 0x0025E0, 0x00006D, 0x000698, 0x000096, 0x000C25, + 0x0000C7, 0x000F1B, 0x0000F3, 0x0012FF, 0x000174, 0x001A66, 0x0001A0, + 0x003099, 0x0001E4, 0x00316B, 0x000252, 0x003F31, 0x00030B, 0x004BE6, + 0x000346, 0x0062FB, 0x00034F, 0x007966, 0x0003F5, 0x007E86, 0x0005D4, + 0x00C511, 0x00062C, 0x00C5F5, 0x000692, 0x00F299, 0x000795, 0x00F298, + 0x0007E9, 0x018A21, 0x00097E, 0x0175AD, 0x000C27, 0x01A67A, 0x000C57, + 0x02EB59, 0x000D22, 0x0314D9, 0x000F19, 0x03F3C2, 0x000FCD, 0x0348CB, + 0x0012F8, 0x04BE41, 0x0018A0, 0x03F3C1, 0x0018A1, 0x04BE40, 0x0018B7, + 0x0629B0, 0x001A64, 0x0D2329, 0x001E30, 0x03F3C3, 0x001F9F, 0x0BAD62, + 0x001F99, 0x0FCF00, 0x00309A, 0x0629B1, 0x002EB6, 0x175AC3, 0x00314C, + 0x069195, 0x003168, 0x0BAD63, 0x00348E, 0x175AC1, 0x003F30, 0x07E781, + 0x003F41, 0x0D2328, 0x003F42, 0x1F9E03, 0x004BC2, 0x175AC2, 0x003F74, + 0x175AC0, 0x005D61, 0x3F3C05, 0x006130, 0x3F3C04, 0x0062B5, +}; + +static const uint8_t ff_wma3_coef1_huffbits[FF_WMA3_HUFF_COEF1_SIZE] = { + 9, 7, 2, 3, 4, 4, 5, + 6, 6, 7, 7, 8, 8, 8, + 9, 9, 9, 9, 10, 10, 10, + 10, 10, 11, 11, 11, 11, 11, + 11, 12, 12, 12, 12, 12, 12, + 12, 12, 12, 13, 13, 13, 13, + 13, 13, 13, 13, 13, 13, 14, + 14, 14, 14, 14, 14, 14, 14, + 14, 14, 14, 14, 14, 15, 15, + 14, 15, 15, 15, 15, 15, 15, + 15, 15, 15, 15, 15, 15, 15, + 15, 15, 15, 15, 15, 15, 15, + 15, 15, 16, 16, 16, 16, 16, + 16, 16, 16, 17, 16, 16, 16, + 16, 16, 16, 16, 3, 5, 6, + 8, 9, 10, 11, 12, 12, 13, + 13, 14, 14, 15, 15, 15, 15, + 15, 16, 16, 16, 16, 16, 17, + 17, 17, 17, 18, 17, 17, 4, + 6, 9, 10, 12, 13, 14, 14, + 15, 15, 5, 8, 10, 12, 14, + 15, 6, 9, 11, 6, 10, 13, + 7, 10, 14, 7, 11, 8, 12, + 8, 12, 8, 13, 9, 13, 9, + 14, 9, 14, 10, 14, 10, 15, + 10, 15, 10, 15, 10, 15, 11, + 16, 11, 16, 11, 16, 11, 16, + 11, 17, 12, 17, 12, 17, 12, + 18, 12, 18, 12, 18, 12, 18, + 13, 19, 13, 18, 13, 19, 13, + 19, 13, 20, 13, 18, 13, 20, + 13, 20, 14, 19, 14, 21, 14, + 19, 14, 20, 14, 21, 14, 19, + 14, 20, 14, 21, 15, 21, 14, + 21, 15, 22, 15, 22, 15, +}; + + +static const uint8_t ff_wma3_coef0_run[] = { + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, + 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, + 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, + 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, + 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, + 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, + 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, + 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, + 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, + 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, + 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 0, 1, 2, 3, + 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, + 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, + 32, 33, 34, 35, 36, 37, 38, 39, 0, 1, 2, 3, 4, 5, + 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, + 4, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, + 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, + 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, + 1, 0, 1, 0, 0, 0, +}; + +static const uint8_t ff_wma3_coef0_level[] = { + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, + 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, + 12, 13, 13, 14, 14, 15, 15, 16, 16, 17, 17, 18, 18, 19, + 19, 20, 20, 21, 21, 22, 22, 23, 23, 24, 24, 25, 25, 26, + 26, 27, 27, 28, 0, 0, +}; + + +static const uint8_t ff_wma3_coef1_run[] = { + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, + 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, + 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, + 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, + 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, + 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 0, 1, 2, 3, 4, 5, 6, 7, + 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, + 26, 27, 28, 29, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, + 4, 5, 0, 1, 2, 0, 1, 2, 0, 1, 2, 0, 1, 0, 1, 0, 1, 0, + 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, + 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, + 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, + 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, + 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, +}; + +static const uint8_t ff_wma3_coef1_level[] = { + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, + 4, 4, 5, 5, 5, 6, 6, 6, 7, 7, 7, 8, 8, 9, 9, 10, 10, 11, + 11, 12, 12, 13, 13, 14, 14, 15, 15, 16, 16, 17, 17, 18, 18, 19, 19, 20, + 20, 21, 21, 22, 22, 23, 23, 24, 24, 25, 25, 26, 26, 27, 27, 28, 28, 29, + 29, 30, 30, 31, 31, 32, 32, 33, 33, 34, 34, 35, 35, 36, 36, 37, 37, 38, + 38, 39, 39, 40, 40, 41, 41, 42, 42, 43, 43, 44, 44, 45, 45, 46, 46, 47, + 47, 48, 48, 49, 49, 50, 51, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, +}; + + #define FF_WMA3_HUFF_VEC4_SIZE 127 #define FF_WMA3_HUFF_VEC4_MAXBITS 14 static const uint32_t ff_wma3_vec4_huffcodes[FF_WMA3_HUFF_VEC4_SIZE] = { @@ -458,90 +542,6 @@ static const uint8_t ff_wma3_symbol_to_v }; -static const uint8_t ff_wma3_coef1_run[] = { - 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, - 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, - 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, - 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, - 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, - 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 0, 1, 2, 3, 4, 5, 6, 7, - 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, - 26, 27, 28, 29, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, - 4, 5, 0, 1, 2, 0, 1, 2, 0, 1, 2, 0, 1, 0, 1, 0, 1, 0, - 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, - 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, - 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, - 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, - 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, -}; - -static const uint8_t ff_wma3_coef1_level[] = { - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, - 4, 4, 5, 5, 5, 6, 6, 6, 7, 7, 7, 8, 8, 9, 9, 10, 10, 11, - 11, 12, 12, 13, 13, 14, 14, 15, 15, 16, 16, 17, 17, 18, 18, 19, 19, 20, - 20, 21, 21, 22, 22, 23, 23, 24, 24, 25, 25, 26, 26, 27, 27, 28, 28, 29, - 29, 30, 30, 31, 31, 32, 32, 33, 33, 34, 34, 35, 35, 36, 36, 37, 37, 38, - 38, 39, 39, 40, 40, 41, 41, 42, 42, 43, 43, 44, 44, 45, 45, 46, 46, 47, - 47, 48, 48, 49, 49, 50, 51, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, -}; - - -static const uint8_t ff_wma3_coef0_run[] = { - 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, - 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, - 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, - 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, - 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, - 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, - 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, - 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, - 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, - 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, - 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 0, 1, 2, 3, - 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, - 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, - 32, 33, 34, 35, 36, 37, 38, 39, 0, 1, 2, 3, 4, 5, - 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, - 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, - 4, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, - 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, - 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, - 1, 0, 1, 0, 0, 0, -}; - -static const uint8_t ff_wma3_coef0_level[] = { - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, - 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, - 12, 13, 13, 14, 14, 15, 15, 16, 16, 17, 17, 18, 18, 19, - 19, 20, 20, 21, 21, 22, 22, 23, 23, 24, 24, 25, 25, 26, - 26, 27, 27, 28, 0, 0, -}; - - static const float ff_wma3_default_decorrelation_matrices[] = { 1.000000, 0.707031, -0.707031, 0.707031, 0.707031, 0.578125, 0.707031, 0.410156, 0.578125, -0.707031, 0.410156, 0.578125, 0.000000, -0.816406,

1 0

[soc]: r3973 - in wmapro: wma3data.h wma3dec.c
by faust3 17 Jan '09

17 Jan '09

Author: faust3 Date: Sat Jan 17 14:40:11 2009 New Revision: 3973 Log: consistent naming for coef? huffman, run and level tables Modified: wmapro/wma3data.h wmapro/wma3dec.c Modified: wmapro/wma3data.h ============================================================================== --- wmapro/wma3data.h Sat Jan 17 14:29:53 2009 (r3972) +++ wmapro/wma3data.h Sat Jan 17 14:40:11 2009 (r3973) @@ -139,9 +139,9 @@ static const uint8_t ff_wma3_scale_rl_le }; -#define FF_WMA3_HUFF_COEF0_SIZE 244 -#define FF_WMA3_HUFF_COEF0_MAXBITS 22 -static const uint32_t ff_wma3_coef0_huffcodes[FF_WMA3_HUFF_COEF0_SIZE] = { +#define FF_WMA3_HUFF_COEF1_SIZE 244 +#define FF_WMA3_HUFF_COEF1_MAXBITS 22 +static const uint32_t ff_wma3_coef1_huffcodes[FF_WMA3_HUFF_COEF1_SIZE] = { 0x0001E2, 0x00007F, 0x000000, 0x000002, 0x000008, 0x00000E, 0x000019, 0x00002F, 0x000037, 0x000060, 0x00006C, 0x000095, 0x0000C6, 0x0000F0, 0x00012E, 0x000189, 0x0001A5, 0x0001F8, 0x000253, 0x00030A, 0x000344, @@ -179,7 +179,7 @@ static const uint32_t ff_wma3_coef0_huff 0x175AC0, 0x005D61, 0x3F3C05, 0x006130, 0x3F3C04, 0x0062B5, }; -static const uint8_t ff_wma3_coef0_huffbits[FF_WMA3_HUFF_COEF0_SIZE] = { +static const uint8_t ff_wma3_coef1_huffbits[FF_WMA3_HUFF_COEF1_SIZE] = { 9, 7, 2, 3, 4, 4, 5, 6, 6, 7, 7, 8, 8, 8, 9, 9, 9, 9, 10, 10, 10, @@ -218,9 +218,9 @@ static const uint8_t ff_wma3_coef0_huffb }; -#define FF_WMA3_HUFF_COEF1_SIZE 272 -#define FF_WMA3_HUFF_COEF1_MAXBITS 21 -static const uint32_t ff_wma3_coef1_huffcodes[FF_WMA3_HUFF_COEF1_SIZE] = { +#define FF_WMA3_HUFF_COEF0_SIZE 272 +#define FF_WMA3_HUFF_COEF0_MAXBITS 21 +static const uint32_t ff_wma3_coef0_huffcodes[FF_WMA3_HUFF_COEF0_SIZE] = { 0x00004A, 0x00002B, 0x000000, 0x000003, 0x000006, 0x000009, 0x00000F, 0x000010, 0x000016, 0x000011, 0x000016, 0x000028, 0x00002F, 0x000026, 0x000029, 0x000045, 0x000055, 0x00005D, 0x000042, 0x00004E, 0x000051, @@ -262,7 +262,7 @@ static const uint32_t ff_wma3_coef1_huff 0x087448, 0x0047E4, 0x043A20, 0x00542A, 0x087449, 0x00898C, }; -static const uint8_t ff_wma3_coef1_huffbits[FF_WMA3_HUFF_COEF1_SIZE] = { +static const uint8_t ff_wma3_coef0_huffbits[FF_WMA3_HUFF_COEF0_SIZE] = { 8, 7, 2, 3, 3, 4, 4, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7, 7, 8, 8, 8, @@ -458,7 +458,7 @@ static const uint8_t ff_wma3_symbol_to_v }; -static const uint8_t ff_wma3_coeff1_run[] = { +static const uint8_t ff_wma3_coef1_run[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, @@ -476,7 +476,7 @@ static const uint8_t ff_wma3_coeff1_run[ 0, 0, 0, 0, }; -static const uint8_t ff_wma3_coeff1_level[] = { +static const uint8_t ff_wma3_coef1_level[] = { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -495,7 +495,7 @@ static const uint8_t ff_wma3_coeff1_leve }; -static const uint8_t ff_wma3_coeff0_run[] = { +static const uint8_t ff_wma3_coef0_run[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, @@ -518,7 +518,7 @@ static const uint8_t ff_wma3_coeff0_run[ 1, 0, 1, 0, 0, 0, }; -static const uint8_t ff_wma3_coeff0_level[] = { +static const uint8_t ff_wma3_coef0_level[] = { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, Modified: wmapro/wma3dec.c ============================================================================== --- wmapro/wma3dec.c Sat Jan 17 14:29:53 2009 (r3972) +++ wmapro/wma3dec.c Sat Jan 17 14:40:11 2009 (r3973) @@ -220,18 +220,17 @@ static av_cold int wma3_decode_init(AVCo ff_wma3_scale_rl_huffbits, 1, 1, ff_wma3_scale_rl_huffcodes, 4, 4, 0); - - init_vlc(&s->coef_vlc[1], VLCBITS, FF_WMA3_HUFF_COEF0_SIZE, + init_vlc(&s->coef_vlc[0], VLCBITS, FF_WMA3_HUFF_COEF0_SIZE, ff_wma3_coef0_huffbits, 1, 1, ff_wma3_coef0_huffcodes, 4, 4, 0); - s->coef_max[1] = ((FF_WMA3_HUFF_COEF0_MAXBITS+VLCBITS-1)/VLCBITS); + s->coef_max[0] = ((FF_WMA3_HUFF_COEF0_MAXBITS+VLCBITS-1)/VLCBITS); - init_vlc(&s->coef_vlc[0], VLCBITS, FF_WMA3_HUFF_COEF1_SIZE, + init_vlc(&s->coef_vlc[1], VLCBITS, FF_WMA3_HUFF_COEF1_SIZE, ff_wma3_coef1_huffbits, 1, 1, ff_wma3_coef1_huffcodes, 4, 4, 0); - s->coef_max[0] = ((FF_WMA3_HUFF_COEF1_MAXBITS+VLCBITS-1)/VLCBITS); + s->coef_max[1] = ((FF_WMA3_HUFF_COEF1_MAXBITS+VLCBITS-1)/VLCBITS); init_vlc(&s->vec4_vlc, VLCBITS, FF_WMA3_HUFF_VEC4_SIZE, ff_wma3_vec4_huffbits, 1, 1, @@ -786,11 +785,11 @@ static int decode_coeffs(WMA3DecodeConte vlcmax = s->coef_max[vlctable]; if(vlctable){ - run = ff_wma3_coeff1_run; - level = ff_wma3_coeff1_level; + run = ff_wma3_coef1_run; + level = ff_wma3_coef1_level; }else{ - run = ff_wma3_coeff0_run; - level = ff_wma3_coeff0_level; + run = ff_wma3_coef0_run; + level = ff_wma3_coef0_level; } while(cur_coeff < s->subframe_len){

1 0

[soc]: r3972 - in wmapro: wma3data.h wma3dec.c
by faust3 17 Jan '09

17 Jan '09

Author: faust3 Date: Sat Jan 17 14:29:53 2009 New Revision: 3972 Log: renamed ff_wma3_level/run_i to ff_wma3_coeffi_level/run and exchanged the indices so that they match the read bit Modified: wmapro/wma3data.h wmapro/wma3dec.c Modified: wmapro/wma3data.h ============================================================================== --- wmapro/wma3data.h Sat Jan 17 14:19:07 2009 (r3971) +++ wmapro/wma3data.h Sat Jan 17 14:29:53 2009 (r3972) @@ -458,7 +458,7 @@ static const uint8_t ff_wma3_symbol_to_v }; -static const uint8_t ff_wma3_run_0[] = { +static const uint8_t ff_wma3_coeff1_run[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, @@ -476,7 +476,7 @@ static const uint8_t ff_wma3_run_0[] = { 0, 0, 0, 0, }; -static const uint8_t ff_wma3_level_0[] = { +static const uint8_t ff_wma3_coeff1_level[] = { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -495,7 +495,7 @@ static const uint8_t ff_wma3_level_0[] = }; -static const uint8_t ff_wma3_run_1[] = { +static const uint8_t ff_wma3_coeff0_run[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, @@ -518,7 +518,7 @@ static const uint8_t ff_wma3_run_1[] = { 1, 0, 1, 0, 0, 0, }; -static const uint8_t ff_wma3_level_1[] = { +static const uint8_t ff_wma3_coeff0_level[] = { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, Modified: wmapro/wma3dec.c ============================================================================== --- wmapro/wma3dec.c Sat Jan 17 14:19:07 2009 (r3971) +++ wmapro/wma3dec.c Sat Jan 17 14:29:53 2009 (r3972) @@ -785,12 +785,12 @@ static int decode_coeffs(WMA3DecodeConte vlc = &s->coef_vlc[vlctable]; vlcmax = s->coef_max[vlctable]; - if(!vlctable){ - run = ff_wma3_run_1; - level = ff_wma3_level_1; + if(vlctable){ + run = ff_wma3_coeff1_run; + level = ff_wma3_coeff1_level; }else{ - run = ff_wma3_run_0; - level = ff_wma3_level_0; + run = ff_wma3_coeff0_run; + level = ff_wma3_coeff0_level; } while(cur_coeff < s->subframe_len){

1 0

[soc]: r3971 - in wmapro: wma3data.h wma3dec.c
by faust3 17 Jan '09

17 Jan '09

Author: faust3 Date: Sat Jan 17 14:19:07 2009 New Revision: 3971 Log: renamed FF_WMA3_COEF0_SIZE/MAXBITS to FF_WMA_HUFF_COEF0_SIZE/MAXBITS and avoid negation during the table selection Modified: wmapro/wma3data.h wmapro/wma3dec.c Modified: wmapro/wma3data.h ============================================================================== --- wmapro/wma3data.h Sat Jan 17 13:55:52 2009 (r3970) +++ wmapro/wma3data.h Sat Jan 17 14:19:07 2009 (r3971) @@ -139,9 +139,9 @@ static const uint8_t ff_wma3_scale_rl_le }; -#define FF_WMA3_COEF0_SIZE 244 -#define FF_WMA3_COEF0_MAXBITS 22 -static const uint32_t ff_wma3_coef0_huffcodes[FF_WMA3_COEF0_SIZE] = { +#define FF_WMA3_HUFF_COEF0_SIZE 244 +#define FF_WMA3_HUFF_COEF0_MAXBITS 22 +static const uint32_t ff_wma3_coef0_huffcodes[FF_WMA3_HUFF_COEF0_SIZE] = { 0x0001E2, 0x00007F, 0x000000, 0x000002, 0x000008, 0x00000E, 0x000019, 0x00002F, 0x000037, 0x000060, 0x00006C, 0x000095, 0x0000C6, 0x0000F0, 0x00012E, 0x000189, 0x0001A5, 0x0001F8, 0x000253, 0x00030A, 0x000344, @@ -179,7 +179,7 @@ static const uint32_t ff_wma3_coef0_huff 0x175AC0, 0x005D61, 0x3F3C05, 0x006130, 0x3F3C04, 0x0062B5, }; -static const uint8_t ff_wma3_coef0_huffbits[FF_WMA3_COEF0_SIZE] = { +static const uint8_t ff_wma3_coef0_huffbits[FF_WMA3_HUFF_COEF0_SIZE] = { 9, 7, 2, 3, 4, 4, 5, 6, 6, 7, 7, 8, 8, 8, 9, 9, 9, 9, 10, 10, 10, @@ -218,9 +218,9 @@ static const uint8_t ff_wma3_coef0_huffb }; -#define FF_WMA3_COEF1_SIZE 272 -#define FF_WMA3_COEF1_MAXBITS 21 -static const uint32_t ff_wma3_coef1_huffcodes[FF_WMA3_COEF1_SIZE] = { +#define FF_WMA3_HUFF_COEF1_SIZE 272 +#define FF_WMA3_HUFF_COEF1_MAXBITS 21 +static const uint32_t ff_wma3_coef1_huffcodes[FF_WMA3_HUFF_COEF1_SIZE] = { 0x00004A, 0x00002B, 0x000000, 0x000003, 0x000006, 0x000009, 0x00000F, 0x000010, 0x000016, 0x000011, 0x000016, 0x000028, 0x00002F, 0x000026, 0x000029, 0x000045, 0x000055, 0x00005D, 0x000042, 0x00004E, 0x000051, @@ -262,7 +262,7 @@ static const uint32_t ff_wma3_coef1_huff 0x087448, 0x0047E4, 0x043A20, 0x00542A, 0x087449, 0x00898C, }; -static const uint8_t ff_wma3_coef1_huffbits[FF_WMA3_COEF1_SIZE] = { +static const uint8_t ff_wma3_coef1_huffbits[FF_WMA3_HUFF_COEF1_SIZE] = { 8, 7, 2, 3, 3, 4, 4, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7, 7, 8, 8, 8, Modified: wmapro/wma3dec.c ============================================================================== --- wmapro/wma3dec.c Sat Jan 17 13:55:52 2009 (r3970) +++ wmapro/wma3dec.c Sat Jan 17 14:19:07 2009 (r3971) @@ -221,17 +221,17 @@ static av_cold int wma3_decode_init(AVCo ff_wma3_scale_rl_huffcodes, 4, 4, 0); - init_vlc(&s->coef_vlc[0], VLCBITS, FF_WMA3_COEF0_SIZE, + init_vlc(&s->coef_vlc[1], VLCBITS, FF_WMA3_HUFF_COEF0_SIZE, ff_wma3_coef0_huffbits, 1, 1, ff_wma3_coef0_huffcodes, 4, 4, 0); - s->coef_max[0] = ((22+VLCBITS-1)/VLCBITS); + s->coef_max[1] = ((FF_WMA3_HUFF_COEF0_MAXBITS+VLCBITS-1)/VLCBITS); - init_vlc(&s->coef_vlc[1], VLCBITS, FF_WMA3_COEF1_SIZE, + init_vlc(&s->coef_vlc[0], VLCBITS, FF_WMA3_HUFF_COEF1_SIZE, ff_wma3_coef1_huffbits, 1, 1, ff_wma3_coef1_huffcodes, 4, 4, 0); - s->coef_max[1] = ((21+VLCBITS-1)/VLCBITS); + s->coef_max[0] = ((FF_WMA3_HUFF_COEF1_MAXBITS+VLCBITS-1)/VLCBITS); init_vlc(&s->vec4_vlc, VLCBITS, FF_WMA3_HUFF_VEC4_SIZE, ff_wma3_vec4_huffbits, 1, 1, @@ -782,8 +782,8 @@ static int decode_coeffs(WMA3DecodeConte s->getbit = gb; s->esc_len = av_log2(s->subframe_len -1) +1; vlctable = get_bits(s->getbit, 1); - vlc = &s->coef_vlc[!vlctable]; - vlcmax = s->coef_max[!vlctable]; + vlc = &s->coef_vlc[vlctable]; + vlcmax = s->coef_max[vlctable]; if(!vlctable){ run = ff_wma3_run_1;

1 0

[soc]: r3969 - in wmapro: wma3.h wma3data.h wma3dec.c
by faust3 17 Jan '09

17 Jan '09

Author: faust3 Date: Sat Jan 17 13:46:01 2009 New Revision: 3969 Log: renamed rlc_vlc to sf_rl_vlc and moved the init uninit next to sf_vlc Modified: wmapro/wma3.h wmapro/wma3data.h wmapro/wma3dec.c Modified: wmapro/wma3.h ============================================================================== --- wmapro/wma3.h Sat Jan 17 13:25:33 2009 (r3968) +++ wmapro/wma3.h Sat Jan 17 13:46:01 2009 (r3969) @@ -119,7 +119,7 @@ typedef struct WMA3DecodeContext { VLC vec2_vlc; VLC vec1_vlc; VLC coef_vlc[2]; - VLC rlc_vlc; + VLC sf_rl_vlc; int coef_max[2]; int parsed_all_subframes; Modified: wmapro/wma3data.h ============================================================================== --- wmapro/wma3data.h Sat Jan 17 13:25:33 2009 (r3968) +++ wmapro/wma3data.h Sat Jan 17 13:46:01 2009 (r3969) @@ -73,9 +73,9 @@ static const uint8_t ff_wma3_scale_huffb }; -#define FF_WMA3_HUFF_RLC_SIZE 120 -#define FF_WMA3_HUFF_RLC_MAXBITS 21 -static const uint32_t ff_wma3_huff_rlc_codes[FF_WMA3_HUFF_RLC_SIZE] = { +#define FF_WMA3_HUFF_SCALE_RL_SIZE 120 +#define FF_WMA3_HUFF_SCALE_RL_MAXBITS 21 +static const uint32_t ff_wma3_scale_rl_huffcodes[FF_WMA3_HUFF_SCALE_RL_SIZE] = { 0x00010C, 0x000001, 0x10FE2A, 0x000003, 0x000003, 0x000001, 0x000013, 0x000020, 0x000029, 0x000014, 0x000016, 0x000045, 0x000049, 0x00002F, 0x000042, 0x00008E, 0x00008F, 0x000129, 0x000009, 0x00000D, 0x0004AC, @@ -96,7 +96,7 @@ static const uint32_t ff_wma3_huff_rlc_c 0x0002B1, }; -static const uint8_t ff_wma3_huff_rlc_bits[FF_WMA3_HUFF_RLC_SIZE] = { +static const uint8_t ff_wma3_scale_rl_huffbits[FF_WMA3_HUFF_SCALE_RL_SIZE] = { 9, 2, 21, 2, 4, 5, 5, 6, 6, 7, 7, 7, 7, 6, 7, 8, 8, 9, 10, 10, 11, Modified: wmapro/wma3dec.c ============================================================================== --- wmapro/wma3dec.c Sat Jan 17 13:25:33 2009 (r3968) +++ wmapro/wma3dec.c Sat Jan 17 13:46:01 2009 (r3969) @@ -110,12 +110,12 @@ static av_cold int wma3_decode_end(AVCod } free_vlc(&s->sf_vlc); + free_vlc(&s->sf_rl_vlc); free_vlc(&s->coef_vlc[0]); free_vlc(&s->coef_vlc[1]); free_vlc(&s->vec4_vlc); free_vlc(&s->vec2_vlc); free_vlc(&s->vec1_vlc); - free_vlc(&s->rlc_vlc); for(i=0 ; i<BLOCK_NB_SIZES ; i++) ff_mdct_end(&s->mdct_ctx[i]); @@ -216,6 +216,11 @@ static av_cold int wma3_decode_init(AVCo ff_wma3_scale_huffbits, 1, 1, ff_wma3_scale_huffcodes, 4, 4, 0); + init_vlc(&s->sf_rl_vlc, VLCBITS, FF_WMA3_HUFF_SCALE_RL_SIZE, + ff_wma3_scale_rl_huffbits, 1, 1, + ff_wma3_scale_rl_huffcodes, 4, 4, 0); + + init_vlc(&s->coef_vlc[0], VLCBITS, FF_WMA3_COEF0_SIZE, ff_wma3_coef0_huffbits, 1, 1, ff_wma3_coef0_huffcodes, 4, 4, 0); @@ -240,10 +245,6 @@ static av_cold int wma3_decode_init(AVCo ff_wma3_vec1_huffbits, 1, 1, ff_wma3_vec1_huffcodes, 4, 4, 0); - init_vlc(&s->rlc_vlc, VLCBITS, FF_WMA3_HUFF_RLC_SIZE, - ff_wma3_huff_rlc_bits, 1, 1, - ff_wma3_huff_rlc_codes, 4, 4, 0); - s->num_sfb = av_mallocz(sizeof(int)*s->num_possible_block_sizes); s->sfb_offsets = av_mallocz(MAX_BANDS * sizeof(int) *s->num_possible_block_sizes); s->subwoofer_cutoffs = av_mallocz(sizeof(int)*s->num_possible_block_sizes); @@ -903,7 +904,7 @@ static int wma_decode_scale_factors(WMA3 short level_mask; short val; - idx = get_vlc2(gb, s->rlc_vlc.table, VLCBITS, ((FF_WMA3_HUFF_RLC_MAXBITS+VLCBITS-1)/VLCBITS)); + idx = get_vlc2(gb, s->sf_rl_vlc.table, VLCBITS, ((FF_WMA3_HUFF_SCALE_RL_MAXBITS+VLCBITS-1)/VLCBITS)); if( !idx ){ uint32_t mask = get_bits(gb,14);

1 0

[soc]: r3968 - wmapro/wma3data.h
by faust3 17 Jan '09

17 Jan '09

Author: faust3 Date: Sat Jan 17 13:25:33 2009 New Revision: 3968 Log: moved scale factor run length huffman tables next to the non run length huffman tables Modified: wmapro/wma3data.h Modified: wmapro/wma3data.h ============================================================================== --- wmapro/wma3data.h Sat Jan 17 13:19:08 2009 (r3967) +++ wmapro/wma3data.h Sat Jan 17 13:25:33 2009 (r3968) @@ -73,6 +73,51 @@ static const uint8_t ff_wma3_scale_huffb }; +#define FF_WMA3_HUFF_RLC_SIZE 120 +#define FF_WMA3_HUFF_RLC_MAXBITS 21 +static const uint32_t ff_wma3_huff_rlc_codes[FF_WMA3_HUFF_RLC_SIZE] = { + 0x00010C, 0x000001, 0x10FE2A, 0x000003, 0x000003, 0x000001, 0x000013, + 0x000020, 0x000029, 0x000014, 0x000016, 0x000045, 0x000049, 0x00002F, + 0x000042, 0x00008E, 0x00008F, 0x000129, 0x000009, 0x00000D, 0x0004AC, + 0x00002C, 0x000561, 0x0002E6, 0x00087C, 0x0002E2, 0x00095C, 0x000018, + 0x000001, 0x000016, 0x000044, 0x00002A, 0x000007, 0x000159, 0x000143, + 0x000128, 0x00015A, 0x00012D, 0x00002B, 0x0000A0, 0x000142, 0x00012A, + 0x0002EF, 0x0004AF, 0x00087D, 0x004AE9, 0x0043F9, 0x000067, 0x000199, + 0x002B05, 0x001583, 0x0021FE, 0x10FE2C, 0x000004, 0x00002E, 0x00010D, + 0x00000A, 0x000244, 0x000017, 0x000245, 0x000011, 0x00010E, 0x00012C, + 0x00002A, 0x00002F, 0x000121, 0x000046, 0x00087E, 0x0000BA, 0x000032, + 0x0087F0, 0x0056DC, 0x0002EC, 0x0043FA, 0x002B6F, 0x004AE8, 0x0002B7, + 0x10FE2B, 0x000001, 0x000051, 0x000010, 0x0002EE, 0x000B9C, 0x002576, + 0x000198, 0x0056DD, 0x0000CD, 0x000AC0, 0x000170, 0x004AEF, 0x00002D, + 0x0004AD, 0x0021FF, 0x0005CF, 0x002B04, 0x10FE29, 0x10FE28, 0x0002ED, + 0x002E74, 0x021FC4, 0x004AEE, 0x010FE3, 0x087F17, 0x000000, 0x000097, + 0x0002E3, 0x000ADA, 0x002575, 0x00173B, 0x0043FB, 0x002E75, 0x10FE2D, + 0x0015B6, 0x00056C, 0x000057, 0x000123, 0x000120, 0x00021E, 0x000172, + 0x0002B1, +}; + +static const uint8_t ff_wma3_huff_rlc_bits[FF_WMA3_HUFF_RLC_SIZE] = { + 9, 2, 21, 2, 4, 5, 5, + 6, 6, 7, 7, 7, 7, 6, + 7, 8, 8, 9, 10, 10, 11, + 12, 11, 12, 12, 12, 12, 11, + 4, 5, 7, 8, 9, 9, 9, + 9, 9, 9, 8, 8, 9, 9, + 12, 11, 12, 15, 15, 13, 15, + 14, 13, 14, 21, 5, 6, 9, + 10, 10, 11, 10, 11, 9, 9, + 6, 8, 9, 7, 12, 10, 12, + 16, 15, 12, 15, 14, 15, 10, + 21, 6, 7, 11, 12, 14, 14, + 15, 15, 14, 12, 11, 15, 12, + 11, 14, 13, 14, 21, 21, 12, + 16, 18, 15, 17, 20, 7, 8, + 12, 12, 14, 15, 15, 16, 21, + 13, 11, 7, 9, 9, 10, 11, + 10, +}; + + #define FF_WMA3_COEF0_SIZE 244 #define FF_WMA3_COEF0_MAXBITS 22 static const uint32_t ff_wma3_coef0_huffcodes[FF_WMA3_COEF0_SIZE] = { @@ -392,51 +437,6 @@ static const uint8_t ff_wma3_symbol_to_v }; -#define FF_WMA3_HUFF_RLC_SIZE 120 -#define FF_WMA3_HUFF_RLC_MAXBITS 21 -static const uint32_t ff_wma3_huff_rlc_codes[FF_WMA3_HUFF_RLC_SIZE] = { - 0x00010C, 0x000001, 0x10FE2A, 0x000003, 0x000003, 0x000001, 0x000013, - 0x000020, 0x000029, 0x000014, 0x000016, 0x000045, 0x000049, 0x00002F, - 0x000042, 0x00008E, 0x00008F, 0x000129, 0x000009, 0x00000D, 0x0004AC, - 0x00002C, 0x000561, 0x0002E6, 0x00087C, 0x0002E2, 0x00095C, 0x000018, - 0x000001, 0x000016, 0x000044, 0x00002A, 0x000007, 0x000159, 0x000143, - 0x000128, 0x00015A, 0x00012D, 0x00002B, 0x0000A0, 0x000142, 0x00012A, - 0x0002EF, 0x0004AF, 0x00087D, 0x004AE9, 0x0043F9, 0x000067, 0x000199, - 0x002B05, 0x001583, 0x0021FE, 0x10FE2C, 0x000004, 0x00002E, 0x00010D, - 0x00000A, 0x000244, 0x000017, 0x000245, 0x000011, 0x00010E, 0x00012C, - 0x00002A, 0x00002F, 0x000121, 0x000046, 0x00087E, 0x0000BA, 0x000032, - 0x0087F0, 0x0056DC, 0x0002EC, 0x0043FA, 0x002B6F, 0x004AE8, 0x0002B7, - 0x10FE2B, 0x000001, 0x000051, 0x000010, 0x0002EE, 0x000B9C, 0x002576, - 0x000198, 0x0056DD, 0x0000CD, 0x000AC0, 0x000170, 0x004AEF, 0x00002D, - 0x0004AD, 0x0021FF, 0x0005CF, 0x002B04, 0x10FE29, 0x10FE28, 0x0002ED, - 0x002E74, 0x021FC4, 0x004AEE, 0x010FE3, 0x087F17, 0x000000, 0x000097, - 0x0002E3, 0x000ADA, 0x002575, 0x00173B, 0x0043FB, 0x002E75, 0x10FE2D, - 0x0015B6, 0x00056C, 0x000057, 0x000123, 0x000120, 0x00021E, 0x000172, - 0x0002B1, -}; - -static const uint8_t ff_wma3_huff_rlc_bits[FF_WMA3_HUFF_RLC_SIZE] = { - 9, 2, 21, 2, 4, 5, 5, - 6, 6, 7, 7, 7, 7, 6, - 7, 8, 8, 9, 10, 10, 11, - 12, 11, 12, 12, 12, 12, 11, - 4, 5, 7, 8, 9, 9, 9, - 9, 9, 9, 8, 8, 9, 9, - 12, 11, 12, 15, 15, 13, 15, - 14, 13, 14, 21, 5, 6, 9, - 10, 10, 11, 10, 11, 9, 9, - 6, 8, 9, 7, 12, 10, 12, - 16, 15, 12, 15, 14, 15, 10, - 21, 6, 7, 11, 12, 14, 14, - 15, 15, 14, 12, 11, 15, 12, - 11, 14, 13, 14, 21, 21, 12, - 16, 18, 15, 17, 20, 7, 8, - 12, 12, 14, 15, 15, 16, 21, - 13, 11, 7, 9, 9, 10, 11, - 10, -}; - - static const uint8_t ff_wma3_run_0[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,

1 0

[soc]: r3967 - in wmapro: wma3.h wma3data.h wma3dec.c
by faust3 17 Jan '09

17 Jan '09

Author: faust3 Date: Sat Jan 17 13:19:08 2009 New Revision: 3967 Log: scale factor vlc table naming cleanup Modified: wmapro/wma3.h wmapro/wma3data.h wmapro/wma3dec.c Modified: wmapro/wma3.h ============================================================================== --- wmapro/wma3.h Sat Jan 17 13:06:51 2009 (r3966) +++ wmapro/wma3.h Sat Jan 17 13:19:08 2009 (r3967) @@ -31,8 +31,7 @@ #define MAX_BANDS 29 //< max number of scale factor bands #define VLCBITS 9 -#define EXPVLCBITS 8 -#define EXPMAX ((19+EXPVLCBITS-1)/EXPVLCBITS) +#define SCALEVLCBITS 8 /* size of blocks defines taken from wma.h*/ #define BLOCK_MIN_BITS 7 @@ -115,7 +114,7 @@ typedef struct WMA3DecodeContext { int cValidBarkBand; int* rgiBarkIndex; - VLC exp_vlc; + VLC sf_vlc; VLC vec4_vlc; VLC vec2_vlc; VLC vec1_vlc; Modified: wmapro/wma3data.h ============================================================================== --- wmapro/wma3data.h Sat Jan 17 13:06:51 2009 (r3966) +++ wmapro/wma3data.h Sat Jan 17 13:19:08 2009 (r3967) @@ -32,9 +32,9 @@ static const uint16_t ff_wma3_critical_f }; -#define FF_WMA3_SCALE_SIZE 121 -#define FF_WMA3_SCALE_MAXBITS 19 -static const uint32_t ff_wma3_scale_huffcodes[FF_WMA3_SCALE_SIZE] = { +#define FF_WMA3_HUFF_SCALE_SIZE 121 +#define FF_WMA3_HUFF_SCALE_MAXBITS 19 +static const uint32_t ff_wma3_scale_huffcodes[FF_WMA3_HUFF_SCALE_SIZE] = { 0x0E639, 0x0E6C2, 0x0E6C1, 0x0E6C0, 0x0E63F, 0x0E63E, 0x0E63D, 0x0E63C, 0x0E63B, 0x0E63A, 0x0E638, 0x0E637, 0x0E636, 0x0E635, 0x0E634, 0x0E632, 0x0E633, 0x0E620, 0x0737B, 0x0E610, 0x0E611, 0x0E612, 0x0E613, 0x0E614, @@ -53,7 +53,7 @@ static const uint32_t ff_wma3_scale_huff 0x0E6F5, }; -static const uint8_t ff_wma3_scale_huffbits[FF_WMA3_SCALE_SIZE] = { +static const uint8_t ff_wma3_scale_huffbits[FF_WMA3_HUFF_SCALE_SIZE] = { 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 18, 19, 19, 19, 19, 19, Modified: wmapro/wma3dec.c ============================================================================== --- wmapro/wma3dec.c Sat Jan 17 13:06:51 2009 (r3966) +++ wmapro/wma3dec.c Sat Jan 17 13:19:08 2009 (r3967) @@ -109,7 +109,7 @@ static av_cold int wma3_decode_end(AVCod av_free(s->default_decorrelation_matrix); } - free_vlc(&s->exp_vlc); + free_vlc(&s->sf_vlc); free_vlc(&s->coef_vlc[0]); free_vlc(&s->coef_vlc[1]); free_vlc(&s->vec4_vlc); @@ -212,7 +212,7 @@ static av_cold int wma3_decode_init(AVCo return -1; } - init_vlc(&s->exp_vlc, EXPVLCBITS, FF_WMA3_SCALE_SIZE, + init_vlc(&s->sf_vlc, SCALEVLCBITS, FF_WMA3_HUFF_SCALE_SIZE, ff_wma3_scale_huffbits, 1, 1, ff_wma3_scale_huffcodes, 4, 4, 0); @@ -886,7 +886,7 @@ static int wma_decode_scale_factors(WMA3 int i; s->channel[c].scale_factor_step = get_bits(gb,2) + 1; for(i=0;i<s->cValidBarkBand;i++){ - int val = get_vlc2(gb, s->exp_vlc.table, EXPVLCBITS, EXPMAX); //dpcm coded + int val = get_vlc2(gb, s->sf_vlc.table, SCALEVLCBITS, ((FF_WMA3_HUFF_SCALE_MAXBITS+SCALEVLCBITS-1)/SCALEVLCBITS)); //dpcm coded if(!i) s->channel[c].scale_factors[i] = 45 / s->channel[c].scale_factor_step + val - 60; else

1 0

[soc]: r3966 - in wmapro: wma3data.h wma3dec.c
by faust3 17 Jan '09

17 Jan '09

Author: faust3 Date: Sat Jan 17 13:06:51 2009 New Revision: 3966 Log: renamed vector lookup tables Modified: wmapro/wma3data.h wmapro/wma3dec.c Modified: wmapro/wma3data.h ============================================================================== --- wmapro/wma3data.h Sat Jan 17 13:03:20 2009 (r3965) +++ wmapro/wma3data.h Sat Jan 17 13:06:51 2009 (r3966) @@ -360,7 +360,7 @@ static const uint8_t ff_wma3_vec1_huffbi }; -static const uint16_t ff_wma3_sym2vec4[] = { +static const uint16_t ff_wma3_symbol_to_vec4[] = { 0, 1, 2, 3, 4, 5, 16, 17, 18, 19, 20, 32, 33, 34, 35, 48, 49, 50, 64, 65, 80, 256, 257, 258, 259, 260, 272, 273, 274, 275, @@ -377,7 +377,7 @@ static const uint16_t ff_wma3_sym2vec4[] }; -static const uint8_t ff_wma3_sym2vec2[] = { +static const uint8_t ff_wma3_symbol_to_vec2[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, Modified: wmapro/wma3dec.c ============================================================================== --- wmapro/wma3dec.c Sat Jan 17 13:03:20 2009 (r3965) +++ wmapro/wma3dec.c Sat Jan 17 13:06:51 2009 (r3966) @@ -740,18 +740,18 @@ static inline void wma_get_vec4(WMA3Deco if(vals[i+1] == 100) vals[i+1] += wma_get_large_val(s); }else{ - vals[i] = (ff_wma3_sym2vec2[idx] >> 4) & 0xF; - vals[i+1] = ff_wma3_sym2vec2[idx] & 0xF; + vals[i] = (ff_wma3_symbol_to_vec2[idx] >> 4) & 0xF; + vals[i+1] = ff_wma3_symbol_to_vec2[idx] & 0xF; } i += 2; } } else { - vals[0] = (unsigned char)(ff_wma3_sym2vec4[idx] >> 8) >> 4; - vals[1] = (ff_wma3_sym2vec4[idx] >> 8) & 0xF; - vals[2] = (ff_wma3_sym2vec4[idx] >> 4) & 0xF; - vals[3] = ff_wma3_sym2vec4[idx] & 0xF; + vals[0] = (unsigned char)(ff_wma3_symbol_to_vec4[idx] >> 8) >> 4; + vals[1] = (ff_wma3_symbol_to_vec4[idx] >> 8) & 0xF; + vals[2] = (ff_wma3_symbol_to_vec4[idx] >> 4) & 0xF; + vals[3] = ff_wma3_symbol_to_vec4[idx] & 0xF; } if(vals[0])

1 0

[soc]: r3965 - wmapro/wma3data.h
by faust3 17 Jan '09

17 Jan '09

Author: faust3 Date: Sat Jan 17 13:03:20 2009 New Revision: 3965 Log: moved vector lookup tables next to the vector huffman tables Modified: wmapro/wma3data.h Modified: wmapro/wma3data.h ============================================================================== --- wmapro/wma3data.h Sat Jan 17 12:48:58 2009 (r3964) +++ wmapro/wma3data.h Sat Jan 17 13:03:20 2009 (r3965) @@ -360,6 +360,38 @@ static const uint8_t ff_wma3_vec1_huffbi }; +static const uint16_t ff_wma3_sym2vec4[] = { + 0, 1, 2, 3, 4, 5, 16, 17, 18, 19, + 20, 32, 33, 34, 35, 48, 49, 50, 64, 65, + 80, 256, 257, 258, 259, 260, 272, 273, 274, 275, + 288, 289, 290, 304, 305, 320, 512, 513, 514, 515, + 528, 529, 530, 544, 545, 560, 768, 769, 770, 784, + 785, 800, 1024, 1025, 1040, 1280, 4096, 4097, 4098, 4099, + 4100, 4112, 4113, 4114, 4115, 4128, 4129, 4130, 4144, 4145, + 4160, 4352, 4353, 4354, 4355, 4368, 4369, 4370, 4384, 4385, + 4400, 4608, 4609, 4610, 4624, 4625, 4640, 4864, 4865, 4880, + 5120, 8192, 8193, 8194, 8195, 8208, 8209, 8210, 8224, 8225, + 8240, 8448, 8449, 8450, 8464, 8465, 8480, 8704, 8705, 8720, + 8960, 12288, 12289, 12290, 12304, 12305, 12320, 12544, 12545, 12560, + 12800, 16384, 16385, 16400, 16640, 20480, 0, 0, +}; + + +static const uint8_t ff_wma3_sym2vec2[] = { + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, + 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, + 30, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, + 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 64, 65, + 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 80, 81, 82, 83, 84, + 85, 86, 87, 88, 89, 90, 96, 97, 98, 99, 100, 101, 102, 103, 104, + 105, 112, 113, 114, 115, 116, 117, 118, 119, 120, 128, 129, 130, 131, 132, + 133, 134, 135, 144, 145, 146, 147, 148, 149, 150, 160, 161, 162, 163, 164, + 165, 176, 177, 178, 179, 180, 192, 193, 194, 195, 208, 209, 210, 224, 225, + 240, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +}; + + #define FF_WMA3_HUFF_RLC_SIZE 120 #define FF_WMA3_HUFF_RLC_MAXBITS 21 static const uint32_t ff_wma3_huff_rlc_codes[FF_WMA3_HUFF_RLC_SIZE] = { @@ -489,38 +521,6 @@ static const uint8_t ff_wma3_level_1[] = }; -static const uint16_t ff_wma3_sym2vec4[] = { - 0, 1, 2, 3, 4, 5, 16, 17, 18, 19, - 20, 32, 33, 34, 35, 48, 49, 50, 64, 65, - 80, 256, 257, 258, 259, 260, 272, 273, 274, 275, - 288, 289, 290, 304, 305, 320, 512, 513, 514, 515, - 528, 529, 530, 544, 545, 560, 768, 769, 770, 784, - 785, 800, 1024, 1025, 1040, 1280, 4096, 4097, 4098, 4099, - 4100, 4112, 4113, 4114, 4115, 4128, 4129, 4130, 4144, 4145, - 4160, 4352, 4353, 4354, 4355, 4368, 4369, 4370, 4384, 4385, - 4400, 4608, 4609, 4610, 4624, 4625, 4640, 4864, 4865, 4880, - 5120, 8192, 8193, 8194, 8195, 8208, 8209, 8210, 8224, 8225, - 8240, 8448, 8449, 8450, 8464, 8465, 8480, 8704, 8705, 8720, - 8960, 12288, 12289, 12290, 12304, 12305, 12320, 12544, 12545, 12560, - 12800, 16384, 16385, 16400, 16640, 20480, 0, 0, -}; - - -static const uint8_t ff_wma3_sym2vec2[] = { - 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, - 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, - 30, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, - 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 64, 65, - 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 80, 81, 82, 83, 84, - 85, 86, 87, 88, 89, 90, 96, 97, 98, 99, 100, 101, 102, 103, 104, - 105, 112, 113, 114, 115, 116, 117, 118, 119, 120, 128, 129, 130, 131, 132, - 133, 134, 135, 144, 145, 146, 147, 148, 149, 150, 160, 161, 162, 163, 164, - 165, 176, 177, 178, 179, 180, 192, 193, 194, 195, 208, 209, 210, 224, 225, - 240, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -}; - - static const uint8_t ff_wma3_run_mask[] = { 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11,

1 0

[soc]: r3963 - wmapro/wma3dec.c
by faust3 17 Jan '09

17 Jan '09

Author: faust3 Date: Sat Jan 17 12:03:28 2009 New Revision: 3963 Log: unifiy number of empty lines between functions Modified: wmapro/wma3dec.c Modified: wmapro/wma3dec.c ============================================================================== --- wmapro/wma3dec.c Sat Jan 17 11:57:54 2009 (r3962) +++ wmapro/wma3dec.c Sat Jan 17 12:03:28 2009 (r3963) @@ -48,7 +48,6 @@ static void dump_context(WMA3DecodeConte PRINT("lossless",s->lossless); } - /** *@brief Get the samples per frame for this stream. *@param sample_rate output sample_rate @@ -88,7 +87,6 @@ static int get_samples_per_frame(int sam return samples_per_frame; } - /** *@brief Uninitialize the decoder and free all ressources. *@param avctx codec context @@ -125,7 +123,6 @@ static av_cold int wma3_decode_end(AVCod return 0; } - /** *@brief Initialize the decoder. *@param avctx codec context @@ -379,8 +376,6 @@ static av_cold int wma3_decode_init(AVCo return 0; } - - /** *@brief Decode how the data in the frame is split into subframes * every WMA frame contains the encoded data for a fixed number of @@ -568,7 +563,6 @@ static int wma_decode_tilehdr(WMA3Decode return 0; } - static int wma_decode_channel_transform(WMA3DecodeContext* s, GetBitContext* gb) { int i; @@ -711,7 +705,6 @@ static int wma_decode_channel_transform( return 1; } - static unsigned int wma_get_large_val(WMA3DecodeContext* s) { int n_bits = 8; @@ -727,7 +720,6 @@ static unsigned int wma_get_large_val(WM return get_bits_long(s->getbit,n_bits); } - static inline void wma_get_vec4(WMA3DecodeContext *s,int* vals,int* masks) { unsigned int idx; @@ -772,7 +764,6 @@ static inline void wma_get_vec4(WMA3Deco masks[3] = get_bits(s->getbit,1); } - static int decode_coeffs(WMA3DecodeContext *s,GetBitContext* gb,int c) { int vlctable; @@ -860,8 +851,6 @@ static int decode_coeffs(WMA3DecodeConte return 0; } - - static int wma_decode_scale_factors(WMA3DecodeContext* s,GetBitContext* gb) { int i; @@ -985,7 +974,6 @@ static void wma_calc_decorrelation_matri } - static void wma_inverse_channel_transform(WMA3DecodeContext *s) { int i; @@ -1065,7 +1053,6 @@ static void wma_inverse_channel_transfor } } - static void wma_window(WMA3DecodeContext *s) { int i; @@ -1113,8 +1100,6 @@ static void wma_window(WMA3DecodeContext } } - - static int wma_decode_subframe(WMA3DecodeContext *s,GetBitContext* gb) { int offset = s->samples_per_frame; @@ -1473,7 +1458,6 @@ static int wma_decode_frame(WMA3DecodeCo return more_frames; } - /** *@brief Calculate remaining input buffer length. *@param s codec context @@ -1620,7 +1604,6 @@ static int wma3_decode_packet(AVCodecCon return avctx->block_align; } - /** *@brief WMA9 decoder */

1 0

[soc]: r3941 - in wmapro: checkout.sh mdct.diff wma3.h wma3data.h wma3dec.c wmapro_ffmpeg.patch
by faust3 17 Jan '09

17 Jan '09

Author: faust3 Date: Sat Jan 10 20:24:33 2009 New Revision: 3941 Log: added a bit of code Added: wmapro/mdct.diff wmapro/wma3.h wmapro/wma3data.h Modified: wmapro/checkout.sh wmapro/wma3dec.c wmapro/wmapro_ffmpeg.patch Modified: wmapro/checkout.sh ============================================================================== --- wmapro/checkout.sh Sat Jan 10 03:31:27 2009 (r3940) +++ wmapro/checkout.sh Sat Jan 10 20:24:33 2009 (r3941) @@ -2,6 +2,9 @@ svn co svn://svn.ffmpeg.org/ffmpeg/trunk ffmpeg cd ffmpeg/libavcodec ln -s ../../wma3dec.c wma3dec.c +ln -s ../../wma3data.h wma3data.h +ln -s ../../wma3.h wma3.h cd ../ patch -p0 <../wmapro_ffmpeg.patch +patch -p0 <../mdct.diff Added: wmapro/mdct.diff ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ wmapro/mdct.diff Sat Jan 10 20:24:33 2009 (r3941) @@ -0,0 +1,30 @@ +Index: libavcodec/dsputil.h +=================================================================== +--- libavcodec/dsputil.h (revision 16409) ++++ libavcodec/dsputil.h (working copy) +@@ -731,7 +731,8 @@ + extern float ff_sine_512 [ 512]; + extern float ff_sine_1024[1024]; + extern float ff_sine_2048[2048]; +-extern float *ff_sine_windows[5]; ++extern float ff_sine_4096[4096]; ++extern float *ff_sine_windows[6]; + + int ff_mdct_init(MDCTContext *s, int nbits, int inverse); + void ff_imdct_calc_c(MDCTContext *s, FFTSample *output, const FFTSample *input); +Index: libavcodec/mdct.c +=================================================================== +--- libavcodec/mdct.c (revision 16409) ++++ libavcodec/mdct.c (working copy) +@@ -53,8 +53,9 @@ + DECLARE_ALIGNED(16, float, ff_sine_512 [ 512]); + DECLARE_ALIGNED(16, float, ff_sine_1024[1024]); + DECLARE_ALIGNED(16, float, ff_sine_2048[2048]); +-float *ff_sine_windows[5] = { +- ff_sine_128, ff_sine_256, ff_sine_512, ff_sine_1024, ff_sine_2048, ++DECLARE_ALIGNED(16, float, ff_sine_4096[4096]); ++float *ff_sine_windows[6] = { ++ ff_sine_128, ff_sine_256, ff_sine_512, ff_sine_1024, ff_sine_2048, ff_sine_4096 + }; + + // Generate a sine window. Added: wmapro/wma3.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ wmapro/wma3.h Sat Jan 10 20:24:33 2009 (r3941) @@ -0,0 +1,166 @@ +/* + * WMA 9/3/PRO compatible decoder + * Copyright (c) 2007 Baptiste Coudurier, Benjamin Larsson, Ulion + * Copyright (c) 2008 - 2009 Sascha Sommer + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef WMA3_H +#define WMA3_H 1 + +#include "wma3data.h" +#include "dsputil.h" + +#define MAX_CHANNELS 8 //< max number of handled channels +#define MAX_SUBFRAMES 32 //< max number of subframes per channel +#define MAX_BANDS 29 //< max number of scale factor bands +#define VLCBITS 9 + +#define EXPVLCBITS 8 +#define EXPMAX ((19+EXPVLCBITS-1)/EXPVLCBITS) + +/* size of blocks defines taken from wma.h*/ +#define BLOCK_MIN_BITS 7 +#define BLOCK_MAX_BITS 12 +#define BLOCK_MAX_SIZE (1 << BLOCK_MAX_BITS) +#define BLOCK_NB_SIZES (BLOCK_MAX_BITS - BLOCK_MIN_BITS + 1) + +/** + *@brief decoder context for a single channel + */ +typedef struct { + int prev_block_len; + uint8_t transmit_coefs; + uint8_t num_subframes; //< number of subframes for the current channel + uint16_t subframe_len[MAX_SUBFRAMES]; //< subframe len in samples + uint16_t subframe_offset[MAX_SUBFRAMES]; + uint16_t channel_len; //< channel len in samples + uint16_t decoded_samples; //< number of samples that have been processed already + uint8_t cur_subframe; + uint8_t grouped; //< true if the channel is contained in a channel group + + float coeffs[4096]; //< MAX_COEF + + int scale_factors[MAX_BANDS]; //< initial scale factor values + int resampled_scale_factors[MAX_BANDS]; //< resampled scale factors from the previous block + //< can be used in case no new scale factors are transmitted + + int reuse_sf; //< reuse scale factors from a previous subframe + int transmit_sf; + int scale_factor_step; + int quant_step_modifier; + int max_scale_factor; + int scale_factor_block_len; //< block len of the frame for which the scale factors were transmitted + DECLARE_ALIGNED_16(float, out[8192]); + +} wma_channel; + +typedef struct { + int nb_channels; + int no_rotation; //< controls the type of the transform + int transform; //< also controls the type of the transform + char transform_band[MAX_BANDS]; //< controls if the transform is enabled for a certain band + char rotation_offset[MAX_CHANNELS * MAX_CHANNELS]; + char positive[MAX_CHANNELS * MAX_CHANNELS]; //< fixme for what are these numbers used? + float decorrelation_matrix[MAX_CHANNELS*MAX_CHANNELS]; + char use_channel[MAX_CHANNELS]; + +} wma_channel_group; + +/** + *@brief main decoder context + */ +typedef struct WMA3DecodeContext { + int16_t* samples; //< current samplebuffer pointer + int16_t* samples_end; //< maximum samplebuffer pointer + int skip_frame; //< do not output the current frame + DSPContext dsp; + + int num_possible_block_sizes; //< number of possible block sizes + int* num_sfb; //< number of scale factor bands for every block size + int* sfb_offsets; //< scale factor band offsets + int* sf_offsets; //< matrix to find the correct scale factor + int* subwoofer_cutoffs; //< subwoofer cutoff values for every block + int subwoofer_cutoff; //< current subwoofer cutoff value + int subframe_len; //< current subframe length + int nb_chgroups; //< number of channel groups for the current subframe + wma_channel_group chgroup[MAX_CHANNELS]; //< channel group information + + int lfe_channel; + int negative_quantstep; + int quant_step; + int channels_for_cur_subframe; + int channel_indices_for_cur_subframe[MAX_CHANNELS]; + const float*** default_decorrelation_matrix; + int esc_len; + + GetBitContext* getbit; + MDCTContext mdct_ctx[BLOCK_NB_SIZES]; + float *windows[BLOCK_NB_SIZES]; + + int cValidBarkBand; + int* rgiBarkIndex; + + VLC exp_vlc; + VLC huff_0_vlc; + VLC huff_1_vlc; + VLC huff_2_vlc; + VLC coef_vlc[2]; + VLC rlc_vlc; + int coef_max[2]; + + int parsed_all_subframes; + AVCodecContext* avctx; //< codec context for av_log + GetBitContext gb; //< getbitcontext for the packet + int buf_bit_size; //< buffer size in bits + + /** packet info */ + uint8_t packet_sequence_number; //< current packet number + uint8_t bit5; //< padding bit? (CBR files) + uint8_t bit6; + uint8_t packet_loss; //< set in case of bitstream error + + /** stream info */ + uint16_t samples_per_frame; //< number of outputed samples + uint16_t log2_frame_size; //< frame size + uint8_t lossless; //< lossless mode + uint8_t no_tiling; //< frames are split in subframes + int8_t nb_channels; //< number of channels + wma_channel channel[MAX_CHANNELS]; //< per channel data + + /** extradata */ + unsigned int decode_flags; //< used compression features + unsigned int dwChannelMask; + uint8_t sample_bit_depth; //< bits per sample + + /** general frame info */ + unsigned int frame_num; //< current frame number + uint8_t len_prefix; //< frame is prefixed with its len + uint8_t allow_subframes; //< frames may contain subframes + uint8_t max_num_subframes; //< maximum number of subframes + uint16_t min_samples_per_subframe; //< minimum samples per subframe + uint8_t dynamic_range_compression;//< frame contains drc data + uint8_t drc_gain; //< gain for the drc tool + + /** buffered frame data */ + int prev_frame_bit_size; //< saved number of bits + uint8_t* prev_frame; //< prev frame data +} WMA3DecodeContext; + +#endif + Added: wmapro/wma3data.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ wmapro/wma3data.h Sat Jan 10 20:24:33 2009 (r3941) @@ -0,0 +1,502 @@ +/* + * WMA 9/3/PRO compatible decoder + * Copyright (c) 2007 Baptiste Coudurier, Benjamin Larsson, Ulion + * Copyright (c) 2008 - 2009 Sascha Sommer + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVCODEC_WMA3DATA_H +#define AVCODEC_WMA3DATA_H + +/* Bark frequencies */ +static const uint16_t ff_wma3_critical_freq[] = { + 100, 200, 300, 400, 510, 630, 770, + 920, 1080, 1270, 1480, 1720, 2000, 2320, + 2700, 3150, 3700, 4400, 5300, 6400, 7700, + 9500, 12000, 15500, 20675, 28575, 41375, 63875, +}; + + +#define FF_WMA3_SCALE_SIZE 121 +#define FF_WMA3_SCALE_MAXBITS 19 +static const uint32_t ff_wma3_scale_huffcodes[FF_WMA3_SCALE_SIZE] = { + 0x0E639, 0x0E6C2, 0x0E6C1, 0x0E6C0, 0x0E63F, 0x0E63E, 0x0E63D, 0x0E63C, + 0x0E63B, 0x0E63A, 0x0E638, 0x0E637, 0x0E636, 0x0E635, 0x0E634, 0x0E632, + 0x0E633, 0x0E620, 0x0737B, 0x0E610, 0x0E611, 0x0E612, 0x0E613, 0x0E614, + 0x0E615, 0x0E616, 0x0E617, 0x0E618, 0x0E619, 0x0E61A, 0x0E61B, 0x0E61C, + 0x0E61D, 0x0E61E, 0x0E61F, 0x0E6C3, 0x0E621, 0x0E622, 0x0E623, 0x0E624, + 0x0E625, 0x0E626, 0x0E627, 0x0E628, 0x0E629, 0x0E62A, 0x0E62B, 0x0E62C, + 0x0E62D, 0x0E62E, 0x0E62F, 0x0E630, 0x0E631, 0x01CDF, 0x00E60, 0x00399, + 0x000E7, 0x0001D, 0x00000, 0x00001, 0x00001, 0x00001, 0x00002, 0x00006, + 0x00002, 0x00007, 0x00006, 0x0000F, 0x00038, 0x00072, 0x0039A, 0x0E6C4, + 0x0E6C5, 0x0E6C6, 0x0E6C7, 0x0E6C8, 0x0E6C9, 0x0E6CA, 0x0E6CB, 0x0E6CC, + 0x0E6CD, 0x0E6CE, 0x0E6CF, 0x0E6D0, 0x0E6D1, 0x0E6D2, 0x0E6D3, 0x0E6D4, + 0x0E6D5, 0x0E6D6, 0x0E6D7, 0x0E6D8, 0x0E6D9, 0x0E6DA, 0x0E6DB, 0x0E6DC, + 0x0E6DD, 0x0E6DE, 0x0E6DF, 0x0E6E0, 0x0E6E1, 0x0E6E2, 0x0E6E3, 0x0E6E4, + 0x0E6E5, 0x0E6E6, 0x0E6E7, 0x0E6E8, 0x0E6E9, 0x0E6EA, 0x0E6EB, 0x0E6EC, + 0x0E6ED, 0x0E6EE, 0x0E6EF, 0x0E6F0, 0x0E6F1, 0x0E6F2, 0x0E6F3, 0x0E6F4, + 0x0E6F5, +}; +static const uint8_t ff_wma3_scale_huffbits[FF_WMA3_SCALE_SIZE] = { + 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 18, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 16, 15, 13, + 11, 8, 5, 2, 1, 3, 5, 6, + 6, 7, 7, 7, 9, 10, 13, 19, + 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19, 19, + 19, +}; + + +#define FF_WMA3_COEF0_SIZE 244 +#define FF_WMA3_COEF0_MAXBITS 22 +static const uint32_t ff_wma3_coef0_huffcodes[FF_WMA3_COEF0_SIZE] = { + 0x0001E2, 0x00007F, 0x000000, 0x000002, 0x000008, 0x00000E, 0x000019, 0x00002F, + 0x000037, 0x000060, 0x00006C, 0x000095, 0x0000C6, 0x0000F0, 0x00012E, 0x000189, + 0x0001A5, 0x0001F8, 0x000253, 0x00030A, 0x000344, 0x00034D, 0x0003F2, 0x0004BD, + 0x0005D7, 0x00062A, 0x00068B, 0x000693, 0x000797, 0x00097D, 0x000BAB, 0x000C52, + 0x000C5E, 0x000D21, 0x000D20, 0x000F1A, 0x000FCE, 0x000FD1, 0x0012F1, 0x001759, + 0x0018AC, 0x0018A7, 0x0018BF, 0x001A2B, 0x001E52, 0x001E50, 0x001E31, 0x001FB8, + 0x0025E6, 0x0025E7, 0x002EB4, 0x002EB7, 0x003169, 0x00315B, 0x00317C, 0x00316C, + 0x0034CA, 0x00348D, 0x003F40, 0x003CA2, 0x003F76, 0x004BC3, 0x004BE5, 0x003F73, + 0x004BF8, 0x004BF9, 0x006131, 0x00628B, 0x006289, 0x0062DA, 0x00628A, 0x0062D4, + 0x006997, 0x0062B4, 0x006918, 0x00794D, 0x007E7B, 0x007E87, 0x007EEA, 0x00794E, + 0x00699D, 0x007967, 0x00699F, 0x0062DB, 0x007E7A, 0x007EEB, 0x00BAC0, 0x0097C9, + 0x00C537, 0x00C5AB, 0x00D233, 0x00D338, 0x00BAC1, 0x00D23D, 0x012F91, 0x00D339, + 0x00FDC8, 0x00D23C, 0x00FDDC, 0x00FDC9, 0x00FDDD, 0x00D33C, 0x000003, 0x000016, + 0x00003E, 0x0000C3, 0x0001A1, 0x000347, 0x00062E, 0x000BAA, 0x000F2D, 0x001A2A, + 0x001E58, 0x00309B, 0x003CA3, 0x005D6A, 0x00629A, 0x006996, 0x00794F, 0x007EE5, + 0x00BAD7, 0x00C5AA, 0x00C5F4, 0x00FDDF, 0x00FDDE, 0x018A20, 0x018A6D, 0x01A67B, + 0x01A464, 0x025F21, 0x01F9E2, 0x01F9E3, 0x00000A, 0x00003D, 0x000128, 0x0003C7, + 0x000C24, 0x0018A3, 0x002EB1, 0x003CB2, 0x00691F, 0x007E79, 0x000013, 0x0000BB, + 0x00034E, 0x000D14, 0x0025FD, 0x004BE7, 0x000024, 0x000188, 0x0007EF, 0x000035, + 0x000308, 0x0012F2, 0x00005C, 0x0003F6, 0x0025E0, 0x00006D, 0x000698, 0x000096, + 0x000C25, 0x0000C7, 0x000F1B, 0x0000F3, 0x0012FF, 0x000174, 0x001A66, 0x0001A0, + 0x003099, 0x0001E4, 0x00316B, 0x000252, 0x003F31, 0x00030B, 0x004BE6, 0x000346, + 0x0062FB, 0x00034F, 0x007966, 0x0003F5, 0x007E86, 0x0005D4, 0x00C511, 0x00062C, + 0x00C5F5, 0x000692, 0x00F299, 0x000795, 0x00F298, 0x0007E9, 0x018A21, 0x00097E, + 0x0175AD, 0x000C27, 0x01A67A, 0x000C57, 0x02EB59, 0x000D22, 0x0314D9, 0x000F19, + 0x03F3C2, 0x000FCD, 0x0348CB, 0x0012F8, 0x04BE41, 0x0018A0, 0x03F3C1, 0x0018A1, + 0x04BE40, 0x0018B7, 0x0629B0, 0x001A64, 0x0D2329, 0x001E30, 0x03F3C3, 0x001F9F, + 0x0BAD62, 0x001F99, 0x0FCF00, 0x00309A, 0x0629B1, 0x002EB6, 0x175AC3, 0x00314C, + 0x069195, 0x003168, 0x0BAD63, 0x00348E, 0x175AC1, 0x003F30, 0x07E781, 0x003F41, + 0x0D2328, 0x003F42, 0x1F9E03, 0x004BC2, 0x175AC2, 0x003F74, 0x175AC0, 0x005D61, + 0x3F3C05, 0x006130, 0x3F3C04, 0x0062B5, +}; +static const uint8_t ff_wma3_coef0_huffbits[FF_WMA3_COEF0_SIZE] = { + 9, 7, 2, 3, 4, 4, 5, 6, + 6, 7, 7, 8, 8, 8, 9, 9, + 9, 9, 10, 10, 10, 10, 10, 11, + 11, 11, 11, 11, 11, 12, 12, 12, + 12, 12, 12, 12, 12, 12, 13, 13, + 13, 13, 13, 13, 13, 13, 13, 13, + 14, 14, 14, 14, 14, 14, 14, 14, + 14, 14, 14, 14, 14, 15, 15, 14, + 15, 15, 15, 15, 15, 15, 15, 15, + 15, 15, 15, 15, 15, 15, 15, 15, + 15, 15, 15, 15, 15, 15, 16, 16, + 16, 16, 16, 16, 16, 16, 17, 16, + 16, 16, 16, 16, 16, 16, 3, 5, + 6, 8, 9, 10, 11, 12, 12, 13, + 13, 14, 14, 15, 15, 15, 15, 15, + 16, 16, 16, 16, 16, 17, 17, 17, + 17, 18, 17, 17, 4, 6, 9, 10, + 12, 13, 14, 14, 15, 15, 5, 8, + 10, 12, 14, 15, 6, 9, 11, 6, + 10, 13, 7, 10, 14, 7, 11, 8, + 12, 8, 12, 8, 13, 9, 13, 9, + 14, 9, 14, 10, 14, 10, 15, 10, + 15, 10, 15, 10, 15, 11, 16, 11, + 16, 11, 16, 11, 16, 11, 17, 12, + 17, 12, 17, 12, 18, 12, 18, 12, + 18, 12, 18, 13, 19, 13, 18, 13, + 19, 13, 19, 13, 20, 13, 18, 13, + 20, 13, 20, 14, 19, 14, 21, 14, + 19, 14, 20, 14, 21, 14, 19, 14, + 20, 14, 21, 15, 21, 14, 21, 15, + 22, 15, 22, 15, +}; + + + +#define FF_WMA3_COEF1_SIZE 272 +#define FF_WMA3_COEF1_MAXBITS 21 +static const uint32_t ff_wma3_coef1_huffcodes[FF_WMA3_COEF1_SIZE] = { + 0x00004A, 0x00002B, 0x000000, 0x000003, 0x000006, 0x000009, 0x00000F, 0x000010, + 0x000016, 0x000011, 0x000016, 0x000028, 0x00002F, 0x000026, 0x000029, 0x000045, + 0x000055, 0x00005D, 0x000042, 0x00004E, 0x000051, 0x00005E, 0x00008D, 0x0000A8, + 0x0000AD, 0x000080, 0x000096, 0x00009F, 0x0000AA, 0x0000BE, 0x00011C, 0x000153, + 0x000158, 0x000170, 0x000104, 0x00010D, 0x000105, 0x000103, 0x00012F, 0x000177, + 0x000175, 0x000157, 0x000174, 0x000225, 0x00023B, 0x00020D, 0x00021F, 0x000281, + 0x00027B, 0x000282, 0x0002AC, 0x0002FD, 0x00044F, 0x000478, 0x00044D, 0x0002EC, + 0x00044E, 0x000564, 0x000409, 0x00040B, 0x000501, 0x000545, 0x0004F3, 0x000541, + 0x00043B, 0x0004F1, 0x0004F4, 0x0008FD, 0x000A94, 0x000811, 0x000B88, 0x000B91, + 0x000B93, 0x0008EA, 0x000899, 0x000B8A, 0x000972, 0x0009E5, 0x000A8F, 0x000A84, + 0x000A8E, 0x000A00, 0x000830, 0x0008E8, 0x000B95, 0x000871, 0x00083A, 0x000814, + 0x000873, 0x000BFE, 0x001728, 0x001595, 0x001712, 0x00102A, 0x001021, 0x001729, + 0x00152E, 0x0013C3, 0x001721, 0x001597, 0x00151B, 0x0010F2, 0x001403, 0x001703, + 0x001503, 0x001708, 0x0013C1, 0x00170E, 0x00170C, 0x0010E1, 0x0011EA, 0x001020, + 0x001500, 0x0017FA, 0x001704, 0x001705, 0x0017F0, 0x0017FB, 0x0021E6, 0x002B2D, + 0x0020C6, 0x002B29, 0x002E4A, 0x0023AC, 0x001519, 0x0023F3, 0x002B2C, 0x0021C0, + 0x0017FE, 0x0023D7, 0x0017F9, 0x0012E7, 0x0013C0, 0x002261, 0x0023D3, 0x002057, + 0x002056, 0x0021D2, 0x0020C7, 0x0023D2, 0x0020EC, 0x0044C0, 0x002FE2, 0x00475B, + 0x002A03, 0x002FE3, 0x0021E2, 0x0021D0, 0x002A31, 0x002E13, 0x002E05, 0x0047E5, + 0x00000E, 0x000024, 0x000088, 0x0000B9, 0x00010C, 0x000224, 0x0002B3, 0x000283, + 0x0002ED, 0x00047B, 0x00041E, 0x00043D, 0x0004F5, 0x0005FD, 0x000A92, 0x000B96, + 0x000838, 0x000971, 0x000B83, 0x000B80, 0x000BF9, 0x0011D3, 0x0011E8, 0x0011D7, + 0x001527, 0x0011F8, 0x001073, 0x0010F0, 0x0010E4, 0x0017F8, 0x001062, 0x001402, + 0x0017E3, 0x00151A, 0x001077, 0x00152B, 0x00170D, 0x0021D3, 0x002E41, 0x0013C2, + 0x000029, 0x0000A9, 0x00025D, 0x000419, 0x000544, 0x000B8B, 0x0009E4, 0x0011D2, + 0x001526, 0x001724, 0x0012E6, 0x00150B, 0x0017FF, 0x002E26, 0x002E4B, 0x002B28, + 0x0021E3, 0x002A14, 0x00475A, 0x002E12, 0x000057, 0x00023E, 0x000A90, 0x000BF0, + 0x001072, 0x001502, 0x0023D6, 0x0020ED, 0x002A30, 0x0044C7, 0x00008C, 0x00047F, + 0x00152A, 0x002262, 0x002E04, 0x0000A1, 0x0005F9, 0x000173, 0x000875, 0x000171, + 0x00152D, 0x0002E3, 0x0017E2, 0x0002AD, 0x0021C1, 0x000479, 0x0021E7, 0x00041F, + 0x005C4E, 0x000543, 0x005C4F, 0x000A91, 0x00898D, 0x000B97, 0x008746, 0x000970, + 0x008745, 0x000B85, 0x00A856, 0x00152F, 0x010E8E, 0x0010E5, 0x00A857, 0x00170F, + 0x021D11, 0x002A58, 0x010E8F, 0x002E40, 0x021D13, 0x002A59, 0x043A25, 0x002A02, + 0x043A21, 0x0044C1, 0x087448, 0x0047E4, 0x043A20, 0x00542A, 0x087449, 0x00898C, + +}; +static const uint8_t ff_wma3_coef1_huffbits[FF_WMA3_COEF1_SIZE] = { + 8, 7, 2, 3, 3, 4, 4, 5, + 5, 6, 6, 6, 6, 7, 7, 7, + 7, 7, 8, 8, 8, 8, 8, 8, + 8, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 11, 11, 11, + 11, 11, 11, 11, 11, 11, 11, 11, + 11, 11, 12, 12, 12, 12, 12, 12, + 12, 12, 12, 12, 12, 13, 12, 12, + 12, 12, 12, 12, 13, 13, 13, 13, + 13, 13, 13, 12, 12, 13, 13, 13, + 13, 13, 13, 13, 13, 14, 14, 13, + 13, 14, 13, 13, 14, 14, 14, 14, + 14, 14, 14, 14, 14, 14, 13, 14, + 14, 14, 14, 14, 14, 14, 15, 14, + 15, 14, 14, 14, 14, 14, 14, 15, + 14, 14, 14, 14, 14, 14, 14, 15, + 15, 15, 15, 14, 15, 15, 15, 15, + 15, 15, 15, 15, 15, 15, 15, 15, + 4, 7, 8, 9, 10, 10, 10, 11, + 11, 11, 12, 12, 12, 12, 12, 12, + 13, 13, 13, 13, 13, 13, 13, 13, + 13, 13, 14, 14, 14, 14, 14, 14, + 14, 14, 14, 13, 14, 15, 14, 14, + 6, 9, 11, 12, 12, 12, 13, 13, + 13, 13, 14, 14, 14, 14, 14, 14, + 15, 15, 15, 15, 7, 10, 12, 13, + 14, 14, 14, 15, 15, 15, 8, 11, + 13, 14, 15, 9, 12, 9, 13, 10, + 13, 10, 14, 11, 15, 11, 15, 12, + 15, 12, 15, 12, 16, 12, 17, 13, + 17, 13, 17, 13, 18, 14, 17, 14, + 19, 14, 18, 14, 19, 14, 20, 15, + 20, 15, 21, 15, 20, 16, 21, 16, + +}; + + + + + + +#define FF_WMA3_HUFF_0_SIZE 127 +#define FF_WMA3_HUFF_0_MAXBITS 14 +static const uint32_t ff_wma3_huff_0_codes[FF_WMA3_HUFF_0_SIZE] = { + 0x0019, 0x0027, 0x00F2, 0x03BA, 0x0930, 0x1267, 0x0031, 0x0030, + 0x0097, 0x0221, 0x058B, 0x0124, 0x00EB, 0x01D4, 0x03D8, 0x0584, + 0x0364, 0x045F, 0x0F66, 0x0931, 0x24CD, 0x002F, 0x0039, 0x00E8, + 0x02C3, 0x078A, 0x0037, 0x0029, 0x0084, 0x01B1, 0x00ED, 0x0086, + 0x00F9, 0x03AB, 0x01EB, 0x08BC, 0x011E, 0x00F3, 0x0220, 0x058A, + 0x00EC, 0x008E, 0x012B, 0x01EA, 0x0119, 0x04B0, 0x04B1, 0x03B8, + 0x0691, 0x0365, 0x01ED, 0x049A, 0x0EA9, 0x0EA8, 0x08BD, 0x24CC, + 0x0026, 0x0035, 0x00DB, 0x02C4, 0x07B2, 0x0038, 0x002B, 0x007F, + 0x01B3, 0x00F4, 0x0091, 0x0116, 0x03BB, 0x0215, 0x0932, 0x002D, + 0x002A, 0x008A, 0x01DE, 0x0028, 0x0020, 0x005C, 0x0090, 0x0068, + 0x01EE, 0x00E9, 0x008D, 0x012A, 0x0087, 0x005D, 0x0118, 0x0349, + 0x01EF, 0x01E3, 0x08B9, 0x00F0, 0x00D3, 0x0214, 0x049B, 0x00DA, + 0x0089, 0x0125, 0x0217, 0x012D, 0x0690, 0x0094, 0x007D, 0x011F, + 0x007E, 0x0059, 0x0127, 0x01A5, 0x0111, 0x00F8, 0x045D, 0x03B9, + 0x0259, 0x0580, 0x02C1, 0x01DF, 0x0585, 0x0216, 0x0163, 0x01B0, + 0x03C4, 0x08B8, 0x078B, 0x0755, 0x0581, 0x0F67, 0x0000, +}; +static const uint8_t ff_wma3_huff_0_bits[FF_WMA3_HUFF_0_SIZE] = { + 5, 6, 8, 10, 12, 13, 6, 6, + 8, 10, 11, 9, 8, 9, 10, 11, + 10, 11, 12, 12, 14, 6, 6, 8, + 10, 11, 6, 6, 8, 9, 8, 8, + 8, 10, 9, 12, 9, 8, 10, 11, + 8, 8, 9, 9, 9, 11, 11, 10, + 11, 10, 9, 11, 12, 12, 12, 14, + 6, 6, 8, 10, 11, 6, 6, 7, + 9, 8, 8, 9, 10, 10, 12, 6, + 6, 8, 9, 6, 6, 7, 8, 7, + 9, 8, 8, 9, 8, 7, 9, 10, + 9, 9, 12, 8, 8, 10, 11, 8, + 8, 9, 10, 9, 11, 8, 7, 9, + 7, 7, 9, 9, 9, 8, 11, 10, + 10, 11, 10, 9, 11, 10, 9, 9, + 10, 12, 11, 11, 11, 12, 1, +}; + +#define FF_WMA3_HUFF_1_SIZE 137 +#define FF_WMA3_HUFF_1_MAXBITS 12 +static const uint32_t ff_wma3_huff_1_codes[FF_WMA3_HUFF_1_SIZE] = { + 0x055, 0x01C, 0x01A, 0x02B, 0x028, 0x067, 0x08B, 0x039, + 0x170, 0x10D, 0x2A5, 0x047, 0x464, 0x697, 0x523, 0x8CB, + 0x01B, 0x00E, 0x000, 0x010, 0x012, 0x036, 0x048, 0x04C, + 0x0C2, 0x09B, 0x171, 0x03B, 0x224, 0x34A, 0x2D6, 0x019, + 0x00F, 0x002, 0x014, 0x017, 0x006, 0x05D, 0x054, 0x0C7, + 0x0B4, 0x192, 0x10E, 0x233, 0x043, 0x02C, 0x00F, 0x013, + 0x006, 0x02F, 0x02C, 0x068, 0x077, 0x0DF, 0x111, 0x1A4, + 0x16A, 0x2A4, 0x027, 0x011, 0x018, 0x02D, 0x00F, 0x04A, + 0x040, 0x097, 0x01F, 0x11B, 0x022, 0x16D, 0x066, 0x035, + 0x005, 0x02B, 0x049, 0x009, 0x075, 0x0CB, 0x0AA, 0x187, + 0x106, 0x08A, 0x047, 0x060, 0x06E, 0x01D, 0x074, 0x0C4, + 0x01E, 0x118, 0x1A7, 0x038, 0x042, 0x053, 0x076, 0x0A8, + 0x0CA, 0x082, 0x110, 0x18D, 0x12D, 0x0B9, 0x0C8, 0x0DE, + 0x01C, 0x0AB, 0x113, 0x18C, 0x10F, 0x09A, 0x0A5, 0x0B7, + 0x11A, 0x186, 0x1A6, 0x259, 0x153, 0x18A, 0x193, 0x020, + 0x10C, 0x046, 0x03A, 0x107, 0x149, 0x16C, 0x2D7, 0x225, + 0x258, 0x316, 0x696, 0x317, 0x042, 0x522, 0x290, 0x8CA, + 0x001, +}; +static const uint8_t ff_wma3_huff_1_bits[FF_WMA3_HUFF_1_SIZE] = { + 7, 6, 6, 6, 7, 7, 8, 9, + 9, 10, 10, 11, 11, 11, 12, 12, + 6, 4, 5, 5, 6, 6, 7, 8, + 8, 9, 9, 10, 10, 10, 11, 6, + 4, 5, 5, 6, 7, 7, 8, 8, + 9, 9, 10, 10, 11, 6, 5, 5, + 6, 6, 7, 7, 8, 8, 9, 9, + 10, 10, 7, 6, 6, 6, 7, 7, + 8, 8, 9, 9, 10, 10, 7, 6, + 7, 7, 7, 8, 8, 8, 9, 9, + 10, 8, 7, 7, 7, 8, 8, 8, + 9, 9, 9, 9, 8, 8, 8, 8, + 8, 9, 9, 9, 9, 8, 8, 8, + 9, 9, 9, 9, 10, 9, 9, 9, + 9, 9, 9, 10, 9, 9, 9, 10, + 10, 11, 10, 10, 10, 10, 11, 10, + 10, 10, 11, 10, 11, 12, 11, 12, + 3, +}; + + + +#define FF_WMA3_HUFF_2_SIZE 101 +#define FF_WMA3_HUFF_2_MAXBITS 11 +static const uint32_t ff_wma3_huff_2_codes[FF_WMA3_HUFF_2_SIZE] = { + 0x01A, 0x003, 0x017, 0x010, 0x00C, 0x009, 0x005, 0x000, + 0x00D, 0x00A, 0x009, 0x00C, 0x00F, 0x002, 0x004, 0x007, + 0x00B, 0x00F, 0x01C, 0x006, 0x010, 0x015, 0x01C, 0x022, + 0x03B, 0x00E, 0x019, 0x023, 0x034, 0x036, 0x03A, 0x047, + 0x008, 0x00A, 0x01E, 0x031, 0x037, 0x050, 0x053, 0x06B, + 0x06F, 0x08C, 0x0E8, 0x0EA, 0x0EB, 0x016, 0x03E, 0x03F, + 0x06C, 0x089, 0x08A, 0x0A3, 0x0A4, 0x0D4, 0x0DD, 0x0EC, + 0x0EE, 0x11A, 0x1D2, 0x024, 0x025, 0x02E, 0x027, 0x0C2, + 0x0C0, 0x0DA, 0x0DB, 0x111, 0x144, 0x116, 0x14A, 0x145, + 0x1B8, 0x1AB, 0x1DA, 0x1DE, 0x1DB, 0x1DF, 0x236, 0x237, + 0x3A6, 0x3A7, 0x04D, 0x04C, 0x05E, 0x05F, 0x183, 0x182, + 0x186, 0x221, 0x187, 0x220, 0x22E, 0x22F, 0x296, 0x354, + 0x297, 0x355, 0x372, 0x373, 0x016, +}; +static const uint8_t ff_wma3_huff_2_bits[FF_WMA3_HUFF_2_SIZE] = { + 7, 6, 5, 5, 5, 5, 5, 5, + 4, 4, 4, 4, 4, 5, 5, 5, + 5, 5, 5, 6, 6, 6, 6, 6, + 6, 7, 7, 7, 7, 7, 7, 7, + 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 11, 11, 11, 11, 11, 11, + 11, 11, 11, 11, 11, 11, 11, 11, + 11, 11, 11, 11, 5, +}; + + + +#define FF_WMA3_HUFF_RLC_SIZE 120 +#define FF_WMA3_HUFF_RLC_MAXBITS 21 +static const uint32_t ff_wma3_huff_rlc_codes[FF_WMA3_HUFF_RLC_SIZE] = { + 0x00010C, 0x000001, 0x10FE2A, 0x000003, 0x000003, 0x000001, 0x000013, 0x000020, + 0x000029, 0x000014, 0x000016, 0x000045, 0x000049, 0x00002F, 0x000042, 0x00008E, + 0x00008F, 0x000129, 0x000009, 0x00000D, 0x0004AC, 0x00002C, 0x000561, 0x0002E6, + 0x00087C, 0x0002E2, 0x00095C, 0x000018, 0x000001, 0x000016, 0x000044, 0x00002A, + 0x000007, 0x000159, 0x000143, 0x000128, 0x00015A, 0x00012D, 0x00002B, 0x0000A0, + 0x000142, 0x00012A, 0x0002EF, 0x0004AF, 0x00087D, 0x004AE9, 0x0043F9, 0x000067, + 0x000199, 0x002B05, 0x001583, 0x0021FE, 0x10FE2C, 0x000004, 0x00002E, 0x00010D, + 0x00000A, 0x000244, 0x000017, 0x000245, 0x000011, 0x00010E, 0x00012C, 0x00002A, + 0x00002F, 0x000121, 0x000046, 0x00087E, 0x0000BA, 0x000032, 0x0087F0, 0x0056DC, + 0x0002EC, 0x0043FA, 0x002B6F, 0x004AE8, 0x0002B7, 0x10FE2B, 0x000001, 0x000051, + 0x000010, 0x0002EE, 0x000B9C, 0x002576, 0x000198, 0x0056DD, 0x0000CD, 0x000AC0, + 0x000170, 0x004AEF, 0x00002D, 0x0004AD, 0x0021FF, 0x0005CF, 0x002B04, 0x10FE29, + 0x10FE28, 0x0002ED, 0x002E74, 0x021FC4, 0x004AEE, 0x010FE3, 0x087F17, 0x000000, + 0x000097, 0x0002E3, 0x000ADA, 0x002575, 0x00173B, 0x0043FB, 0x002E75, 0x10FE2D, + 0x0015B6, 0x00056C, 0x000057, 0x000123, 0x000120, 0x00021E, 0x000172, 0x0002B1, + +}; +static const uint8_t ff_wma3_huff_rlc_bits[FF_WMA3_HUFF_RLC_SIZE] = { + 9, 2, 21, 2, 4, 5, 5, 6, + 6, 7, 7, 7, 7, 6, 7, 8, + 8, 9, 10, 10, 11, 12, 11, 12, + 12, 12, 12, 11, 4, 5, 7, 8, + 9, 9, 9, 9, 9, 9, 8, 8, + 9, 9, 12, 11, 12, 15, 15, 13, + 15, 14, 13, 14, 21, 5, 6, 9, + 10, 10, 11, 10, 11, 9, 9, 6, + 8, 9, 7, 12, 10, 12, 16, 15, + 12, 15, 14, 15, 10, 21, 6, 7, + 11, 12, 14, 14, 15, 15, 14, 12, + 11, 15, 12, 11, 14, 13, 14, 21, + 21, 12, 16, 18, 15, 17, 20, 7, + 8, 12, 12, 14, 15, 15, 16, 21, + 13, 11, 7, 9, 9, 10, 11, 10, + +}; + + + + + +static const short ff_wma3_run_0[] = { +0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, +20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, +40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, +60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, +80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, +0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, +20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, +0, 1, 2, 3, 4, 5, 0, 1, 2, 0, 1, 2, 0, 1, 2, 0, 1, 0, 1, 0, +1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, +1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, +1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, +1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, +0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +}; +static const short ff_wma3_level_0[] = { +1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, +1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, +1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, +1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, +1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, +2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, +2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, +4, 4, 4, 4, 4, 4, 5, 5, 5, 6, 6, 6, 7, 7, 7, 8, 8, 9, 9, 10, +10, 11, 11, 12, 12, 13, 13, 14, 14, 15, 15, 16, 16, 17, 17, 18, 18, 19, 19, 20, +20, 21, 21, 22, 22, 23, 23, 24, 24, 25, 25, 26, 26, 27, 27, 28, 28, 29, 29, 30, +30, 31, 31, 32, 32, 33, 33, 34, 34, 35, 35, 36, 36, 37, 37, 38, 38, 39, 39, 40, +40, 41, 41, 42, 42, 43, 43, 44, 44, 45, 45, 46, 46, 47, 47, 48, 48, 49, 49, 50, +51, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +}; +static const short ff_wma3_run_1[] = { +0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, +20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, +40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, +60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, +80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, +100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, +120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, +140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, +10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, +30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, +10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, +0, 1, 2, 3, 4, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, +1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, +1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 0, 0, +}; +static const short ff_wma3_level_1[] = { +1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, +1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, +1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, +1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, +1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, +1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, +1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, +1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, +2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, +2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, +3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, +5, 5, 5, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, +13, 14, 14, 15, 15, 16, 16, 17, 17, 18, 18, 19, 19, 20, 20, 21, 21, 22, 22, 23, +23, 24, 24, 25, 25, 26, 26, 27, 27, 28, 0, 0, +}; + +static const short ff_wma3_sym2vec4[] = { +0, 1, 2, 3, 4, 5, 16, 17, 18, 19, 20, 32, 33, 34, 35, 48, 49, 50, 64, 65, +80, 256, 257, 258, 259, 260, 272, 273, 274, 275, 288, 289, 290, 304, 305, 320, 512, 513, 514, 515, +528, 529, 530, 544, 545, 560, 768, 769, 770, 784, 785, 800, 1024, 1025, 1040, 1280, 4096, 4097, 4098, 4099, +4100, 4112, 4113, 4114, 4115, 4128, 4129, 4130, 4144, 4145, 4160, 4352, 4353, 4354, 4355, 4368, 4369, 4370, 4384, 4385, +4400, 4608, 4609, 4610, 4624, 4625, 4640, 4864, 4865, 4880, 5120, 8192, 8193, 8194, 8195, 8208, 8209, 8210, 8224, 8225, +8240, 8448, 8449, 8450, 8464, 8465, 8480, 8704, 8705, 8720, 8960, 12288, 12289, 12290, 12304, 12305, 12320, 12544, 12545, 12560, +12800, 16384, 16385, 16400, 16640, 20480, 0, 0, +}; + + +static const uint8_t ff_wma3_sym2vec2[] = { +0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, +20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 32, 33, 34, 35, 36, 37, 38, 39, 40, +41, 42, 43, 44, 45, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 64, 65, +66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, +90, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 112, 113, 114, 115, 116, 117, 118, 119, 120, +-128, -127, -126, -125, -124, -123, -122, -121, -112, -111, -110, -109, -108, -107, -106, -96, -95, -94, -93, -92, +-91, -80, -79, -78, -77, -76, -64, -63, -62, -61, -48, -47, -46, -32, -31, -16, 0, 0, 0, 0, +0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + +}; + +static const uint8_t ff_wma3_run_mask[] = { +0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, +19, 20, 21, 22, 23, 24, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, +14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 0, 1, 2, 3, 4, 5, 6, 7, 8, +9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 0, 1, 2, 3, +4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, +24, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 0, 1, 0, 1, 0, 1, +}; +static const uint8_t ff_wma3_level_mask[] = { +1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, +2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, +3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, +4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, +5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, +5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 8, 8, 9, 9, 0, 0, +0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +}; + +static const float ff_wma3_default_decorrelation_matrices[] = { +1.000000, 0.707031, -0.707031, 0.707031, 0.707031, 0.578125, 0.707031, 0.410156, 0.578125, -0.707031, 0.410156, 0.578125, 0.000000, -0.816406, 0.500000, 0.652344, 0.500000, 0.269531, 0.500000, 0.269531, +-0.500000, -0.652344, 0.500000, -0.269531, -0.500000, 0.652344, 0.500000, -0.652344, 0.500000, -0.269531, 0.445312, 0.601562, 0.511719, 0.371094, 0.195312, 0.445312, 0.371094, -0.195312, -0.601562, -0.511719, +0.445312, 0.000000, -0.632812, 0.000000, 0.632812, 0.445312, -0.371094, -0.195312, 0.601562, -0.511719, 0.445312, -0.601562, 0.511719, -0.371094, 0.195312, 0.410156, 0.558594, 0.500000, 0.410156, 0.289062, +0.148438, 0.410156, 0.410156, 0.000000, -0.410156, -0.578125, -0.410156, 0.410156, 0.148438, -0.500000, -0.410156, 0.289062, 0.558594, 0.410156, -0.148438, -0.500000, 0.410156, 0.289062, -0.558594, 0.410156, +-0.410156, 0.000000, 0.410156, -0.578125, 0.410156, 0.410156, -0.558594, 0.500000, -0.410156, 0.289062, -0.148438, +}; + +#endif /* AVCODEC_WMA3DATA_H */ Modified: wmapro/wma3dec.c ============================================================================== --- wmapro/wma3dec.c Sat Jan 10 03:31:27 2009 (r3940) +++ wmapro/wma3dec.c Sat Jan 10 20:24:33 2009 (r3941) @@ -1,7 +1,7 @@ /* * WMA 9/3/PRO compatible decoder * Copyright (c) 2007 Baptiste Coudurier, Benjamin Larsson, Ulion - * Copyright (c) 2008 Sascha Sommer + * Copyright (c) 2008 - 2009 Sascha Sommer, Benjamin Larsson * * This file is part of FFmpeg. * @@ -22,63 +22,14 @@ #include "avcodec.h" #include "bitstream.h" +#include "wma3.h" +#undef NDEBUG +#include <assert.h> -#define MAX_CHANNELS 6 //< max number of handled channels -#define MAX_SUBFRAMES 32 //< max number of subframes per channel - -/** - *@brief decoder context for a single channel - */ -typedef struct { - uint8_t num_subframes; //< number of subframes for the current channel - uint16_t subframe_len[MAX_SUBFRAMES]; //< subframe len in samples - uint16_t channel_len; //< channel len in samples -} wma_channel_t; - - -/** - *@brief main decoder context - */ -typedef struct WMA3DecodeContext { - AVCodecContext* avctx; //< codec context for av_log - GetBitContext gb; //< getbitcontext for the packet - int buf_bit_size; //< buffer size in bits - - /** packet info */ - uint8_t packet_sequence_number; //< current packet number - uint8_t bit5; //< padding bit? (CBR files) - uint8_t bit6; - uint8_t packet_loss; //< set in case of bitstream error - - /** stream info */ - uint16_t samples_per_frame; //< number of outputed samples - uint16_t log2_frame_size; //< frame size - uint8_t lossless; //< lossless mode - uint8_t no_tiling; //< frames are split in subframes - int8_t nb_channels; //< number of channels - wma_channel_t channel[MAX_CHANNELS]; //< per channel data - - /** extradata */ - unsigned int decode_flags; //< used compression features - unsigned int dwChannelMask; - uint8_t sample_bit_depth; //< bits per sample - - /** general frame info */ - unsigned int frame_num; //< current frame number - uint8_t len_prefix; //< frame is prefixed with its len - uint8_t allow_subframes; //< frames may contain subframes - uint8_t max_num_subframes; //< maximum number of subframes - uint16_t min_samples_per_subframe; //< minimum samples per subframe - uint8_t dynamic_range_compression;//< frame contains drc data - uint8_t drc_gain; //< gain for the drc tool - uint8_t update_samples_per_frame; //< recalculate output size - +static av_cold int wma3_decode_end(AVCodecContext *avctx); - /** buffered frame data */ - int prev_frame_bit_size; //< saved number of bits - uint8_t* prev_frame; //< prev frame data +unsigned int bitstreamcounter; -} WMA3DecodeContext; /** *@brief helper function to print the most important members of the context @@ -123,7 +74,7 @@ static int get_samples_per_frame(int sam else samples_per_frame = 8192; - /* WMA voice code if (decode_flags & 0x800) { + /* WMA voice code if (decode_flags & 0x800) { tmp = ((decode_flags & 6) >> 1) | ((decode_flags & 0x600) >> 7); samples_per_frame = (tmp+1)*160; } else { */ @@ -136,7 +87,6 @@ static int get_samples_per_frame(int sam else if (tmp == 0x6) samples_per_frame >>= 2; - return samples_per_frame; } @@ -149,15 +99,19 @@ static av_cold int wma3_decode_init(AVCo { WMA3DecodeContext *s = avctx->priv_data; uint8_t *edata_ptr = avctx->extradata; + int* sfb_offsets; int i; - int log2_max_num_subframes; s->avctx = avctx; + dsputil_init(&s->dsp, avctx); + + /* FIXME is this really the right thing todo for 24 bit? */ + s->sample_bit_depth = 16; //avctx->bits_per_sample; if (avctx->extradata_size >= 18) { s->decode_flags = AV_RL16(edata_ptr+14); s->dwChannelMask = AV_RL32(edata_ptr+2); - s->sample_bit_depth = AV_RL16(edata_ptr); +// s->sample_bit_depth = AV_RL16(edata_ptr); /** dump the extradata */ for (i=0 ; i<avctx->extradata_size ; i++) @@ -170,14 +124,12 @@ static av_cold int wma3_decode_init(AVCo return -1; } - s->samples_per_frame = get_samples_per_frame(avctx->sample_rate, - s->decode_flags); - /** generic init */ - s->packet_loss = 0; + s->packet_loss = 0; //FIXME unneeded s->log2_frame_size = av_log2(avctx->block_align*8)+1; /** frame info */ + s->skip_frame = 1; /** skip first frame */ s->len_prefix = s->decode_flags & 0x40; if(!s->len_prefix){ @@ -185,12 +137,20 @@ static av_cold int wma3_decode_init(AVCo return -1; } + /** get frame len */ + s->samples_per_frame = get_samples_per_frame(avctx->sample_rate, + s->decode_flags); + + /** init previous block len */ + for(i=0;i<avctx->channels;i++) + s->channel[i].prev_block_len = s->samples_per_frame; + /** subframe info */ - log2_max_num_subframes = (s->decode_flags & 0x38) >> 3; - s->max_num_subframes = 1 << log2_max_num_subframes; + s->max_num_subframes = 1 << ((s->decode_flags & 0x38) >> 3); + s->num_possible_block_sizes = av_log2(s->max_num_subframes) + 1; s->allow_subframes = s->max_num_subframes > 1; s->min_samples_per_subframe = s->samples_per_frame / s->max_num_subframes; - s->dynamic_range_compression = s->decode_flags & 0x80; + s->dynamic_range_compression = (s->decode_flags & 0x80) >> 7; if(s->max_num_subframes > MAX_SUBFRAMES){ av_log(avctx, AV_LOG_ERROR, "invalid number of subframes %i\n", @@ -200,14 +160,187 @@ static av_cold int wma3_decode_init(AVCo s->nb_channels = avctx->channels; + /** extract lfe channel position */ + s->lfe_channel = -1; + + if(s->dwChannelMask & 8){ + unsigned int mask = 1; + for(i=0;i<32;i++){ + if(s->dwChannelMask & mask) + ++s->lfe_channel; + if(mask & 8) + break; + mask <<= 1; + } + } + if(s->nb_channels < 0 || s->nb_channels > MAX_CHANNELS){ av_log(avctx, AV_LOG_ERROR, "invalid number of channels %i\n", s->nb_channels); return -1; } - dump_context(s); + init_vlc(&s->exp_vlc, EXPVLCBITS, FF_WMA3_SCALE_SIZE, + ff_wma3_scale_huffbits, 1, 1, + ff_wma3_scale_huffcodes, 4, 4, 0); + + init_vlc(&s->coef_vlc[0], VLCBITS, FF_WMA3_COEF0_SIZE, + ff_wma3_coef0_huffbits, 1, 1, + ff_wma3_coef0_huffcodes, 4, 4, 0); + + s->coef_max[0] = ((22+VLCBITS-1)/VLCBITS); + + init_vlc(&s->coef_vlc[1], VLCBITS, FF_WMA3_COEF1_SIZE, + ff_wma3_coef1_huffbits, 1, 1, + ff_wma3_coef1_huffcodes, 4, 4, 0); + + s->coef_max[1] = ((21+VLCBITS-1)/VLCBITS); + + init_vlc(&s->huff_0_vlc, VLCBITS, FF_WMA3_HUFF_0_SIZE, + ff_wma3_huff_0_bits, 1, 1, + ff_wma3_huff_0_codes, 4, 4, 0); + + init_vlc(&s->huff_1_vlc, VLCBITS, FF_WMA3_HUFF_1_SIZE, + ff_wma3_huff_1_bits, 1, 1, + ff_wma3_huff_1_codes, 4, 4, 0); + + init_vlc(&s->huff_2_vlc, VLCBITS, FF_WMA3_HUFF_2_SIZE, + ff_wma3_huff_2_bits, 1, 1, + ff_wma3_huff_2_codes, 4, 4, 0); + + init_vlc(&s->rlc_vlc, VLCBITS, FF_WMA3_HUFF_RLC_SIZE, + ff_wma3_huff_rlc_bits, 1, 1, + ff_wma3_huff_rlc_codes, 4, 4, 0); + + s->num_sfb = av_mallocz(sizeof(int)*s->num_possible_block_sizes); + s->sfb_offsets = av_mallocz(MAX_BANDS * sizeof(int) *s->num_possible_block_sizes); + s->subwoofer_cutoffs = av_mallocz(sizeof(int)*s->num_possible_block_sizes); + s->sf_offsets = av_mallocz(s->num_possible_block_sizes * + s->num_possible_block_sizes * MAX_BANDS * sizeof(int)); + + if(!s->num_sfb || !s->sfb_offsets || !s->subwoofer_cutoffs || !s->sf_offsets){ + av_log(avctx, AV_LOG_ERROR, "failed to allocate scale factor offset tables\n"); + wma3_decode_end(avctx); + return -1; + } + + /** calculate number of scale factor bands and their offsets + for every possible block size */ + sfb_offsets = s->sfb_offsets; + for(i=0;i<s->num_possible_block_sizes;i++){ + int subframe_len = s->samples_per_frame / (1 << i); + int x; + int band = 1; + + sfb_offsets[0] = 0; + + for(x=0;x < MAX_BANDS-1 && sfb_offsets[band-1] < subframe_len;x++){ + int offset = (subframe_len * 2 * ff_wma3_critical_freq[x]) / s->avctx->sample_rate + 2; + offset -= offset % 4; + if ( offset > sfb_offsets[band - 1] ){ + sfb_offsets[band] = offset; + ++band; + } + } + sfb_offsets[band - 1] = subframe_len; + s->num_sfb[i] = band - 1; + sfb_offsets += MAX_BANDS; + } + + + /** scale factors can be shared between blocks of different size + as every block has a different scale factor band layout + the matrix sf_offsets is needed to find the correct scale factor + */ + + for(i=0;i<s->num_possible_block_sizes;i++){ + int b; + for(b=0;b< s->num_sfb[i];b++){ + int x; + int offset = ((s->sfb_offsets[MAX_BANDS * i + b] + + s->sfb_offsets[MAX_BANDS * i + b + 1] - 1)<<i)/2; + for(x=0;x<s->num_possible_block_sizes;x++){ + int v = 0; + while(s->sfb_offsets[MAX_BANDS * x + v +1] << x < offset) + ++v; + s->sf_offsets[ i * s->num_possible_block_sizes * MAX_BANDS + + x * MAX_BANDS + b] = v; + } + } + } + + /** init MDCT, FIXME only init needed sizes */ + for(i = 0; i < BLOCK_NB_SIZES; i++) + ff_mdct_init(&s->mdct_ctx[i], BLOCK_MIN_BITS+1+i, 1); + + /** init MDCT windows : simple sinus window */ + for(i=0 ; i<BLOCK_NB_SIZES ; i++) { + int n; + n = 1 << (BLOCK_MAX_BITS - i); + ff_sine_window_init(ff_sine_windows[BLOCK_MAX_BITS - i - 7], n); + s->windows[BLOCK_NB_SIZES-i-1] = ff_sine_windows[BLOCK_MAX_BITS - i - 7]; + } + + /** calculate subwoofer cutoff values */ + + for(i=0;i< s->num_possible_block_sizes;i++){ + int block_size = s->samples_per_frame / (1 << i); + int cutoff = ceil(block_size * 440.0 / (double)s->avctx->sample_rate + 0.5); + if(cutoff < 4) + cutoff = 4; + if(cutoff > block_size) + cutoff = block_size; + s->subwoofer_cutoffs[i] = cutoff; + } + s->subwoofer_cutoff = s->subwoofer_cutoffs[0]; + + + //FIXME + /** init stuff for the postprocxform */ + s->default_decorrelation_matrix = av_mallocz(sizeof(int) * (s->nb_channels + 1)); + s->default_decorrelation_matrix[0] = 0; + for(i=1;i<=s->nb_channels;i++){ + const float* tab = ff_wma3_default_decorrelation_matrices; + s->default_decorrelation_matrix[i] = av_mallocz(sizeof(float) * i); + switch(i){ + case 1: + s->default_decorrelation_matrix[i][0] = &tab[0]; + break; + case 2: + s->default_decorrelation_matrix[i][0] = &tab[1]; + s->default_decorrelation_matrix[i][1] = &tab[3]; + break; + case 3: + s->default_decorrelation_matrix[i][0] = &tab[5]; + s->default_decorrelation_matrix[i][1] = &tab[8]; + s->default_decorrelation_matrix[i][2] = &tab[11]; + break; + case 4: + s->default_decorrelation_matrix[i][0] = &tab[14]; + s->default_decorrelation_matrix[i][1] = &tab[18]; + s->default_decorrelation_matrix[i][2] = &tab[22]; + s->default_decorrelation_matrix[i][3] = &tab[26]; + break; + case 5: + s->default_decorrelation_matrix[i][0] = &tab[30]; + s->default_decorrelation_matrix[i][1] = &tab[35]; + s->default_decorrelation_matrix[i][2] = &tab[40]; + s->default_decorrelation_matrix[i][3] = &tab[45]; + s->default_decorrelation_matrix[i][4] = &tab[50]; + break; + case 6: + s->default_decorrelation_matrix[i][0] = &tab[55]; + s->default_decorrelation_matrix[i][1] = &tab[61]; + s->default_decorrelation_matrix[i][2] = &tab[67]; + s->default_decorrelation_matrix[i][3] = &tab[73]; + s->default_decorrelation_matrix[i][4] = &tab[79]; + s->default_decorrelation_matrix[i][5] = &tab[85]; + break; + } + } + + dump_context(s); return 0; } @@ -264,135 +397,426 @@ static int wma_decode_tilehdr(WMA3Decode subframe_len_zero_bit = 1; subframe_len_bits = 3; }else - subframe_len_bits = av_log2(s->max_num_subframes) + 1; + subframe_len_bits = av_log2(av_log2(s->max_num_subframes)) + 1; /** loop until the frame data is split between the subframes */ while(missing_samples > 0){ - int64_t tileinfo = -1; - int min_channel_len = s->samples_per_frame; - int num_subframes_per_channel = 0; - int num_channels = 0; - int subframe_len = s->samples_per_frame / s->max_num_subframes; - - /** find channel with the smallest overall len */ - for(c=0;c<s->nb_channels;c++){ - if(min_channel_len > s->channel[c].channel_len) - min_channel_len = s->channel[c].channel_len; - } - - /** check if this is the start of a new frame */ - if(missing_samples == s->nb_channels * s->samples_per_frame){ - s->no_tiling = get_bits1(gb); - } + int64_t tileinfo = -1; + int min_channel_len = s->samples_per_frame; + int num_subframes_per_channel = 0; + int num_channels = 0; + int subframe_len = s->samples_per_frame / s->max_num_subframes; - if(s->no_tiling){ - num_subframes_per_channel = 1; - num_channels = s->nb_channels; - }else{ - /** count how many channels have the minimum len */ - for(c=0;c<s->nb_channels;c++){ - if(min_channel_len == s->channel[c].channel_len){ - ++num_channels; - } - } - if(num_channels <= 1) - num_subframes_per_channel = 1; - } + /** find channel with the smallest overall len */ + for(c=0;c<s->nb_channels;c++){ + if(min_channel_len > s->channel[c].channel_len) + min_channel_len = s->channel[c].channel_len; + } - /** maximum number of subframes, evenly split */ - if(subframe_len == missing_samples / num_channels){ - num_subframes_per_channel = 1; - } + /** check if this is the start of a new frame */ + if(missing_samples == s->nb_channels * s->samples_per_frame){ + s->no_tiling = get_bits1(gb); + } - /** if there might be multiple subframes per channel */ - if(num_subframes_per_channel != 1){ - int total_num_bits = num_channels; - tileinfo = 0; - /** for every channel with the minimum len 1 bit is - transmitted that informs us if the channel - contains a subframe with the next subframe_len */ - while(total_num_bits){ - int num_bits = total_num_bits; - if(num_bits > 32) - num_bits = 32; - tileinfo |= get_bits_long(gb,num_bits); - total_num_bits -= num_bits; - num_bits = total_num_bits; - tileinfo <<= (num_bits > 32)? 32 : num_bits; - } - } + if(s->no_tiling){ + num_subframes_per_channel = 1; + num_channels = s->nb_channels; + }else{ + /** count how many channels have the minimum len */ + for(c=0;c<s->nb_channels;c++){ + if(min_channel_len == s->channel[c].channel_len){ + ++num_channels; + } + } + if(num_channels <= 1) + num_subframes_per_channel = 1; + } + /** maximum number of subframes, evenly split */ + if(subframe_len == missing_samples / num_channels){ + num_subframes_per_channel = 1; + } - /** if the frames are not evenly split get the next subframe len - from the bitstream */ - if(subframe_len != missing_samples / num_channels){ - int log2_subframe_len = 0; - /* 1 bit indicates if the subframe len is zero */ - if(subframe_len_zero_bit){ - if(get_bits1(gb)){ - log2_subframe_len = get_bits(gb,subframe_len_bits-1); - ++log2_subframe_len; - } - }else - log2_subframe_len = get_bits(gb,subframe_len_bits); + /** if there might be multiple subframes per channel */ + if(num_subframes_per_channel != 1){ + int total_num_bits = num_channels; + tileinfo = 0; + /** for every channel with the minimum len 1 bit is + transmitted that informs us if the channel + contains a subframe with the next subframe_len */ + while(total_num_bits){ + int num_bits = total_num_bits; + if(num_bits > 32) + num_bits = 32; + tileinfo |= get_bits_long(gb,num_bits); + total_num_bits -= num_bits; + num_bits = total_num_bits; + tileinfo <<= (num_bits > 32)? 32 : num_bits; + } + } - if(s->lossless){ - subframe_len = - s->samples_per_frame / s->max_num_subframes; - subframe_len *= log2_subframe_len + 1; - }else - subframe_len = - s->samples_per_frame / (1 << log2_subframe_len); + /** if the frames are not evenly split get the next subframe len + from the bitstream */ + if(subframe_len != missing_samples / num_channels){ + int log2_subframe_len = 0; + /* 1 bit indicates if the subframe len is zero */ + if(subframe_len_zero_bit){ + if(get_bits1(gb)){ + log2_subframe_len = get_bits(gb,subframe_len_bits-1); + ++log2_subframe_len; + } + }else + log2_subframe_len = get_bits(gb,subframe_len_bits); - } + if(s->lossless){ + subframe_len = + s->samples_per_frame / s->max_num_subframes; + subframe_len *= log2_subframe_len + 1; + }else + subframe_len = + s->samples_per_frame / (1 << log2_subframe_len); + } - /** sanity check the len */ - if(subframe_len < s->min_samples_per_subframe - || subframe_len > s->samples_per_frame){ - av_log(s->avctx, AV_LOG_ERROR, - "broken frame: subframe_len %i\n", subframe_len); - return -1; - } - for(c=0; c<s->nb_channels;c++){ - wma_channel_t* chan = &s->channel[c]; - if(chan->num_subframes > 32){ - av_log(s->avctx, AV_LOG_ERROR, - "broken frame: num subframes %i\n", - chan->num_subframes); - return -1; - } + /** sanity check the len */ + if(subframe_len < s->min_samples_per_subframe + || subframe_len > s->samples_per_frame){ + av_log(s->avctx, AV_LOG_ERROR, + "broken frame: subframe_len %i\n", subframe_len); + return -1; + } + for(c=0; c<s->nb_channels;c++){ + wma_channel* chan = &s->channel[c]; + if(chan->num_subframes > 32){ + av_log(s->avctx, AV_LOG_ERROR, + "broken frame: num subframes %i\n", + chan->num_subframes); + return -1; + } - /** add subframes to the individual channels */ - if(min_channel_len == chan->channel_len){ - --num_channels; - if(tileinfo & (1<<num_channels)){ - if(chan->num_subframes > 31){ - av_log(s->avctx, AV_LOG_ERROR, - "broken frame: num subframes > 31\n"); - return -1; - } - chan->subframe_len[chan->num_subframes] = subframe_len; - chan->channel_len += subframe_len; - missing_samples -= subframe_len; - ++chan->num_subframes; - if(missing_samples < 0 - || chan->channel_len > s->samples_per_frame){ - av_log(s->avctx, AV_LOG_ERROR,"broken frame: " - "channel len > samples_per_frame\n"); - return -1; - } + /** add subframes to the individual channels */ + if(min_channel_len == chan->channel_len){ + --num_channels; + if(tileinfo & (1<<num_channels)){ + if(chan->num_subframes > 31){ + av_log(s->avctx, AV_LOG_ERROR, + "broken frame: num subframes > 31\n"); + return -1; } - } - } + chan->subframe_len[chan->num_subframes] = subframe_len; + chan->channel_len += subframe_len; + missing_samples -= subframe_len; + ++chan->num_subframes; + if(missing_samples < 0 + || chan->channel_len > s->samples_per_frame){ + av_log(s->avctx, AV_LOG_ERROR,"broken frame: " + "channel len > samples_per_frame\n"); + return -1; + } + } + } + } } - } for(c=0;c<s->nb_channels;c++){ int i; + int offset = 0; for(i=0;i<s->channel[c].num_subframes;i++){ - av_log(s->avctx, AV_LOG_INFO,"frame[%i] channel[%i] subframe[%i]" + av_log(s->avctx, AV_LOG_DEBUG,"frame[%i] channel[%i] subframe[%i]" " len %i\n",s->frame_num,c,i,s->channel[c].subframe_len[i]); + s->channel[c].subframe_offset[i] = offset; + offset += s->channel[c].subframe_len[i]; + } + } + + return 0; +} + + +static int wma_decode_channel_transform(WMA3DecodeContext* s, GetBitContext* gb){ + int i; + for(i=0;i< s->nb_channels;i++){ + memset(s->chgroup[i].decorrelation_matrix,0,4*s->nb_channels * s->nb_channels); + } + + if(s->nb_channels == 1 ){ + s->nb_chgroups = 0; + s->chgroup[0].nb_channels = 1; + s->chgroup[0].no_rotation = 1; + s->chgroup[0].transform = 2; + s->channel[0].resampled_scale_factors[0] = 0; + memset(s->chgroup[0].transform_band,0,MAX_BANDS); + memset(s->chgroup[0].decorrelation_matrix,0,4*s->nb_channels * s->nb_channels); + + s->chgroup[0].decorrelation_matrix[0] = 1.0; + + }else{ + int remaining_channels = s->channels_for_cur_subframe; + + if(get_bits(gb,1)){ + av_log(s->avctx,AV_LOG_ERROR,"unsupported channel transform bit\n"); + return 0; + } + + for(s->nb_chgroups = 0; remaining_channels && s->nb_chgroups < s->channels_for_cur_subframe;s->nb_chgroups++){ + wma_channel_group* chgroup = &s->chgroup[s->nb_chgroups]; + chgroup->nb_channels = 0; + chgroup->no_rotation = 0; + chgroup->transform = 0; + + /* decode channel mask */ + memset(chgroup->use_channel,0,sizeof(chgroup->use_channel)); + + if(remaining_channels > 2){ + for(i=0;i<s->channels_for_cur_subframe;i++){ + int channel_idx = s->channel_indices_for_cur_subframe[i]; + if(!s->channel[channel_idx].grouped && get_bits(gb,1)){ + ++chgroup->nb_channels; + s->channel[channel_idx].grouped = 1; + chgroup->use_channel[channel_idx] = 1; + } + } + }else{ + chgroup->nb_channels = remaining_channels; + for(i=0;i<s->nb_channels ;i++){ + chgroup->use_channel[i] = s->channel[i].grouped != 1; + s->channel[i].grouped = 1; + } + } + + /** done decode channel mask */ + + /* decide x form type FIXME port this to float, all rotations should lie on the unit circle*/ + if(chgroup->nb_channels == 1){ + chgroup->no_rotation = 1; + chgroup->transform = 2; + chgroup->decorrelation_matrix[0] = 1.0; + + }else if(chgroup->nb_channels == 2){ + if(get_bits(gb,1)){ + if(!get_bits(gb,1)){ + chgroup->no_rotation = 1; + chgroup->transform = 2; + chgroup->decorrelation_matrix[0] = 1.0; + chgroup->decorrelation_matrix[1] = 0; + chgroup->decorrelation_matrix[2] = 0; + chgroup->decorrelation_matrix[3] = 1.0; + } + }else{ + chgroup->no_rotation = 1; + chgroup->transform = 1; + chgroup->decorrelation_matrix[0] = 0.70703125; + chgroup->decorrelation_matrix[1] = -0.70703125; + chgroup->decorrelation_matrix[2] = 0.70703125; + chgroup->decorrelation_matrix[3] = 0.70703125; + } + }else{ + if(get_bits(gb,1)){ + if(get_bits(gb,1)){ + chgroup->no_rotation = 0; + chgroup->transform = 0; + }else{ + int x; + chgroup->no_rotation = 1; + chgroup->transform = 3; + for(x = 0; x < chgroup->nb_channels ; x++){ + int y; + for(y=0;y< chgroup->nb_channels ;y++){ + chgroup->decorrelation_matrix[y + x * chgroup->nb_channels] = s->default_decorrelation_matrix[chgroup->nb_channels][x][y]; + } + } + } + }else{ + int i; + chgroup->no_rotation = 1; + chgroup->transform = 2; + for(i=0;i<chgroup->nb_channels;i++){ + chgroup->decorrelation_matrix[i+i*chgroup->nb_channels] = 1.0; + } + } + } + + /** done decide x form type */ + + if(!chgroup->no_rotation){ /** decode channel transform */ + int n_offset = chgroup->nb_channels * (chgroup->nb_channels - 1) / 2; + int i; + for(i=0;i<n_offset;i++){ + chgroup->rotation_offset[i] = get_bits(gb,6); + } + for(i=0;i<chgroup->nb_channels;i++) + chgroup->positive[i] = get_bits(gb,1); + } + + /* decode transform on / off */ + if(chgroup->nb_channels <= 1 || ((chgroup->no_rotation != 1 || chgroup->transform == 2) && chgroup->no_rotation)){ + // done + int i; + for(i=0;i<s->cValidBarkBand;i++) + chgroup->transform_band[i] = 1; + }else{ + if(get_bits(gb,1) == 0){ + int i; + // transform works on individual scale factor bands + for(i=0;i< s->cValidBarkBand;i++){ + chgroup->transform_band[i] = get_bits(gb,1); + } + }else{ + int i; + for(i=0;i<s->cValidBarkBand;i++) + chgroup->transform_band[i] = 1; + } + } + /** done decode transform on / off */ + remaining_channels -= chgroup->nb_channels; + } + } + return 1; +} + + + +static unsigned int wma_get_large_val(WMA3DecodeContext* s) +{ + int n_bits = 8; + if(get_bits(s->getbit,1)){ + n_bits += 8; + if(get_bits(s->getbit,1)){ + n_bits += 8; + if(get_bits(s->getbit,1)){ + n_bits += 7; + } + } + } + return get_bits_long(s->getbit,n_bits); +} + + +static inline void wma_get_vec4(WMA3DecodeContext *s,int* vals,int* masks){ + unsigned int idx; + int i = 0; + // read 4 values + idx = get_vlc2(s->getbit, s->huff_0_vlc.table, VLCBITS, ((FF_WMA3_HUFF_0_MAXBITS+VLCBITS-1)/VLCBITS)); + + + if ( idx == 126 ) + { + while(i < 4){ + idx = get_vlc2(s->getbit, s->huff_1_vlc.table, VLCBITS, ((FF_WMA3_HUFF_1_MAXBITS+VLCBITS-1)/VLCBITS)); + if ( idx == 136 ){ + vals[i] = get_vlc2(s->getbit, s->huff_2_vlc.table, VLCBITS, ((FF_WMA3_HUFF_2_MAXBITS+VLCBITS-1)/VLCBITS)); + if(vals[i] == 100) + vals[i] += wma_get_large_val(s); + vals[i+1] = get_vlc2(s->getbit, s->huff_2_vlc.table, VLCBITS, ((FF_WMA3_HUFF_2_MAXBITS+VLCBITS-1)/VLCBITS)); + if(vals[i+1] == 100) + vals[i+1] += wma_get_large_val(s); + }else{ + vals[i] = (ff_wma3_sym2vec2[idx] >> 4) & 0xF; + vals[i+1] = ff_wma3_sym2vec2[idx] & 0xF; + } + i += 2; + } + } + else + { + vals[0] = (unsigned char)(ff_wma3_sym2vec4[idx] >> 8) >> 4; + vals[1] = (ff_wma3_sym2vec4[idx] >> 8) & 0xF; + vals[2] = (ff_wma3_sym2vec4[idx] >> 4) & 0xF; + vals[3] = ff_wma3_sym2vec4[idx] & 0xF; + } + + if(vals[0]) + masks[0] = get_bits(s->getbit,1); + if(vals[1]) + masks[1] = get_bits(s->getbit,1); + if(vals[2]) + masks[2] = get_bits(s->getbit,1); + if(vals[3]) + masks[3] = get_bits(s->getbit,1); +} + + +static int decode_coeffs(WMA3DecodeContext *s,GetBitContext* gb,int c) +{ + int vlctable; + VLC* vlc; + int vlcmax; + wma_channel* ci = &s->channel[c]; + int rl_mode = 0; + int cur_coeff = 0; + int last_write = 0; + const short* run; + const short* level; + + av_log(s->avctx,AV_LOG_DEBUG,"decode coefs for channel %i\n",c); + + s->getbit = gb; + s->esc_len = av_log2(s->subframe_len -1) +1; + vlctable = get_bits(s->getbit, 1); + vlc = &s->coef_vlc[!vlctable]; + vlcmax = s->coef_max[!vlctable]; + + if(!vlctable){ + run = ff_wma3_run_1; + level = ff_wma3_level_1; + }else{ + run = ff_wma3_run_0; + level = ff_wma3_level_0; + } + + while(cur_coeff < s->subframe_len){ + if(rl_mode){ + unsigned int idx; + int mask; + int val; + idx = get_vlc2(s->getbit, vlc->table, VLCBITS, vlcmax); + + if( idx == 1) + return 0; + else if( !idx ){ + val = wma_get_large_val(s); + /** escape decode */ + if(get_bits(s->getbit,1)){ + if(get_bits(s->getbit,1)){ + if(get_bits(s->getbit,1)){ + av_log(s->avctx,AV_LOG_ERROR,"broken escape sequence\n"); + return 0; + }else + cur_coeff += get_bits(s->getbit,s->esc_len) + 4; + }else + cur_coeff += get_bits(s->getbit,2) + 1; + } + }else{ + cur_coeff += run[idx - 2]; + val = level[idx - 2]; + } + mask = get_bits(s->getbit,1) - 1; + ci->coeffs[cur_coeff] = (val^mask) - mask; + ++cur_coeff; + }else{ + int i = 0; + int vals[4]; + int masks[4]; + + if( cur_coeff >= s->subframe_len ) + return 0; + + wma_get_vec4(s,vals,masks); + + while(i < 4){ + ++cur_coeff; + ++last_write; + + if(vals[i]){ + ci->coeffs[cur_coeff-1] = (((int64_t)vals[i])^(masks[i] -1)) - (masks[i] -1); + last_write = 0; + } + if( cur_coeff >= s->subframe_len ) // handled entire subframe -> quit + return 0; + if ( last_write > s->subframe_len / 256 ) //switch to RL mode + rl_mode = 1; + ++i; + } } } @@ -400,6 +824,497 @@ static int wma_decode_tilehdr(WMA3Decode } + +static int wma_decode_scale_factors(WMA3DecodeContext* s,GetBitContext* gb) +{ + int i; + for(i=0;i<s->channels_for_cur_subframe;i++){ + int c = s->channel_indices_for_cur_subframe[i]; + + /** resample scale factors for the new block size */ + if(s->channel[c].reuse_sf){ + int b; + for(b=0;b< s->cValidBarkBand;b++){ + int idx0 = av_log2(s->samples_per_frame/s->subframe_len); + int idx1 = av_log2(s->samples_per_frame/s->channel[c].scale_factor_block_len); + int bidx = s->sf_offsets[s->num_possible_block_sizes * MAX_BANDS * idx0 + + MAX_BANDS * idx1 + b]; + s->channel[c].resampled_scale_factors[b] = s->channel[c].scale_factors[bidx]; + } + s->channel[c].max_scale_factor = s->channel[c].resampled_scale_factors[0]; + for(b=1;b<s->cValidBarkBand;b++){ + if(s->channel[c].resampled_scale_factors[b] > s->channel[c].max_scale_factor) + s->channel[c].max_scale_factor = s->channel[c].resampled_scale_factors[b]; + } + } + + if(s->channel[c].cur_subframe > 0){ + s->channel[c].transmit_sf = get_bits(gb,1); + }else + s->channel[c].transmit_sf = 1; + + if(s->channel[c].transmit_sf){ + int b; + + if(!s->channel[c].reuse_sf){ + int i; + s->channel[c].scale_factor_step = get_bits(gb,2) + 1; + for(i=0;i<s->cValidBarkBand;i++){ + int val = get_vlc2(gb, s->exp_vlc.table, EXPVLCBITS, EXPMAX); //dpcm coded + if(!i) + s->channel[c].scale_factors[i] = 45 / s->channel[c].scale_factor_step + val - 60; + else + s->channel[c].scale_factors[i] = s->channel[c].scale_factors[i-1] + val - 60; + } + }else{ // rl coded + int i; + memcpy(s->channel[c].scale_factors,s->channel[c].resampled_scale_factors, + 4 * s->cValidBarkBand); + + for(i=0;i<s->cValidBarkBand;i++){ + int idx; + short skip; + short level_mask; + short val; + + idx = get_vlc2(gb, s->rlc_vlc.table, VLCBITS, ((FF_WMA3_HUFF_RLC_MAXBITS+VLCBITS-1)/VLCBITS)); + + if( !idx ){ + uint32_t mask = get_bits(gb,14); + level_mask = mask >> 6; + val = (mask & 1) - 1; + skip = (0x3f & mask)>>1; + }else if(idx == 1){ + break; + }else{ + skip = ff_wma3_run_mask[idx-2]; + level_mask = ff_wma3_level_mask[idx-2]; + val = get_bits(gb,1)-1; + } + + i += skip; + if(i >= s->cValidBarkBand){ + av_log(s->avctx,AV_LOG_ERROR,"invalid scale factor coding\n"); + return 0; + }else + s->channel[c].scale_factors[i] += (val ^ level_mask) - val; + + } + + } + + s->channel[c].reuse_sf = 1; + s->channel[c].max_scale_factor = s->channel[c].scale_factors[0]; + for(b=1;b<s->cValidBarkBand;b++){ + if(s->channel[c].max_scale_factor < s->channel[c].scale_factors[b]) + s->channel[c].max_scale_factor = s->channel[c].scale_factors[b]; + } + s->channel[c].scale_factor_block_len = s->subframe_len; + } + } + return 1; +} + +static void wma_calc_decorrelation_matrix(WMA3DecodeContext *s, wma_channel_group* chgroup){ + int i; + int offset = 0; + memset(chgroup->decorrelation_matrix, 0, chgroup->nb_channels * 4 * chgroup->nb_channels); + for(i=0;i<chgroup->nb_channels;i++) + chgroup->decorrelation_matrix[chgroup->nb_channels * i + i] = chgroup->positive[i]?1.0:-1.0; + + for(i=0;i<chgroup->nb_channels;i++){ + if ( i > 0 ) + { + int x; + for(x=0;x<i;x++){ + int y; + float tmp1[MAX_CHANNELS]; + float tmp2[MAX_CHANNELS]; + memcpy(tmp1, &chgroup->decorrelation_matrix[x * chgroup->nb_channels], 4 * (i + 1)); + memcpy(tmp2, &chgroup->decorrelation_matrix[i * chgroup->nb_channels], 4 * (i + 1)); + for(y=0;y < i + 1 ; y++){ + float v1 = tmp1[y]; + float v2 = tmp2[y]; + int n = chgroup->rotation_offset[offset + x]; + float cosv = sin(n*M_PI / 64.0); + float sinv = -cos(n*M_PI / 64.0); + + chgroup->decorrelation_matrix[y + x * chgroup->nb_channels] = (v1 * cosv) + (v2 * sinv); + chgroup->decorrelation_matrix[y + i * chgroup->nb_channels] = (v1 * -sinv) + (v2 * cosv); + } + } + } + offset += i; + } + +} + + +static void wma_inverse_channel_transform(WMA3DecodeContext *s) +{ + int i; + + for(i=0;i<s->nb_chgroups;i++){ + + if(s->chgroup[i].nb_channels == 1) + continue; + + if(s->chgroup[i].no_rotation == 1 && s->chgroup[i].transform == 2) + continue; + + if((s->nb_channels == 2) && + (s->chgroup[i].no_rotation == 1) && + (s->chgroup[i].transform == 1)){ + int b; + for(b = 0; b < s->cValidBarkBand;b++){ + int y; + if(s->chgroup[i].transform_band[b] == 1){ //M/S stereo + for(y=s->rgiBarkIndex[b];y<FFMIN(s->rgiBarkIndex[b+1], s->subframe_len);y++){ + float v1 = s->channel[0].coeffs[y]; + float v2 = s->channel[1].coeffs[y]; + s->channel[0].coeffs[y] = v1 - v2; + s->channel[1].coeffs[y] = v1 + v2; + } + }else{ + for(y=s->rgiBarkIndex[b];y<FFMIN(s->rgiBarkIndex[b+1], s->subframe_len);y++){ + s->channel[0].coeffs[y] *= 362; + s->channel[0].coeffs[y] /= 256; + s->channel[1].coeffs[y] *= 362; + s->channel[1].coeffs[y] /= 256; + } + } + } + }else{ + int x; + int b; + int cnt = 0; + float* ch_data[MAX_CHANNELS]; + float sums[MAX_CHANNELS * MAX_CHANNELS]; + if(!s->chgroup[i].no_rotation) + wma_calc_decorrelation_matrix(s,&s->chgroup[i]); + + for(x=0;x<s->channels_for_cur_subframe;x++){ + int chan = s->channel_indices_for_cur_subframe[x]; + if(s->chgroup[i].use_channel[chan] == 1){ // assign ptrs + ch_data[cnt] = s->channel[chan].coeffs; + ++cnt; + } + } + + for(b = 0; b < s->cValidBarkBand;b++){ + int y; + if(s->chgroup[i].transform_band[b] == 1){ + //multiply values with decorrelation_matrix + for(y=s->rgiBarkIndex[b];y<FFMIN(s->rgiBarkIndex[b+1], s->subframe_len);y++){ + float* matrix = s->chgroup[i].decorrelation_matrix; + int m; + + for(m = 0;m<s->chgroup[i].nb_channels;m++) + sums[m] = 0; + + for(m = 0;m<s->chgroup[i].nb_channels * s->chgroup[i].nb_channels;m++) + sums[m/s->chgroup[i].nb_channels] += (matrix[m] * ch_data[m%s->chgroup[i].nb_channels][0]); + + for(m = 0;m<s->chgroup[i].nb_channels;m++){ + ch_data[m][0] = sums[m]; + ++ch_data[m]; + } + } + }else{ /** skip band */ + for(y=0;y<s->chgroup[i].nb_channels;y++) + ch_data[y] += s->rgiBarkIndex[b+1] - s->rgiBarkIndex[b]; + } + } + } + } +} + + +static void wma_window(WMA3DecodeContext *s){ + int i; + for(i=0;i<s->channels_for_cur_subframe;i++){ + int c = s->channel_indices_for_cur_subframe[i]; + int j = s->channel[c].cur_subframe; + int x; + //FIXME use dsp.vector_fmul_window + float* start; + float* end; + float* window; + int prev_block_len = s->channel[c].prev_block_len; + int block_len = s->channel[c].subframe_len[j]; + int len; + int winlen; + start = &s->channel[c].out[s->samples_per_frame/2 + s->channel[c].subframe_offset[j] - prev_block_len /2 ]; + end = &s->channel[c].out[s->samples_per_frame/2 + s->channel[c].subframe_offset[j] + block_len /2 - 1]; + + if(block_len <= prev_block_len){ + start += (prev_block_len - block_len)/2; + len = block_len/2; + winlen = block_len; + }else{ + end -= (block_len - prev_block_len)/2; + len = prev_block_len /2; + winlen = prev_block_len; + } + +// float* rs = &s->channel[c].out[s->samples_per_frame/2 + s->channel[c].subframe_offset[i]]; +// printf("Dstart %i %i end %i win %i prev %i\n",s->frame_num+1, start - rs,end -rs,winlen,prev_block_len); + +#if 1 + window = s->windows[av_log2(winlen)-BLOCK_MIN_BITS]; + for(x=0;x<len;x++){ + float ts = *start; + float te = *end; + float sin_v = window[x]; + float cos_v = window[winlen - x -1]; + *start = cos_v * ts - sin_v * te; + *end = cos_v * te + sin_v * ts; + ++start; + --end; + } +#else + wma_window2(); +#endif + + s->channel[c].prev_block_len = block_len; + } +} + + +/** + * Apply MDCT window and add into output. + * + * We ensure that when the windows overlap their squared sum + * is always 1 (MDCT reconstruction rule). + */ + + + + + +static int wma_decode_subframe(WMA3DecodeContext *s,GetBitContext* gb){ + int offset = s->samples_per_frame; + int subframe_len = s->samples_per_frame; + int i; + int total_samples = s->samples_per_frame * s->nb_channels; + int transmit_coeffs = 0; + + bitstreamcounter = get_bits_count(gb); + + + /** reset channel context and find the next block offset and size + == the next block of the channel with the smallest number of decoded samples + */ + for(i=0;i<s->nb_channels;i++){ + s->channel[i].grouped = 0; + memset(s->channel[i].coeffs,0,sizeof(s->channel[0].coeffs)); + if(offset > s->channel[i].decoded_samples){ + offset = s->channel[i].decoded_samples; + subframe_len = s->channel[i].subframe_len[s->channel[i].cur_subframe]; + } + } + + av_log(s->avctx, AV_LOG_DEBUG,"processing subframe with offset %i len %i\n",offset,subframe_len); + + /** get a list of all channels that contain the estimated block */ + s->channels_for_cur_subframe = 0; + for(i=0;i<s->nb_channels;i++){ + /** substract already processed samples */ + total_samples -= s->channel[i].decoded_samples; + + /** and count if there are multiple subframes that match our profile */ + if(offset == s->channel[i].decoded_samples && subframe_len == s->channel[i].subframe_len[s->channel[i].cur_subframe]){ + total_samples -= s->channel[i].subframe_len[s->channel[i].cur_subframe]; + s->channel[i].decoded_samples += s->channel[i].subframe_len[s->channel[i].cur_subframe]; + s->channel_indices_for_cur_subframe[s->channels_for_cur_subframe] = i; + ++s->channels_for_cur_subframe; + } + } + + /** check if the frame will be complete after processing the estimated block */ + if(total_samples == 0) + s->parsed_all_subframes = 1; + + + av_log(s->avctx, AV_LOG_DEBUG,"subframe is part of %i channels\n",s->channels_for_cur_subframe); + + /** configure the decoder for the current subframe */ + for(i=0;i<s->channels_for_cur_subframe;i++){ + int c = s->channel_indices_for_cur_subframe[i]; + + if(s->channel[c].num_subframes <= 1){ + s->cValidBarkBand = s->num_sfb[0]; + s->rgiBarkIndex = s->sfb_offsets; + s->subwoofer_cutoff = s->subwoofer_cutoffs[0]; + }else{ + int frame_offset = av_log2(s->samples_per_frame/s->channel[c].subframe_len[s->channel[c].cur_subframe]); + s->cValidBarkBand = s->num_sfb[frame_offset]; + s->rgiBarkIndex = &s->sfb_offsets[MAX_BANDS * frame_offset]; + s->subwoofer_cutoff = s->subwoofer_cutoffs[frame_offset]; + } + + /** init some things if this is the first subframe */ + if(!s->channel[c].cur_subframe){ + s->channel[c].scale_factor_step = 1; + s->channel[c].max_scale_factor = 0; + memset(s->channel[c].scale_factors, 0, sizeof(s->channel[c].scale_factors)); + memset(s->channel[c].resampled_scale_factors, 0, sizeof(s->channel[c].resampled_scale_factors)); + } + + } + + s->subframe_len = subframe_len; + + /** skip extended header if any */ + if(get_bits(gb,1)){ + int num_fill_bits; + if(!(num_fill_bits = get_bits(gb,2))){ + num_fill_bits = get_bits(gb,4); + num_fill_bits = get_bits(gb,num_fill_bits) + 1; + } + + if(num_fill_bits >= 0){ + skip_bits(gb,num_fill_bits); + } + } + + /** no idea for what the following bit is used */ + if(get_bits(gb,1)){ + av_log(s->avctx,AV_LOG_ERROR,"reserved bit set\n"); + return 0; + } + + + if(!wma_decode_channel_transform(s,gb)) + return 0; + + + for(i=0;i<s->channels_for_cur_subframe;i++){ + int c = s->channel_indices_for_cur_subframe[i]; + if((s->channel[c].transmit_coefs = get_bits(gb,1))) + transmit_coeffs = 1; + } + + s->quant_step = 90 * s->sample_bit_depth / 16; + + if(transmit_coeffs){ + int quant; + int sign = 1; + int large_quant = 0; + if((get_bits(gb,1))){ /** FIXME might influence how often getvec4 may be called */ + av_log(s->avctx,AV_LOG_ERROR,"unsupported quant step coding\n"); + return 0; + } + /** decode quantization step */ + quant = get_bits(gb,6); + if(quant & 0x20){ + quant |= 0xFFFFFFC0u; + sign = -1; + } + s->quant_step += quant; + if(quant <= -32 || quant > 30) + large_quant = 1; + while(large_quant){ + quant = get_bits(gb,5); + if(quant != 31){ + s->quant_step += quant * sign; + break; + } + s->quant_step += 31 * sign; + if(s->quant_step < 0){ + s->negative_quantstep = 1; + av_log(s->avctx,AV_LOG_ERROR,"negative quant step\n"); + return 0; + } + } + + /** decode quantization step modifiers for every channel */ + + if(s->channels_for_cur_subframe == 1) + s->channel[s->channel_indices_for_cur_subframe[0]].quant_step_modifier = 0; + else{ + int modifier_len = get_bits(gb,3); + for(i=0;i<s->channels_for_cur_subframe;i++){ + int c = s->channel_indices_for_cur_subframe[i]; + s->channel[c].quant_step_modifier = 0; + if(get_bits(gb,1)){ + if(modifier_len) + s->channel[c].quant_step_modifier = get_bits(gb,modifier_len) + 1; + else + s->channel[c].quant_step_modifier = 1; + }else + s->channel[c].quant_step_modifier = 0; + + } + } + + /** decode scale factors */ + if(!wma_decode_scale_factors(s,gb)) + return 0; + } + + av_log(s->avctx,AV_LOG_DEBUG,"BITSTREAM: subframe header length was %i\n",get_bits_count(gb) - bitstreamcounter); + + /** parse coefficients */ + for(i=0;i<s->channels_for_cur_subframe;i++){ + int c = s->channel_indices_for_cur_subframe[i]; + if(s->channel[c].transmit_coefs) + decode_coeffs(s,gb,c); + } + + av_log(s->avctx,AV_LOG_DEBUG,"BITSTREAM: subframe length was %i\n",get_bits_count(gb) - bitstreamcounter); + + if(transmit_coeffs){ + wma_inverse_channel_transform(s); + for(i=0;i<s->channels_for_cur_subframe;i++){ + int c = s->channel_indices_for_cur_subframe[i]; + int b; + float* dst; + if(c == s->lfe_channel) + memset(&s->channel[c].coeffs[s->subwoofer_cutoff],0,4 * (subframe_len - s->subwoofer_cutoff)); + + /** inverse quantization */ + for(b=0;b<s->cValidBarkBand;b++){ + int start = s->rgiBarkIndex[b]; + int end = s->rgiBarkIndex[b+1]; + int min; + float quant; + if(end > s->subframe_len) + end = s->subframe_len; + + if(s->channel[c].transmit_sf) + min = s->channel[c].scale_factor_step * (s->channel[c].max_scale_factor - s->channel[c].scale_factors[b]); + else + min = s->channel[c].scale_factor_step * (s->channel[c].max_scale_factor - s->channel[c].resampled_scale_factors[b]); + quant = pow(10.0,(s->quant_step + s->channel[c].quant_step_modifier - min) / 20.0); + while(start < end){ + s->channel[c].coeffs[start] *= quant; + ++start; + } + } + + dst = &s->channel[c].out[s->samples_per_frame/2 + s->channel[c].subframe_offset[s->channel[c].cur_subframe]]; + ff_imdct_half(&s->mdct_ctx[av_log2(subframe_len)-BLOCK_MIN_BITS], dst, s->channel[c].coeffs); //DCTIV with reverse + for(b=0;b<subframe_len;b++) + dst[b] /= subframe_len / 2; //FIXME try to remove this scaling + } + } + + wma_window(s); + + /** handled one subframe */ + for(i=0;i<s->channels_for_cur_subframe;i++){ + int c = s->channel_indices_for_cur_subframe[i]; + if(s->channel[c].cur_subframe >= s->channel[c].num_subframes){ + av_log(s->avctx,AV_LOG_ERROR,"broken subframe\n"); + return 0; + } + ++s->channel[c].cur_subframe; + } + + return 1; +} + /** *@brief Decode one WMA frame. *@param s context @@ -410,13 +1325,24 @@ static int wma_decode_tilehdr(WMA3Decode static int wma_decode_frame(WMA3DecodeContext *s,GetBitContext* gb){ unsigned int gb_start_count = get_bits_count(gb); int more_frames = 0; - /** get frame length */ int len = 0; + int i; + + /** check for potential output buffer overflow */ + if(s->samples + s->nb_channels * s->samples_per_frame > s->samples_end){ + av_log(s->avctx,AV_LOG_ERROR,"not enough space for the output samples\n"); + s->packet_loss = 1; + return 0; + } + s->negative_quantstep = 0; + bitstreamcounter = get_bits_count(gb); + + /** get frame length */ if(s->len_prefix) len = get_bits(gb,s->log2_frame_size); - av_log(s->avctx,AV_LOG_INFO,"decoding frame with len %x\n",len); + av_log(s->avctx,AV_LOG_DEBUG,"decoding frame with len %x\n",len); /** decode tile information */ if(wma_decode_tilehdr(s,gb)){ @@ -424,9 +1350,8 @@ static int wma_decode_frame(WMA3DecodeCo return 0; } - /** read postproc transform */ - if(get_bits1(gb)){ + if(s->nb_channels > 1 && get_bits1(gb)){ av_log(s->avctx,AV_LOG_ERROR,"Unsupported postproc transform found\n"); s->packet_loss = 1; return 0; @@ -435,29 +1360,85 @@ static int wma_decode_frame(WMA3DecodeCo /** read drc info */ if(s->dynamic_range_compression){ s->drc_gain = get_bits(gb,8); - av_log(s->avctx,AV_LOG_INFO,"drc_gain %i\n",s->drc_gain); + av_log(s->avctx,AV_LOG_DEBUG,"drc_gain %i\n",s->drc_gain); } - s->update_samples_per_frame = 0; - - /** check if num output samples might change */ + /** no idea what these are for, might be the number of samples + that need to be skipped at the beginning or end of a stream */ if(get_bits(gb,1)){ - s->update_samples_per_frame = get_bits1(gb); + int skip; /** usually true for the first frame */ - if(s->update_samples_per_frame){ - av_log(s->avctx,AV_LOG_INFO,"blocksize: %i\n",get_bits(gb,av_log2(s->samples_per_frame * 2))); + if(get_bits1(gb)){ + skip = get_bits(gb,av_log2(s->samples_per_frame * 2)); + av_log(s->avctx,AV_LOG_DEBUG,"start skip: %i\n",skip); } /** sometimes true for the last frame */ if(get_bits(gb,1)){ - av_log(s->avctx,AV_LOG_INFO,"end blocksize: %i\n",get_bits(gb,av_log2(s->samples_per_frame * 2))); + skip = get_bits(gb,av_log2(s->samples_per_frame * 2)); + av_log(s->avctx,AV_LOG_DEBUG,"end skip: %i\n",skip); } } + av_log(s->avctx,AV_LOG_DEBUG,"BITSTREAM: frame header length was %i\n",get_bits_count(gb) - bitstreamcounter); + + /** reset subframe states */ + s->parsed_all_subframes = 0; + for(i=0;i<s->nb_channels;i++){ + s->channel[i].decoded_samples = 0; + s->channel[i].cur_subframe = 0; + s->channel[i].reuse_sf = 0; + } + + /** parse all subframes */ + while(!s->parsed_all_subframes){ + if(!wma_decode_subframe(s,gb)){ + s->packet_loss = 1; + return 0; + } + } + + /** convert samples to short and write them to the output buffer */ + for(i = 0; i < s->nb_channels; i++) { + int16_t* ptr; + int incr = s->nb_channels; + /* FIXME what about other channel layouts? */ + const char layout[] = {0,1,4,5,2,3}; + int chpos; + float* iptr = s->channel[i].out; + int x; + + if(s->nb_channels == 6){ + chpos = layout[i]; + }else + chpos = i; + + ptr = s->samples + chpos; + + for(x=0;x<s->samples_per_frame;x++) { + *ptr = av_clip_int16(lrintf(*iptr++)); + ptr += incr; + } + + /** reuse second half of the imdct output for the next frame */ + memmove(&s->channel[i].out[0], &s->channel[i].out[s->samples_per_frame], + s->samples_per_frame * sizeof(float)); + } + + if(s->skip_frame) + s->skip_frame = 0; + else + s->samples += s->nb_channels * s->samples_per_frame; + + + //FIXME remove + av_log(s->avctx,AV_LOG_DEBUG,"frame[%i] skipping %i bits\n",s->frame_num,len - (get_bits_count(gb) - gb_start_count) - 1); + if(len - (get_bits_count(gb) - gb_start_count) - 1 != 1) + assert(0); + /** skip the rest of the frame data */ - av_log(s->avctx,AV_LOG_INFO,"skipping %i bits\n",len - (get_bits_count(gb) - gb_start_count) - 1); skip_bits_long(gb,len - (get_bits_count(gb) - gb_start_count) - 1); /** decode trailer bit */ @@ -532,8 +1513,12 @@ static int wma3_decode_packet(AVCodecCon WMA3DecodeContext *s = avctx->priv_data; int more_frames=1; int num_bits_prev_frame; + + s->samples = data; + s->samples_end = (int16_t*)((int8_t*)data + *data_size); s->buf_bit_size = buf_size << 3; + *data_size = 0; /** sanity check for the buffer length */ @@ -548,7 +1533,7 @@ static int wma3_decode_packet(AVCodecCon /** get number of bits that need to be added to the previous frame */ num_bits_prev_frame = get_bits(&s->gb, s->log2_frame_size); - av_log(avctx, AV_LOG_INFO, "[%d]: nbpf %x\n", avctx->frame_number, + av_log(avctx, AV_LOG_DEBUG, "packet[%d]: nbpf %x\n", avctx->frame_number, num_bits_prev_frame); /** check for packet loss */ @@ -562,7 +1547,7 @@ static int wma3_decode_packet(AVCodecCon /** append the prev frame data to the remaining data from the previous packet to create a full frame */ save_bits(s,num_bits_prev_frame); - av_log(avctx, AV_LOG_INFO, "accumulated %x bits of frame data\n", + av_log(avctx, AV_LOG_DEBUG, "accumulated %x bits of frame data\n", s->prev_frame_bit_size); /** decode the cross packet frame if it is valid */ @@ -585,6 +1570,7 @@ static int wma3_decode_packet(AVCodecCon /** there is enough data for a full frame */ if(remaining_bits(s) >= frame_size){ + /** decode the frame */ more_frames = wma_decode_frame(s,&s->gb); @@ -595,10 +1581,15 @@ static int wma3_decode_packet(AVCodecCon more_frames = 0; } + if(s->packet_loss == 1 && !s->negative_quantstep) + assert(0); + /** save the rest of the data so that it can be decoded with the next packet */ save_bits(s,remaining_bits(s)); + *data_size = (int8_t *)s->samples - (int8_t *)data; + return avctx->block_align; } @@ -610,15 +1601,38 @@ static int wma3_decode_packet(AVCodecCon static av_cold int wma3_decode_end(AVCodecContext *avctx) { WMA3DecodeContext *s = avctx->priv_data; - if(s->prev_frame) - av_free(s->prev_frame); + int i; + + av_free(s->prev_frame); + av_free(s->num_sfb); + av_free(s->sfb_offsets); + av_free(s->subwoofer_cutoffs); + av_free(s->sf_offsets); + + if(s->default_decorrelation_matrix){ + for(i=1;i<=s->nb_channels;i++) + av_free(s->default_decorrelation_matrix[i]); + av_free(s->default_decorrelation_matrix); + } + + free_vlc(&s->exp_vlc); + free_vlc(&s->coef_vlc[0]); + free_vlc(&s->coef_vlc[1]); + free_vlc(&s->huff_0_vlc); + free_vlc(&s->huff_1_vlc); + free_vlc(&s->huff_2_vlc); + free_vlc(&s->rlc_vlc); + + for(i=0 ; i<BLOCK_NB_SIZES ; i++) + ff_mdct_end(&s->mdct_ctx[i]); + return 0; } /** *@brief WMA9 decoder */ -AVCodec wmav3pro_decoder = +AVCodec wmapro_decoder = { "wmav3pro", CODEC_TYPE_AUDIO, Modified: wmapro/wmapro_ffmpeg.patch ============================================================================== --- wmapro/wmapro_ffmpeg.patch Sat Jan 10 03:31:27 2009 (r3940) +++ wmapro/wmapro_ffmpeg.patch Sat Jan 10 20:24:33 2009 (r3941) @@ -1,24 +1,24 @@ Index: libavcodec/Makefile =================================================================== ---- libavcodec/Makefile (revision 13558) +--- libavcodec/Makefile (revision 16517) +++ libavcodec/Makefile (working copy) -@@ -217,6 +217,7 @@ - OBJS-$(CONFIG_WMAV1_ENCODER) += wmaenc.o wma.o mdct.o fft.o - OBJS-$(CONFIG_WMAV2_DECODER) += wmadec.o wma.o mdct.o fft.o - OBJS-$(CONFIG_WMAV2_ENCODER) += wmaenc.o wma.o mdct.o fft.o -+OBJS-$(CONFIG_WMAV3PRO_DECODER) += wma3dec.o +@@ -233,6 +233,7 @@ + OBJS-$(CONFIG_WMAV1_ENCODER) += wmaenc.o wma.o + OBJS-$(CONFIG_WMAV2_DECODER) += wmadec.o wma.o + OBJS-$(CONFIG_WMAV2_ENCODER) += wmaenc.o wma.o ++OBJS-$(CONFIG_WMAPRO_DECODER) += wma3dec.o OBJS-$(CONFIG_WMV1_DECODER) += h263dec.o h263.o mpeg12data.o mpegvideo.o error_resilience.o OBJS-$(CONFIG_WMV1_ENCODER) += mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o OBJS-$(CONFIG_WMV2_DECODER) += wmv2dec.o wmv2.o msmpeg4.o msmpeg4data.o h263dec.o h263.o intrax8.o intrax8dsp.o mpeg12data.o mpegvideo.o error_resilience.o Index: libavcodec/allcodecs.c =================================================================== ---- libavcodec/allcodecs.c (revision 13558) +--- libavcodec/allcodecs.c (revision 16517) +++ libavcodec/allcodecs.c (working copy) -@@ -210,6 +210,7 @@ +@@ -211,6 +211,7 @@ REGISTER_DECODER (WAVPACK, wavpack); REGISTER_ENCDEC (WMAV1, wmav1); REGISTER_ENCDEC (WMAV2, wmav2); -+ REGISTER_DECODER (WMAV3PRO, wmav3pro); ++ REGISTER_DECODER (WMAPRO, wmapro); REGISTER_DECODER (WS_SND1, ws_snd1); /* PCM codecs */

3 2

[soc]: r3962 - wmapro/wma3dec.c
by faust3 17 Jan '09

17 Jan '09

Author: faust3 Date: Sat Jan 17 11:57:54 2009 New Revision: 3962 Log: start functions bodies with { on a new line Modified: wmapro/wma3dec.c Modified: wmapro/wma3dec.c ============================================================================== --- wmapro/wma3dec.c Sat Jan 17 11:40:28 2009 (r3961) +++ wmapro/wma3dec.c Sat Jan 17 11:57:54 2009 (r3962) @@ -55,7 +55,8 @@ static void dump_context(WMA3DecodeConte *@param decode_flags codec compression features *@return number of output samples per frame */ -static int get_samples_per_frame(int sample_rate, unsigned int decode_flags) { +static int get_samples_per_frame(int sample_rate, unsigned int decode_flags) +{ int samples_per_frame; int tmp; @@ -402,7 +403,8 @@ static av_cold int wma3_decode_init(AVCo *@param gb current get bit context *@return 0 on success < 0 in case of an error */ -static int wma_decode_tilehdr(WMA3DecodeContext *s, GetBitContext* gb){ +static int wma_decode_tilehdr(WMA3DecodeContext *s, GetBitContext* gb) +{ int c; int missing_samples = s->nb_channels * s->samples_per_frame; @@ -567,7 +569,8 @@ static int wma_decode_tilehdr(WMA3Decode } -static int wma_decode_channel_transform(WMA3DecodeContext* s, GetBitContext* gb){ +static int wma_decode_channel_transform(WMA3DecodeContext* s, GetBitContext* gb) +{ int i; for(i=0;i< s->nb_channels;i++){ memset(s->chgroup[i].decorrelation_matrix,0,4*s->nb_channels * s->nb_channels); @@ -725,7 +728,8 @@ static unsigned int wma_get_large_val(WM } -static inline void wma_get_vec4(WMA3DecodeContext *s,int* vals,int* masks){ +static inline void wma_get_vec4(WMA3DecodeContext *s,int* vals,int* masks) +{ unsigned int idx; int i = 0; // read 4 values @@ -946,7 +950,8 @@ static int wma_decode_scale_factors(WMA3 return 1; } -static void wma_calc_decorrelation_matrix(WMA3DecodeContext *s, wma_channel_group* chgroup){ +static void wma_calc_decorrelation_matrix(WMA3DecodeContext *s, wma_channel_group* chgroup) +{ int i; int offset = 0; memset(chgroup->decorrelation_matrix, 0, chgroup->nb_channels * 4 * chgroup->nb_channels); @@ -1061,7 +1066,8 @@ static void wma_inverse_channel_transfor } -static void wma_window(WMA3DecodeContext *s){ +static void wma_window(WMA3DecodeContext *s) +{ int i; for(i=0;i<s->channels_for_cur_subframe;i++){ int c = s->channel_indices_for_cur_subframe[i]; @@ -1109,7 +1115,8 @@ static void wma_window(WMA3DecodeContext -static int wma_decode_subframe(WMA3DecodeContext *s,GetBitContext* gb){ +static int wma_decode_subframe(WMA3DecodeContext *s,GetBitContext* gb) +{ int offset = s->samples_per_frame; int subframe_len = s->samples_per_frame; int i; @@ -1339,7 +1346,8 @@ static int wma_decode_subframe(WMA3Decod *@return 0 if the trailer bit indicates that this is the last frame, * 1 if there are more frames */ -static int wma_decode_frame(WMA3DecodeContext *s,GetBitContext* gb){ +static int wma_decode_frame(WMA3DecodeContext *s,GetBitContext* gb) +{ unsigned int gb_start_count = get_bits_count(gb); int more_frames = 0; int len = 0; @@ -1471,7 +1479,8 @@ static int wma_decode_frame(WMA3DecodeCo *@param s codec context *@return remaining size in bits */ -static int remaining_bits(WMA3DecodeContext *s){ +static int remaining_bits(WMA3DecodeContext *s) +{ return s->buf_bit_size - get_bits_count(&s->gb); } @@ -1480,7 +1489,8 @@ static int remaining_bits(WMA3DecodeCont *@param s codec context *@param len length of the partial frame */ -static void save_bits(WMA3DecodeContext *s,int len){ +static void save_bits(WMA3DecodeContext *s,int len) +{ int buflen = (s->prev_frame_bit_size + len + 8) / 8; int bit_offset = s->prev_frame_bit_size % 8; int pos = (s->prev_frame_bit_size - bit_offset) / 8;

1 0

[soc]: r3961 - wmapro/wma3.h
by faust3 17 Jan '09

17 Jan '09

Author: faust3 Date: Sat Jan 17 11:40:28 2009 New Revision: 3961 Log: removed 1 from multiple inclusion guard Modified: wmapro/wma3.h Modified: wmapro/wma3.h ============================================================================== --- wmapro/wma3.h Thu Jan 15 22:04:55 2009 (r3960) +++ wmapro/wma3.h Sat Jan 17 11:40:28 2009 (r3961) @@ -21,7 +21,7 @@ */ #ifndef AVCODEC_WMA3_H -#define AVCODEC_WMA3_H 1 +#define AVCODEC_WMA3_H #include "wma3data.h" #include "dsputil.h"

1 0

[soc]: r3956 - wmapro/wma3.h
by faust3 17 Jan '09

17 Jan '09

Author: faust3 Date: Thu Jan 15 19:45:48 2009 New Revision: 3956 Log: fixed multiple inclusion guard Modified: wmapro/wma3.h Modified: wmapro/wma3.h ============================================================================== --- wmapro/wma3.h Tue Jan 13 07:23:06 2009 (r3955) +++ wmapro/wma3.h Thu Jan 15 19:45:48 2009 (r3956) @@ -20,8 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef WMA3_H -#define WMA3_H 1 +#ifndef AVCODEC_WMA3_H +#define AVCODEC_WMA3_H 1 #include "wma3data.h" #include "dsputil.h"

3 2

[soc]: r3957 - wmapro/wma3dec.c
by faust3 17 Jan '09

17 Jan '09

Author: faust3 Date: Thu Jan 15 19:47:58 2009 New Revision: 3957 Log: name the decoder wmapro Modified: wmapro/wma3dec.c Modified: wmapro/wma3dec.c ============================================================================== --- wmapro/wma3dec.c Thu Jan 15 19:45:48 2009 (r3956) +++ wmapro/wma3dec.c Thu Jan 15 19:47:58 2009 (r3957) @@ -1616,7 +1616,7 @@ static int wma3_decode_packet(AVCodecCon */ AVCodec wmapro_decoder = { - "wmav3pro", + "wmapro", CODEC_TYPE_AUDIO, CODEC_ID_WMAPRO, sizeof(WMA3DecodeContext),

4 3

[soc]: r3960 - in wmapro: wma3data.h wma3dec.c
by faust3 15 Jan '09

15 Jan '09

Author: faust3 Date: Thu Jan 15 22:04:55 2009 New Revision: 3960 Log: use smaller datatypes for the tables where possible Modified: wmapro/wma3data.h wmapro/wma3dec.c Modified: wmapro/wma3data.h ============================================================================== --- wmapro/wma3data.h Thu Jan 15 21:44:00 2009 (r3959) +++ wmapro/wma3data.h Thu Jan 15 22:04:55 2009 (r3960) @@ -405,7 +405,7 @@ static const uint8_t ff_wma3_huff_rlc_bi }; -static const short ff_wma3_run_0[] = { +static const uint8_t ff_wma3_run_0[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, @@ -423,7 +423,7 @@ static const short ff_wma3_run_0[] = { 0, 0, 0, 0, }; -static const short ff_wma3_level_0[] = { +static const uint8_t ff_wma3_level_0[] = { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -442,7 +442,7 @@ static const short ff_wma3_level_0[] = { }; -static const short ff_wma3_run_1[] = { +static const uint8_t ff_wma3_run_1[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, @@ -465,7 +465,7 @@ static const short ff_wma3_run_1[] = { 1, 0, 1, 0, 0, 0, }; -static const short ff_wma3_level_1[] = { +static const uint8_t ff_wma3_level_1[] = { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, Modified: wmapro/wma3dec.c ============================================================================== --- wmapro/wma3dec.c Thu Jan 15 21:44:00 2009 (r3959) +++ wmapro/wma3dec.c Thu Jan 15 22:04:55 2009 (r3960) @@ -778,8 +778,8 @@ static int decode_coeffs(WMA3DecodeConte int rl_mode = 0; int cur_coeff = 0; int last_write = 0; - const short* run; - const short* level; + const uint8_t* run; + const uint8_t* level; av_log(s->avctx,AV_LOG_DEBUG,"decode coefs for channel %i\n",c);

1 0

[soc]: r3959 - wmapro/wma3.h
by faust3 15 Jan '09

15 Jan '09

Author: faust3 Date: Thu Jan 15 21:44:00 2009 New Revision: 3959 Log: added a comment to the end of the multiple inclusion guard Modified: wmapro/wma3.h Modified: wmapro/wma3.h ============================================================================== --- wmapro/wma3.h Thu Jan 15 21:42:37 2009 (r3958) +++ wmapro/wma3.h Thu Jan 15 21:44:00 2009 (r3959) @@ -161,5 +161,5 @@ typedef struct WMA3DecodeContext { uint8_t* prev_frame; //< prev frame data } WMA3DecodeContext; -#endif +#endif /* AVCODEC_WMA3_H */

1 0

[soc]: r3958 - wmapro/wma3data.h
by faust3 15 Jan '09

15 Jan '09

Author: faust3 Date: Thu Jan 15 21:42:37 2009 New Revision: 3958 Log: reformated the tables Modified: wmapro/wma3data.h Modified: wmapro/wma3data.h ============================================================================== --- wmapro/wma3data.h Thu Jan 15 19:47:58 2009 (r3957) +++ wmapro/wma3data.h Thu Jan 15 21:42:37 2009 (r3958) @@ -25,474 +25,537 @@ /* Bark frequencies */ static const uint16_t ff_wma3_critical_freq[] = { - 100, 200, 300, 400, 510, 630, 770, - 920, 1080, 1270, 1480, 1720, 2000, 2320, - 2700, 3150, 3700, 4400, 5300, 6400, 7700, - 9500, 12000, 15500, 20675, 28575, 41375, 63875, + 100, 200, 300, 400, 510, 630, 770, + 920, 1080, 1270, 1480, 1720, 2000, 2320, + 2700, 3150, 3700, 4400, 5300, 6400, 7700, + 9500, 12000, 15500, 20675, 28575, 41375, 63875, }; #define FF_WMA3_SCALE_SIZE 121 #define FF_WMA3_SCALE_MAXBITS 19 static const uint32_t ff_wma3_scale_huffcodes[FF_WMA3_SCALE_SIZE] = { - 0x0E639, 0x0E6C2, 0x0E6C1, 0x0E6C0, 0x0E63F, 0x0E63E, 0x0E63D, 0x0E63C, - 0x0E63B, 0x0E63A, 0x0E638, 0x0E637, 0x0E636, 0x0E635, 0x0E634, 0x0E632, - 0x0E633, 0x0E620, 0x0737B, 0x0E610, 0x0E611, 0x0E612, 0x0E613, 0x0E614, - 0x0E615, 0x0E616, 0x0E617, 0x0E618, 0x0E619, 0x0E61A, 0x0E61B, 0x0E61C, - 0x0E61D, 0x0E61E, 0x0E61F, 0x0E6C3, 0x0E621, 0x0E622, 0x0E623, 0x0E624, - 0x0E625, 0x0E626, 0x0E627, 0x0E628, 0x0E629, 0x0E62A, 0x0E62B, 0x0E62C, - 0x0E62D, 0x0E62E, 0x0E62F, 0x0E630, 0x0E631, 0x01CDF, 0x00E60, 0x00399, - 0x000E7, 0x0001D, 0x00000, 0x00001, 0x00001, 0x00001, 0x00002, 0x00006, - 0x00002, 0x00007, 0x00006, 0x0000F, 0x00038, 0x00072, 0x0039A, 0x0E6C4, - 0x0E6C5, 0x0E6C6, 0x0E6C7, 0x0E6C8, 0x0E6C9, 0x0E6CA, 0x0E6CB, 0x0E6CC, - 0x0E6CD, 0x0E6CE, 0x0E6CF, 0x0E6D0, 0x0E6D1, 0x0E6D2, 0x0E6D3, 0x0E6D4, - 0x0E6D5, 0x0E6D6, 0x0E6D7, 0x0E6D8, 0x0E6D9, 0x0E6DA, 0x0E6DB, 0x0E6DC, - 0x0E6DD, 0x0E6DE, 0x0E6DF, 0x0E6E0, 0x0E6E1, 0x0E6E2, 0x0E6E3, 0x0E6E4, - 0x0E6E5, 0x0E6E6, 0x0E6E7, 0x0E6E8, 0x0E6E9, 0x0E6EA, 0x0E6EB, 0x0E6EC, - 0x0E6ED, 0x0E6EE, 0x0E6EF, 0x0E6F0, 0x0E6F1, 0x0E6F2, 0x0E6F3, 0x0E6F4, - 0x0E6F5, + 0x0E639, 0x0E6C2, 0x0E6C1, 0x0E6C0, 0x0E63F, 0x0E63E, 0x0E63D, 0x0E63C, + 0x0E63B, 0x0E63A, 0x0E638, 0x0E637, 0x0E636, 0x0E635, 0x0E634, 0x0E632, + 0x0E633, 0x0E620, 0x0737B, 0x0E610, 0x0E611, 0x0E612, 0x0E613, 0x0E614, + 0x0E615, 0x0E616, 0x0E617, 0x0E618, 0x0E619, 0x0E61A, 0x0E61B, 0x0E61C, + 0x0E61D, 0x0E61E, 0x0E61F, 0x0E6C3, 0x0E621, 0x0E622, 0x0E623, 0x0E624, + 0x0E625, 0x0E626, 0x0E627, 0x0E628, 0x0E629, 0x0E62A, 0x0E62B, 0x0E62C, + 0x0E62D, 0x0E62E, 0x0E62F, 0x0E630, 0x0E631, 0x01CDF, 0x00E60, 0x00399, + 0x000E7, 0x0001D, 0x00000, 0x00001, 0x00001, 0x00001, 0x00002, 0x00006, + 0x00002, 0x00007, 0x00006, 0x0000F, 0x00038, 0x00072, 0x0039A, 0x0E6C4, + 0x0E6C5, 0x0E6C6, 0x0E6C7, 0x0E6C8, 0x0E6C9, 0x0E6CA, 0x0E6CB, 0x0E6CC, + 0x0E6CD, 0x0E6CE, 0x0E6CF, 0x0E6D0, 0x0E6D1, 0x0E6D2, 0x0E6D3, 0x0E6D4, + 0x0E6D5, 0x0E6D6, 0x0E6D7, 0x0E6D8, 0x0E6D9, 0x0E6DA, 0x0E6DB, 0x0E6DC, + 0x0E6DD, 0x0E6DE, 0x0E6DF, 0x0E6E0, 0x0E6E1, 0x0E6E2, 0x0E6E3, 0x0E6E4, + 0x0E6E5, 0x0E6E6, 0x0E6E7, 0x0E6E8, 0x0E6E9, 0x0E6EA, 0x0E6EB, 0x0E6EC, + 0x0E6ED, 0x0E6EE, 0x0E6EF, 0x0E6F0, 0x0E6F1, 0x0E6F2, 0x0E6F3, 0x0E6F4, + 0x0E6F5, }; + static const uint8_t ff_wma3_scale_huffbits[FF_WMA3_SCALE_SIZE] = { - 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 18, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 16, 15, 13, - 11, 8, 5, 2, 1, 3, 5, 6, - 6, 7, 7, 7, 9, 10, 13, 19, - 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, - 19, + 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 18, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 16, 15, 13, + 11, 8, 5, 2, 1, 3, 5, 6, + 6, 7, 7, 7, 9, 10, 13, 19, + 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19, 19, + 19, }; #define FF_WMA3_COEF0_SIZE 244 #define FF_WMA3_COEF0_MAXBITS 22 static const uint32_t ff_wma3_coef0_huffcodes[FF_WMA3_COEF0_SIZE] = { - 0x0001E2, 0x00007F, 0x000000, 0x000002, 0x000008, 0x00000E, 0x000019, 0x00002F, - 0x000037, 0x000060, 0x00006C, 0x000095, 0x0000C6, 0x0000F0, 0x00012E, 0x000189, - 0x0001A5, 0x0001F8, 0x000253, 0x00030A, 0x000344, 0x00034D, 0x0003F2, 0x0004BD, - 0x0005D7, 0x00062A, 0x00068B, 0x000693, 0x000797, 0x00097D, 0x000BAB, 0x000C52, - 0x000C5E, 0x000D21, 0x000D20, 0x000F1A, 0x000FCE, 0x000FD1, 0x0012F1, 0x001759, - 0x0018AC, 0x0018A7, 0x0018BF, 0x001A2B, 0x001E52, 0x001E50, 0x001E31, 0x001FB8, - 0x0025E6, 0x0025E7, 0x002EB4, 0x002EB7, 0x003169, 0x00315B, 0x00317C, 0x00316C, - 0x0034CA, 0x00348D, 0x003F40, 0x003CA2, 0x003F76, 0x004BC3, 0x004BE5, 0x003F73, - 0x004BF8, 0x004BF9, 0x006131, 0x00628B, 0x006289, 0x0062DA, 0x00628A, 0x0062D4, - 0x006997, 0x0062B4, 0x006918, 0x00794D, 0x007E7B, 0x007E87, 0x007EEA, 0x00794E, - 0x00699D, 0x007967, 0x00699F, 0x0062DB, 0x007E7A, 0x007EEB, 0x00BAC0, 0x0097C9, - 0x00C537, 0x00C5AB, 0x00D233, 0x00D338, 0x00BAC1, 0x00D23D, 0x012F91, 0x00D339, - 0x00FDC8, 0x00D23C, 0x00FDDC, 0x00FDC9, 0x00FDDD, 0x00D33C, 0x000003, 0x000016, - 0x00003E, 0x0000C3, 0x0001A1, 0x000347, 0x00062E, 0x000BAA, 0x000F2D, 0x001A2A, - 0x001E58, 0x00309B, 0x003CA3, 0x005D6A, 0x00629A, 0x006996, 0x00794F, 0x007EE5, - 0x00BAD7, 0x00C5AA, 0x00C5F4, 0x00FDDF, 0x00FDDE, 0x018A20, 0x018A6D, 0x01A67B, - 0x01A464, 0x025F21, 0x01F9E2, 0x01F9E3, 0x00000A, 0x00003D, 0x000128, 0x0003C7, - 0x000C24, 0x0018A3, 0x002EB1, 0x003CB2, 0x00691F, 0x007E79, 0x000013, 0x0000BB, - 0x00034E, 0x000D14, 0x0025FD, 0x004BE7, 0x000024, 0x000188, 0x0007EF, 0x000035, - 0x000308, 0x0012F2, 0x00005C, 0x0003F6, 0x0025E0, 0x00006D, 0x000698, 0x000096, - 0x000C25, 0x0000C7, 0x000F1B, 0x0000F3, 0x0012FF, 0x000174, 0x001A66, 0x0001A0, - 0x003099, 0x0001E4, 0x00316B, 0x000252, 0x003F31, 0x00030B, 0x004BE6, 0x000346, - 0x0062FB, 0x00034F, 0x007966, 0x0003F5, 0x007E86, 0x0005D4, 0x00C511, 0x00062C, - 0x00C5F5, 0x000692, 0x00F299, 0x000795, 0x00F298, 0x0007E9, 0x018A21, 0x00097E, - 0x0175AD, 0x000C27, 0x01A67A, 0x000C57, 0x02EB59, 0x000D22, 0x0314D9, 0x000F19, - 0x03F3C2, 0x000FCD, 0x0348CB, 0x0012F8, 0x04BE41, 0x0018A0, 0x03F3C1, 0x0018A1, - 0x04BE40, 0x0018B7, 0x0629B0, 0x001A64, 0x0D2329, 0x001E30, 0x03F3C3, 0x001F9F, - 0x0BAD62, 0x001F99, 0x0FCF00, 0x00309A, 0x0629B1, 0x002EB6, 0x175AC3, 0x00314C, - 0x069195, 0x003168, 0x0BAD63, 0x00348E, 0x175AC1, 0x003F30, 0x07E781, 0x003F41, - 0x0D2328, 0x003F42, 0x1F9E03, 0x004BC2, 0x175AC2, 0x003F74, 0x175AC0, 0x005D61, - 0x3F3C05, 0x006130, 0x3F3C04, 0x0062B5, + 0x0001E2, 0x00007F, 0x000000, 0x000002, 0x000008, 0x00000E, 0x000019, + 0x00002F, 0x000037, 0x000060, 0x00006C, 0x000095, 0x0000C6, 0x0000F0, + 0x00012E, 0x000189, 0x0001A5, 0x0001F8, 0x000253, 0x00030A, 0x000344, + 0x00034D, 0x0003F2, 0x0004BD, 0x0005D7, 0x00062A, 0x00068B, 0x000693, + 0x000797, 0x00097D, 0x000BAB, 0x000C52, 0x000C5E, 0x000D21, 0x000D20, + 0x000F1A, 0x000FCE, 0x000FD1, 0x0012F1, 0x001759, 0x0018AC, 0x0018A7, + 0x0018BF, 0x001A2B, 0x001E52, 0x001E50, 0x001E31, 0x001FB8, 0x0025E6, + 0x0025E7, 0x002EB4, 0x002EB7, 0x003169, 0x00315B, 0x00317C, 0x00316C, + 0x0034CA, 0x00348D, 0x003F40, 0x003CA2, 0x003F76, 0x004BC3, 0x004BE5, + 0x003F73, 0x004BF8, 0x004BF9, 0x006131, 0x00628B, 0x006289, 0x0062DA, + 0x00628A, 0x0062D4, 0x006997, 0x0062B4, 0x006918, 0x00794D, 0x007E7B, + 0x007E87, 0x007EEA, 0x00794E, 0x00699D, 0x007967, 0x00699F, 0x0062DB, + 0x007E7A, 0x007EEB, 0x00BAC0, 0x0097C9, 0x00C537, 0x00C5AB, 0x00D233, + 0x00D338, 0x00BAC1, 0x00D23D, 0x012F91, 0x00D339, 0x00FDC8, 0x00D23C, + 0x00FDDC, 0x00FDC9, 0x00FDDD, 0x00D33C, 0x000003, 0x000016, 0x00003E, + 0x0000C3, 0x0001A1, 0x000347, 0x00062E, 0x000BAA, 0x000F2D, 0x001A2A, + 0x001E58, 0x00309B, 0x003CA3, 0x005D6A, 0x00629A, 0x006996, 0x00794F, + 0x007EE5, 0x00BAD7, 0x00C5AA, 0x00C5F4, 0x00FDDF, 0x00FDDE, 0x018A20, + 0x018A6D, 0x01A67B, 0x01A464, 0x025F21, 0x01F9E2, 0x01F9E3, 0x00000A, + 0x00003D, 0x000128, 0x0003C7, 0x000C24, 0x0018A3, 0x002EB1, 0x003CB2, + 0x00691F, 0x007E79, 0x000013, 0x0000BB, 0x00034E, 0x000D14, 0x0025FD, + 0x004BE7, 0x000024, 0x000188, 0x0007EF, 0x000035, 0x000308, 0x0012F2, + 0x00005C, 0x0003F6, 0x0025E0, 0x00006D, 0x000698, 0x000096, 0x000C25, + 0x0000C7, 0x000F1B, 0x0000F3, 0x0012FF, 0x000174, 0x001A66, 0x0001A0, + 0x003099, 0x0001E4, 0x00316B, 0x000252, 0x003F31, 0x00030B, 0x004BE6, + 0x000346, 0x0062FB, 0x00034F, 0x007966, 0x0003F5, 0x007E86, 0x0005D4, + 0x00C511, 0x00062C, 0x00C5F5, 0x000692, 0x00F299, 0x000795, 0x00F298, + 0x0007E9, 0x018A21, 0x00097E, 0x0175AD, 0x000C27, 0x01A67A, 0x000C57, + 0x02EB59, 0x000D22, 0x0314D9, 0x000F19, 0x03F3C2, 0x000FCD, 0x0348CB, + 0x0012F8, 0x04BE41, 0x0018A0, 0x03F3C1, 0x0018A1, 0x04BE40, 0x0018B7, + 0x0629B0, 0x001A64, 0x0D2329, 0x001E30, 0x03F3C3, 0x001F9F, 0x0BAD62, + 0x001F99, 0x0FCF00, 0x00309A, 0x0629B1, 0x002EB6, 0x175AC3, 0x00314C, + 0x069195, 0x003168, 0x0BAD63, 0x00348E, 0x175AC1, 0x003F30, 0x07E781, + 0x003F41, 0x0D2328, 0x003F42, 0x1F9E03, 0x004BC2, 0x175AC2, 0x003F74, + 0x175AC0, 0x005D61, 0x3F3C05, 0x006130, 0x3F3C04, 0x0062B5, }; + static const uint8_t ff_wma3_coef0_huffbits[FF_WMA3_COEF0_SIZE] = { - 9, 7, 2, 3, 4, 4, 5, 6, - 6, 7, 7, 8, 8, 8, 9, 9, - 9, 9, 10, 10, 10, 10, 10, 11, - 11, 11, 11, 11, 11, 12, 12, 12, - 12, 12, 12, 12, 12, 12, 13, 13, - 13, 13, 13, 13, 13, 13, 13, 13, - 14, 14, 14, 14, 14, 14, 14, 14, - 14, 14, 14, 14, 14, 15, 15, 14, - 15, 15, 15, 15, 15, 15, 15, 15, - 15, 15, 15, 15, 15, 15, 15, 15, - 15, 15, 15, 15, 15, 15, 16, 16, - 16, 16, 16, 16, 16, 16, 17, 16, - 16, 16, 16, 16, 16, 16, 3, 5, - 6, 8, 9, 10, 11, 12, 12, 13, - 13, 14, 14, 15, 15, 15, 15, 15, - 16, 16, 16, 16, 16, 17, 17, 17, - 17, 18, 17, 17, 4, 6, 9, 10, - 12, 13, 14, 14, 15, 15, 5, 8, - 10, 12, 14, 15, 6, 9, 11, 6, - 10, 13, 7, 10, 14, 7, 11, 8, - 12, 8, 12, 8, 13, 9, 13, 9, - 14, 9, 14, 10, 14, 10, 15, 10, - 15, 10, 15, 10, 15, 11, 16, 11, - 16, 11, 16, 11, 16, 11, 17, 12, - 17, 12, 17, 12, 18, 12, 18, 12, - 18, 12, 18, 13, 19, 13, 18, 13, - 19, 13, 19, 13, 20, 13, 18, 13, - 20, 13, 20, 14, 19, 14, 21, 14, - 19, 14, 20, 14, 21, 14, 19, 14, - 20, 14, 21, 15, 21, 14, 21, 15, - 22, 15, 22, 15, + 9, 7, 2, 3, 4, 4, 5, + 6, 6, 7, 7, 8, 8, 8, + 9, 9, 9, 9, 10, 10, 10, + 10, 10, 11, 11, 11, 11, 11, + 11, 12, 12, 12, 12, 12, 12, + 12, 12, 12, 13, 13, 13, 13, + 13, 13, 13, 13, 13, 13, 14, + 14, 14, 14, 14, 14, 14, 14, + 14, 14, 14, 14, 14, 15, 15, + 14, 15, 15, 15, 15, 15, 15, + 15, 15, 15, 15, 15, 15, 15, + 15, 15, 15, 15, 15, 15, 15, + 15, 15, 16, 16, 16, 16, 16, + 16, 16, 16, 17, 16, 16, 16, + 16, 16, 16, 16, 3, 5, 6, + 8, 9, 10, 11, 12, 12, 13, + 13, 14, 14, 15, 15, 15, 15, + 15, 16, 16, 16, 16, 16, 17, + 17, 17, 17, 18, 17, 17, 4, + 6, 9, 10, 12, 13, 14, 14, + 15, 15, 5, 8, 10, 12, 14, + 15, 6, 9, 11, 6, 10, 13, + 7, 10, 14, 7, 11, 8, 12, + 8, 12, 8, 13, 9, 13, 9, + 14, 9, 14, 10, 14, 10, 15, + 10, 15, 10, 15, 10, 15, 11, + 16, 11, 16, 11, 16, 11, 16, + 11, 17, 12, 17, 12, 17, 12, + 18, 12, 18, 12, 18, 12, 18, + 13, 19, 13, 18, 13, 19, 13, + 19, 13, 20, 13, 18, 13, 20, + 13, 20, 14, 19, 14, 21, 14, + 19, 14, 20, 14, 21, 14, 19, + 14, 20, 14, 21, 15, 21, 14, + 21, 15, 22, 15, 22, 15, }; - #define FF_WMA3_COEF1_SIZE 272 #define FF_WMA3_COEF1_MAXBITS 21 static const uint32_t ff_wma3_coef1_huffcodes[FF_WMA3_COEF1_SIZE] = { - 0x00004A, 0x00002B, 0x000000, 0x000003, 0x000006, 0x000009, 0x00000F, 0x000010, - 0x000016, 0x000011, 0x000016, 0x000028, 0x00002F, 0x000026, 0x000029, 0x000045, - 0x000055, 0x00005D, 0x000042, 0x00004E, 0x000051, 0x00005E, 0x00008D, 0x0000A8, - 0x0000AD, 0x000080, 0x000096, 0x00009F, 0x0000AA, 0x0000BE, 0x00011C, 0x000153, - 0x000158, 0x000170, 0x000104, 0x00010D, 0x000105, 0x000103, 0x00012F, 0x000177, - 0x000175, 0x000157, 0x000174, 0x000225, 0x00023B, 0x00020D, 0x00021F, 0x000281, - 0x00027B, 0x000282, 0x0002AC, 0x0002FD, 0x00044F, 0x000478, 0x00044D, 0x0002EC, - 0x00044E, 0x000564, 0x000409, 0x00040B, 0x000501, 0x000545, 0x0004F3, 0x000541, - 0x00043B, 0x0004F1, 0x0004F4, 0x0008FD, 0x000A94, 0x000811, 0x000B88, 0x000B91, - 0x000B93, 0x0008EA, 0x000899, 0x000B8A, 0x000972, 0x0009E5, 0x000A8F, 0x000A84, - 0x000A8E, 0x000A00, 0x000830, 0x0008E8, 0x000B95, 0x000871, 0x00083A, 0x000814, - 0x000873, 0x000BFE, 0x001728, 0x001595, 0x001712, 0x00102A, 0x001021, 0x001729, - 0x00152E, 0x0013C3, 0x001721, 0x001597, 0x00151B, 0x0010F2, 0x001403, 0x001703, - 0x001503, 0x001708, 0x0013C1, 0x00170E, 0x00170C, 0x0010E1, 0x0011EA, 0x001020, - 0x001500, 0x0017FA, 0x001704, 0x001705, 0x0017F0, 0x0017FB, 0x0021E6, 0x002B2D, - 0x0020C6, 0x002B29, 0x002E4A, 0x0023AC, 0x001519, 0x0023F3, 0x002B2C, 0x0021C0, - 0x0017FE, 0x0023D7, 0x0017F9, 0x0012E7, 0x0013C0, 0x002261, 0x0023D3, 0x002057, - 0x002056, 0x0021D2, 0x0020C7, 0x0023D2, 0x0020EC, 0x0044C0, 0x002FE2, 0x00475B, - 0x002A03, 0x002FE3, 0x0021E2, 0x0021D0, 0x002A31, 0x002E13, 0x002E05, 0x0047E5, - 0x00000E, 0x000024, 0x000088, 0x0000B9, 0x00010C, 0x000224, 0x0002B3, 0x000283, - 0x0002ED, 0x00047B, 0x00041E, 0x00043D, 0x0004F5, 0x0005FD, 0x000A92, 0x000B96, - 0x000838, 0x000971, 0x000B83, 0x000B80, 0x000BF9, 0x0011D3, 0x0011E8, 0x0011D7, - 0x001527, 0x0011F8, 0x001073, 0x0010F0, 0x0010E4, 0x0017F8, 0x001062, 0x001402, - 0x0017E3, 0x00151A, 0x001077, 0x00152B, 0x00170D, 0x0021D3, 0x002E41, 0x0013C2, - 0x000029, 0x0000A9, 0x00025D, 0x000419, 0x000544, 0x000B8B, 0x0009E4, 0x0011D2, - 0x001526, 0x001724, 0x0012E6, 0x00150B, 0x0017FF, 0x002E26, 0x002E4B, 0x002B28, - 0x0021E3, 0x002A14, 0x00475A, 0x002E12, 0x000057, 0x00023E, 0x000A90, 0x000BF0, - 0x001072, 0x001502, 0x0023D6, 0x0020ED, 0x002A30, 0x0044C7, 0x00008C, 0x00047F, - 0x00152A, 0x002262, 0x002E04, 0x0000A1, 0x0005F9, 0x000173, 0x000875, 0x000171, - 0x00152D, 0x0002E3, 0x0017E2, 0x0002AD, 0x0021C1, 0x000479, 0x0021E7, 0x00041F, - 0x005C4E, 0x000543, 0x005C4F, 0x000A91, 0x00898D, 0x000B97, 0x008746, 0x000970, - 0x008745, 0x000B85, 0x00A856, 0x00152F, 0x010E8E, 0x0010E5, 0x00A857, 0x00170F, - 0x021D11, 0x002A58, 0x010E8F, 0x002E40, 0x021D13, 0x002A59, 0x043A25, 0x002A02, - 0x043A21, 0x0044C1, 0x087448, 0x0047E4, 0x043A20, 0x00542A, 0x087449, 0x00898C, - + 0x00004A, 0x00002B, 0x000000, 0x000003, 0x000006, 0x000009, 0x00000F, + 0x000010, 0x000016, 0x000011, 0x000016, 0x000028, 0x00002F, 0x000026, + 0x000029, 0x000045, 0x000055, 0x00005D, 0x000042, 0x00004E, 0x000051, + 0x00005E, 0x00008D, 0x0000A8, 0x0000AD, 0x000080, 0x000096, 0x00009F, + 0x0000AA, 0x0000BE, 0x00011C, 0x000153, 0x000158, 0x000170, 0x000104, + 0x00010D, 0x000105, 0x000103, 0x00012F, 0x000177, 0x000175, 0x000157, + 0x000174, 0x000225, 0x00023B, 0x00020D, 0x00021F, 0x000281, 0x00027B, + 0x000282, 0x0002AC, 0x0002FD, 0x00044F, 0x000478, 0x00044D, 0x0002EC, + 0x00044E, 0x000564, 0x000409, 0x00040B, 0x000501, 0x000545, 0x0004F3, + 0x000541, 0x00043B, 0x0004F1, 0x0004F4, 0x0008FD, 0x000A94, 0x000811, + 0x000B88, 0x000B91, 0x000B93, 0x0008EA, 0x000899, 0x000B8A, 0x000972, + 0x0009E5, 0x000A8F, 0x000A84, 0x000A8E, 0x000A00, 0x000830, 0x0008E8, + 0x000B95, 0x000871, 0x00083A, 0x000814, 0x000873, 0x000BFE, 0x001728, + 0x001595, 0x001712, 0x00102A, 0x001021, 0x001729, 0x00152E, 0x0013C3, + 0x001721, 0x001597, 0x00151B, 0x0010F2, 0x001403, 0x001703, 0x001503, + 0x001708, 0x0013C1, 0x00170E, 0x00170C, 0x0010E1, 0x0011EA, 0x001020, + 0x001500, 0x0017FA, 0x001704, 0x001705, 0x0017F0, 0x0017FB, 0x0021E6, + 0x002B2D, 0x0020C6, 0x002B29, 0x002E4A, 0x0023AC, 0x001519, 0x0023F3, + 0x002B2C, 0x0021C0, 0x0017FE, 0x0023D7, 0x0017F9, 0x0012E7, 0x0013C0, + 0x002261, 0x0023D3, 0x002057, 0x002056, 0x0021D2, 0x0020C7, 0x0023D2, + 0x0020EC, 0x0044C0, 0x002FE2, 0x00475B, 0x002A03, 0x002FE3, 0x0021E2, + 0x0021D0, 0x002A31, 0x002E13, 0x002E05, 0x0047E5, 0x00000E, 0x000024, + 0x000088, 0x0000B9, 0x00010C, 0x000224, 0x0002B3, 0x000283, 0x0002ED, + 0x00047B, 0x00041E, 0x00043D, 0x0004F5, 0x0005FD, 0x000A92, 0x000B96, + 0x000838, 0x000971, 0x000B83, 0x000B80, 0x000BF9, 0x0011D3, 0x0011E8, + 0x0011D7, 0x001527, 0x0011F8, 0x001073, 0x0010F0, 0x0010E4, 0x0017F8, + 0x001062, 0x001402, 0x0017E3, 0x00151A, 0x001077, 0x00152B, 0x00170D, + 0x0021D3, 0x002E41, 0x0013C2, 0x000029, 0x0000A9, 0x00025D, 0x000419, + 0x000544, 0x000B8B, 0x0009E4, 0x0011D2, 0x001526, 0x001724, 0x0012E6, + 0x00150B, 0x0017FF, 0x002E26, 0x002E4B, 0x002B28, 0x0021E3, 0x002A14, + 0x00475A, 0x002E12, 0x000057, 0x00023E, 0x000A90, 0x000BF0, 0x001072, + 0x001502, 0x0023D6, 0x0020ED, 0x002A30, 0x0044C7, 0x00008C, 0x00047F, + 0x00152A, 0x002262, 0x002E04, 0x0000A1, 0x0005F9, 0x000173, 0x000875, + 0x000171, 0x00152D, 0x0002E3, 0x0017E2, 0x0002AD, 0x0021C1, 0x000479, + 0x0021E7, 0x00041F, 0x005C4E, 0x000543, 0x005C4F, 0x000A91, 0x00898D, + 0x000B97, 0x008746, 0x000970, 0x008745, 0x000B85, 0x00A856, 0x00152F, + 0x010E8E, 0x0010E5, 0x00A857, 0x00170F, 0x021D11, 0x002A58, 0x010E8F, + 0x002E40, 0x021D13, 0x002A59, 0x043A25, 0x002A02, 0x043A21, 0x0044C1, + 0x087448, 0x0047E4, 0x043A20, 0x00542A, 0x087449, 0x00898C, }; -static const uint8_t ff_wma3_coef1_huffbits[FF_WMA3_COEF1_SIZE] = { - 8, 7, 2, 3, 3, 4, 4, 5, - 5, 6, 6, 6, 6, 7, 7, 7, - 7, 7, 8, 8, 8, 8, 8, 8, - 8, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 11, 11, 11, - 11, 11, 11, 11, 11, 11, 11, 11, - 11, 11, 12, 12, 12, 12, 12, 12, - 12, 12, 12, 12, 12, 13, 12, 12, - 12, 12, 12, 12, 13, 13, 13, 13, - 13, 13, 13, 12, 12, 13, 13, 13, - 13, 13, 13, 13, 13, 14, 14, 13, - 13, 14, 13, 13, 14, 14, 14, 14, - 14, 14, 14, 14, 14, 14, 13, 14, - 14, 14, 14, 14, 14, 14, 15, 14, - 15, 14, 14, 14, 14, 14, 14, 15, - 14, 14, 14, 14, 14, 14, 14, 15, - 15, 15, 15, 14, 15, 15, 15, 15, - 15, 15, 15, 15, 15, 15, 15, 15, - 4, 7, 8, 9, 10, 10, 10, 11, - 11, 11, 12, 12, 12, 12, 12, 12, - 13, 13, 13, 13, 13, 13, 13, 13, - 13, 13, 14, 14, 14, 14, 14, 14, - 14, 14, 14, 13, 14, 15, 14, 14, - 6, 9, 11, 12, 12, 12, 13, 13, - 13, 13, 14, 14, 14, 14, 14, 14, - 15, 15, 15, 15, 7, 10, 12, 13, - 14, 14, 14, 15, 15, 15, 8, 11, - 13, 14, 15, 9, 12, 9, 13, 10, - 13, 10, 14, 11, 15, 11, 15, 12, - 15, 12, 15, 12, 16, 12, 17, 13, - 17, 13, 17, 13, 18, 14, 17, 14, - 19, 14, 18, 14, 19, 14, 20, 15, - 20, 15, 21, 15, 20, 16, 21, 16, +static const uint8_t ff_wma3_coef1_huffbits[FF_WMA3_COEF1_SIZE] = { + 8, 7, 2, 3, 3, 4, 4, + 5, 5, 6, 6, 6, 6, 7, + 7, 7, 7, 7, 8, 8, 8, + 8, 8, 8, 8, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 10, + 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 11, 11, 11, 11, + 11, 11, 11, 11, 11, 11, 11, + 11, 11, 12, 12, 12, 12, 12, + 12, 12, 12, 12, 12, 12, 13, + 12, 12, 12, 12, 12, 12, 13, + 13, 13, 13, 13, 13, 13, 12, + 12, 13, 13, 13, 13, 13, 13, + 13, 13, 14, 14, 13, 13, 14, + 13, 13, 14, 14, 14, 14, 14, + 14, 14, 14, 14, 14, 13, 14, + 14, 14, 14, 14, 14, 14, 15, + 14, 15, 14, 14, 14, 14, 14, + 14, 15, 14, 14, 14, 14, 14, + 14, 14, 15, 15, 15, 15, 14, + 15, 15, 15, 15, 15, 15, 15, + 15, 15, 15, 15, 15, 4, 7, + 8, 9, 10, 10, 10, 11, 11, + 11, 12, 12, 12, 12, 12, 12, + 13, 13, 13, 13, 13, 13, 13, + 13, 13, 13, 14, 14, 14, 14, + 14, 14, 14, 14, 14, 13, 14, + 15, 14, 14, 6, 9, 11, 12, + 12, 12, 13, 13, 13, 13, 14, + 14, 14, 14, 14, 14, 15, 15, + 15, 15, 7, 10, 12, 13, 14, + 14, 14, 15, 15, 15, 8, 11, + 13, 14, 15, 9, 12, 9, 13, + 10, 13, 10, 14, 11, 15, 11, + 15, 12, 15, 12, 15, 12, 16, + 12, 17, 13, 17, 13, 17, 13, + 18, 14, 17, 14, 19, 14, 18, + 14, 19, 14, 20, 15, 20, 15, + 21, 15, 20, 16, 21, 16, }; - - - - #define FF_WMA3_HUFF_0_SIZE 127 #define FF_WMA3_HUFF_0_MAXBITS 14 static const uint32_t ff_wma3_huff_0_codes[FF_WMA3_HUFF_0_SIZE] = { - 0x0019, 0x0027, 0x00F2, 0x03BA, 0x0930, 0x1267, 0x0031, 0x0030, - 0x0097, 0x0221, 0x058B, 0x0124, 0x00EB, 0x01D4, 0x03D8, 0x0584, - 0x0364, 0x045F, 0x0F66, 0x0931, 0x24CD, 0x002F, 0x0039, 0x00E8, - 0x02C3, 0x078A, 0x0037, 0x0029, 0x0084, 0x01B1, 0x00ED, 0x0086, - 0x00F9, 0x03AB, 0x01EB, 0x08BC, 0x011E, 0x00F3, 0x0220, 0x058A, - 0x00EC, 0x008E, 0x012B, 0x01EA, 0x0119, 0x04B0, 0x04B1, 0x03B8, - 0x0691, 0x0365, 0x01ED, 0x049A, 0x0EA9, 0x0EA8, 0x08BD, 0x24CC, - 0x0026, 0x0035, 0x00DB, 0x02C4, 0x07B2, 0x0038, 0x002B, 0x007F, - 0x01B3, 0x00F4, 0x0091, 0x0116, 0x03BB, 0x0215, 0x0932, 0x002D, - 0x002A, 0x008A, 0x01DE, 0x0028, 0x0020, 0x005C, 0x0090, 0x0068, - 0x01EE, 0x00E9, 0x008D, 0x012A, 0x0087, 0x005D, 0x0118, 0x0349, - 0x01EF, 0x01E3, 0x08B9, 0x00F0, 0x00D3, 0x0214, 0x049B, 0x00DA, - 0x0089, 0x0125, 0x0217, 0x012D, 0x0690, 0x0094, 0x007D, 0x011F, - 0x007E, 0x0059, 0x0127, 0x01A5, 0x0111, 0x00F8, 0x045D, 0x03B9, - 0x0259, 0x0580, 0x02C1, 0x01DF, 0x0585, 0x0216, 0x0163, 0x01B0, - 0x03C4, 0x08B8, 0x078B, 0x0755, 0x0581, 0x0F67, 0x0000, + 0x0019, 0x0027, 0x00F2, 0x03BA, 0x0930, 0x1267, 0x0031, 0x0030, + 0x0097, 0x0221, 0x058B, 0x0124, 0x00EB, 0x01D4, 0x03D8, 0x0584, + 0x0364, 0x045F, 0x0F66, 0x0931, 0x24CD, 0x002F, 0x0039, 0x00E8, + 0x02C3, 0x078A, 0x0037, 0x0029, 0x0084, 0x01B1, 0x00ED, 0x0086, + 0x00F9, 0x03AB, 0x01EB, 0x08BC, 0x011E, 0x00F3, 0x0220, 0x058A, + 0x00EC, 0x008E, 0x012B, 0x01EA, 0x0119, 0x04B0, 0x04B1, 0x03B8, + 0x0691, 0x0365, 0x01ED, 0x049A, 0x0EA9, 0x0EA8, 0x08BD, 0x24CC, + 0x0026, 0x0035, 0x00DB, 0x02C4, 0x07B2, 0x0038, 0x002B, 0x007F, + 0x01B3, 0x00F4, 0x0091, 0x0116, 0x03BB, 0x0215, 0x0932, 0x002D, + 0x002A, 0x008A, 0x01DE, 0x0028, 0x0020, 0x005C, 0x0090, 0x0068, + 0x01EE, 0x00E9, 0x008D, 0x012A, 0x0087, 0x005D, 0x0118, 0x0349, + 0x01EF, 0x01E3, 0x08B9, 0x00F0, 0x00D3, 0x0214, 0x049B, 0x00DA, + 0x0089, 0x0125, 0x0217, 0x012D, 0x0690, 0x0094, 0x007D, 0x011F, + 0x007E, 0x0059, 0x0127, 0x01A5, 0x0111, 0x00F8, 0x045D, 0x03B9, + 0x0259, 0x0580, 0x02C1, 0x01DF, 0x0585, 0x0216, 0x0163, 0x01B0, + 0x03C4, 0x08B8, 0x078B, 0x0755, 0x0581, 0x0F67, 0x0000, }; + static const uint8_t ff_wma3_huff_0_bits[FF_WMA3_HUFF_0_SIZE] = { - 5, 6, 8, 10, 12, 13, 6, 6, - 8, 10, 11, 9, 8, 9, 10, 11, - 10, 11, 12, 12, 14, 6, 6, 8, - 10, 11, 6, 6, 8, 9, 8, 8, - 8, 10, 9, 12, 9, 8, 10, 11, - 8, 8, 9, 9, 9, 11, 11, 10, - 11, 10, 9, 11, 12, 12, 12, 14, - 6, 6, 8, 10, 11, 6, 6, 7, - 9, 8, 8, 9, 10, 10, 12, 6, - 6, 8, 9, 6, 6, 7, 8, 7, - 9, 8, 8, 9, 8, 7, 9, 10, - 9, 9, 12, 8, 8, 10, 11, 8, - 8, 9, 10, 9, 11, 8, 7, 9, - 7, 7, 9, 9, 9, 8, 11, 10, - 10, 11, 10, 9, 11, 10, 9, 9, - 10, 12, 11, 11, 11, 12, 1, + 5, 6, 8, 10, 12, 13, 6, 6, + 8, 10, 11, 9, 8, 9, 10, 11, + 10, 11, 12, 12, 14, 6, 6, 8, + 10, 11, 6, 6, 8, 9, 8, 8, + 8, 10, 9, 12, 9, 8, 10, 11, + 8, 8, 9, 9, 9, 11, 11, 10, + 11, 10, 9, 11, 12, 12, 12, 14, + 6, 6, 8, 10, 11, 6, 6, 7, + 9, 8, 8, 9, 10, 10, 12, 6, + 6, 8, 9, 6, 6, 7, 8, 7, + 9, 8, 8, 9, 8, 7, 9, 10, + 9, 9, 12, 8, 8, 10, 11, 8, + 8, 9, 10, 9, 11, 8, 7, 9, + 7, 7, 9, 9, 9, 8, 11, 10, + 10, 11, 10, 9, 11, 10, 9, 9, + 10, 12, 11, 11, 11, 12, 1, }; + #define FF_WMA3_HUFF_1_SIZE 137 #define FF_WMA3_HUFF_1_MAXBITS 12 static const uint32_t ff_wma3_huff_1_codes[FF_WMA3_HUFF_1_SIZE] = { - 0x055, 0x01C, 0x01A, 0x02B, 0x028, 0x067, 0x08B, 0x039, - 0x170, 0x10D, 0x2A5, 0x047, 0x464, 0x697, 0x523, 0x8CB, - 0x01B, 0x00E, 0x000, 0x010, 0x012, 0x036, 0x048, 0x04C, - 0x0C2, 0x09B, 0x171, 0x03B, 0x224, 0x34A, 0x2D6, 0x019, - 0x00F, 0x002, 0x014, 0x017, 0x006, 0x05D, 0x054, 0x0C7, - 0x0B4, 0x192, 0x10E, 0x233, 0x043, 0x02C, 0x00F, 0x013, - 0x006, 0x02F, 0x02C, 0x068, 0x077, 0x0DF, 0x111, 0x1A4, - 0x16A, 0x2A4, 0x027, 0x011, 0x018, 0x02D, 0x00F, 0x04A, - 0x040, 0x097, 0x01F, 0x11B, 0x022, 0x16D, 0x066, 0x035, - 0x005, 0x02B, 0x049, 0x009, 0x075, 0x0CB, 0x0AA, 0x187, - 0x106, 0x08A, 0x047, 0x060, 0x06E, 0x01D, 0x074, 0x0C4, - 0x01E, 0x118, 0x1A7, 0x038, 0x042, 0x053, 0x076, 0x0A8, - 0x0CA, 0x082, 0x110, 0x18D, 0x12D, 0x0B9, 0x0C8, 0x0DE, - 0x01C, 0x0AB, 0x113, 0x18C, 0x10F, 0x09A, 0x0A5, 0x0B7, - 0x11A, 0x186, 0x1A6, 0x259, 0x153, 0x18A, 0x193, 0x020, - 0x10C, 0x046, 0x03A, 0x107, 0x149, 0x16C, 0x2D7, 0x225, - 0x258, 0x316, 0x696, 0x317, 0x042, 0x522, 0x290, 0x8CA, - 0x001, + 0x055, 0x01C, 0x01A, 0x02B, 0x028, 0x067, 0x08B, 0x039, + 0x170, 0x10D, 0x2A5, 0x047, 0x464, 0x697, 0x523, 0x8CB, + 0x01B, 0x00E, 0x000, 0x010, 0x012, 0x036, 0x048, 0x04C, + 0x0C2, 0x09B, 0x171, 0x03B, 0x224, 0x34A, 0x2D6, 0x019, + 0x00F, 0x002, 0x014, 0x017, 0x006, 0x05D, 0x054, 0x0C7, + 0x0B4, 0x192, 0x10E, 0x233, 0x043, 0x02C, 0x00F, 0x013, + 0x006, 0x02F, 0x02C, 0x068, 0x077, 0x0DF, 0x111, 0x1A4, + 0x16A, 0x2A4, 0x027, 0x011, 0x018, 0x02D, 0x00F, 0x04A, + 0x040, 0x097, 0x01F, 0x11B, 0x022, 0x16D, 0x066, 0x035, + 0x005, 0x02B, 0x049, 0x009, 0x075, 0x0CB, 0x0AA, 0x187, + 0x106, 0x08A, 0x047, 0x060, 0x06E, 0x01D, 0x074, 0x0C4, + 0x01E, 0x118, 0x1A7, 0x038, 0x042, 0x053, 0x076, 0x0A8, + 0x0CA, 0x082, 0x110, 0x18D, 0x12D, 0x0B9, 0x0C8, 0x0DE, + 0x01C, 0x0AB, 0x113, 0x18C, 0x10F, 0x09A, 0x0A5, 0x0B7, + 0x11A, 0x186, 0x1A6, 0x259, 0x153, 0x18A, 0x193, 0x020, + 0x10C, 0x046, 0x03A, 0x107, 0x149, 0x16C, 0x2D7, 0x225, + 0x258, 0x316, 0x696, 0x317, 0x042, 0x522, 0x290, 0x8CA, + 0x001, }; + static const uint8_t ff_wma3_huff_1_bits[FF_WMA3_HUFF_1_SIZE] = { - 7, 6, 6, 6, 7, 7, 8, 9, - 9, 10, 10, 11, 11, 11, 12, 12, - 6, 4, 5, 5, 6, 6, 7, 8, - 8, 9, 9, 10, 10, 10, 11, 6, - 4, 5, 5, 6, 7, 7, 8, 8, - 9, 9, 10, 10, 11, 6, 5, 5, - 6, 6, 7, 7, 8, 8, 9, 9, - 10, 10, 7, 6, 6, 6, 7, 7, - 8, 8, 9, 9, 10, 10, 7, 6, - 7, 7, 7, 8, 8, 8, 9, 9, - 10, 8, 7, 7, 7, 8, 8, 8, - 9, 9, 9, 9, 8, 8, 8, 8, - 8, 9, 9, 9, 9, 8, 8, 8, - 9, 9, 9, 9, 10, 9, 9, 9, - 9, 9, 9, 10, 9, 9, 9, 10, - 10, 11, 10, 10, 10, 10, 11, 10, - 10, 10, 11, 10, 11, 12, 11, 12, - 3, + 7, 6, 6, 6, 7, 7, 8, 9, + 9, 10, 10, 11, 11, 11, 12, 12, + 6, 4, 5, 5, 6, 6, 7, 8, + 8, 9, 9, 10, 10, 10, 11, 6, + 4, 5, 5, 6, 7, 7, 8, 8, + 9, 9, 10, 10, 11, 6, 5, 5, + 6, 6, 7, 7, 8, 8, 9, 9, + 10, 10, 7, 6, 6, 6, 7, 7, + 8, 8, 9, 9, 10, 10, 7, 6, + 7, 7, 7, 8, 8, 8, 9, 9, + 10, 8, 7, 7, 7, 8, 8, 8, + 9, 9, 9, 9, 8, 8, 8, 8, + 8, 9, 9, 9, 9, 8, 8, 8, + 9, 9, 9, 9, 10, 9, 9, 9, + 9, 9, 9, 10, 9, 9, 9, 10, + 10, 11, 10, 10, 10, 10, 11, 10, + 10, 10, 11, 10, 11, 12, 11, 12, + 3, }; - #define FF_WMA3_HUFF_2_SIZE 101 #define FF_WMA3_HUFF_2_MAXBITS 11 static const uint32_t ff_wma3_huff_2_codes[FF_WMA3_HUFF_2_SIZE] = { - 0x01A, 0x003, 0x017, 0x010, 0x00C, 0x009, 0x005, 0x000, - 0x00D, 0x00A, 0x009, 0x00C, 0x00F, 0x002, 0x004, 0x007, - 0x00B, 0x00F, 0x01C, 0x006, 0x010, 0x015, 0x01C, 0x022, - 0x03B, 0x00E, 0x019, 0x023, 0x034, 0x036, 0x03A, 0x047, - 0x008, 0x00A, 0x01E, 0x031, 0x037, 0x050, 0x053, 0x06B, - 0x06F, 0x08C, 0x0E8, 0x0EA, 0x0EB, 0x016, 0x03E, 0x03F, - 0x06C, 0x089, 0x08A, 0x0A3, 0x0A4, 0x0D4, 0x0DD, 0x0EC, - 0x0EE, 0x11A, 0x1D2, 0x024, 0x025, 0x02E, 0x027, 0x0C2, - 0x0C0, 0x0DA, 0x0DB, 0x111, 0x144, 0x116, 0x14A, 0x145, - 0x1B8, 0x1AB, 0x1DA, 0x1DE, 0x1DB, 0x1DF, 0x236, 0x237, - 0x3A6, 0x3A7, 0x04D, 0x04C, 0x05E, 0x05F, 0x183, 0x182, - 0x186, 0x221, 0x187, 0x220, 0x22E, 0x22F, 0x296, 0x354, - 0x297, 0x355, 0x372, 0x373, 0x016, + 0x01A, 0x003, 0x017, 0x010, 0x00C, 0x009, 0x005, 0x000, + 0x00D, 0x00A, 0x009, 0x00C, 0x00F, 0x002, 0x004, 0x007, + 0x00B, 0x00F, 0x01C, 0x006, 0x010, 0x015, 0x01C, 0x022, + 0x03B, 0x00E, 0x019, 0x023, 0x034, 0x036, 0x03A, 0x047, + 0x008, 0x00A, 0x01E, 0x031, 0x037, 0x050, 0x053, 0x06B, + 0x06F, 0x08C, 0x0E8, 0x0EA, 0x0EB, 0x016, 0x03E, 0x03F, + 0x06C, 0x089, 0x08A, 0x0A3, 0x0A4, 0x0D4, 0x0DD, 0x0EC, + 0x0EE, 0x11A, 0x1D2, 0x024, 0x025, 0x02E, 0x027, 0x0C2, + 0x0C0, 0x0DA, 0x0DB, 0x111, 0x144, 0x116, 0x14A, 0x145, + 0x1B8, 0x1AB, 0x1DA, 0x1DE, 0x1DB, 0x1DF, 0x236, 0x237, + 0x3A6, 0x3A7, 0x04D, 0x04C, 0x05E, 0x05F, 0x183, 0x182, + 0x186, 0x221, 0x187, 0x220, 0x22E, 0x22F, 0x296, 0x354, + 0x297, 0x355, 0x372, 0x373, 0x016, }; + static const uint8_t ff_wma3_huff_2_bits[FF_WMA3_HUFF_2_SIZE] = { - 7, 6, 5, 5, 5, 5, 5, 5, - 4, 4, 4, 4, 4, 5, 5, 5, - 5, 5, 5, 6, 6, 6, 6, 6, - 6, 7, 7, 7, 7, 7, 7, 7, - 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 11, 11, 11, 11, 11, 11, - 11, 11, 11, 11, 11, 11, 11, 11, - 11, 11, 11, 11, 5, + 7, 6, 5, 5, 5, 5, 5, 5, + 4, 4, 4, 4, 4, 5, 5, 5, + 5, 5, 5, 6, 6, 6, 6, 6, + 6, 7, 7, 7, 7, 7, 7, 7, + 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 11, 11, 11, 11, 11, 11, + 11, 11, 11, 11, 11, 11, 11, 11, + 11, 11, 11, 11, 5, }; - #define FF_WMA3_HUFF_RLC_SIZE 120 #define FF_WMA3_HUFF_RLC_MAXBITS 21 static const uint32_t ff_wma3_huff_rlc_codes[FF_WMA3_HUFF_RLC_SIZE] = { - 0x00010C, 0x000001, 0x10FE2A, 0x000003, 0x000003, 0x000001, 0x000013, 0x000020, - 0x000029, 0x000014, 0x000016, 0x000045, 0x000049, 0x00002F, 0x000042, 0x00008E, - 0x00008F, 0x000129, 0x000009, 0x00000D, 0x0004AC, 0x00002C, 0x000561, 0x0002E6, - 0x00087C, 0x0002E2, 0x00095C, 0x000018, 0x000001, 0x000016, 0x000044, 0x00002A, - 0x000007, 0x000159, 0x000143, 0x000128, 0x00015A, 0x00012D, 0x00002B, 0x0000A0, - 0x000142, 0x00012A, 0x0002EF, 0x0004AF, 0x00087D, 0x004AE9, 0x0043F9, 0x000067, - 0x000199, 0x002B05, 0x001583, 0x0021FE, 0x10FE2C, 0x000004, 0x00002E, 0x00010D, - 0x00000A, 0x000244, 0x000017, 0x000245, 0x000011, 0x00010E, 0x00012C, 0x00002A, - 0x00002F, 0x000121, 0x000046, 0x00087E, 0x0000BA, 0x000032, 0x0087F0, 0x0056DC, - 0x0002EC, 0x0043FA, 0x002B6F, 0x004AE8, 0x0002B7, 0x10FE2B, 0x000001, 0x000051, - 0x000010, 0x0002EE, 0x000B9C, 0x002576, 0x000198, 0x0056DD, 0x0000CD, 0x000AC0, - 0x000170, 0x004AEF, 0x00002D, 0x0004AD, 0x0021FF, 0x0005CF, 0x002B04, 0x10FE29, - 0x10FE28, 0x0002ED, 0x002E74, 0x021FC4, 0x004AEE, 0x010FE3, 0x087F17, 0x000000, - 0x000097, 0x0002E3, 0x000ADA, 0x002575, 0x00173B, 0x0043FB, 0x002E75, 0x10FE2D, - 0x0015B6, 0x00056C, 0x000057, 0x000123, 0x000120, 0x00021E, 0x000172, 0x0002B1, - + 0x00010C, 0x000001, 0x10FE2A, 0x000003, 0x000003, 0x000001, 0x000013, + 0x000020, 0x000029, 0x000014, 0x000016, 0x000045, 0x000049, 0x00002F, + 0x000042, 0x00008E, 0x00008F, 0x000129, 0x000009, 0x00000D, 0x0004AC, + 0x00002C, 0x000561, 0x0002E6, 0x00087C, 0x0002E2, 0x00095C, 0x000018, + 0x000001, 0x000016, 0x000044, 0x00002A, 0x000007, 0x000159, 0x000143, + 0x000128, 0x00015A, 0x00012D, 0x00002B, 0x0000A0, 0x000142, 0x00012A, + 0x0002EF, 0x0004AF, 0x00087D, 0x004AE9, 0x0043F9, 0x000067, 0x000199, + 0x002B05, 0x001583, 0x0021FE, 0x10FE2C, 0x000004, 0x00002E, 0x00010D, + 0x00000A, 0x000244, 0x000017, 0x000245, 0x000011, 0x00010E, 0x00012C, + 0x00002A, 0x00002F, 0x000121, 0x000046, 0x00087E, 0x0000BA, 0x000032, + 0x0087F0, 0x0056DC, 0x0002EC, 0x0043FA, 0x002B6F, 0x004AE8, 0x0002B7, + 0x10FE2B, 0x000001, 0x000051, 0x000010, 0x0002EE, 0x000B9C, 0x002576, + 0x000198, 0x0056DD, 0x0000CD, 0x000AC0, 0x000170, 0x004AEF, 0x00002D, + 0x0004AD, 0x0021FF, 0x0005CF, 0x002B04, 0x10FE29, 0x10FE28, 0x0002ED, + 0x002E74, 0x021FC4, 0x004AEE, 0x010FE3, 0x087F17, 0x000000, 0x000097, + 0x0002E3, 0x000ADA, 0x002575, 0x00173B, 0x0043FB, 0x002E75, 0x10FE2D, + 0x0015B6, 0x00056C, 0x000057, 0x000123, 0x000120, 0x00021E, 0x000172, + 0x0002B1, }; -static const uint8_t ff_wma3_huff_rlc_bits[FF_WMA3_HUFF_RLC_SIZE] = { - 9, 2, 21, 2, 4, 5, 5, 6, - 6, 7, 7, 7, 7, 6, 7, 8, - 8, 9, 10, 10, 11, 12, 11, 12, - 12, 12, 12, 11, 4, 5, 7, 8, - 9, 9, 9, 9, 9, 9, 8, 8, - 9, 9, 12, 11, 12, 15, 15, 13, - 15, 14, 13, 14, 21, 5, 6, 9, - 10, 10, 11, 10, 11, 9, 9, 6, - 8, 9, 7, 12, 10, 12, 16, 15, - 12, 15, 14, 15, 10, 21, 6, 7, - 11, 12, 14, 14, 15, 15, 14, 12, - 11, 15, 12, 11, 14, 13, 14, 21, - 21, 12, 16, 18, 15, 17, 20, 7, - 8, 12, 12, 14, 15, 15, 16, 21, - 13, 11, 7, 9, 9, 10, 11, 10, +static const uint8_t ff_wma3_huff_rlc_bits[FF_WMA3_HUFF_RLC_SIZE] = { + 9, 2, 21, 2, 4, 5, 5, + 6, 6, 7, 7, 7, 7, 6, + 7, 8, 8, 9, 10, 10, 11, + 12, 11, 12, 12, 12, 12, 11, + 4, 5, 7, 8, 9, 9, 9, + 9, 9, 9, 8, 8, 9, 9, + 12, 11, 12, 15, 15, 13, 15, + 14, 13, 14, 21, 5, 6, 9, + 10, 10, 11, 10, 11, 9, 9, + 6, 8, 9, 7, 12, 10, 12, + 16, 15, 12, 15, 14, 15, 10, + 21, 6, 7, 11, 12, 14, 14, + 15, 15, 14, 12, 11, 15, 12, + 11, 14, 13, 14, 21, 21, 12, + 16, 18, 15, 17, 20, 7, 8, + 12, 12, 14, 15, 15, 16, 21, + 13, 11, 7, 9, 9, 10, 11, + 10, }; + static const short ff_wma3_run_0[] = { -0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, -20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, -40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, -60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, -80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, -0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, -20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, -0, 1, 2, 3, 4, 5, 0, 1, 2, 0, 1, 2, 0, 1, 2, 0, 1, 0, 1, 0, -1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, -1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, -1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, -1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, + 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, + 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, + 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, + 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, + 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 0, 1, 2, 3, 4, 5, 6, 7, + 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, + 26, 27, 28, 29, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, + 4, 5, 0, 1, 2, 0, 1, 2, 0, 1, 2, 0, 1, 0, 1, 0, 1, 0, + 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, + 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, + 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, + 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, + 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, }; + static const short ff_wma3_level_0[] = { -1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, -1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, -1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, -1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, -1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, -2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, -4, 4, 4, 4, 4, 4, 5, 5, 5, 6, 6, 6, 7, 7, 7, 8, 8, 9, 9, 10, -10, 11, 11, 12, 12, 13, 13, 14, 14, 15, 15, 16, 16, 17, 17, 18, 18, 19, 19, 20, -20, 21, 21, 22, 22, 23, 23, 24, 24, 25, 25, 26, 26, 27, 27, 28, 28, 29, 29, 30, -30, 31, 31, 32, 32, 33, 33, 34, 34, 35, 35, 36, 36, 37, 37, 38, 38, 39, 39, 40, -40, 41, 41, 42, 42, 43, 43, 44, 44, 45, 45, 46, 46, 47, 47, 48, 48, 49, 49, 50, -51, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, + 4, 4, 5, 5, 5, 6, 6, 6, 7, 7, 7, 8, 8, 9, 9, 10, 10, 11, + 11, 12, 12, 13, 13, 14, 14, 15, 15, 16, 16, 17, 17, 18, 18, 19, 19, 20, + 20, 21, 21, 22, 22, 23, 23, 24, 24, 25, 25, 26, 26, 27, 27, 28, 28, 29, + 29, 30, 30, 31, 31, 32, 32, 33, 33, 34, 34, 35, 35, 36, 36, 37, 37, 38, + 38, 39, 39, 40, 40, 41, 41, 42, 42, 43, 43, 44, 44, 45, 45, 46, 46, 47, + 47, 48, 48, 49, 49, 50, 51, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, }; + + static const short ff_wma3_run_1[] = { -0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, -20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, -40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, -60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, -80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, -100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, -120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, -140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, -10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, -30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, -10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, -0, 1, 2, 3, 4, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, -1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, -1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 0, 0, + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, + 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, + 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, + 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, + 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, + 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, + 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, + 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, + 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, + 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, + 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 0, 1, 2, 3, + 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, + 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, + 32, 33, 34, 35, 36, 37, 38, 39, 0, 1, 2, 3, 4, 5, + 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, + 4, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, + 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, + 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, + 1, 0, 1, 0, 0, 0, }; + static const short ff_wma3_level_1[] = { -1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, -1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, -1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, -1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, -1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, -1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, -1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, -1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, -3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, -5, 5, 5, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, -13, 14, 14, 15, 15, 16, 16, 17, 17, 18, 18, 19, 19, 20, 20, 21, 21, 22, 22, 23, -23, 24, 24, 25, 25, 26, 26, 27, 27, 28, 0, 0, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, + 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, + 12, 13, 13, 14, 14, 15, 15, 16, 16, 17, 17, 18, 18, 19, + 19, 20, 20, 21, 21, 22, 22, 23, 23, 24, 24, 25, 25, 26, + 26, 27, 27, 28, 0, 0, }; -static const short ff_wma3_sym2vec4[] = { -0, 1, 2, 3, 4, 5, 16, 17, 18, 19, 20, 32, 33, 34, 35, 48, 49, 50, 64, 65, -80, 256, 257, 258, 259, 260, 272, 273, 274, 275, 288, 289, 290, 304, 305, 320, 512, 513, 514, 515, -528, 529, 530, 544, 545, 560, 768, 769, 770, 784, 785, 800, 1024, 1025, 1040, 1280, 4096, 4097, 4098, 4099, -4100, 4112, 4113, 4114, 4115, 4128, 4129, 4130, 4144, 4145, 4160, 4352, 4353, 4354, 4355, 4368, 4369, 4370, 4384, 4385, -4400, 4608, 4609, 4610, 4624, 4625, 4640, 4864, 4865, 4880, 5120, 8192, 8193, 8194, 8195, 8208, 8209, 8210, 8224, 8225, -8240, 8448, 8449, 8450, 8464, 8465, 8480, 8704, 8705, 8720, 8960, 12288, 12289, 12290, 12304, 12305, 12320, 12544, 12545, 12560, -12800, 16384, 16385, 16400, 16640, 20480, 0, 0, + +static const uint16_t ff_wma3_sym2vec4[] = { + 0, 1, 2, 3, 4, 5, 16, 17, 18, 19, + 20, 32, 33, 34, 35, 48, 49, 50, 64, 65, + 80, 256, 257, 258, 259, 260, 272, 273, 274, 275, + 288, 289, 290, 304, 305, 320, 512, 513, 514, 515, + 528, 529, 530, 544, 545, 560, 768, 769, 770, 784, + 785, 800, 1024, 1025, 1040, 1280, 4096, 4097, 4098, 4099, + 4100, 4112, 4113, 4114, 4115, 4128, 4129, 4130, 4144, 4145, + 4160, 4352, 4353, 4354, 4355, 4368, 4369, 4370, 4384, 4385, + 4400, 4608, 4609, 4610, 4624, 4625, 4640, 4864, 4865, 4880, + 5120, 8192, 8193, 8194, 8195, 8208, 8209, 8210, 8224, 8225, + 8240, 8448, 8449, 8450, 8464, 8465, 8480, 8704, 8705, 8720, + 8960, 12288, 12289, 12290, 12304, 12305, 12320, 12544, 12545, 12560, + 12800, 16384, 16385, 16400, 16640, 20480, 0, 0, }; static const uint8_t ff_wma3_sym2vec2[] = { -0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, -20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 32, 33, 34, 35, 36, 37, 38, 39, 40, -41, 42, 43, 44, 45, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 64, 65, -66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, -90, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 112, 113, 114, 115, 116, 117, 118, 119, 120, --128, -127, -126, -125, -124, -123, -122, -121, -112, -111, -110, -109, -108, -107, -106, -96, -95, -94, -93, -92, --91, -80, -79, -78, -77, -76, -64, -63, -62, -61, -48, -47, -46, -32, -31, -16, 0, 0, 0, 0, -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, + 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, + 30, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, + 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 64, 65, + 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 80, 81, 82, 83, 84, + 85, 86, 87, 88, 89, 90, 96, 97, 98, 99, 100, 101, 102, 103, 104, + 105, 112, 113, 114, 115, 116, 117, 118, 119, 120, 128, 129, 130, 131, 132, + 133, 134, 135, 144, 145, 146, 147, 148, 149, 150, 160, 161, 162, 163, 164, + 165, 176, 177, 178, 179, 180, 192, 193, 194, 195, 208, 209, 210, 224, 225, + 240, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }; + static const uint8_t ff_wma3_run_mask[] = { -0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, -19, 20, 21, 22, 23, 24, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, -14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 0, 1, 2, 3, 4, 5, 6, 7, 8, -9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 0, 1, 2, 3, -4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, -24, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 0, 1, 0, 1, 0, 1, + 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, + 18, 19, 20, 21, 22, 23, 24, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, + 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 0, 1, 2, 3, 4, 5, + 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, + 19, 20, 21, 22, 23, 24, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 0, 1, + 0, 1, 0, 1, }; + static const uint8_t ff_wma3_level_mask[] = { -1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, -3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, -4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, -5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, -5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 8, 8, 9, 9, 0, 0, -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, + 8, 8, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }; + static const float ff_wma3_default_decorrelation_matrices[] = { -1.000000, 0.707031, -0.707031, 0.707031, 0.707031, 0.578125, 0.707031, 0.410156, 0.578125, -0.707031, 0.410156, 0.578125, 0.000000, -0.816406, 0.500000, 0.652344, 0.500000, 0.269531, 0.500000, 0.269531, --0.500000, -0.652344, 0.500000, -0.269531, -0.500000, 0.652344, 0.500000, -0.652344, 0.500000, -0.269531, 0.445312, 0.601562, 0.511719, 0.371094, 0.195312, 0.445312, 0.371094, -0.195312, -0.601562, -0.511719, -0.445312, 0.000000, -0.632812, 0.000000, 0.632812, 0.445312, -0.371094, -0.195312, 0.601562, -0.511719, 0.445312, -0.601562, 0.511719, -0.371094, 0.195312, 0.410156, 0.558594, 0.500000, 0.410156, 0.289062, -0.148438, 0.410156, 0.410156, 0.000000, -0.410156, -0.578125, -0.410156, 0.410156, 0.148438, -0.500000, -0.410156, 0.289062, 0.558594, 0.410156, -0.148438, -0.500000, 0.410156, 0.289062, -0.558594, 0.410156, --0.410156, 0.000000, 0.410156, -0.578125, 0.410156, 0.410156, -0.558594, 0.500000, -0.410156, 0.289062, -0.148438, + 1.000000, 0.707031, -0.707031, 0.707031, 0.707031, 0.578125, 0.707031, + 0.410156, 0.578125, -0.707031, 0.410156, 0.578125, 0.000000, -0.816406, + 0.500000, 0.652344, 0.500000, 0.269531, 0.500000, 0.269531, -0.500000, + -0.652344, 0.500000, -0.269531, -0.500000, 0.652344, 0.500000, -0.652344, + 0.500000, -0.269531, 0.445312, 0.601562, 0.511719, 0.371094, 0.195312, + 0.445312, 0.371094, -0.195312, -0.601562, -0.511719, 0.445312, 0.000000, + -0.632812, 0.000000, 0.632812, 0.445312, -0.371094, -0.195312, 0.601562, + -0.511719, 0.445312, -0.601562, 0.511719, -0.371094, 0.195312, 0.410156, + 0.558594, 0.500000, 0.410156, 0.289062, 0.148438, 0.410156, 0.410156, + 0.000000, -0.410156, -0.578125, -0.410156, 0.410156, 0.148438, -0.500000, + -0.410156, 0.289062, 0.558594, 0.410156, -0.148438, -0.500000, 0.410156, + 0.289062, -0.558594, 0.410156, -0.410156, 0.000000, 0.410156, -0.578125, + 0.410156, 0.410156, -0.558594, 0.500000, -0.410156, 0.289062, -0.148438, }; #endif /* AVCODEC_WMA3DATA_H */

1 0

[soc]: r3955 - in dirac: decoder.diff libavcodec/dirac.c libavcodec/diracdec.c
by conrad 13 Jan '09

13 Jan '09

Author: conrad Date: Tue Jan 13 07:23:06 2009 New Revision: 3955 Log: dirac_wavelet.* isn't used in the decoder anymore Modified: dirac/decoder.diff dirac/libavcodec/dirac.c dirac/libavcodec/diracdec.c Modified: dirac/decoder.diff ============================================================================== --- dirac/decoder.diff Tue Jan 13 07:23:04 2009 (r3954) +++ dirac/decoder.diff Tue Jan 13 07:23:06 2009 (r3955) @@ -1,8 +1,8 @@ diff --git a/configure b/configure -index 605bf3f..9842825 100755 +index 8c3cafe..d1b994f 100755 --- a/configure +++ b/configure -@@ -954,6 +954,7 @@ cavs_decoder_select="golomb" +@@ -969,6 +969,7 @@ cavs_decoder_select="golomb" cook_decoder_select="fft mdct" cscd_decoder_suggest="zlib" dca_decoder_select="fft mdct" @@ -11,22 +11,22 @@ index 605bf3f..9842825 100755 dxa_decoder_select="zlib" eac3_decoder_deps="gpl" diff --git a/libavcodec/Makefile b/libavcodec/Makefile -index b7cce5f..a001cba 100644 +index f2f544c..069ba73 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile -@@ -58,6 +58,7 @@ OBJS-$(CONFIG_COOK_DECODER) += cook.o +@@ -59,6 +59,7 @@ OBJS-$(CONFIG_COOK_DECODER) += cook.o OBJS-$(CONFIG_CSCD_DECODER) += cscd.o OBJS-$(CONFIG_CYUV_DECODER) += cyuv.o OBJS-$(CONFIG_DCA_DECODER) += dca.o -+OBJS-$(CONFIG_DIRAC_DECODER) += diracdec.o dirac.o dirac_arith.o dirac_wavelet.o mpeg12data.o ++OBJS-$(CONFIG_DIRAC_DECODER) += diracdec.o dirac.o dirac_arith.o mpeg12data.o dwt.o OBJS-$(CONFIG_DNXHD_DECODER) += dnxhddec.o dnxhddata.o OBJS-$(CONFIG_DNXHD_ENCODER) += dnxhdenc.o dnxhddata.o mpegvideo_enc.o motion_est.o ratecontrol.o mpeg12data.o mpegvideo.o OBJS-$(CONFIG_DSICINAUDIO_DECODER) += dsicinav.o diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c -index d5fe8b5..fc8a12a 100644 +index d1bfff9..e05f5e8 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c -@@ -74,6 +74,7 @@ void avcodec_register_all(void) +@@ -64,6 +64,7 @@ void avcodec_register_all(void) REGISTER_DECODER (CLJR, cljr); REGISTER_DECODER (CSCD, cscd); REGISTER_DECODER (CYUV, cyuv); Modified: dirac/libavcodec/dirac.c ============================================================================== --- dirac/libavcodec/dirac.c Tue Jan 13 07:23:04 2009 (r3954) +++ dirac/libavcodec/dirac.c Tue Jan 13 07:23:06 2009 (r3955) @@ -32,7 +32,6 @@ #include "bytestream.h" #include "golomb.h" #include "dirac_arith.h" -#include "dirac_wavelet.h" #include "mpeg12data.h" /* defaults for source parameters */ Modified: dirac/libavcodec/diracdec.c ============================================================================== --- dirac/libavcodec/diracdec.c Tue Jan 13 07:23:04 2009 (r3954) +++ dirac/libavcodec/diracdec.c Tue Jan 13 07:23:06 2009 (r3955) @@ -32,7 +32,6 @@ #include "bytestream.h" #include "golomb.h" #include "dirac_arith.h" -#include "dirac_wavelet.h" #include "mpeg12data.h" #include "dwt.h"

1 0

[soc]: r3954 - dirac/libavcodec/dirac_arith.c
by conrad 13 Jan '09

13 Jan '09

Author: conrad Date: Tue Jan 13 07:23:04 2009 New Revision: 3954 Log: Schroedinger's encoder relys on all overread bits being 1 Modified: dirac/libavcodec/dirac_arith.c Modified: dirac/libavcodec/dirac_arith.c ============================================================================== --- dirac/libavcodec/dirac_arith.c Tue Jan 13 07:23:02 2009 (r3953) +++ dirac/libavcodec/dirac_arith.c Tue Jan 13 07:23:04 2009 (r3954) @@ -158,12 +158,20 @@ static inline void renorm_arith_decoder( arith->low <<= 1; arith->range <<= 1; - if (arith->bytestream < arith->bytestream_end && !--arith->counter) { - arith->low |= (arith->bytestream[0]<<8) + arith->bytestream[1]; - arith->bytestream += 2; + if (!--arith->counter) { + if (arith->bytestream < arith->bytestream_end) + arith->low |= *arith->bytestream << 8; + else + arith->low |= 0xff00; + arith->bytestream++; + + if (arith->bytestream < arith->bytestream_end) + arith->low |= *arith->bytestream; + else + arith->low |= 0xff; + arith->bytestream++; + arith->counter = 16; - } else if (arith->bytestream >= arith->bytestream_end) { - arith->low |= 1; } } }

1 0

[soc]: r3953 - dirac/libavcodec/dirac.c
by conrad 13 Jan '09

13 Jan '09

Author: conrad Date: Tue Jan 13 07:23:02 2009 New Revision: 3953 Log: Remove useless avcodec_check_dimensions check; this is already checked in ff_dirac_parse_sequence_header Modified: dirac/libavcodec/dirac.c Modified: dirac/libavcodec/dirac.c ============================================================================== --- dirac/libavcodec/dirac.c Tue Jan 13 07:23:00 2009 (r3952) +++ dirac/libavcodec/dirac.c Tue Jan 13 07:23:02 2009 (r3953) @@ -951,13 +951,6 @@ int dirac_motion_compensation(DiracConte s->refdata[i], comp, p->xblen, p->yblen); } - if (avcodec_check_dimensions(s->avctx, p->width, p->height)) { - for (i = 0; i < s->refs; i++) - av_free(s->refdata[i]); - - return -1; - } - s->mcpic = av_malloc(p->width * p->height * sizeof(int16_t)); if (!s->mcpic) { for (i = 0; i < s->refs; i++)

1 0

[soc]: r3952 - in dirac/libavcodec: dirac.c dwt.c
by conrad 13 Jan '09

13 Jan '09

Author: conrad Date: Tue Jan 13 07:23:00 2009 New Revision: 3952 Log: Remove executable property that snuck in Modified: dirac/libavcodec/dirac.c (contents, props changed) dirac/libavcodec/dwt.c (contents, props changed) Modified: dirac/libavcodec/dirac.c ============================================================================== Modified: dirac/libavcodec/dwt.c ==============================================================================

1 0

[soc]: r3951 - dirac/libavcodec/dirac_arith.c
by conrad 13 Jan '09

13 Jan '09

Author: conrad Date: Tue Jan 13 07:22:57 2009 New Revision: 3951 Log: Revert r3927; this causes an infinite loop in get_arith_uint Modified: dirac/libavcodec/dirac_arith.c Modified: dirac/libavcodec/dirac_arith.c ============================================================================== --- dirac/libavcodec/dirac_arith.c Mon Jan 12 00:33:12 2009 (r3950) +++ dirac/libavcodec/dirac_arith.c Tue Jan 13 07:22:57 2009 (r3951) @@ -162,6 +162,8 @@ static inline void renorm_arith_decoder( arith->low |= (arith->bytestream[0]<<8) + arith->bytestream[1]; arith->bytestream += 2; arith->counter = 16; + } else if (arith->bytestream >= arith->bytestream_end) { + arith->low |= 1; } } }

1 0

[soc]: r3950 - in libavfilter: checkout.sh diffs/01_ffplay_filters.diff diffs/02_ffmpeg_filters.diff
by stefano 11 Jan '09

11 Jan '09

Author: stefano Date: Mon Jan 12 00:33:12 2009 New Revision: 3950 Log: Update to FFmpeg r16562. Modified: libavfilter/checkout.sh libavfilter/diffs/01_ffplay_filters.diff libavfilter/diffs/02_ffmpeg_filters.diff Modified: libavfilter/checkout.sh ============================================================================== --- libavfilter/checkout.sh Mon Jan 12 00:23:20 2009 (r3949) +++ libavfilter/checkout.sh Mon Jan 12 00:33:12 2009 (r3950) @@ -1,7 +1,7 @@ #! /bin/sh echo "checking out pristine ffmpeg" -svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r16172 +svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r16562 echo "patching ffmpeg" for diff in $(ls $(pwd)/diffs/*.diff); do patch -d ffmpeg -p0 -i $diff; done Modified: libavfilter/diffs/01_ffplay_filters.diff ============================================================================== --- libavfilter/diffs/01_ffplay_filters.diff Mon Jan 12 00:23:20 2009 (r3949) +++ libavfilter/diffs/01_ffplay_filters.diff Mon Jan 12 00:33:12 2009 (r3950) @@ -1,6 +1,6 @@ Index: ffplay.c =================================================================== ---- ffplay.c (revision 16172) +--- ffplay.c (revision 16562) +++ ffplay.c (working copy) @@ -29,6 +29,12 @@ #include "libavcodec/audioconvert.h" @@ -59,7 +59,7 @@ Index: ffplay.c /* current context */ static int is_full_screen; -@@ -657,6 +677,13 @@ +@@ -658,6 +678,13 @@ vp = &is->pictq[is->pictq_rindex]; if (vp->bmp) { @@ -73,7 +73,7 @@ Index: ffplay.c /* XXX: use variable in the frame */ if (is->video_st->sample_aspect_ratio.num) aspect_ratio = av_q2d(is->video_st->sample_aspect_ratio); -@@ -664,9 +691,10 @@ +@@ -665,9 +692,10 @@ aspect_ratio = av_q2d(is->video_st->codec->sample_aspect_ratio); else aspect_ratio = 0; @@ -85,7 +85,7 @@ Index: ffplay.c /* if an active format is indicated, then it overrides the mpeg format */ #if 0 -@@ -869,9 +897,15 @@ +@@ -870,9 +898,15 @@ } else if(!is_full_screen && screen_width){ w = screen_width; h = screen_height; @@ -101,7 +101,7 @@ Index: ffplay.c } else { w = 640; h = 480; -@@ -1176,6 +1210,20 @@ +@@ -1177,6 +1211,20 @@ if (vp->bmp) SDL_FreeYUVOverlay(vp->bmp); @@ -122,7 +122,7 @@ Index: ffplay.c #if 0 /* XXX: use generic function */ /* XXX: disable overlay if no hardware acceleration or if RGB format */ -@@ -1193,12 +1241,9 @@ +@@ -1194,12 +1242,9 @@ break; } #endif @@ -136,7 +136,7 @@ Index: ffplay.c SDL_LockMutex(is->pictq_mutex); vp->allocated = 1; -@@ -1215,8 +1260,11 @@ +@@ -1216,8 +1261,11 @@ VideoPicture *vp; int dst_pix_fmt; AVPicture pict; @@ -149,7 +149,7 @@ Index: ffplay.c /* wait until we have space to put a new picture */ SDL_LockMutex(is->pictq_mutex); while (is->pictq_size >= VIDEO_PICTURE_QUEUE_SIZE && -@@ -1232,8 +1280,13 @@ +@@ -1233,8 +1281,13 @@ /* alloc or resize hardware picture buffer */ if (!vp->bmp || @@ -163,7 +163,7 @@ Index: ffplay.c SDL_Event event; vp->allocated = 0; -@@ -1257,6 +1310,12 @@ +@@ -1258,6 +1311,12 @@ /* if the frame is not skipped, then display it */ if (vp->bmp) { @@ -176,7 +176,7 @@ Index: ffplay.c /* get a pointer on the bitmap */ SDL_LockYUVOverlay (vp->bmp); -@@ -1268,18 +1327,30 @@ +@@ -1269,18 +1328,30 @@ pict.linesize[0] = vp->bmp->pitches[0]; pict.linesize[1] = vp->bmp->pitches[2]; pict.linesize[2] = vp->bmp->pitches[1]; @@ -211,7 +211,7 @@ Index: ffplay.c /* update the bitmap content */ SDL_UnlockYUVOverlay(vp->bmp); -@@ -1334,54 +1405,264 @@ +@@ -1335,54 +1406,264 @@ return queue_picture(is, src_frame, pts); } @@ -507,7 +507,7 @@ Index: ffplay.c av_free(frame); return 0; } -@@ -2161,6 +2442,12 @@ +@@ -2170,6 +2451,12 @@ /* free all pictures */ for(i=0;i<VIDEO_PICTURE_QUEUE_SIZE; i++) { vp = &is->pictq[i]; @@ -520,7 +520,7 @@ Index: ffplay.c if (vp->bmp) { SDL_FreeYUVOverlay(vp->bmp); vp->bmp = NULL; -@@ -2498,6 +2785,9 @@ +@@ -2507,6 +2794,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" }, @@ -530,7 +530,7 @@ Index: ffplay.c { "default", OPT_FUNC2 | HAS_ARG | OPT_AUDIO | OPT_VIDEO | OPT_EXPERT, {(void*)opt_default}, "generic catch all option", "" }, { NULL, }, }; -@@ -2546,7 +2836,9 @@ +@@ -2555,7 +2845,9 @@ avctx_opts[i]= avcodec_alloc_context2(i); } avformat_opts = av_alloc_format_context(); Modified: libavfilter/diffs/02_ffmpeg_filters.diff ============================================================================== --- libavfilter/diffs/02_ffmpeg_filters.diff Mon Jan 12 00:23:20 2009 (r3949) +++ libavfilter/diffs/02_ffmpeg_filters.diff Mon Jan 12 00:33:12 2009 (r3950) @@ -1,6 +1,6 @@ Index: ffmpeg.c =================================================================== ---- ffmpeg.c (revision 16172) +--- ffmpeg.c (revision 16562) +++ ffmpeg.c (working copy) @@ -41,6 +41,13 @@ #include "libavutil/avstring.h" @@ -26,7 +26,7 @@ Index: ffmpeg.c static int intra_only = 0; static int audio_sample_rate = 44100; -@@ -285,6 +295,13 @@ +@@ -286,6 +296,13 @@ is not defined */ int64_t pts; /* current pts */ int is_start; /* is 1 at the start and after a discontinuity */ @@ -40,7 +40,7 @@ Index: ffmpeg.c } AVInputStream; typedef struct AVInputFile { -@@ -300,6 +317,174 @@ +@@ -301,6 +318,174 @@ static struct termios oldtty; #endif @@ -215,7 +215,7 @@ Index: ffmpeg.c static void term_exit(void) { #ifdef HAVE_TERMIOS_H -@@ -869,6 +1054,9 @@ +@@ -886,6 +1071,9 @@ if (nb_frames <= 0) return; @@ -225,7 +225,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) { av_log(NULL, AV_LOG_ERROR, "error cropping picture\n"); -@@ -880,6 +1068,7 @@ +@@ -897,6 +1085,7 @@ } else { formatted_picture = in_picture; } @@ -233,7 +233,7 @@ Index: ffmpeg.c final_picture = formatted_picture; padding_src = formatted_picture; -@@ -897,12 +1086,14 @@ +@@ -914,12 +1103,14 @@ } } @@ -248,7 +248,7 @@ Index: ffmpeg.c if (ost->video_pad) { av_picture_pad((AVPicture*)final_picture, (AVPicture *)padding_src, -@@ -1173,6 +1364,7 @@ +@@ -1190,6 +1381,7 @@ static short *samples= NULL; AVSubtitle subtitle, *subtitle_to_free; int got_subtitle; @@ -256,7 +256,7 @@ Index: ffmpeg.c if(ist->next_pts == AV_NOPTS_VALUE) ist->next_pts= ist->pts; -@@ -1290,6 +1482,15 @@ +@@ -1307,6 +1499,15 @@ &buffer_to_free); } @@ -272,7 +272,7 @@ Index: ffmpeg.c // preprocess audio (volume) if (ist->st->codec->codec_type == CODEC_TYPE_AUDIO) { if (audio_volume != 256) { -@@ -1311,10 +1512,16 @@ +@@ -1328,10 +1529,16 @@ if (pts > now) usleep(pts - now); } @@ -290,7 +290,7 @@ Index: ffmpeg.c for(i=0;i<nb_ostreams;i++) { int frame_size; -@@ -1337,6 +1544,9 @@ +@@ -1354,6 +1561,9 @@ do_audio_out(os, ost, ist, data_buf, data_size); break; case CODEC_TYPE_VIDEO: @@ -300,7 +300,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); -@@ -1394,7 +1604,15 @@ +@@ -1411,7 +1621,15 @@ av_free_packet(&opkt); } } @@ -316,7 +316,7 @@ Index: ffmpeg.c av_free(buffer_to_free); /* XXX: allocate the subtitles in the codec ? */ if (subtitle_to_free) { -@@ -1814,10 +2032,21 @@ +@@ -1840,10 +2058,21 @@ fprintf(stderr, "Cannot get resampling context\n"); av_exit(1); } @@ -338,7 +338,7 @@ Index: ffmpeg.c break; case CODEC_TYPE_SUBTITLE: ost->encoding_needed = 1; -@@ -3804,6 +4033,9 @@ +@@ -3831,6 +4060,9 @@ #ifdef CONFIG_VHOOK { "vhook", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)add_frame_hooker}, "insert video processing module", "module" }, #endif

1 0

[soc]: r3949 - in libavfilter: graphparser.c graphparser.h
by stefano 11 Jan '09

11 Jan '09

Author: stefano Date: Mon Jan 12 00:23:20 2009 New Revision: 3949 Log: Remove graphparser.{c,h}, they're already in the official repo. Deleted: libavfilter/graphparser.c libavfilter/graphparser.h

1 0

[soc]: r3948 - wmapro/wma3.h
by faust3 11 Jan '09

11 Jan '09

Author: faust3 Date: Sun Jan 11 22:38:55 2009 New Revision: 3948 Log: also use DECLARE_ALIGNED_16 for the coeffs buffer Modified: wmapro/wma3.h Modified: wmapro/wma3.h ============================================================================== --- wmapro/wma3.h Sun Jan 11 20:05:48 2009 (r3947) +++ wmapro/wma3.h Sun Jan 11 22:38:55 2009 (r3948) @@ -54,7 +54,7 @@ typedef struct { uint8_t cur_subframe; uint8_t grouped; //< true if the channel is contained in a channel group - float coeffs[4096]; //< MAX_COEF + DECLARE_ALIGNED_16(float, coeffs[4096]); //< MAX_COEF int scale_factors[MAX_BANDS]; //< initial scale factor values int resampled_scale_factors[MAX_BANDS]; //< resampled scale factors from the previous block

1 0

[soc]: r3947 - libavfilter/diffs/01_ffplay_filters.diff
by stefano 11 Jan '09

11 Jan '09

Author: stefano Date: Sun Jan 11 20:05:48 2009 New Revision: 3947 Log: Make input_request_frame() call get_video_frame() until it gets a decoded picture. Fix playback of res_change_ffmpeg_aspect.ts. Modified: libavfilter/diffs/01_ffplay_filters.diff Modified: libavfilter/diffs/01_ffplay_filters.diff ============================================================================== --- libavfilter/diffs/01_ffplay_filters.diff Sun Jan 11 14:21:10 2009 (r3946) +++ libavfilter/diffs/01_ffplay_filters.diff Sun Jan 11 20:05:48 2009 (r3947) @@ -211,7 +211,7 @@ Index: ffplay.c /* update the bitmap content */ SDL_UnlockYUVOverlay(vp->bmp); -@@ -1334,54 +1405,261 @@ +@@ -1334,54 +1405,264 @@ return queue_picture(is, src_frame, pts); } @@ -282,8 +282,11 @@ Index: ffplay.c + AVFilterPicRef *picref; + uint64_t pts = 0; + AVPacket pkt; ++ int ret; + -+ if(get_video_frame(priv->is, priv->frame, &pts, &pkt) < 0) ++ while (!(ret = get_video_frame(priv->is, priv->frame, &pts, &pkt))) ++ av_free_packet(&pkt); ++ if (ret < 0) + return -1; + + /* FIXME: until I figure out how to hook everything up to the codec @@ -504,7 +507,7 @@ Index: ffplay.c av_free(frame); return 0; } -@@ -2161,6 +2439,12 @@ +@@ -2161,6 +2442,12 @@ /* free all pictures */ for(i=0;i<VIDEO_PICTURE_QUEUE_SIZE; i++) { vp = &is->pictq[i]; @@ -517,7 +520,7 @@ Index: ffplay.c if (vp->bmp) { SDL_FreeYUVOverlay(vp->bmp); vp->bmp = NULL; -@@ -2498,6 +2782,9 @@ +@@ -2498,6 +2785,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" }, @@ -527,7 +530,7 @@ Index: ffplay.c { "default", OPT_FUNC2 | HAS_ARG | OPT_AUDIO | OPT_VIDEO | OPT_EXPERT, {(void*)opt_default}, "generic catch all option", "" }, { NULL, }, }; -@@ -2546,7 +2833,9 @@ +@@ -2546,7 +2836,9 @@ avctx_opts[i]= avcodec_alloc_context2(i); } avformat_opts = av_alloc_format_context();

1 0

[soc]: r3946 - wmapro/audioframesize.patch
by faust3 11 Jan '09

11 Jan '09

Author: faust3 Date: Sun Jan 11 14:21:10 2009 New Revision: 3946 Log: fixed playback of ambient2_192_mulitchannel.wma Modified: wmapro/audioframesize.patch Modified: wmapro/audioframesize.patch ============================================================================== --- wmapro/audioframesize.patch Sun Jan 11 12:12:05 2009 (r3945) +++ wmapro/audioframesize.patch Sun Jan 11 14:21:10 2009 (r3946) @@ -1,13 +1,13 @@ Index: libavcodec/avcodec.h =================================================================== ---- libavcodec/avcodec.h (revision 16517) +--- libavcodec/avcodec.h (revision 16536) +++ libavcodec/avcodec.h (working copy) @@ -386,7 +386,7 @@ #define CH_LAYOUT_STEREO_DOWNMIX (CH_STEREO_LEFT|CH_STEREO_RIGHT) /* in bytes */ -#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio -+#define AVCODEC_MAX_AUDIO_FRAME_SIZE 1048567 ++#define AVCODEC_MAX_AUDIO_FRAME_SIZE 1130496 /** * Required number of additionally allocated bytes at the end of the input bitstream for decoding.

1 0

[soc]: r3945 - in wmapro: audioframesize.patch checkout.sh mdct.diff
by faust3 11 Jan '09

11 Jan '09

Author: faust3 Date: Sun Jan 11 12:12:05 2009 New Revision: 3945 Log: removed already integrated mdct changes and increased MAX_AUDIO_FRAME_SIZE to make the multichannel files playable Added: wmapro/audioframesize.patch Deleted: wmapro/mdct.diff Modified: wmapro/checkout.sh Added: wmapro/audioframesize.patch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ wmapro/audioframesize.patch Sun Jan 11 12:12:05 2009 (r3945) @@ -0,0 +1,13 @@ +Index: libavcodec/avcodec.h +=================================================================== +--- libavcodec/avcodec.h (revision 16517) ++++ libavcodec/avcodec.h (working copy) +@@ -386,7 +386,7 @@ + #define CH_LAYOUT_STEREO_DOWNMIX (CH_STEREO_LEFT|CH_STEREO_RIGHT) + + /* in bytes */ +-#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio ++#define AVCODEC_MAX_AUDIO_FRAME_SIZE 1048567 + + /** + * Required number of additionally allocated bytes at the end of the input bitstream for decoding. Modified: wmapro/checkout.sh ============================================================================== --- wmapro/checkout.sh Sun Jan 11 11:55:23 2009 (r3944) +++ wmapro/checkout.sh Sun Jan 11 12:12:05 2009 (r3945) @@ -6,5 +6,5 @@ ln -s ../../wma3data.h wma3data.h ln -s ../../wma3.h wma3.h cd ../ patch -p0 <../wmapro_ffmpeg.patch -patch -p0 <../mdct.diff +patch -p0 <../audioframesize.patch

1 0

[soc]: r3944 - in wmapro: wma3.h wma3data.h wma3dec.c
by faust3 11 Jan '09

11 Jan '09

Author: faust3 Date: Sun Jan 11 11:55:23 2009 New Revision: 3944 Log: a few cosmetic fixes and FIXMEs by Benjamin Larsson Modified: wmapro/wma3.h wmapro/wma3data.h wmapro/wma3dec.c Modified: wmapro/wma3.h ============================================================================== --- wmapro/wma3.h Sun Jan 11 11:42:29 2009 (r3943) +++ wmapro/wma3.h Sun Jan 11 11:55:23 2009 (r3944) @@ -64,8 +64,8 @@ typedef struct { int transmit_sf; int scale_factor_step; int quant_step_modifier; - int max_scale_factor; - int scale_factor_block_len; //< block len of the frame for which the scale factors were transmitted + int max_scale_factor; + int scale_factor_block_len; //< block len of the frame for which the scale factors were transmitted DECLARE_ALIGNED_16(float, out[8192]); } wma_channel; @@ -79,7 +79,6 @@ typedef struct { char positive[MAX_CHANNELS * MAX_CHANNELS]; //< fixme for what are these numbers used? float decorrelation_matrix[MAX_CHANNELS*MAX_CHANNELS]; char use_channel[MAX_CHANNELS]; - } wma_channel_group; /** Modified: wmapro/wma3data.h ============================================================================== --- wmapro/wma3data.h Sun Jan 11 11:42:29 2009 (r3943) +++ wmapro/wma3data.h Sun Jan 11 11:55:23 2009 (r3944) @@ -383,10 +383,6 @@ static const uint8_t ff_wma3_huff_rlc_bi }; - - - - static const short ff_wma3_run_0[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, Modified: wmapro/wma3dec.c ============================================================================== --- wmapro/wma3dec.c Sun Jan 11 11:42:29 2009 (r3943) +++ wmapro/wma3dec.c Sun Jan 11 11:55:23 2009 (r3944) @@ -138,7 +138,6 @@ static av_cold int wma3_decode_init(AVCo int i; s->avctx = avctx; - dsputil_init(&s->dsp, avctx); /* FIXME is this really the right thing todo for 24 bit? */ @@ -640,7 +639,7 @@ static int wma_decode_channel_transform( }else{ chgroup->no_rotation = 1; chgroup->transform = 1; - chgroup->decorrelation_matrix[0] = 0.70703125; + chgroup->decorrelation_matrix[0] = 0.70703125; //FIXME cos(pi/4) chgroup->decorrelation_matrix[1] = -0.70703125; chgroup->decorrelation_matrix[2] = 0.70703125; chgroup->decorrelation_matrix[3] = 0.70703125; @@ -710,7 +709,6 @@ static int wma_decode_channel_transform( } - static unsigned int wma_get_large_val(WMA3DecodeContext* s) { int n_bits = 8; @@ -933,9 +931,7 @@ static int wma_decode_scale_factors(WMA3 return 0; }else s->channel[c].scale_factors[i] += (val ^ level_mask) - val; - } - } s->channel[c].reuse_sf = 1; @@ -971,7 +967,7 @@ static void wma_calc_decorrelation_matri float v1 = tmp1[y]; float v2 = tmp2[y]; int n = chgroup->rotation_offset[offset + x]; - float cosv = sin(n*M_PI / 64.0); + float cosv = sin(n*M_PI / 64.0); //FIXME use one table for this float sinv = -cos(n*M_PI / 64.0); chgroup->decorrelation_matrix[y + x * chgroup->nb_channels] = (v1 * cosv) + (v2 * sinv);

1 0

[soc]: r3943 - wmapro/wma3dec.c
by faust3 11 Jan '09

11 Jan '09

Author: faust3 Date: Sun Jan 11 11:42:29 2009 New Revision: 3943 Log: removed some windowing cruft, patch by Benjamin Larsson Modified: wmapro/wma3dec.c Modified: wmapro/wma3dec.c ============================================================================== --- wmapro/wma3dec.c Sun Jan 11 11:36:28 2009 (r3942) +++ wmapro/wma3dec.c Sun Jan 11 11:42:29 2009 (r3943) @@ -1095,7 +1095,7 @@ static void wma_window(WMA3DecodeContext // float* rs = &s->channel[c].out[s->samples_per_frame/2 + s->channel[c].subframe_offset[i]]; // printf("Dstart %i %i end %i win %i prev %i\n",s->frame_num+1, start - rs,end -rs,winlen,prev_block_len); -#if 1 + //FIXME untagle the windowing so dsp functions can be used window = s->windows[av_log2(winlen)-BLOCK_MIN_BITS]; for(x=0;x<len;x++){ float ts = *start; @@ -1107,25 +1107,11 @@ static void wma_window(WMA3DecodeContext ++start; --end; } -#else - wma_window2(); -#endif - s->channel[c].prev_block_len = block_len; } } -/** - * Apply MDCT window and add into output. - * - * We ensure that when the windows overlap their squared sum - * is always 1 (MDCT reconstruction rule). - */ - - - - static int wma_decode_subframe(WMA3DecodeContext *s,GetBitContext* gb){ int offset = s->samples_per_frame;

1 0

[soc]: r3942 - wmapro/wma3dec.c
by faust3 11 Jan '09

11 Jan '09

Author: faust3 Date: Sun Jan 11 11:36:28 2009 New Revision: 3942 Log: avoid forward declaration, patch by Benjamin Larsson Modified: wmapro/wma3dec.c Modified: wmapro/wma3dec.c ============================================================================== --- wmapro/wma3dec.c Sat Jan 10 20:24:33 2009 (r3941) +++ wmapro/wma3dec.c Sun Jan 11 11:36:28 2009 (r3942) @@ -26,11 +26,8 @@ #undef NDEBUG #include <assert.h> -static av_cold int wma3_decode_end(AVCodecContext *avctx); - unsigned int bitstreamcounter; - /** *@brief helper function to print the most important members of the context *@param s context @@ -90,6 +87,44 @@ static int get_samples_per_frame(int sam return samples_per_frame; } + +/** + *@brief Uninitialize the decoder and free all ressources. + *@param avctx codec context + *@return 0 on success, < 0 otherwise + */ +static av_cold int wma3_decode_end(AVCodecContext *avctx) +{ + WMA3DecodeContext *s = avctx->priv_data; + int i; + + av_free(s->prev_frame); + av_free(s->num_sfb); + av_free(s->sfb_offsets); + av_free(s->subwoofer_cutoffs); + av_free(s->sf_offsets); + + if(s->default_decorrelation_matrix){ + for(i=1;i<=s->nb_channels;i++) + av_free(s->default_decorrelation_matrix[i]); + av_free(s->default_decorrelation_matrix); + } + + free_vlc(&s->exp_vlc); + free_vlc(&s->coef_vlc[0]); + free_vlc(&s->coef_vlc[1]); + free_vlc(&s->huff_0_vlc); + free_vlc(&s->huff_1_vlc); + free_vlc(&s->huff_2_vlc); + free_vlc(&s->rlc_vlc); + + for(i=0 ; i<BLOCK_NB_SIZES ; i++) + ff_mdct_end(&s->mdct_ctx[i]); + + return 0; +} + + /** *@brief Initialize the decoder. *@param avctx codec context @@ -1593,41 +1628,6 @@ static int wma3_decode_packet(AVCodecCon return avctx->block_align; } -/** - *@brief Uninitialize the decoder and free all ressources. - *@param avctx codec context - *@return 0 on success, < 0 otherwise - */ -static av_cold int wma3_decode_end(AVCodecContext *avctx) -{ - WMA3DecodeContext *s = avctx->priv_data; - int i; - - av_free(s->prev_frame); - av_free(s->num_sfb); - av_free(s->sfb_offsets); - av_free(s->subwoofer_cutoffs); - av_free(s->sf_offsets); - - if(s->default_decorrelation_matrix){ - for(i=1;i<=s->nb_channels;i++) - av_free(s->default_decorrelation_matrix[i]); - av_free(s->default_decorrelation_matrix); - } - - free_vlc(&s->exp_vlc); - free_vlc(&s->coef_vlc[0]); - free_vlc(&s->coef_vlc[1]); - free_vlc(&s->huff_0_vlc); - free_vlc(&s->huff_1_vlc); - free_vlc(&s->huff_2_vlc); - free_vlc(&s->rlc_vlc); - - for(i=0 ; i<BLOCK_NB_SIZES ; i++) - ff_mdct_end(&s->mdct_ctx[i]); - - return 0; -} /** *@brief WMA9 decoder

1 0

[soc]: r3937 - dvbmuxer/mpegtsenc.c
by bcoudurier 11 Jan '09

11 Jan '09

Author: bcoudurier Date: Sat Jan 10 01:48:25 2009 New Revision: 3937 Log: fix pcr computation, forgot si packets Modified: dvbmuxer/mpegtsenc.c Modified: dvbmuxer/mpegtsenc.c ============================================================================== --- dvbmuxer/mpegtsenc.c Fri Jan 2 00:33:53 2009 (r3936) +++ dvbmuxer/mpegtsenc.c Sat Jan 10 01:48:25 2009 (r3937) @@ -37,9 +37,34 @@ typedef struct MpegTSSection { void *opaque; } MpegTSSection; +typedef struct MpegTSService { + MpegTSSection pmt; /* MPEG2 pmt table context */ + int sid; /* service ID */ + char *name; + char *provider_name; + int pcr_pid; +} MpegTSService; + +typedef struct MpegTSWrite { + MpegTSSection pat; /* MPEG2 pat table */ + MpegTSSection sdt; /* MPEG2 sdt table context */ + MpegTSService **services; + int sdt_packet_count; + int sdt_packet_freq; + int pat_packet_count; + int pat_packet_freq; + int nb_services; + int onid; + int tsid; + int64_t last_pcr; ///< last program clock reference */ + int64_t cur_pcr; ///< last program clock reference */ + int mux_rate; +} MpegTSWrite; + /* NOTE: 4 bytes must be left at the end for the crc32 */ static void mpegts_write_section(MpegTSSection *s, uint8_t *buf, int len) { + MpegTSWrite *ts = ((AVFormatContext*)s->opaque)->priv_data; unsigned int crc; unsigned char packet[TS_PACKET_SIZE]; const unsigned char *buf_ptr; @@ -81,6 +106,7 @@ static void mpegts_write_section(MpegTSS buf_ptr += len1; len -= len1; + ts->cur_pcr += TS_PACKET_SIZE*8*90000LL/ts->mux_rate; } } @@ -151,30 +177,6 @@ typedef struct MpegTSWriteStream { uint8_t payload[DEFAULT_PES_PAYLOAD_SIZE]; } MpegTSWriteStream; -typedef struct MpegTSService { - MpegTSSection pmt; /* MPEG2 pmt table context */ - int sid; /* service ID */ - char *name; - char *provider_name; - int pcr_pid; -} MpegTSService; - -typedef struct MpegTSWrite { - MpegTSSection pat; /* MPEG2 pat table */ - MpegTSSection sdt; /* MPEG2 sdt table context */ - MpegTSService **services; - int sdt_packet_count; - int sdt_packet_freq; - int pat_packet_count; - int pat_packet_freq; - int nb_services; - int onid; - int tsid; - int64_t last_pcr; ///< last program clock reference */ - int64_t cur_pcr; ///< last program clock reference */ - int mux_rate; -} MpegTSWrite; - static void mpegts_write_pat(AVFormatContext *s) { MpegTSWrite *ts = s->priv_data; @@ -580,7 +582,7 @@ static void mpegts_write_pes(AVFormatCon payload += len; payload_size -= len; put_buffer(s->pb, buf, TS_PACKET_SIZE); - ts->cur_pcr += (TS_PACKET_SIZE+write_pcr)*8*90000LL / ts->mux_rate; + ts->cur_pcr += TS_PACKET_SIZE*8*90000LL/ts->mux_rate; } put_flush_packet(s->pb); }

3 4

[soc]: r3940 - dvbmuxer/mpegtsenc.c
by bcoudurier 10 Jan '09

10 Jan '09

Author: bcoudurier Date: Sat Jan 10 03:31:27 2009 New Revision: 3940 Log: pcr is in 27mhz freq, while dts aren't Modified: dvbmuxer/mpegtsenc.c Modified: dvbmuxer/mpegtsenc.c ============================================================================== --- dvbmuxer/mpegtsenc.c Sat Jan 10 02:59:02 2009 (r3939) +++ dvbmuxer/mpegtsenc.c Sat Jan 10 03:31:27 2009 (r3940) @@ -646,7 +646,7 @@ static int output_packet(AVFormatContext StreamInfo *stream; int es_size; int best_i= -1; - int64_t pcr= s->last_pcr; + int64_t pcr= s->last_pcr/300; if ((es_size = ff_pes_output_packet(ctx, DEFAULT_PES_PAYLOAD_SIZE, &pcr, &best_i, flush, flush_packet)) <= 0) @@ -661,7 +661,7 @@ static int output_packet(AVFormatContext if(es_size) stream->premux_packet->unwritten_size -= es_size; - if(ff_pes_remove_decoded_packets(ctx, s->last_pcr) < 0) + if(ff_pes_remove_decoded_packets(ctx, s->last_pcr/300) < 0) return -1; return 1;

1 0

[soc]: r3939 - dvbmuxer/mpegtsenc.c
by bcoudurier 10 Jan '09

10 Jan '09

Author: bcoudurier Date: Sat Jan 10 02:59:02 2009 New Revision: 3939 Log: use correct timebase in pcr computation Modified: dvbmuxer/mpegtsenc.c Modified: dvbmuxer/mpegtsenc.c ============================================================================== --- dvbmuxer/mpegtsenc.c Sat Jan 10 02:08:41 2009 (r3938) +++ dvbmuxer/mpegtsenc.c Sat Jan 10 02:59:02 2009 (r3939) @@ -25,6 +25,9 @@ #include "libavcodec/bytestream.h" #include "mpegpes.h" +#define PCR_TIME_BASE 27000000LL +#define MAX_DELTA_PCR (PCR_TIME_BASE / 25) /**< 40ms for DVB */ + /* write DVB SI sections */ /*********************************************/ @@ -106,7 +109,7 @@ static void mpegts_write_section(MpegTSS buf_ptr += len1; len -= len1; - ts->cur_pcr += TS_PACKET_SIZE*8*90000LL/ts->mux_rate; + ts->cur_pcr += TS_PACKET_SIZE*8*PCR_TIME_BASE/ts->mux_rate; } } @@ -165,9 +168,6 @@ static int mpegts_write_section1(MpegTSS #define SDT_RETRANS_TIME 500 #define PAT_RETRANS_TIME 100 -#define PCR_TIME_BASE 27000000LL -#define MAX_DELTA_PCR (PCR_TIME_BASE / 25) /**< 40ms for DVB */ - typedef struct MpegTSWriteStream { StreamInfo pes; struct MpegTSService *service; @@ -516,7 +516,6 @@ static void mpegts_write_pes(AVFormatCon int afc_len, stuffing_len; is_start = 1; - ts->cur_pcr = pcr; while (payload_size > 0) { retransmit_si_info(s); @@ -587,7 +586,7 @@ static void mpegts_write_pes(AVFormatCon payload += len; payload_size -= len; put_buffer(s->pb, buf, TS_PACKET_SIZE); - ts->cur_pcr += TS_PACKET_SIZE*8*90000LL/ts->mux_rate; + ts->cur_pcr += TS_PACKET_SIZE*8*PCR_TIME_BASE/ts->mux_rate; } put_flush_packet(s->pb); }

1 0

[soc]: r3938 - dvbmuxer/mpegtsenc.c
by bcoudurier 10 Jan '09

10 Jan '09

Author: bcoudurier Date: Sat Jan 10 02:08:41 2009 New Revision: 3938 Log: write pcr extension, based on patch by Tomer Barletz, barletz at gmail dot com Modified: dvbmuxer/mpegtsenc.c Modified: dvbmuxer/mpegtsenc.c ============================================================================== --- dvbmuxer/mpegtsenc.c Sat Jan 10 01:48:25 2009 (r3937) +++ dvbmuxer/mpegtsenc.c Sat Jan 10 02:08:41 2009 (r3938) @@ -164,7 +164,9 @@ static int mpegts_write_section1(MpegTSS /* we retransmit the SI info at this rate */ #define SDT_RETRANS_TIME 500 #define PAT_RETRANS_TIME 100 -#define MAX_DELTA_PCR 9000 /**< 0.1s according to ISO 13818-1 */ + +#define PCR_TIME_BASE 27000000LL +#define MAX_DELTA_PCR (PCR_TIME_BASE / 25) /**< 40ms for DVB */ typedef struct MpegTSWriteStream { StreamInfo pes; @@ -520,7 +522,7 @@ static void mpegts_write_pes(AVFormatCon write_pcr = !ts->cur_pcr; if (ts_st->pid == ts_st->service->pcr_pid) { - pcr = ts->cur_pcr + (TS_PACKET_SIZE+4+7)*8*90000LL / ts->mux_rate; + pcr = ts->cur_pcr + (TS_PACKET_SIZE+4+7)*8*PCR_TIME_BASE / ts->mux_rate; if (pcr - ts->last_pcr > MAX_DELTA_PCR) write_pcr = 1; } @@ -538,16 +540,19 @@ static void mpegts_write_pes(AVFormatCon *q++ = 0x10 | ts_st->cc | (write_pcr ? 0x20 : 0); ts_st->cc = (ts_st->cc + 1) & 0xf; if (write_pcr) { + uint64_t pcr_base, pcr_ext; /* add header and pcr bytes to pcr according to specs */ - pcr = ts->cur_pcr + (4+7)*8*90000LL / ts->mux_rate; + pcr = ts->cur_pcr + (4+7)*8*PCR_TIME_BASE / ts->mux_rate; + pcr_base = pcr / 300; + pcr_ext = pcr % 300; *q++ = 7; /* AFC length */ *q++ = 0x10; /* flags: PCR present */ - *q++ = pcr >> 25; - *q++ = pcr >> 17; - *q++ = pcr >> 9; - *q++ = pcr >> 1; - *q++ = (pcr & 1) << 7; - *q++ = 0; + *q++ = pcr_base >> 25; + *q++ = pcr_base >> 17; + *q++ = pcr_base >> 9; + *q++ = pcr_base >> 1; + *q++ = (pcr_base & 1) << 7 | ((pcr_ext >> 8) & 1); + *q++ = pcr_ext; ts->last_pcr = pcr; } /* header size */

1 0

[soc]: r3915 - dirac/libavcodec/dwt.c
by conrad 01 Jan '09

01 Jan '09

Author: conrad Date: Thu Jan 1 21:31:39 2009 New Revision: 3915 Log: Daubechies 9/7 idwt Modified: dirac/libavcodec/dwt.c Modified: dirac/libavcodec/dwt.c ============================================================================== --- dirac/libavcodec/dwt.c Thu Jan 1 21:31:37 2009 (r3914) +++ dirac/libavcodec/dwt.c Thu Jan 1 21:31:39 2009 (r3915) @@ -59,6 +59,18 @@ static inline int extend_odd(int v, int #define COMPOSE_HAARiH0(b0, b1)\ (b0 + b1) +#define COMPOSE_DAUB97iL1(b0, b1, b2)\ + (b1 - ((1817*(b0 + b2) + 2048) >> 12)) + +#define COMPOSE_DAUB97iH1(b0, b1, b2)\ + (b1 - ((3616*(b0 + b2) + 2048) >> 12)) + +#define COMPOSE_DAUB97iL0(b0, b1, b2)\ + (b1 + (( 217*(b0 + b2) + 2048) >> 12)) + +#define COMPOSE_DAUB97iH0(b0, b1, b2)\ + (b1 + ((6497*(b0 + b2) + 2048) >> 12)) + static av_always_inline void interleave(IDWTELEM *dst, IDWTELEM *src0, IDWTELEM *src1, int width, int add, int shift){ @@ -280,6 +292,95 @@ static void spatial_compose_haari_dy(dwt cs->y += 2; } +static void horizontal_compose_daub97i(IDWTELEM *b, int w) { + IDWTELEM temp[w]; + const int w2 = w >> 1; + int x, b0, b1, b2; + + temp[0] = COMPOSE_DAUB97iL1(b[w2], b[0], b[w2]); + for (x = 0; x < w2-1; x++) { + temp[ x+1] = COMPOSE_DAUB97iL1(b[x+w2], b[ x+1], b[x+w2+1]); + temp[w2+x] = COMPOSE_DAUB97iH1(temp[x], b[w2+x], temp[x+1]); + } + temp[w-1] = COMPOSE_DAUB97iH1(temp[w2-1], b[w-1], temp[w2-1]); + + // second stage combined with interleave and shift + b0 = b2 = COMPOSE_DAUB97iL0(temp[w2], temp[0], temp[w2]); + b[0] = (b0 + 1) >> 1; + for (x = 0; x < w2-1; x++) { + b2 = COMPOSE_DAUB97iL0(temp[x+w2], temp[ x+1], temp[x+w2+1 ]); + b1 = COMPOSE_DAUB97iH0( b0, temp[w2+x], b2); + b[2*x + 1] = (b1 + 1) >> 1; + b[2*(x+1)] = (b2 + 1) >> 1; + b0 = b2; + } + b[w-1] = (COMPOSE_DAUB97iH0(b2, temp[w-1], b2) + 1) >> 1; +} + +static void vertical_compose_daub97iH0(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, int width){ + int i; + + for(i=0; i<width; i++){ + b1[i] = COMPOSE_DAUB97iH0(b0[i], b1[i], b2[i]); + } +} + +static void vertical_compose_daub97iH1(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, int width){ + int i; + + for(i=0; i<width; i++){ + b1[i] = COMPOSE_DAUB97iH1(b0[i], b1[i], b2[i]); + } +} + +static void vertical_compose_daub97iL0(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, int width){ + int i; + + for(i=0; i<width; i++){ + b1[i] = COMPOSE_DAUB97iL0(b0[i], b1[i], b2[i]); + } +} + +static void vertical_compose_daub97iL1(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, int width){ + int i; + + for(i=0; i<width; i++){ + b1[i] = COMPOSE_DAUB97iL1(b0[i], b1[i], b2[i]); + } +} + +static void spatial_compose_daub97i_dy(dwt_compose *cs, IDWTELEM *buffer, int width, int height, int stride){ + int y = cs->y; + IDWTELEM *b0= cs->b0; + IDWTELEM *b1= cs->b1; + IDWTELEM *b2= cs->b2; + IDWTELEM *b3= cs->b3; + IDWTELEM *b4= buffer + mirror(y+3, height-1)*stride; + IDWTELEM *b5= buffer + mirror(y+4, height-1)*stride; + + if(y+3<(unsigned)height) vertical_compose_daub97iL1(b3, b4, b5, width); + if(y+2<(unsigned)height) vertical_compose_daub97iH1(b2, b3, b4, width); + if(y+1<(unsigned)height) vertical_compose_daub97iL0(b1, b2, b3, width); + if(y+0<(unsigned)height) vertical_compose_daub97iH0(b0, b1, b2, width); + + if(y-1<(unsigned)height) horizontal_compose_daub97i(b0, width); + if(y+0<(unsigned)height) horizontal_compose_daub97i(b1, width); + + cs->b0=b2; + cs->b1=b3; + cs->b2=b4; + cs->b3=b5; + cs->y += 2; +} + +static void spatial_compose97i_init(dwt_compose *cs, IDWTELEM *buffer, int height, int stride){ + cs->b0 = buffer + mirror(-3-1, height-1)*stride; + cs->b1 = buffer + mirror(-3 , height-1)*stride; + cs->b2 = buffer + mirror(-3+1, height-1)*stride; + cs->b3 = buffer + mirror(-3+2, height-1)*stride; + cs->y = -3; +} + static void spatial_compose53i_init(dwt_compose *cs, IDWTELEM *buffer, int height, int stride){ cs->b0 = buffer + mirror(-1-1, height-1)*stride; @@ -337,13 +438,16 @@ void ff_spatial_idwt_init2(dwt_compose * case DWT_DIRAC_HAAR1: spatial_compose_haari_init(cs+level, buffer, hl, stride_l); break; + case DWT_DIRAC_DAUB9_7: + spatial_compose97i_init(cs+level, buffer, hl, stride_l); + break; } } } void ff_spatial_idwt_slice2(dwt_compose *cs, IDWTELEM *buffer, int width, int height, int stride, int type, int decomposition_count, int y){ - const int support[] = {5, 3, 7, 3, 7, 3, 3}; + const int support[] = {5, 3, 7, 3, 7, 3, 3, 0, 5}; int level; for(level=decomposition_count-1; level>=0; level--){ @@ -368,6 +472,9 @@ void ff_spatial_idwt_slice2(dwt_compose case DWT_DIRAC_HAAR1: spatial_compose_haari_dy(cs+level, buffer, wl, hl, stride_l, 1); break; + case DWT_DIRAC_DAUB9_7: + spatial_compose_daub97i_dy(cs+level, buffer, wl, hl, stride_l); + break; } } }

3 2

[soc]: r3936 - dirac/libavcodec/dwt.c
by conrad 01 Jan '09

01 Jan '09

Author: conrad Date: Fri Jan 2 00:33:53 2009 New Revision: 3936 Log: Factor out >>5 Modified: dirac/libavcodec/dwt.c (contents, props changed) Modified: dirac/libavcodec/dwt.c ============================================================================== --- dirac/libavcodec/dwt.c Thu Jan 1 21:32:25 2009 (r3935) +++ dirac/libavcodec/dwt.c Fri Jan 2 00:33:53 2009 (r3936) @@ -63,7 +63,7 @@ static inline int extend_odd(int v, int (b1 - ((1817*(b0 + b2) + 2048) >> 12)) #define COMPOSE_DAUB97iH1(b0, b1, b2)\ - (b1 - ((3616*(b0 + b2) + 2048) >> 12)) + (b1 - (( 113*(b0 + b2) + 64) >> 7)) #define COMPOSE_DAUB97iL0(b0, b1, b2)\ (b1 + (( 217*(b0 + b2) + 2048) >> 12))

1 0

[soc]: r3935 - dirac/libavcodec/dirac.c
by conrad 01 Jan '09

01 Jan '09

Author: conrad Date: Thu Jan 1 21:32:25 2009 New Revision: 3935 Log: Fix for non-qpel MC Modified: dirac/libavcodec/dirac.c (contents, props changed) Modified: dirac/libavcodec/dirac.c ============================================================================== --- dirac/libavcodec/dirac.c Thu Jan 1 21:32:23 2009 (r3934) +++ dirac/libavcodec/dirac.c Thu Jan 1 21:32:25 2009 (r3935) @@ -657,13 +657,16 @@ static void motion_comp_block2refs(Dirac val1 += w1[1] * refline1[hx1 + 1]; val1 += w1[2] * refline1[hx1 + s->refwidth ]; val1 += w1[3] * refline1[hx1 + s->refwidth + 1]; - val1 >>= s->mv_precision; val2 += w2[0] * refline2[hx2 ]; val2 += w2[1] * refline2[hx2 + 1]; val2 += w2[2] * refline2[hx2 + s->refwidth ]; val2 += w2[3] * refline2[hx2 + s->refwidth + 1]; - val2 >>= s->mv_precision; + + if (s->mv_precision) { + val1 >>= (s->mv_precision-1)<<1; + val2 >>= (s->mv_precision-1)<<1; + } } val1 *= s->picture_weight_ref1; @@ -810,7 +813,8 @@ static void motion_comp_block1ref(DiracC val += w[1] * refline[hx + 1]; val += w[2] * refline[hx + s->refwidth ]; val += w[3] * refline[hx + s->refwidth + 1]; - val >>= s->mv_precision; + if (s->mv_precision) + val >>= (s->mv_precision-1)<<1; } val *= s->picture_weight_ref1

1 0

[soc]: r3934 - in dirac/libavcodec: dirac_arith.c dirac_arith.h diracdec.c
by conrad 01 Jan '09

01 Jan '09

Author: conrad Date: Thu Jan 1 21:32:23 2009 New Revision: 3934 Log: Move contexts so that the initial context for coeffs can be calculated without a lookup table 1% faster decode Modified: dirac/libavcodec/dirac_arith.c dirac/libavcodec/dirac_arith.h dirac/libavcodec/diracdec.c Modified: dirac/libavcodec/dirac_arith.c ============================================================================== --- dirac/libavcodec/dirac_arith.c Thu Jan 1 21:32:21 2009 (r3933) +++ dirac/libavcodec/dirac_arith.c Thu Jan 1 21:32:23 2009 (r3934) @@ -63,18 +63,15 @@ static uint16_t arith_lookup[256] = { }; static uint8_t next_ctx[ARITH_CONTEXT_COUNT] = { - 0, - 0, - 0, ARITH_CONTEXT_ZP_F2, // ZPZN_F1 ARITH_CONTEXT_ZP_F2, // ZPNN_F1 + ARITH_CONTEXT_NP_F2, // NPZN_F1 + ARITH_CONTEXT_NP_F2, // NPNN_F1 ARITH_CONTEXT_ZP_F3, // ZP_F2 ARITH_CONTEXT_ZP_F4, // ZP_F3 ARITH_CONTEXT_ZP_F5, // ZP_F4 ARITH_CONTEXT_ZP_F6, // ZP_F5 ARITH_CONTEXT_ZP_F6, // ZP_F6 - ARITH_CONTEXT_NP_F2, // NPZN_F1 - ARITH_CONTEXT_NP_F2, // NPNN_F1 ARITH_CONTEXT_NP_F3, // NP_F2 ARITH_CONTEXT_NP_F4, // NP_F3 ARITH_CONTEXT_NP_F5, // NP_F4 @@ -82,6 +79,9 @@ static uint8_t next_ctx[ARITH_CONTEXT_CO ARITH_CONTEXT_NP_F6, // NP_F6 0, 0, + 0, + 0, + 0, ARITH_CONTEXT_Q_OFFSET_FOLLOW, 0, 0, Modified: dirac/libavcodec/dirac_arith.h ============================================================================== --- dirac/libavcodec/dirac_arith.h Thu Jan 1 21:32:21 2009 (r3933) +++ dirac/libavcodec/dirac_arith.h Thu Jan 1 21:32:23 2009 (r3934) @@ -31,23 +31,23 @@ #include "bitstream.h" enum arith_context_indices { - ARITH_CONTEXT_SIGN_ZERO, - ARITH_CONTEXT_SIGN_POS, - ARITH_CONTEXT_SIGN_NEG, ARITH_CONTEXT_ZPZN_F1, ARITH_CONTEXT_ZPNN_F1, + ARITH_CONTEXT_NPZN_F1, + ARITH_CONTEXT_NPNN_F1, ARITH_CONTEXT_ZP_F2, ARITH_CONTEXT_ZP_F3, ARITH_CONTEXT_ZP_F4, ARITH_CONTEXT_ZP_F5, ARITH_CONTEXT_ZP_F6, - ARITH_CONTEXT_NPZN_F1, - ARITH_CONTEXT_NPNN_F1, ARITH_CONTEXT_NP_F2, ARITH_CONTEXT_NP_F3, ARITH_CONTEXT_NP_F4, ARITH_CONTEXT_NP_F5, ARITH_CONTEXT_NP_F6, + ARITH_CONTEXT_SIGN_ZERO, + ARITH_CONTEXT_SIGN_POS, + ARITH_CONTEXT_SIGN_NEG, ARITH_CONTEXT_COEFF_DATA, ARITH_CONTEXT_ZERO_BLOCK, ARITH_CONTEXT_Q_OFFSET_FOLLOW, Modified: dirac/libavcodec/diracdec.c ============================================================================== --- dirac/libavcodec/diracdec.c Thu Jan 1 21:32:21 2009 (r3933) +++ dirac/libavcodec/diracdec.c Thu Jan 1 21:32:23 2009 (r3934) @@ -142,9 +142,6 @@ static inline void coeff_unpack_arith(Di int coeff; int read_sign; int sign_ctx; - static const uint8_t follow_ctxs[4] = { - ARITH_CONTEXT_ZPZN_F1, ARITH_CONTEXT_ZPNN_F1, - ARITH_CONTEXT_NPZN_F1, ARITH_CONTEXT_NPNN_F1 }; /* The value of the pixel belonging to the lower level. */ if (b->parent) @@ -155,7 +152,7 @@ static inline void coeff_unpack_arith(Di sign_ctx = sign_predict(coeffp, b->orientation, x, y, b->stride); - coeff = dirac_get_arith_uint(&s->arith, follow_ctxs[(parent<<1) | nhood], + coeff = dirac_get_arith_uint(&s->arith, (parent<<1) | nhood, ARITH_CONTEXT_COEFF_DATA); read_sign = coeff;

1 0

[soc]: r3933 - dirac/libavcodec/dirac.h
by conrad 01 Jan '09

01 Jan '09

Author: conrad Date: Thu Jan 1 21:32:21 2009 New Revision: 3933 Log: Return the context name rather than number from sign_predict Modified: dirac/libavcodec/dirac.h Modified: dirac/libavcodec/dirac.h ============================================================================== --- dirac/libavcodec/dirac.h Thu Jan 1 21:32:19 2009 (r3932) +++ dirac/libavcodec/dirac.h Thu Jan 1 21:32:21 2009 (r3933) @@ -305,7 +305,7 @@ int sign_predict(IDWTELEM *data, dirac_s else if (orientation == subband_lh && x > 0) return DIRAC_SIGN(data[-1]); else - return 0; + return ARITH_CONTEXT_SIGN_ZERO; } static inline

1 0

[soc]: r3932 - dirac/libavcodec/diracdec.c
by conrad 01 Jan '09

01 Jan '09

Author: conrad Date: Thu Jan 1 21:32:19 2009 New Revision: 3932 Log: Remove redundant macro Modified: dirac/libavcodec/diracdec.c Modified: dirac/libavcodec/diracdec.c ============================================================================== --- dirac/libavcodec/diracdec.c Thu Jan 1 21:32:17 2009 (r3931) +++ dirac/libavcodec/diracdec.c Thu Jan 1 21:32:19 2009 (r3932) @@ -334,9 +334,6 @@ static void init_planes(DiracContext *s) { int i, w, h, level, orientation; -#define PAD(size, depth) \ - (((size + (1 << depth) - 1) >> depth) << depth) - av_freep(&s->spatial_idwt_buffer); for (i = 0; i < 3; i++) { @@ -344,8 +341,8 @@ static void init_planes(DiracContext *s) p->width = s->source.width >> (i ? s->chroma_hshift : 0); p->height = s->source.height >> (i ? s->chroma_vshift : 0); - p->padded_width = w = PAD(p->width , s->wavelet_depth); - p->padded_height = h = PAD(p->height, s->wavelet_depth); + p->padded_width = w = CALC_PADDING(p->width , s->wavelet_depth); + p->padded_height = h = CALC_PADDING(p->height, s->wavelet_depth); if (i == 0) s->spatial_idwt_buffer = @@ -392,7 +389,6 @@ static void init_planes(DiracContext *s) p->current_blheight = (p->height - p->yoffset) / p->ybsep + 1; } } -#undef PAD } /**

1 0

[soc]: r3931 - in dirac/libavcodec: dirac_arith.c diracdec.c
by conrad 01 Jan '09

01 Jan '09

Author: conrad Date: Thu Jan 1 21:32:17 2009 New Revision: 3931 Log: Unused variables Modified: dirac/libavcodec/dirac_arith.c dirac/libavcodec/diracdec.c Modified: dirac/libavcodec/dirac_arith.c ============================================================================== --- dirac/libavcodec/dirac_arith.c Thu Jan 1 21:32:15 2009 (r3930) +++ dirac/libavcodec/dirac_arith.c Thu Jan 1 21:32:17 2009 (r3931) @@ -176,7 +176,6 @@ static inline void renorm_arith_decoder( int dirac_get_arith_bit(dirac_arith_state *arith, int context) { unsigned int prob_zero = arith->contexts[context]; - unsigned int count; unsigned int range_times_prob; unsigned int ret; Modified: dirac/libavcodec/diracdec.c ============================================================================== --- dirac/libavcodec/diracdec.c Thu Jan 1 21:32:15 2009 (r3930) +++ dirac/libavcodec/diracdec.c Thu Jan 1 21:32:17 2009 (r3931) @@ -139,7 +139,6 @@ static inline void coeff_unpack_arith(Di { int parent = 0; int nhood; - int idx; int coeff; int read_sign; int sign_ctx;

1 0

[soc]: r3930 - dirac/libavcodec/diracdec.c
by conrad 01 Jan '09

01 Jan '09

Author: conrad Date: Thu Jan 1 21:32:15 2009 New Revision: 3930 Log: Cosmetics: unneeded if() and {} Modified: dirac/libavcodec/diracdec.c Modified: dirac/libavcodec/diracdec.c ============================================================================== --- dirac/libavcodec/diracdec.c Thu Jan 1 21:32:12 2009 (r3929) +++ dirac/libavcodec/diracdec.c Thu Jan 1 21:32:15 2009 (r3930) @@ -161,10 +161,8 @@ static inline void coeff_unpack_arith(Di read_sign = coeff; coeff = coeff_dequant(coeff, qoffset, qfactor); - if (read_sign) { - if (dirac_get_arith_bit(&s->arith, sign_ctx)) - coeff = -coeff; - } + if (read_sign && dirac_get_arith_bit(&s->arith, sign_ctx)) + coeff = -coeff; *coeffp = coeff; }

1 0

[soc]: r3929 - dirac/libavcodec/dirac_arith.c
by conrad 01 Jan '09

01 Jan '09

Author: conrad Date: Thu Jan 1 21:32:12 2009 New Revision: 3929 Log: Merge updating contexts with the previous if/else Modified: dirac/libavcodec/dirac_arith.c Modified: dirac/libavcodec/dirac_arith.c ============================================================================== --- dirac/libavcodec/dirac_arith.c Thu Jan 1 21:32:10 2009 (r3928) +++ dirac/libavcodec/dirac_arith.c Thu Jan 1 21:32:12 2009 (r3929) @@ -187,16 +187,12 @@ int dirac_get_arith_bit(dirac_arith_stat ret = 1; arith->low -= range_times_prob << 16; arith->range -= range_times_prob; + arith->contexts[context] -= arith_lookup[arith->contexts[context] >> 8]; } else { ret = 0; arith->range = range_times_prob; - } - - /* Update contexts. */ - if (ret) - arith->contexts[context] -= arith_lookup[arith->contexts[context] >> 8]; - else arith->contexts[context] += arith_lookup[255 - (arith->contexts[context] >> 8)]; + } renorm_arith_decoder(arith);

1 0

[soc]: r3928 - dirac/libavcodec/dirac_arith.h
by conrad 01 Jan '09

01 Jan '09

Author: conrad Date: Thu Jan 1 21:32:10 2009 New Revision: 3928 Log: The probabilites fit in 16 bits, so make the context array smaller Modified: dirac/libavcodec/dirac_arith.h Modified: dirac/libavcodec/dirac_arith.h ============================================================================== --- dirac/libavcodec/dirac_arith.h Thu Jan 1 21:32:08 2009 (r3927) +++ dirac/libavcodec/dirac_arith.h Thu Jan 1 21:32:10 2009 (r3928) @@ -86,7 +86,7 @@ typedef struct dirac_arith_state { const uint8_t *bytestream; const uint8_t *bytestream_end; - unsigned int contexts[ARITH_CONTEXT_COUNT]; + uint16_t contexts[ARITH_CONTEXT_COUNT]; PutBitContext *pb; } dirac_arith_state;

1 0

[soc]: r3927 - dirac/libavcodec/dirac_arith.c
by conrad 01 Jan '09

01 Jan '09

Author: conrad Date: Thu Jan 1 21:32:08 2009 New Revision: 3927 Log: Remove shifting default of 1 in case of overflow; shouldn't matter Modified: dirac/libavcodec/dirac_arith.c Modified: dirac/libavcodec/dirac_arith.c ============================================================================== --- dirac/libavcodec/dirac_arith.c Thu Jan 1 21:32:06 2009 (r3926) +++ dirac/libavcodec/dirac_arith.c Thu Jan 1 21:32:08 2009 (r3927) @@ -162,8 +162,6 @@ static inline void renorm_arith_decoder( arith->low |= (arith->bytestream[0]<<8) + arith->bytestream[1]; arith->bytestream += 2; arith->counter = 16; - } else if (arith->bytestream >= arith->bytestream_end) { - arith->low |= 1; } } }

1 0

[soc]: r3926 - in dirac/libavcodec: dirac_arith.c dirac_arith.h
by conrad 01 Jan '09

01 Jan '09

Author: conrad Date: Thu Jan 1 21:32:06 2009 New Revision: 3926 Log: Don't use bitstream for arith decoding Modified: dirac/libavcodec/dirac_arith.c dirac/libavcodec/dirac_arith.h Modified: dirac/libavcodec/dirac_arith.c ============================================================================== --- dirac/libavcodec/dirac_arith.c Thu Jan 1 21:32:03 2009 (r3925) +++ dirac/libavcodec/dirac_arith.c Thu Jan 1 21:32:06 2009 (r3926) @@ -128,11 +128,18 @@ void dirac_init_arith_decoder(dirac_arit { align_get_bits(gb); arith->pb = NULL; - arith->bits_left = 8 * length - 32; - arith->low = get_bits_long(gb, 32); - arith->gb = gb; arith->counter = 16; + arith->bytestream_start = + arith->bytestream = gb->buffer + get_bits_count(gb)/8; + arith->bytestream_end = arith->bytestream_start + length; + skip_bits_long(gb, length*8); + + arith->low = (*arith->bytestream++) << 24; + arith->low |= (*arith->bytestream++) << 16; + arith->low |= (*arith->bytestream++) << 8; + arith->low |= (*arith->bytestream++); + dirac_arith_init_common(arith); } @@ -141,23 +148,21 @@ void dirac_init_arith_encoder(dirac_arit arith->pb = pb; arith->carry = 0; arith->low = 0; - arith->gb = NULL; dirac_arith_init_common(arith); } static inline void renorm_arith_decoder(dirac_arith_state *arith) { - GetBitContext *gb = arith->gb; while (arith->range <= 0x4000) { arith->low <<= 1; arith->range <<= 1; - if (arith->bits_left > 0 && !--arith->counter) { - arith->low |= get_bits_long(gb, 16); - arith->bits_left -= 16; + if (arith->bytestream < arith->bytestream_end && !--arith->counter) { + arith->low |= (arith->bytestream[0]<<8) + arith->bytestream[1]; + arith->bytestream += 2; arith->counter = 16; - } else if (arith->bits_left <= 0) { + } else if (arith->bytestream >= arith->bytestream_end) { arith->low |= 1; } } @@ -322,8 +327,6 @@ void dirac_put_arith_int(dirac_arith_sta void dirac_get_arith_terminate(dirac_arith_state *arith) { assert(!arith->pb); - skip_bits_long(arith->gb, arith->bits_left); - arith->bits_left = 0; } Modified: dirac/libavcodec/dirac_arith.h ============================================================================== --- dirac/libavcodec/dirac_arith.h Thu Jan 1 21:32:03 2009 (r3925) +++ dirac/libavcodec/dirac_arith.h Thu Jan 1 21:32:06 2009 (r3926) @@ -79,12 +79,15 @@ typedef struct dirac_arith_state { /* Arithmetic decoding. */ unsigned int low; unsigned int range; - int bits_left; unsigned int counter; int carry; + + const uint8_t *bytestream_start; + const uint8_t *bytestream; + const uint8_t *bytestream_end; + unsigned int contexts[ARITH_CONTEXT_COUNT]; - GetBitContext *gb; PutBitContext *pb; } dirac_arith_state;

1 0

[soc]: r3925 - in dirac/libavcodec: dirac_arith.c dirac_arith.h
by conrad 01 Jan '09

01 Jan '09

Author: conrad Date: Thu Jan 1 21:32:03 2009 New Revision: 3925 Log: Read in two bytes at a time in the arith decoder Modified: dirac/libavcodec/dirac_arith.c dirac/libavcodec/dirac_arith.h Modified: dirac/libavcodec/dirac_arith.c ============================================================================== --- dirac/libavcodec/dirac_arith.c Thu Jan 1 21:32:01 2009 (r3924) +++ dirac/libavcodec/dirac_arith.c Thu Jan 1 21:32:03 2009 (r3925) @@ -128,9 +128,10 @@ void dirac_init_arith_decoder(dirac_arit { align_get_bits(gb); arith->pb = NULL; - arith->bits_left = 8 * length - 16; - arith->low = get_bits(gb, 16); + arith->bits_left = 8 * length - 32; + arith->low = get_bits_long(gb, 32); arith->gb = gb; + arith->counter = 16; dirac_arith_init_common(arith); } @@ -152,10 +153,11 @@ static inline void renorm_arith_decoder( arith->low <<= 1; arith->range <<= 1; - if (arith->bits_left > 0) { - arith->low |= get_bits1(gb); - arith->bits_left--; - } else { + if (arith->bits_left > 0 && !--arith->counter) { + arith->low |= get_bits_long(gb, 16); + arith->bits_left -= 16; + arith->counter = 16; + } else if (arith->bits_left <= 0) { arith->low |= 1; } } @@ -178,9 +180,9 @@ int dirac_get_arith_bit(dirac_arith_stat assert(!arith->pb); range_times_prob = (arith->range * prob_zero) >> 16; - if (arith->low >= range_times_prob) { + if ((arith->low >> 16) >= range_times_prob) { ret = 1; - arith->low -= range_times_prob; + arith->low -= range_times_prob << 16; arith->range -= range_times_prob; } else { ret = 0; Modified: dirac/libavcodec/dirac_arith.h ============================================================================== --- dirac/libavcodec/dirac_arith.h Thu Jan 1 21:32:01 2009 (r3924) +++ dirac/libavcodec/dirac_arith.h Thu Jan 1 21:32:03 2009 (r3925) @@ -79,7 +79,8 @@ typedef struct dirac_arith_state { /* Arithmetic decoding. */ unsigned int low; unsigned int range; - unsigned int bits_left; + int bits_left; + unsigned int counter; int carry; unsigned int contexts[ARITH_CONTEXT_COUNT];

1 0

[soc]: r3924 - in dirac/libavcodec: dirac_arith.c dirac_arith.h
by conrad 01 Jan '09

01 Jan '09

Author: conrad Date: Thu Jan 1 21:32:01 2009 New Revision: 3924 Log: Remove code from the arith coder context. low is now equivalent to the previous code - low. 8% faster overall decode Modified: dirac/libavcodec/dirac_arith.c dirac/libavcodec/dirac_arith.h Modified: dirac/libavcodec/dirac_arith.c ============================================================================== --- dirac/libavcodec/dirac_arith.c Thu Jan 1 21:31:59 2009 (r3923) +++ dirac/libavcodec/dirac_arith.c Thu Jan 1 21:32:01 2009 (r3924) @@ -108,7 +108,6 @@ static void dirac_arith_init_common(dira { int i; - arith->low = 0; arith->range = 0xFFFF; /* Initialize contexts. */ @@ -130,7 +129,7 @@ void dirac_init_arith_decoder(dirac_arit align_get_bits(gb); arith->pb = NULL; arith->bits_left = 8 * length - 16; - arith->code = get_bits(gb, 16); + arith->low = get_bits(gb, 16); arith->gb = gb; dirac_arith_init_common(arith); @@ -140,6 +139,7 @@ void dirac_init_arith_encoder(dirac_arit { arith->pb = pb; arith->carry = 0; + arith->low = 0; arith->gb = NULL; dirac_arith_init_common(arith); @@ -149,22 +149,15 @@ static inline void renorm_arith_decoder( { GetBitContext *gb = arith->gb; while (arith->range <= 0x4000) { - if (((arith->low + arith->range - 1)^arith->low) >= 0x8000) { - arith->code ^= 0x4000; - arith->low ^= 0x4000; - } arith->low <<= 1; arith->range <<= 1; - arith->low &= 0xFFFF; - arith->code <<= 1; + if (arith->bits_left > 0) { - arith->code |= get_bits1(gb); + arith->low |= get_bits1(gb); arith->bits_left--; } else { - /* Get default: */ - arith->code |= 1; + arith->low |= 1; } - arith->code &= 0xffff; } } @@ -184,11 +177,10 @@ int dirac_get_arith_bit(dirac_arith_stat assert(!arith->pb); - count = arith->code - arith->low; range_times_prob = (arith->range * prob_zero) >> 16; - if (count >= range_times_prob) { + if (arith->low >= range_times_prob) { ret = 1; - arith->low += range_times_prob; + arith->low -= range_times_prob; arith->range -= range_times_prob; } else { ret = 0; Modified: dirac/libavcodec/dirac_arith.h ============================================================================== --- dirac/libavcodec/dirac_arith.h Thu Jan 1 21:31:59 2009 (r3923) +++ dirac/libavcodec/dirac_arith.h Thu Jan 1 21:32:01 2009 (r3924) @@ -79,7 +79,6 @@ typedef struct dirac_arith_state { /* Arithmetic decoding. */ unsigned int low; unsigned int range; - unsigned int code; unsigned int bits_left; int carry; unsigned int contexts[ARITH_CONTEXT_COUNT];

1 0

[soc]: r3923 - dirac/libavcodec/dirac_arith.c
by conrad 01 Jan '09

01 Jan '09

Author: conrad Date: Thu Jan 1 21:31:59 2009 New Revision: 3923 Log: Move renormalization of the arith decoder to its own function Modified: dirac/libavcodec/dirac_arith.c Modified: dirac/libavcodec/dirac_arith.c ============================================================================== --- dirac/libavcodec/dirac_arith.c Thu Jan 1 21:31:56 2009 (r3922) +++ dirac/libavcodec/dirac_arith.c Thu Jan 1 21:31:59 2009 (r3923) @@ -145,6 +145,29 @@ void dirac_init_arith_encoder(dirac_arit dirac_arith_init_common(arith); } +static inline void renorm_arith_decoder(dirac_arith_state *arith) +{ + GetBitContext *gb = arith->gb; + while (arith->range <= 0x4000) { + if (((arith->low + arith->range - 1)^arith->low) >= 0x8000) { + arith->code ^= 0x4000; + arith->low ^= 0x4000; + } + arith->low <<= 1; + arith->range <<= 1; + arith->low &= 0xFFFF; + arith->code <<= 1; + if (arith->bits_left > 0) { + arith->code |= get_bits1(gb); + arith->bits_left--; + } else { + /* Get default: */ + arith->code |= 1; + } + arith->code &= 0xffff; + } +} + /** * Read a single bit using the arithmetic decoder * @@ -154,7 +177,6 @@ void dirac_init_arith_encoder(dirac_arit */ int dirac_get_arith_bit(dirac_arith_state *arith, int context) { - GetBitContext *gb = arith->gb; unsigned int prob_zero = arith->contexts[context]; unsigned int count; unsigned int range_times_prob; @@ -179,24 +201,7 @@ int dirac_get_arith_bit(dirac_arith_stat else arith->contexts[context] += arith_lookup[255 - (arith->contexts[context] >> 8)]; - while (arith->range <= 0x4000) { - if (((arith->low + arith->range - 1)^arith->low) >= 0x8000) { - arith->code ^= 0x4000; - arith->low ^= 0x4000; - } - arith->low <<= 1; - arith->range <<= 1; - arith->low &= 0xFFFF; - arith->code <<= 1; - if (arith->bits_left > 0) { - arith->code |= get_bits1(gb); - arith->bits_left--; - } else { - /* Get default: */ - arith->code |= 1; - } - arith->code &= 0xffff; - } + renorm_arith_decoder(arith); return ret; }

1 0

[soc]: r3922 - in dirac/libavcodec: dirac.h dirac_arith.c dirac_arith.h diracdec.c
by conrad 01 Jan '09

01 Jan '09

Author: conrad Date: Thu Jan 1 21:31:56 2009 New Revision: 3922 Log: Use a table to determine the next context, removing the need for separate context sets. 5% faster decode. Modified: dirac/libavcodec/dirac.h dirac/libavcodec/dirac_arith.c dirac/libavcodec/dirac_arith.h dirac/libavcodec/diracdec.c Modified: dirac/libavcodec/dirac.h ============================================================================== --- dirac/libavcodec/dirac.h Thu Jan 1 21:31:53 2009 (r3921) +++ dirac/libavcodec/dirac.h Thu Jan 1 21:31:56 2009 (r3922) @@ -72,7 +72,9 @@ typedef struct { a.chroma_offset == b.chroma_offset && \ a.chroma_excursion == b.chroma_excursion) -#define DIRAC_SIGN(x) ((x) > 0 ? 2 : ((x) < 0 ? 1 : 0)) +#define DIRAC_SIGN(x) ((x) > 0 ? ARITH_CONTEXT_SIGN_POS : \ + (x) < 0 ? ARITH_CONTEXT_SIGN_NEG : \ + ARITH_CONTEXT_SIGN_ZERO) #define DIRAC_PARSE_INFO_PREFIX 0x42424344 #define CALC_PADDING(size, depth) \ (((size + (1 << depth) - 1) >> depth) << depth) Modified: dirac/libavcodec/dirac_arith.c ============================================================================== --- dirac/libavcodec/dirac_arith.c Thu Jan 1 21:31:53 2009 (r3921) +++ dirac/libavcodec/dirac_arith.c Thu Jan 1 21:31:56 2009 (r3922) @@ -62,134 +62,45 @@ static uint16_t arith_lookup[256] = { 805, 750, 690, 625, 553, 471, 376, 255 }; -struct dirac_arith_context_set ff_dirac_context_set_split = - { - .follow = { ARITH_CONTEXT_SB_F1, ARITH_CONTEXT_SB_F2, - ARITH_CONTEXT_SB_F2, ARITH_CONTEXT_SB_F2, - ARITH_CONTEXT_SB_F2, ARITH_CONTEXT_SB_F2 }, - .data = ARITH_CONTEXT_SB_DATA - }; - -struct dirac_arith_context_set ff_dirac_context_set_mv = - { - .follow = { ARITH_CONTEXT_VECTOR_F1, ARITH_CONTEXT_VECTOR_F2, - ARITH_CONTEXT_VECTOR_F3, ARITH_CONTEXT_VECTOR_F4, - ARITH_CONTEXT_VECTOR_F5, ARITH_CONTEXT_VECTOR_F5 }, - .data = ARITH_CONTEXT_VECTOR_DATA, - .sign = ARITH_CONTEXT_VECTOR_SIGN - }; - -struct dirac_arith_context_set ff_dirac_context_set_dc = - { - .follow = { ARITH_CONTEXT_DC_F1, ARITH_CONTEXT_DC_F2, - ARITH_CONTEXT_DC_F2, ARITH_CONTEXT_DC_F2, - ARITH_CONTEXT_DC_F2, ARITH_CONTEXT_DC_F2 }, - .data = ARITH_CONTEXT_DC_DATA, - .sign = ARITH_CONTEXT_DC_SIGN - }; - -struct dirac_arith_context_set ff_dirac_context_set_quant = - { - .follow = { ARITH_CONTEXT_Q_OFFSET_FOLLOW, ARITH_CONTEXT_Q_OFFSET_FOLLOW, - ARITH_CONTEXT_Q_OFFSET_FOLLOW, ARITH_CONTEXT_Q_OFFSET_FOLLOW, - ARITH_CONTEXT_Q_OFFSET_FOLLOW, ARITH_CONTEXT_Q_OFFSET_FOLLOW }, - .data = ARITH_CONTEXT_Q_OFFSET_DATA, - .sign = ARITH_CONTEXT_Q_OFFSET_SIGN, - }; - -struct dirac_arith_context_set ff_dirac_context_sets_waveletcoeff[] = { - { - /* Parent = 0, Zero neighbourhood, sign predict 0 */ - .follow = { ARITH_CONTEXT_ZPZN_F1, ARITH_CONTEXT_ZP_F2, - ARITH_CONTEXT_ZP_F3, ARITH_CONTEXT_ZP_F4, - ARITH_CONTEXT_ZP_F5, ARITH_CONTEXT_ZP_F6 }, - .data = ARITH_CONTEXT_COEFF_DATA, - .sign = ARITH_CONTEXT_SIGN_ZERO, - }, { - /* Parent = 0, Zero neighbourhood, sign predict < 0 */ - .follow = { ARITH_CONTEXT_ZPZN_F1, ARITH_CONTEXT_ZP_F2, - ARITH_CONTEXT_ZP_F3, ARITH_CONTEXT_ZP_F4, - ARITH_CONTEXT_ZP_F5, ARITH_CONTEXT_ZP_F6 }, - .data = ARITH_CONTEXT_COEFF_DATA, - .sign = ARITH_CONTEXT_SIGN_NEG - }, { - /* Parent = 0, Zero neighbourhood, sign predict > 0 */ - .follow = { ARITH_CONTEXT_ZPZN_F1, ARITH_CONTEXT_ZP_F2, - ARITH_CONTEXT_ZP_F3, ARITH_CONTEXT_ZP_F4, - ARITH_CONTEXT_ZP_F5, ARITH_CONTEXT_ZP_F6 }, - .data = ARITH_CONTEXT_COEFF_DATA, - .sign = ARITH_CONTEXT_SIGN_POS - }, - - { - /* Parent = 0, No Zero neighbourhood, sign predict 0 */ - .follow = { ARITH_CONTEXT_ZPNN_F1, ARITH_CONTEXT_ZP_F2, - ARITH_CONTEXT_ZP_F3, ARITH_CONTEXT_ZP_F4, - ARITH_CONTEXT_ZP_F5, ARITH_CONTEXT_ZP_F6 }, - .data = ARITH_CONTEXT_COEFF_DATA, - .sign = ARITH_CONTEXT_SIGN_ZERO - }, { - /* Parent = 0, No Zero neighbourhood, sign predict < 0 */ - .follow = { ARITH_CONTEXT_ZPNN_F1, ARITH_CONTEXT_ZP_F2, - ARITH_CONTEXT_ZP_F3, ARITH_CONTEXT_ZP_F4, - ARITH_CONTEXT_ZP_F5, ARITH_CONTEXT_ZP_F6 }, - .data = ARITH_CONTEXT_COEFF_DATA, - .sign = ARITH_CONTEXT_SIGN_NEG - }, { - /* Parent = 0, No Zero neighbourhood, sign predict > 0 */ - .follow = { ARITH_CONTEXT_ZPNN_F1, ARITH_CONTEXT_ZP_F2, - ARITH_CONTEXT_ZP_F3, ARITH_CONTEXT_ZP_F4, - ARITH_CONTEXT_ZP_F5, ARITH_CONTEXT_ZP_F6 }, - .data = ARITH_CONTEXT_COEFF_DATA, - .sign = ARITH_CONTEXT_SIGN_POS - }, - - { - /* Parent != 0, Zero neighbourhood, sign predict 0 */ - .follow = { ARITH_CONTEXT_NPZN_F1, ARITH_CONTEXT_NP_F2, - ARITH_CONTEXT_NP_F3, ARITH_CONTEXT_NP_F4, - ARITH_CONTEXT_NP_F5, ARITH_CONTEXT_NP_F6 }, - .data = ARITH_CONTEXT_COEFF_DATA, - .sign = ARITH_CONTEXT_SIGN_ZERO - }, { - /* Parent != 0, Zero neighbourhood, sign predict < 0 */ - .follow = { ARITH_CONTEXT_NPZN_F1, ARITH_CONTEXT_NP_F2, - ARITH_CONTEXT_NP_F3, ARITH_CONTEXT_NP_F4, - ARITH_CONTEXT_NP_F5, ARITH_CONTEXT_NP_F6 }, - .data = ARITH_CONTEXT_COEFF_DATA, - .sign = ARITH_CONTEXT_SIGN_NEG - }, { - /* Parent != 0, Zero neighbourhood, sign predict > 0 */ - .follow = { ARITH_CONTEXT_NPZN_F1, ARITH_CONTEXT_NP_F2, - ARITH_CONTEXT_NP_F3, ARITH_CONTEXT_NP_F4, - ARITH_CONTEXT_NP_F5, ARITH_CONTEXT_NP_F6 }, - .data = ARITH_CONTEXT_COEFF_DATA, - .sign = ARITH_CONTEXT_SIGN_POS - }, - +static uint8_t next_ctx[ARITH_CONTEXT_COUNT] = { + 0, + 0, + 0, + ARITH_CONTEXT_ZP_F2, // ZPZN_F1 + ARITH_CONTEXT_ZP_F2, // ZPNN_F1 + ARITH_CONTEXT_ZP_F3, // ZP_F2 + ARITH_CONTEXT_ZP_F4, // ZP_F3 + ARITH_CONTEXT_ZP_F5, // ZP_F4 + ARITH_CONTEXT_ZP_F6, // ZP_F5 + ARITH_CONTEXT_ZP_F6, // ZP_F6 + ARITH_CONTEXT_NP_F2, // NPZN_F1 + ARITH_CONTEXT_NP_F2, // NPNN_F1 + ARITH_CONTEXT_NP_F3, // NP_F2 + ARITH_CONTEXT_NP_F4, // NP_F3 + ARITH_CONTEXT_NP_F5, // NP_F4 + ARITH_CONTEXT_NP_F6, // NP_F5 + ARITH_CONTEXT_NP_F6, // NP_F6 + 0, + 0, + ARITH_CONTEXT_Q_OFFSET_FOLLOW, + 0, + 0, - { - /* Parent != 0, No Zero neighbourhood, sign predict 0 */ - .follow = { ARITH_CONTEXT_NPNN_F1, ARITH_CONTEXT_NP_F2, - ARITH_CONTEXT_NP_F3, ARITH_CONTEXT_NP_F4, - ARITH_CONTEXT_NP_F5, ARITH_CONTEXT_NP_F6 }, - .data = ARITH_CONTEXT_COEFF_DATA, - .sign = ARITH_CONTEXT_SIGN_ZERO - }, { - /* Parent != 0, No Zero neighbourhood, sign predict < 0 */ - .follow = { ARITH_CONTEXT_NPNN_F1, ARITH_CONTEXT_NP_F2, - ARITH_CONTEXT_NP_F3, ARITH_CONTEXT_NP_F4, - ARITH_CONTEXT_NP_F5, ARITH_CONTEXT_NP_F6 }, - .data = ARITH_CONTEXT_COEFF_DATA, - .sign = ARITH_CONTEXT_SIGN_NEG - }, { - /* Parent != 0, No Zero neighbourhood, sign predict > 0 */ - .follow = { ARITH_CONTEXT_NPNN_F1, ARITH_CONTEXT_NP_F2, - ARITH_CONTEXT_NP_F3, ARITH_CONTEXT_NP_F4, - ARITH_CONTEXT_NP_F5, ARITH_CONTEXT_NP_F6 }, - .data = ARITH_CONTEXT_COEFF_DATA, - .sign = ARITH_CONTEXT_SIGN_POS - } + ARITH_CONTEXT_SB_F2, // SB_F1 + ARITH_CONTEXT_SB_F2, // SB_F2 + 0, + 0, + 0, + 0, + ARITH_CONTEXT_VECTOR_F2, // VECTOR_F1 + ARITH_CONTEXT_VECTOR_F3, // VECTOR_F2 + ARITH_CONTEXT_VECTOR_F4, // VECTOR_F3 + ARITH_CONTEXT_VECTOR_F5, // VECTOR_F4 + ARITH_CONTEXT_VECTOR_F5, // VECTOR_F5 + 0, + 0, + ARITH_CONTEXT_DC_F2, // DC_F2 + ARITH_CONTEXT_DC_F2, // DC_F2 }; @@ -331,15 +242,6 @@ void dirac_put_arith_bit(dirac_arith_sta } } -static inline -unsigned int follow_context(int index, - struct dirac_arith_context_set *context_set) -{ - int pos; - pos = FFMIN(index, 5); - return context_set->follow[pos]; -} - /** * Read an unsigned int using the arithmetic decoder * @param arith state of arithmetic decoder @@ -347,16 +249,15 @@ unsigned int follow_context(int index, * @return value read by arithmetic decoder */ unsigned int dirac_get_arith_uint(dirac_arith_state *arith, - struct dirac_arith_context_set *context_set) + int follow_ctx, int data_ctx) { int ret = 1; - int index = 0; - while (dirac_get_arith_bit (arith, follow_context(index, context_set)) == 0) { + while (dirac_get_arith_bit (arith, follow_ctx) == 0) { ret <<= 1; - if (dirac_get_arith_bit (arith, context_set->data)) + if (dirac_get_arith_bit (arith, data_ctx)) ret++; - index++; + follow_ctx = next_ctx[follow_ctx]; } ret--; return ret; @@ -370,17 +271,17 @@ unsigned int dirac_get_arith_uint(dirac_ * @param i value to write */ void dirac_put_arith_uint(dirac_arith_state *arith, - struct dirac_arith_context_set *context_set, + int follow_ctx, int data_ctx, unsigned int i) { int log = av_log2(++i); - int index = 0; while(log) { log--; - dirac_put_arith_bit(arith, follow_context(index++, context_set), 0); - dirac_put_arith_bit(arith, context_set->data, (i >> log)&1); + dirac_put_arith_bit(arith, follow_ctx, 0); + dirac_put_arith_bit(arith, data_ctx, (i >> log)&1); + follow_ctx = next_ctx[follow_ctx]; } - dirac_put_arith_bit(arith, follow_context(index, context_set), 1); + dirac_put_arith_bit(arith, follow_ctx, 1); } /** @@ -389,11 +290,11 @@ void dirac_put_arith_uint(dirac_arith_st * @param context_set the collection of contexts to read the signed int * @return value read by arithmetic decoder */ -int dirac_get_arith_int(dirac_arith_state *arith, - struct dirac_arith_context_set *context_set) +int dirac_get_arith_int(dirac_arith_state *arith, int follow_ctx, + int data_ctx, int sign_ctx) { - int ret = dirac_get_arith_uint(arith, context_set); - if (ret != 0 && dirac_get_arith_bit(arith, context_set->sign)) + int ret = dirac_get_arith_uint(arith, follow_ctx, data_ctx); + if (ret != 0 && dirac_get_arith_bit(arith, sign_ctx)) ret = -ret; return ret; } @@ -406,12 +307,12 @@ int dirac_get_arith_int(dirac_arith_stat * @param i value to write */ void dirac_put_arith_int(dirac_arith_state *arith, - struct dirac_arith_context_set *context_set, + int follow_ctx, int data_ctx, int sign_ctx, int i) { - dirac_put_arith_uint(arith, context_set, FFABS(i)); + dirac_put_arith_uint(arith, follow_ctx, data_ctx, FFABS(i)); if (i) - dirac_put_arith_bit(arith, context_set->sign, i < 0); + dirac_put_arith_bit(arith, sign_ctx, i < 0); } @@ -471,15 +372,6 @@ void dirac_put_arith_terminate(dirac_ari #if 0 void dirac_arith_test(void) { - struct dirac_arith_context_set context = - { - /* Parent = 0, Zero neighbourhood, sign predict 0 */ - .follow = { ARITH_CONTEXT_ZPZN_F1, ARITH_CONTEXT_ZP_F2, - ARITH_CONTEXT_ZP_F3, ARITH_CONTEXT_ZP_F4, - ARITH_CONTEXT_ZP_F5, ARITH_CONTEXT_ZP_F6 }, - .data = ARITH_CONTEXT_COEFF_DATA, - .sign = ARITH_CONTEXT_SIGN_ZERO, - }; struct dirac_arith_state arith; char in[] = "**** Test arithmetic coding and decoding ****"; char out[100]; @@ -499,17 +391,32 @@ void dirac_arith_test(void) { } } - dirac_put_arith_uint(&arith, &context, 50); - dirac_put_arith_uint(&arith, &context, 100000); - dirac_put_arith_uint(&arith, &context, 0); - dirac_put_arith_uint(&arith, &context, 123); - dirac_put_arith_uint(&arith, &context, 4321); + dirac_put_arith_uint(&arith, ARITH_CONTEXT_ZPZN_F1, + ARITH_CONTEXT_COEFF_DATA, 50); + dirac_put_arith_uint(&arith, ARITH_CONTEXT_ZPZN_F1, + ARITH_CONTEXT_COEFF_DATA, 100000); + dirac_put_arith_uint(&arith, ARITH_CONTEXT_ZPZN_F1, + ARITH_CONTEXT_COEFF_DATA, 0); + dirac_put_arith_uint(&arith, ARITH_CONTEXT_ZPZN_F1, + ARITH_CONTEXT_COEFF_DATA, 123); + dirac_put_arith_uint(&arith, ARITH_CONTEXT_ZPZN_F1, + ARITH_CONTEXT_COEFF_DATA, 4321); - dirac_put_arith_int(&arith, &context, -100); - dirac_put_arith_int(&arith, &context, -12345); - dirac_put_arith_int(&arith, &context, 0); - dirac_put_arith_int(&arith, &context, 1234); - dirac_put_arith_int(&arith, &context, -1); + dirac_put_arith_int(&arith, ARITH_CONTEXT_ZPZN_F1, + ARITH_CONTEXT_COEFF_DATA, + ARITH_CONTEXT_SIGN_ZERO, -100); + dirac_put_arith_int(&arith, ARITH_CONTEXT_ZPZN_F1, + ARITH_CONTEXT_COEFF_DATA, + ARITH_CONTEXT_SIGN_ZERO, -12345); + dirac_put_arith_int(&arith, ARITH_CONTEXT_ZPZN_F1, + ARITH_CONTEXT_COEFF_DATA, + ARITH_CONTEXT_SIGN_ZERO, 0); + dirac_put_arith_int(&arith, ARITH_CONTEXT_ZPZN_F1, + ARITH_CONTEXT_COEFF_DATA, + ARITH_CONTEXT_SIGN_ZERO, 1234); + dirac_put_arith_int(&arith, ARITH_CONTEXT_ZPZN_F1, + ARITH_CONTEXT_COEFF_DATA, + ARITH_CONTEXT_SIGN_ZERO, -1); dirac_put_arith_terminate(&arith); flush_put_bits(&pb); @@ -529,9 +436,12 @@ void dirac_arith_test(void) { } for (i = 0; i < 5; i++) - dprintf(0, "UINT: %d\n", dirac_get_arith_uint(&arith, &context)); + dprintf(0, "UINT: %d\n", dirac_get_arith_uint(&arith, + ARITH_CONTEXT_ZPZN_F1, ARITH_CONTEXT_COEFF_DATA)); for (i = 0; i < 5; i++) - dprintf(0, "INT: %d\n", dirac_get_arith_int(&arith, &context)); + dprintf(0, "INT: %d\n", dirac_get_arith_int(&arith, + ARITH_CONTEXT_ZPZN_F1, ARITH_CONTEXT_COEFF_DATA, + ARITH_CONTEXT_SIGN_ZERO)); dirac_get_arith_terminate(&arith); Modified: dirac/libavcodec/dirac_arith.h ============================================================================== --- dirac/libavcodec/dirac_arith.h Thu Jan 1 21:31:53 2009 (r3921) +++ dirac/libavcodec/dirac_arith.h Thu Jan 1 21:31:56 2009 (r3922) @@ -88,29 +88,16 @@ typedef struct dirac_arith_state { PutBitContext *pb; } dirac_arith_state; -struct dirac_arith_context_set { - unsigned int follow[6]; ///< the first follow contexts - unsigned int follow_length; ///< the amount of follow contexts in follow - unsigned int data; ///< context to read data - unsigned int sign; ///< context to read the sign -}; - -extern struct dirac_arith_context_set ff_dirac_context_set_split; -extern struct dirac_arith_context_set ff_dirac_context_set_mv; -extern struct dirac_arith_context_set ff_dirac_context_set_dc; -extern struct dirac_arith_context_set ff_dirac_context_set_quant; -extern struct dirac_arith_context_set ff_dirac_context_sets_waveletcoeff[]; - void dirac_init_arith_decoder(dirac_arith_state *arith, GetBitContext *gb, int length); int dirac_get_arith_bit(dirac_arith_state *arith, int context); unsigned int dirac_get_arith_uint(dirac_arith_state *arith, - struct dirac_arith_context_set *context_set); + int follow_ctx, int data_ctx); -int dirac_get_arith_int(dirac_arith_state *arith, - struct dirac_arith_context_set *context_set); +int dirac_get_arith_int(dirac_arith_state *arith, int follow_ctx, + int data_ctx, int sign_ctx); void dirac_get_arith_terminate(dirac_arith_state *arith); @@ -120,11 +107,11 @@ void dirac_init_arith_encoder(dirac_arit void dirac_put_arith_bit(dirac_arith_state *arith, int bit, int context); void dirac_put_arith_uint(dirac_arith_state *arith, - struct dirac_arith_context_set *context_set, + int follow_ctx, int data_ctx, unsigned int i); void dirac_put_arith_int(dirac_arith_state *arith, - struct dirac_arith_context_set *context_set, + int follow_ctx, int data_ctx, int sign_ctx, int i); void dirac_put_arith_terminate(dirac_arith_state *arith); Modified: dirac/libavcodec/diracdec.c ============================================================================== --- dirac/libavcodec/diracdec.c Thu Jan 1 21:31:53 2009 (r3921) +++ dirac/libavcodec/diracdec.c Thu Jan 1 21:31:56 2009 (r3922) @@ -142,7 +142,10 @@ static inline void coeff_unpack_arith(Di int idx; int coeff; int read_sign; - struct dirac_arith_context_set *context; + int sign_ctx; + static const uint8_t follow_ctxs[4] = { + ARITH_CONTEXT_ZPZN_F1, ARITH_CONTEXT_ZPNN_F1, + ARITH_CONTEXT_NPZN_F1, ARITH_CONTEXT_NPNN_F1 }; /* The value of the pixel belonging to the lower level. */ if (b->parent) @@ -151,18 +154,15 @@ static inline void coeff_unpack_arith(Di /* Determine if the pixel has only zeros in its neighbourhood. */ nhood = zero_neighbourhood(coeffp, x, y, b->stride); - /* Calculate an index into context_sets_waveletcoeff. */ - idx = parent * 6 + (!nhood) * 3; - idx += sign_predict(coeffp, b->orientation, x, y, b->stride); - - context = &ff_dirac_context_sets_waveletcoeff[idx]; + sign_ctx = sign_predict(coeffp, b->orientation, x, y, b->stride); - coeff = dirac_get_arith_uint(&s->arith, context); + coeff = dirac_get_arith_uint(&s->arith, follow_ctxs[(parent<<1) | nhood], + ARITH_CONTEXT_COEFF_DATA); read_sign = coeff; coeff = coeff_dequant(coeff, qoffset, qfactor); if (read_sign) { - if (dirac_get_arith_bit(&s->arith, context->sign)) + if (dirac_get_arith_bit(&s->arith, sign_ctx)) coeff = -coeff; } @@ -212,7 +212,9 @@ static inline void codeblock(DiracContex return; if (s->codeblock_mode && is_arith) - *quant += dirac_get_arith_int(&s->arith, &ff_dirac_context_set_quant); + *quant += dirac_get_arith_int(&s->arith, ARITH_CONTEXT_Q_OFFSET_FOLLOW, + ARITH_CONTEXT_Q_OFFSET_DATA, + ARITH_CONTEXT_Q_OFFSET_SIGN); else if (s->codeblock_mode) *quant += dirac_get_se_golomb(&s->gb); } @@ -547,7 +549,8 @@ static void unpack_block_dc(DiracContext return; } - res = dirac_get_arith_int(&s->arith, &ff_dirac_context_set_dc); + res = dirac_get_arith_int(&s->arith, ARITH_CONTEXT_DC_F1, + ARITH_CONTEXT_DC_DATA, ARITH_CONTEXT_DC_SIGN); res += block_dc_prediction(s, x, y, comp); s->blmotion[y * s->blwidth + x].dc[comp] = res; @@ -570,7 +573,8 @@ static void dirac_unpack_motion_vector(D if ((s->blmotion[y * s->blwidth + x].use_ref & refmask) != ref + 1) return; - res = dirac_get_arith_int(&s->arith, &ff_dirac_context_set_mv); + res = dirac_get_arith_int(&s->arith, ARITH_CONTEXT_VECTOR_F1, + ARITH_CONTEXT_VECTOR_DATA, ARITH_CONTEXT_VECTOR_SIGN); res += motion_vector_prediction(s, x, y, ref, dir); s->blmotion[y * s->blwidth + x].vect[ref][dir] = res; } @@ -644,7 +648,8 @@ static int dirac_unpack_block_motion_dat dirac_init_arith_decoder(&s->arith, gb, length); for (y = 0; y < s->sbheight; y++) for (x = 0; x < s->sbwidth; x++) { - int res = dirac_get_arith_uint(&s->arith, &ff_dirac_context_set_split); + int res = dirac_get_arith_uint(&s->arith, ARITH_CONTEXT_SB_F1, + ARITH_CONTEXT_SB_DATA); s->sbsplit[y * s->sbwidth + x] = res + split_prediction(s, x, y); s->sbsplit[y * s->sbwidth + x] %= 3; }

1 0

[soc]: r3921 - in dirac/libavcodec: dirac_arith.c dirac_arith.h
by conrad 01 Jan '09

01 Jan '09

Author: conrad Date: Thu Jan 1 21:31:53 2009 New Revision: 3921 Log: Remove hidden pointer from dirac_arith_state typedef Modified: dirac/libavcodec/dirac_arith.c dirac/libavcodec/dirac_arith.h Modified: dirac/libavcodec/dirac_arith.c ============================================================================== --- dirac/libavcodec/dirac_arith.c Thu Jan 1 21:31:51 2009 (r3920) +++ dirac/libavcodec/dirac_arith.c Thu Jan 1 21:31:53 2009 (r3921) @@ -193,7 +193,7 @@ struct dirac_arith_context_set ff_dirac_ }; -static void dirac_arith_init_common(dirac_arith_state arith) +static void dirac_arith_init_common(dirac_arith_state *arith) { int i; @@ -213,7 +213,7 @@ static void dirac_arith_init_common(dira * @param gb GetBitContext to read from * @param length amount of bytes to decode */ -void dirac_init_arith_decoder(dirac_arith_state arith, +void dirac_init_arith_decoder(dirac_arith_state *arith, GetBitContext *gb, int length) { align_get_bits(gb); @@ -225,7 +225,7 @@ void dirac_init_arith_decoder(dirac_arit dirac_arith_init_common(arith); } -void dirac_init_arith_encoder(dirac_arith_state arith, PutBitContext *pb) +void dirac_init_arith_encoder(dirac_arith_state *arith, PutBitContext *pb) { arith->pb = pb; arith->carry = 0; @@ -241,7 +241,7 @@ void dirac_init_arith_encoder(dirac_arit * @param context the context of the bit to read * @return the bit read */ -int dirac_get_arith_bit(dirac_arith_state arith, int context) +int dirac_get_arith_bit(dirac_arith_state *arith, int context) { GetBitContext *gb = arith->gb; unsigned int prob_zero = arith->contexts[context]; @@ -297,7 +297,7 @@ int dirac_get_arith_bit(dirac_arith_stat * @param context the context of the bit to write * @param bit the bit to write */ -void dirac_put_arith_bit(dirac_arith_state arith, int context, int bit) +void dirac_put_arith_bit(dirac_arith_state *arith, int context, int bit) { PutBitContext *pb = arith->pb; unsigned int prob_zero = arith->contexts[context]; @@ -346,7 +346,7 @@ unsigned int follow_context(int index, * @param context_set the collection of contexts to read the unsigned int * @return value read by arithmetic decoder */ -unsigned int dirac_get_arith_uint(dirac_arith_state arith, +unsigned int dirac_get_arith_uint(dirac_arith_state *arith, struct dirac_arith_context_set *context_set) { int ret = 1; @@ -369,7 +369,7 @@ unsigned int dirac_get_arith_uint(dirac_ * @param context_set the collection of contexts used to write the unsigned int * @param i value to write */ -void dirac_put_arith_uint(dirac_arith_state arith, +void dirac_put_arith_uint(dirac_arith_state *arith, struct dirac_arith_context_set *context_set, unsigned int i) { @@ -389,7 +389,7 @@ void dirac_put_arith_uint(dirac_arith_st * @param context_set the collection of contexts to read the signed int * @return value read by arithmetic decoder */ -int dirac_get_arith_int(dirac_arith_state arith, +int dirac_get_arith_int(dirac_arith_state *arith, struct dirac_arith_context_set *context_set) { int ret = dirac_get_arith_uint(arith, context_set); @@ -405,7 +405,7 @@ int dirac_get_arith_int(dirac_arith_stat * @param context_set the collection of contexts used to write the signed int * @param i value to write */ -void dirac_put_arith_int(dirac_arith_state arith, +void dirac_put_arith_int(dirac_arith_state *arith, struct dirac_arith_context_set *context_set, int i) { @@ -419,7 +419,7 @@ void dirac_put_arith_int(dirac_arith_sta * Flush the arithmetic decoder, consume all bytes up to the * initialized length. */ -void dirac_get_arith_terminate(dirac_arith_state arith) +void dirac_get_arith_terminate(dirac_arith_state *arith) { assert(!arith->pb); skip_bits_long(arith->gb, arith->bits_left); @@ -430,7 +430,7 @@ void dirac_get_arith_terminate(dirac_ari /** * Flush the arithmetic coder. */ -void dirac_put_arith_terminate(dirac_arith_state arith) +void dirac_put_arith_terminate(dirac_arith_state *arith) { int i; int rem; Modified: dirac/libavcodec/dirac_arith.h ============================================================================== --- dirac/libavcodec/dirac_arith.h Thu Jan 1 21:31:51 2009 (r3920) +++ dirac/libavcodec/dirac_arith.h Thu Jan 1 21:31:53 2009 (r3921) @@ -86,7 +86,7 @@ typedef struct dirac_arith_state { GetBitContext *gb; PutBitContext *pb; -} *dirac_arith_state; +} dirac_arith_state; struct dirac_arith_context_set { unsigned int follow[6]; ///< the first follow contexts @@ -101,32 +101,32 @@ extern struct dirac_arith_context_set ff extern struct dirac_arith_context_set ff_dirac_context_set_quant; extern struct dirac_arith_context_set ff_dirac_context_sets_waveletcoeff[]; -void dirac_init_arith_decoder(dirac_arith_state arith, +void dirac_init_arith_decoder(dirac_arith_state *arith, GetBitContext *gb, int length); -int dirac_get_arith_bit(dirac_arith_state arith, int context); +int dirac_get_arith_bit(dirac_arith_state *arith, int context); -unsigned int dirac_get_arith_uint(dirac_arith_state arith, +unsigned int dirac_get_arith_uint(dirac_arith_state *arith, struct dirac_arith_context_set *context_set); -int dirac_get_arith_int(dirac_arith_state arith, +int dirac_get_arith_int(dirac_arith_state *arith, struct dirac_arith_context_set *context_set); -void dirac_get_arith_terminate(dirac_arith_state arith); +void dirac_get_arith_terminate(dirac_arith_state *arith); -void dirac_init_arith_encoder(dirac_arith_state arith, PutBitContext *pb); +void dirac_init_arith_encoder(dirac_arith_state *arith, PutBitContext *pb); -void dirac_put_arith_bit(dirac_arith_state arith, int bit, int context); +void dirac_put_arith_bit(dirac_arith_state *arith, int bit, int context); -void dirac_put_arith_uint(dirac_arith_state arith, +void dirac_put_arith_uint(dirac_arith_state *arith, struct dirac_arith_context_set *context_set, unsigned int i); -void dirac_put_arith_int(dirac_arith_state arith, +void dirac_put_arith_int(dirac_arith_state *arith, struct dirac_arith_context_set *context_set, int i); -void dirac_put_arith_terminate(dirac_arith_state arith); +void dirac_put_arith_terminate(dirac_arith_state *arith); #endif /* AVCODEC_DIRAC_ARITH_H */

1 0

[soc]: r3920 - in dirac/libavcodec: dirac_arith.c dirac_arith.h diracdec.c diracenc.c
by conrad 01 Jan '09

01 Jan '09

Author: conrad Date: Thu Jan 1 21:31:51 2009 New Revision: 3920 Log: Rename dirac arith coder functions to mirror cabac/rangecoder Modified: dirac/libavcodec/dirac_arith.c dirac/libavcodec/dirac_arith.h dirac/libavcodec/diracdec.c dirac/libavcodec/diracenc.c Modified: dirac/libavcodec/dirac_arith.c ============================================================================== --- dirac/libavcodec/dirac_arith.c Thu Jan 1 21:31:48 2009 (r3919) +++ dirac/libavcodec/dirac_arith.c Thu Jan 1 21:31:51 2009 (r3920) @@ -213,7 +213,7 @@ static void dirac_arith_init_common(dira * @param gb GetBitContext to read from * @param length amount of bytes to decode */ -void dirac_arith_init(dirac_arith_state arith, +void dirac_init_arith_decoder(dirac_arith_state arith, GetBitContext *gb, int length) { align_get_bits(gb); @@ -225,7 +225,7 @@ void dirac_arith_init(dirac_arith_state dirac_arith_init_common(arith); } -void dirac_arith_coder_init(dirac_arith_state arith, PutBitContext *pb) +void dirac_init_arith_encoder(dirac_arith_state arith, PutBitContext *pb) { arith->pb = pb; arith->carry = 0; @@ -241,7 +241,7 @@ void dirac_arith_coder_init(dirac_arith_ * @param context the context of the bit to read * @return the bit read */ -int dirac_arith_get_bit(dirac_arith_state arith, int context) +int dirac_get_arith_bit(dirac_arith_state arith, int context) { GetBitContext *gb = arith->gb; unsigned int prob_zero = arith->contexts[context]; @@ -297,7 +297,7 @@ int dirac_arith_get_bit(dirac_arith_stat * @param context the context of the bit to write * @param bit the bit to write */ -void dirac_arith_put_bit(dirac_arith_state arith, int context, int bit) +void dirac_put_arith_bit(dirac_arith_state arith, int context, int bit) { PutBitContext *pb = arith->pb; unsigned int prob_zero = arith->contexts[context]; @@ -346,15 +346,15 @@ unsigned int follow_context(int index, * @param context_set the collection of contexts to read the unsigned int * @return value read by arithmetic decoder */ -unsigned int dirac_arith_read_uint(dirac_arith_state arith, +unsigned int dirac_get_arith_uint(dirac_arith_state arith, struct dirac_arith_context_set *context_set) { int ret = 1; int index = 0; - while (dirac_arith_get_bit (arith, follow_context(index, context_set)) == 0) { + while (dirac_get_arith_bit (arith, follow_context(index, context_set)) == 0) { ret <<= 1; - if (dirac_arith_get_bit (arith, context_set->data)) + if (dirac_get_arith_bit (arith, context_set->data)) ret++; index++; } @@ -369,7 +369,7 @@ unsigned int dirac_arith_read_uint(dirac * @param context_set the collection of contexts used to write the unsigned int * @param i value to write */ -void dirac_arith_write_uint(dirac_arith_state arith, +void dirac_put_arith_uint(dirac_arith_state arith, struct dirac_arith_context_set *context_set, unsigned int i) { @@ -377,10 +377,10 @@ void dirac_arith_write_uint(dirac_arith_ int index = 0; while(log) { log--; - dirac_arith_put_bit(arith, follow_context(index++, context_set), 0); - dirac_arith_put_bit(arith, context_set->data, (i >> log)&1); + dirac_put_arith_bit(arith, follow_context(index++, context_set), 0); + dirac_put_arith_bit(arith, context_set->data, (i >> log)&1); } - dirac_arith_put_bit(arith, follow_context(index, context_set), 1); + dirac_put_arith_bit(arith, follow_context(index, context_set), 1); } /** @@ -389,11 +389,11 @@ void dirac_arith_write_uint(dirac_arith_ * @param context_set the collection of contexts to read the signed int * @return value read by arithmetic decoder */ -int dirac_arith_read_int(dirac_arith_state arith, +int dirac_get_arith_int(dirac_arith_state arith, struct dirac_arith_context_set *context_set) { - int ret = dirac_arith_read_uint(arith, context_set); - if (ret != 0 && dirac_arith_get_bit(arith, context_set->sign)) + int ret = dirac_get_arith_uint(arith, context_set); + if (ret != 0 && dirac_get_arith_bit(arith, context_set->sign)) ret = -ret; return ret; } @@ -405,13 +405,13 @@ int dirac_arith_read_int(dirac_arith_sta * @param context_set the collection of contexts used to write the signed int * @param i value to write */ -void dirac_arith_write_int(dirac_arith_state arith, +void dirac_put_arith_int(dirac_arith_state arith, struct dirac_arith_context_set *context_set, int i) { - dirac_arith_write_uint(arith, context_set, FFABS(i)); + dirac_put_arith_uint(arith, context_set, FFABS(i)); if (i) - dirac_arith_put_bit(arith, context_set->sign, i < 0); + dirac_put_arith_bit(arith, context_set->sign, i < 0); } @@ -419,7 +419,7 @@ void dirac_arith_write_int(dirac_arith_s * Flush the arithmetic decoder, consume all bytes up to the * initialized length. */ -void dirac_arith_flush(dirac_arith_state arith) +void dirac_get_arith_terminate(dirac_arith_state arith) { assert(!arith->pb); skip_bits_long(arith->gb, arith->bits_left); @@ -430,7 +430,7 @@ void dirac_arith_flush(dirac_arith_state /** * Flush the arithmetic coder. */ -void dirac_arith_coder_flush(dirac_arith_state arith) +void dirac_put_arith_terminate(dirac_arith_state arith) { int i; int rem; @@ -491,37 +491,37 @@ void dirac_arith_test(void) { /* Code the string. */ init_put_bits(&pb, buf, sizeof(buf)*8); - dirac_arith_coder_init(&arith, &pb); + dirac_init_arith_encoder(&arith, &pb); for (c = 0; c < sizeof(in); c++) { for (i = 0; i < 8; i++) { int bit = (in[c] >> (7 - i)) & 1; - dirac_arith_put_bit(&arith, i, bit); + dirac_put_arith_bit(&arith, i, bit); } } - dirac_arith_write_uint(&arith, &context, 50); - dirac_arith_write_uint(&arith, &context, 100000); - dirac_arith_write_uint(&arith, &context, 0); - dirac_arith_write_uint(&arith, &context, 123); - dirac_arith_write_uint(&arith, &context, 4321); + dirac_put_arith_uint(&arith, &context, 50); + dirac_put_arith_uint(&arith, &context, 100000); + dirac_put_arith_uint(&arith, &context, 0); + dirac_put_arith_uint(&arith, &context, 123); + dirac_put_arith_uint(&arith, &context, 4321); - dirac_arith_write_int(&arith, &context, -100); - dirac_arith_write_int(&arith, &context, -12345); - dirac_arith_write_int(&arith, &context, 0); - dirac_arith_write_int(&arith, &context, 1234); - dirac_arith_write_int(&arith, &context, -1); + dirac_put_arith_int(&arith, &context, -100); + dirac_put_arith_int(&arith, &context, -12345); + dirac_put_arith_int(&arith, &context, 0); + dirac_put_arith_int(&arith, &context, 1234); + dirac_put_arith_int(&arith, &context, -1); - dirac_arith_coder_flush(&arith); + dirac_put_arith_terminate(&arith); flush_put_bits(&pb); length = put_bits_count(&pb); /* Now decode the string. */ init_get_bits(&gb, buf, sizeof(buf)*8); - dirac_arith_init(&arith, &gb, length); + dirac_init_arith_decoder(&arith, &gb, length); for(c = 0; 1; c++) { out[c] = 0; for (i = 0; i < 8; i++) { - int bit = dirac_arith_get_bit(&arith, i); + int bit = dirac_get_arith_bit(&arith, i); out[c] = (out[c] << 1) | bit; } if (out[c] == 0) @@ -529,11 +529,11 @@ void dirac_arith_test(void) { } for (i = 0; i < 5; i++) - dprintf(0, "UINT: %d\n", dirac_arith_read_uint(&arith, &context)); + dprintf(0, "UINT: %d\n", dirac_get_arith_uint(&arith, &context)); for (i = 0; i < 5; i++) - dprintf(0, "INT: %d\n", dirac_arith_read_int(&arith, &context)); + dprintf(0, "INT: %d\n", dirac_get_arith_int(&arith, &context)); - dirac_arith_flush(&arith); + dirac_get_arith_terminate(&arith); dprintf(0, "Encoder input : `%s'\n", in); dprintf(0, "Decoder output: `%s'\n", out); Modified: dirac/libavcodec/dirac_arith.h ============================================================================== --- dirac/libavcodec/dirac_arith.h Thu Jan 1 21:31:48 2009 (r3919) +++ dirac/libavcodec/dirac_arith.h Thu Jan 1 21:31:51 2009 (r3920) @@ -101,32 +101,32 @@ extern struct dirac_arith_context_set ff extern struct dirac_arith_context_set ff_dirac_context_set_quant; extern struct dirac_arith_context_set ff_dirac_context_sets_waveletcoeff[]; -void dirac_arith_init(dirac_arith_state arith, +void dirac_init_arith_decoder(dirac_arith_state arith, GetBitContext *gb, int length); -int dirac_arith_get_bit(dirac_arith_state arith, int context); +int dirac_get_arith_bit(dirac_arith_state arith, int context); -unsigned int dirac_arith_read_uint(dirac_arith_state arith, +unsigned int dirac_get_arith_uint(dirac_arith_state arith, struct dirac_arith_context_set *context_set); -int dirac_arith_read_int(dirac_arith_state arith, +int dirac_get_arith_int(dirac_arith_state arith, struct dirac_arith_context_set *context_set); -void dirac_arith_flush(dirac_arith_state arith); +void dirac_get_arith_terminate(dirac_arith_state arith); -void dirac_arith_coder_init(dirac_arith_state arith, PutBitContext *pb); +void dirac_init_arith_encoder(dirac_arith_state arith, PutBitContext *pb); -void dirac_arith_put_bit(dirac_arith_state arith, int bit, int context); +void dirac_put_arith_bit(dirac_arith_state arith, int bit, int context); -void dirac_arith_write_uint(dirac_arith_state arith, +void dirac_put_arith_uint(dirac_arith_state arith, struct dirac_arith_context_set *context_set, unsigned int i); -void dirac_arith_write_int(dirac_arith_state arith, +void dirac_put_arith_int(dirac_arith_state arith, struct dirac_arith_context_set *context_set, int i); -void dirac_arith_coder_flush(dirac_arith_state arith); +void dirac_put_arith_terminate(dirac_arith_state arith); #endif /* AVCODEC_DIRAC_ARITH_H */ Modified: dirac/libavcodec/diracdec.c ============================================================================== --- dirac/libavcodec/diracdec.c Thu Jan 1 21:31:48 2009 (r3919) +++ dirac/libavcodec/diracdec.c Thu Jan 1 21:31:51 2009 (r3920) @@ -157,12 +157,12 @@ static inline void coeff_unpack_arith(Di context = &ff_dirac_context_sets_waveletcoeff[idx]; - coeff = dirac_arith_read_uint(&s->arith, context); + coeff = dirac_get_arith_uint(&s->arith, context); read_sign = coeff; coeff = coeff_dequant(coeff, qoffset, qfactor); if (read_sign) { - if (dirac_arith_get_bit(&s->arith, context->sign)) + if (dirac_get_arith_bit(&s->arith, context->sign)) coeff = -coeff; } @@ -204,7 +204,7 @@ static inline void codeblock(DiracContex int zero_block; /* Determine if this codeblock is a zero block. */ if (is_arith) - zero_block = dirac_arith_get_bit(&s->arith, ARITH_CONTEXT_ZERO_BLOCK); + zero_block = dirac_get_arith_bit(&s->arith, ARITH_CONTEXT_ZERO_BLOCK); else zero_block = get_bits1(&s->gb); @@ -212,7 +212,7 @@ static inline void codeblock(DiracContex return; if (s->codeblock_mode && is_arith) - *quant += dirac_arith_read_int(&s->arith, &ff_dirac_context_set_quant); + *quant += dirac_get_arith_int(&s->arith, &ff_dirac_context_set_quant); else if (s->codeblock_mode) *quant += dirac_get_se_golomb(&s->gb); } @@ -276,7 +276,7 @@ static av_always_inline void decode_subb align_get_bits(gb); if (is_arith) - dirac_arith_init(&s->arith, gb, length); + dirac_init_arith_decoder(&s->arith, gb, length); top = 0; for (cb_y = 0; cb_y < cb_numy; cb_y++) { @@ -291,7 +291,7 @@ static av_always_inline void decode_subb } if (is_arith) - dirac_arith_flush(&s->arith); + dirac_get_arith_terminate(&s->arith); if (b->orientation == subband_ll && s->refs == 0) intra_dc_prediction(b); @@ -489,12 +489,12 @@ static int dirac_unpack_prediction_param */ static void blockmode_prediction(DiracContext *s, int x, int y) { - int res = dirac_arith_get_bit(&s->arith, ARITH_CONTEXT_PMODE_REF1); + int res = dirac_get_arith_bit(&s->arith, ARITH_CONTEXT_PMODE_REF1); res ^= mode_prediction(s, x, y, DIRAC_REF_MASK_REF1, 0); s->blmotion[y * s->blwidth + x].use_ref |= res; if (s->refs == 2) { - res = dirac_arith_get_bit(&s->arith, ARITH_CONTEXT_PMODE_REF2); + res = dirac_get_arith_bit(&s->arith, ARITH_CONTEXT_PMODE_REF2); res ^= mode_prediction(s, x, y, DIRAC_REF_MASK_REF2, 1); s->blmotion[y * s->blwidth + x].use_ref |= res << 1; } @@ -514,7 +514,7 @@ static void blockglob_prediction(DiracCo /* Global motion compensation is not used for this block. */ if (s->blmotion[y * s->blwidth + x].use_ref & 3) { - int res = dirac_arith_get_bit(&s->arith, ARITH_CONTEXT_GLOBAL_BLOCK); + int res = dirac_get_arith_bit(&s->arith, ARITH_CONTEXT_GLOBAL_BLOCK); res ^= mode_prediction(s, x, y, DIRAC_REF_MASK_GLOBAL, 2); s->blmotion[y * s->blwidth + x].use_ref |= res << 2; } @@ -547,7 +547,7 @@ static void unpack_block_dc(DiracContext return; } - res = dirac_arith_read_int(&s->arith, &ff_dirac_context_set_dc); + res = dirac_get_arith_int(&s->arith, &ff_dirac_context_set_dc); res += block_dc_prediction(s, x, y, comp); s->blmotion[y * s->blwidth + x].dc[comp] = res; @@ -570,7 +570,7 @@ static void dirac_unpack_motion_vector(D if ((s->blmotion[y * s->blwidth + x].use_ref & refmask) != ref + 1) return; - res = dirac_arith_read_int(&s->arith, &ff_dirac_context_set_mv); + res = dirac_get_arith_int(&s->arith, &ff_dirac_context_set_mv); res += motion_vector_prediction(s, x, y, ref, dir); s->blmotion[y * s->blwidth + x].vect[ref][dir] = res; } @@ -588,7 +588,7 @@ static void dirac_unpack_motion_vectors( int x, y; length = svq3_get_ue_golomb(gb); - dirac_arith_init(&s->arith, gb, length); + dirac_init_arith_decoder(&s->arith, gb, length); for (y = 0; y < s->sbheight; y++) for (x = 0; x < s->sbwidth; x++) { int q, p; @@ -605,7 +605,7 @@ static void dirac_unpack_motion_vectors( 4 * y + q * step); } } - dirac_arith_flush(&s->arith); + dirac_get_arith_terminate(&s->arith); } /** @@ -641,18 +641,18 @@ static int dirac_unpack_block_motion_dat /* Superblock splitmodes. */ length = svq3_get_ue_golomb(gb); - dirac_arith_init(&s->arith, gb, length); + dirac_init_arith_decoder(&s->arith, gb, length); for (y = 0; y < s->sbheight; y++) for (x = 0; x < s->sbwidth; x++) { - int res = dirac_arith_read_uint(&s->arith, &ff_dirac_context_set_split); + int res = dirac_get_arith_uint(&s->arith, &ff_dirac_context_set_split); s->sbsplit[y * s->sbwidth + x] = res + split_prediction(s, x, y); s->sbsplit[y * s->sbwidth + x] %= 3; } - dirac_arith_flush(&s->arith); + dirac_get_arith_terminate(&s->arith); /* Prediction modes. */ length = svq3_get_ue_golomb(gb); - dirac_arith_init(&s->arith, gb, length); + dirac_init_arith_decoder(&s->arith, gb, length); for (y = 0; y < s->sbheight; y++) for (x = 0; x < s->sbwidth; x++) { int q, p; @@ -668,7 +668,7 @@ static int dirac_unpack_block_motion_dat propagate_block_data(s, step, xblk, yblk); } } - dirac_arith_flush(&s->arith); + dirac_get_arith_terminate(&s->arith); /* Unpack the motion vectors. */ for (i = 0; i < s->refs; i++) { @@ -680,7 +680,7 @@ static int dirac_unpack_block_motion_dat for (comp = 0; comp < 3; comp++) { /* Unpack the DC values. */ length = svq3_get_ue_golomb(gb); - dirac_arith_init(&s->arith, gb, length); + dirac_init_arith_decoder(&s->arith, gb, length); for (y = 0; y < s->sbheight; y++) for (x = 0; x < s->sbwidth; x++) { int q, p; @@ -695,7 +695,7 @@ static int dirac_unpack_block_motion_dat propagate_block_data(s, step, xblk, yblk); } } - dirac_arith_flush(&s->arith); + dirac_get_arith_terminate(&s->arith); } return 0; Modified: dirac/libavcodec/diracenc.c ============================================================================== --- dirac/libavcodec/diracenc.c Thu Jan 1 21:31:48 2009 (r3919) +++ dirac/libavcodec/diracenc.c Thu Jan 1 21:31:51 2009 (r3920) @@ -327,7 +327,7 @@ static void encode_coeff(DiracContext *s /* XXX: Quantization. */ /* Write out the coefficient. */ - dirac_arith_write_int(&s->arith, context, coeff); + dirac_put_arith_int(&s->arith, context, coeff); } static void encode_codeblock(DiracContext *s, int16_t *coeffs, int level, @@ -357,7 +357,7 @@ static void encode_codeblock(DiracContex } } - dirac_arith_put_bit(&s->arith, ARITH_CONTEXT_ZERO_BLOCK, zero); + dirac_put_arith_bit(&s->arith, ARITH_CONTEXT_ZERO_BLOCK, zero); if (zero) return; @@ -389,7 +389,7 @@ static inline void dirac_arithblk_writelen(DiracContext *s, PutBitContext *pb) { int length ; - dirac_arith_coder_flush(&s->arith); + dirac_put_arith_terminate(&s->arith); flush_put_bits(pb); length = put_bits_count(pb) / 8; dirac_set_ue_golomb(&s->pb, length); @@ -420,7 +420,7 @@ static int encode_subband(DiracContext * /* Encode the data. */ init_put_bits(&pb, s->encodebuf, (1 << 20) * 8); - dirac_arith_coder_init(&s->arith, &pb); + dirac_init_arith_encoder(&s->arith, &pb); if (level == 0 && s->refs == 0) intra_dc_coding(s, coeffs); @@ -533,13 +533,13 @@ static void blockmode_encode(DiracContex { int res = s->blmotion[y * s->blwidth + x].use_ref & DIRAC_REF_MASK_REF1; res ^= mode_prediction(s, x, y, DIRAC_REF_MASK_REF1, 0); - dirac_arith_put_bit(&s->arith, ARITH_CONTEXT_PMODE_REF2, res); + dirac_put_arith_bit(&s->arith, ARITH_CONTEXT_PMODE_REF2, res); if (s->refs == 2) { res = (s->blmotion[y * s->blwidth + x].use_ref & DIRAC_REF_MASK_REF2) >> 1; res ^= mode_prediction(s, x, y, DIRAC_REF_MASK_REF2, 1); - dirac_arith_put_bit(&s->arith, ARITH_CONTEXT_PMODE_REF2, res); + dirac_put_arith_bit(&s->arith, ARITH_CONTEXT_PMODE_REF2, res); } } @@ -554,7 +554,7 @@ static void blockglob_encode(DiracContex int res = (s->blmotion[y * s->blwidth + x].use_ref & DIRAC_REF_MASK_GLOBAL) >> 2; res ^= mode_prediction(s, x, y, DIRAC_REF_MASK_GLOBAL, 2); - dirac_arith_put_bit(&s->arith, ARITH_CONTEXT_GLOBAL_BLOCK, res); + dirac_put_arith_bit(&s->arith, ARITH_CONTEXT_GLOBAL_BLOCK, res); } } @@ -571,7 +571,7 @@ static void dirac_pack_motion_vector(Dir res = s->blmotion[y * s->blwidth + x].vect[ref][dir]; res -= motion_vector_prediction(s, x, y, ref, dir); - dirac_arith_write_int(&s->arith, &dirac_context_set_mv, res); + dirac_put_arith_int(&s->arith, &dirac_context_set_mv, res); } static void dirac_pack_motion_vectors(DiracContext *s, int ref, int dir) @@ -580,7 +580,7 @@ static void dirac_pack_motion_vectors(Di int x, y; init_put_bits(&pb, s->encodebuf, (1 << 20) * 8); - dirac_arith_coder_init(&s->arith, &pb); + dirac_init_arith_encoder(&s->arith, &pb); for (y = 0; y < s->sbheight; y++) for (x = 0; x < s->sbwidth; x++) { int q, p; @@ -608,7 +608,7 @@ static void pack_block_dc(DiracContext * res = s->blmotion[y * s->blwidth + x].dc[comp]; res -= block_dc_prediction(s, x, y, comp); - dirac_arith_write_int(&s->arith, &dirac_context_set_dc, res); + dirac_put_arith_int(&s->arith, &dirac_context_set_dc, res); } static int dirac_encode_blockdata(DiracContext *s) @@ -668,7 +668,7 @@ static int dirac_encode_blockdata(DiracC /* Superblock splitmodes. XXX: Just (for now) encode "2", so that blocks are not split at all. */ init_put_bits(&pb, s->encodebuf, (1 << 20) * 8); - dirac_arith_coder_init(&s->arith, &pb); + dirac_init_arith_encoder(&s->arith, &pb); for (y = 0; y < s->sbheight; y++) for (x = 0; x < s->sbwidth; x++) { int res; @@ -680,14 +680,14 @@ static int dirac_encode_blockdata(DiracC if (res < 0) res += 3; - dirac_arith_write_uint(&s->arith, &dirac_context_set_split, res); + dirac_put_arith_uint(&s->arith, &dirac_context_set_split, res); } dirac_arithblk_writelen(s, &pb); dirac_arithblk_writedata(s, &pb); /* Prediction modes. */ init_put_bits(&pb, s->encodebuf, (1 << 20) * 8); - dirac_arith_coder_init(&s->arith, &pb); + dirac_init_arith_encoder(&s->arith, &pb); for (y = 0; y < s->sbheight; y++) for (x = 0; x < s->sbwidth; x++) { int q, p; @@ -717,7 +717,7 @@ static int dirac_encode_blockdata(DiracC for (comp = 0; comp < 3; comp++) { /* Unpack the DC values. */ init_put_bits(&pb, s->encodebuf, (1 << 20) * 8); - dirac_arith_coder_init(&s->arith, &pb); + dirac_init_arith_encoder(&s->arith, &pb); for (y = 0; y < s->sbheight; y++) for (x = 0; x < s->sbwidth; x++) { int q, p;

1 0

[soc]: r3919 - dirac/libavcodec/dirac_arith.h
by conrad 01 Jan '09

01 Jan '09

Author: conrad Date: Thu Jan 1 21:31:48 2009 New Revision: 3919 Log: Separate arithmetic coder read/write function declarations Modified: dirac/libavcodec/dirac_arith.h Modified: dirac/libavcodec/dirac_arith.h ============================================================================== --- dirac/libavcodec/dirac_arith.h Thu Jan 1 21:31:46 2009 (r3918) +++ dirac/libavcodec/dirac_arith.h Thu Jan 1 21:31:48 2009 (r3919) @@ -104,18 +104,21 @@ extern struct dirac_arith_context_set ff void dirac_arith_init(dirac_arith_state arith, GetBitContext *gb, int length); -void dirac_arith_coder_init(dirac_arith_state arith, PutBitContext *pb); - int dirac_arith_get_bit(dirac_arith_state arith, int context); -void dirac_arith_put_bit(dirac_arith_state arith, int bit, int context); - unsigned int dirac_arith_read_uint(dirac_arith_state arith, struct dirac_arith_context_set *context_set); int dirac_arith_read_int(dirac_arith_state arith, struct dirac_arith_context_set *context_set); +void dirac_arith_flush(dirac_arith_state arith); + + +void dirac_arith_coder_init(dirac_arith_state arith, PutBitContext *pb); + +void dirac_arith_put_bit(dirac_arith_state arith, int bit, int context); + void dirac_arith_write_uint(dirac_arith_state arith, struct dirac_arith_context_set *context_set, unsigned int i); @@ -124,8 +127,6 @@ void dirac_arith_write_int(dirac_arith_s struct dirac_arith_context_set *context_set, int i); -void dirac_arith_flush(dirac_arith_state arith); - void dirac_arith_coder_flush(dirac_arith_state arith); #endif /* AVCODEC_DIRAC_ARITH_H */

1 0