* qatar/master: (25 commits) Replace custom DEBUG preprocessor trickery by the standard one. vorbis: Remove non-compiling debug statement. vorbis: Remove pointless DEBUG #ifdef around debug output macros. cook: Remove non-compiling debug output. Remove pointless #ifdefs around function declarations in a header. Replace #ifdef + av_log() combinations by av_dlog(). Replace custom debug output functions by av_dlog(). cook: Remove unused debug functions. Remove stray extra arguments from av_dlog() invocations. targa: fix big-endian build v4l2: remove one forgotten use of AVFormatParameters.pix_fmt. vfwcap: add a framerate private option. v4l2: add a framerate private option. libdc1394: add a framerate private option. fbdev: add a framerate private option. bktr: add a framerate private option. oma: check avio_read() return value nutdec: remove unused variable Remove unused variables swscale: allocate larger buffer to handle altivec overreads. ... Conflicts: ffmpeg.c libavcodec/dca.c libavcodec/dirac.c libavcodec/error_resilience.c libavcodec/h264.c libavcodec/mpeg12.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/pthread.c libavcodec/rv10.c libavcodec/s302m.c libavcodec/shorten.c libavcodec/truemotion2.c libavcodec/utils.c libavdevice/dv1394.c libavdevice/fbdev.c libavdevice/libdc1394.c libavdevice/v4l2.c libavformat/4xm.c libavformat/apetag.c libavformat/asfdec.c libavformat/avidec.c libavformat/mmf.c libavformat/mpeg.c libavformat/mpegenc.c libavformat/mpegts.c libavformat/oggdec.c libavformat/oggparseogm.c libavformat/rl2.c libavformat/rmdec.c libavformat/rpl.c libavformat/rtpdec_latm.c libavformat/sauce.c libavformat/sol.c libswscale/utils.c tests/ref/vsynth1/error tests/ref/vsynth2/error
Showing the changes to libavcodec/aaccoder.c (1 of 70 files). Show all
Unified · Split
| @@ -312,7 +312,7 @@ static void encode_window_bands_info(AACEncContext *s, SingleChannelElement *sce · 311 unmodified lines | |||
| 312 | int win, int group_len, const float lambda) | 312 | int win, int group_len, const float lambda) |
| 313 | { | 313 | { |
| 314 | BandCodingPath path[120][12]; | 314 | BandCodingPath path[120][12]; |
| 315 | int w, swb, cb, start, start2, size; | 315 | int w, swb, cb, start, size; |
| 316 | int i, j; | 316 | int i, j; |
| 317 | const int max_sfb = sce->ics.max_sfb; | 317 | const int max_sfb = sce->ics.max_sfb; |
| 318 | const int run_bits = sce->ics.num_windows == 1 ? 5 : 3; | 318 | const int run_bits = sce->ics.num_windows == 1 ? 5 : 3; |
| @@ -330,7 +330,6 @@ static void encode_window_bands_info(AACEncContext *s, SingleChannelElement *sce · 11 unmodified lines | |||
| 330 | path[0][cb].run = 0; | 330 | path[0][cb].run = 0; |
| 331 | } | 331 | } |
| 332 | for (swb = 0; swb < max_sfb; swb++) { | 332 | for (swb = 0; swb < max_sfb; swb++) { |
| 333 | start2 = start; | ||
| 334 | size = sce->ics.swb_sizes[swb]; | 333 | size = sce->ics.swb_sizes[swb]; |
| 335 | if (sce->zeroes[win*16 + swb]) { | 334 | if (sce->zeroes[win*16 + swb]) { |
| 336 | for (cb = 0; cb < 12; cb++) { | 335 | for (cb = 0; cb < 12; cb++) { |
| @@ -414,7 +413,7 @@ static void codebook_trellis_rate(AACEncContext *s, SingleChannelElement *sce, · 77 unmodified lines | |||
| 414 | int win, int group_len, const float lambda) | 413 | int win, int group_len, const float lambda) |
| 415 | { | 414 | { |
| 416 | BandCodingPath path[120][12]; | 415 | BandCodingPath path[120][12]; |
| 417 | int w, swb, cb, start, start2, size; | 416 | int w, swb, cb, start, size; |
| 418 | int i, j; | 417 | int i, j; |
| 419 | const int max_sfb = sce->ics.max_sfb; | 418 | const int max_sfb = sce->ics.max_sfb; |
| 420 | const int run_bits = sce->ics.num_windows == 1 ? 5 : 3; | 419 | const int run_bits = sce->ics.num_windows == 1 ? 5 : 3; |
| @@ -432,7 +431,6 @@ static void codebook_trellis_rate(AACEncContext *s, SingleChannelElement *sce, · 11 unmodified lines | |||
| 432 | path[0][cb].run = 0; | 431 | path[0][cb].run = 0; |
| 433 | } | 432 | } |
| 434 | for (swb = 0; swb < max_sfb; swb++) { | 433 | for (swb = 0; swb < max_sfb; swb++) { |
| 435 | start2 = start; | ||
| 436 | size = sce->ics.swb_sizes[swb]; | 434 | size = sce->ics.swb_sizes[swb]; |
| 437 | if (sce->zeroes[win*16 + swb]) { | 435 | if (sce->zeroes[win*16 + swb]) { |
| 438 | for (cb = 0; cb < 12; cb++) { | 436 | for (cb = 0; cb < 12; cb++) { |
| @@ -1007,12 +1005,11 @@ static void search_for_quantizers_fast(AVCodecContext *avctx, AACEncContext *s, · 568 unmodified lines | |||
| 1007 | SingleChannelElement *sce, | 1005 | SingleChannelElement *sce, |
| 1008 | const float lambda) | 1006 | const float lambda) |
| 1009 | { | 1007 | { |
| 1010 | int start = 0, i, w, w2, g; | 1008 | int i, w, w2, g; |
| 1011 | int minq = 255; | 1009 | int minq = 255; |
| 1012 | 1010 | ||
| 1013 | memset(sce->sf_idx, 0, sizeof(sce->sf_idx)); | 1011 | memset(sce->sf_idx, 0, sizeof(sce->sf_idx)); |
| 1014 | for (w = 0; w < sce->ics.num_windows; w += sce->ics.group_len[w]) { | 1012 | for (w = 0; w < sce->ics.num_windows; w += sce->ics.group_len[w]) { |
| 1015 | start = w*128; | ||
| 1016 | for (g = 0; g < sce->ics.num_swb; g++) { | 1013 | for (g = 0; g < sce->ics.num_swb; g++) { |
| 1017 | for (w2 = 0; w2 < sce->ics.group_len[w]; w2++) { | 1014 | for (w2 = 0; w2 < sce->ics.group_len[w]; w2++) { |
| 1018 | FFPsyBand *band = &s->psy.psy_bands[s->cur_channel*PSY_MAX_BANDS+(w+w2)*16+g]; | 1015 | FFPsyBand *band = &s->psy.psy_bands[s->cur_channel*PSY_MAX_BANDS+(w+w2)*16+g]; |