* qatar/master: avcodec: Convert some commented-out printf/av_log instances to av_dlog avcodec: Drop silly and/or broken printf debug output avcodec: Drop some silly commented-out av_log() invocations avformat: Convert some commented-out printf/av_log instances to av_dlog avformat: Remove non-compiling and/or silly commented-out printf/av_log statements Remove some silly disabled code. ac3dec: ensure get_buffer() gets a buffer for the correct number of channels Conflicts: libavcodec/dnxhddec.c libavcodec/ffv1.c libavcodec/h264.c libavcodec/h264_parser.c libavcodec/mjpegdec.c libavcodec/motion_est_template.c libavcodec/mpegaudiodec.c libavcodec/mpegvideo_enc.c libavcodec/put_bits.h libavcodec/ratecontrol.c libavcodec/wmaenc.c libavdevice/timefilter.c libavformat/asfdec.c libavformat/avidec.c libavformat/avienc.c libavformat/flvenc.c libavformat/utils.c
Showing the changes to libavcodec/aaccoder.c (1 of 62 files). Show all
Unified · Split
| @@ -585,7 +585,6 @@ static void search_for_quantizers_anmr(AVCodecContext *avctx, AACEncContext *s, · 584 unmodified lines | |||
| 585 | q0 = coef2minsf(q0f); | 585 | q0 = coef2minsf(q0f); |
| 586 | //maximum scalefactor index is when maximum coefficient after quantizing is still not zero | 586 | //maximum scalefactor index is when maximum coefficient after quantizing is still not zero |
| 587 | q1 = coef2maxsf(q1f); | 587 | q1 = coef2maxsf(q1f); |
| 588 | //av_log(NULL, AV_LOG_ERROR, "q0 %d, q1 %d\n", q0, q1); | ||
| 589 | if (q1 - q0 > 60) { | 588 | if (q1 - q0 > 60) { |
| 590 | int q0low = q0; | 589 | int q0low = q0; |
| 591 | int q1high = q1; | 590 | int q1high = q1; |
| @@ -593,7 +592,6 @@ static void search_for_quantizers_anmr(AVCodecContext *avctx, AACEncContext *s, · 1 unmodified line | |||
| 593 | int qnrg = av_clip_uint8(log2f(sqrtf(qnrgf/qcnt))*4 - 31 + SCALE_ONE_POS - SCALE_DIV_512); | 592 | int qnrg = av_clip_uint8(log2f(sqrtf(qnrgf/qcnt))*4 - 31 + SCALE_ONE_POS - SCALE_DIV_512); |
| 594 | q1 = qnrg + 30; | 593 | q1 = qnrg + 30; |
| 595 | q0 = qnrg - 30; | 594 | q0 = qnrg - 30; |
| 596 | //av_log(NULL, AV_LOG_ERROR, "q0 %d, q1 %d\n", q0, q1); | ||
| 597 | if (q0 < q0low) { | 595 | if (q0 < q0low) { |
| 598 | q1 += q0low - q0; | 596 | q1 += q0low - q0; |
| 599 | q0 = q0low; | 597 | q0 = q0low; |
| @@ -602,7 +600,6 @@ static void search_for_quantizers_anmr(AVCodecContext *avctx, AACEncContext *s, · 2 unmodified lines | |||
| 602 | q1 = q1high; | 600 | q1 = q1high; |
| 603 | } | 601 | } |
| 604 | } | 602 | } |
| 605 | //av_log(NULL, AV_LOG_ERROR, "q0 %d, q1 %d\n", q0, q1); | ||
| 606 | 603 | ||
| 607 | for (i = 0; i < TRELLIS_STATES; i++) { | 604 | for (i = 0; i < TRELLIS_STATES; i++) { |
| 608 | paths[0][i].cost = 0.0f; | 605 | paths[0][i].cost = 0.0f; |