Module: libav
Branch: release/12
Commit: 26a264e427c0c41787c4cb80d937f6c177643963
Author: Diego Biurrun <di...@biurrun.de>
Committer: Sean McGovern <gsean...@gmail.com>
Date: Tue Aug 2 12:01:12 2016 +0200
wma: Kill non-compiling disabled cruft
---
libavcodec/wma.c | 10 ----------
libavcodec/wmaenc.c | 17 -----------------
2 files changed, 27 deletions(-)
diff --git a/libavcodec/wma.c b/libavcodec/wma.c
index 85193ff..4067dff 100644
--- a/libavcodec/wma.c
+++ b/libavcodec/wma.c
@@ -276,16 +276,6 @@ av_cold int ff_wma_init(AVCodecContext *avctx, int flags2)
s->exponent_high_bands[k][j++] = end - start;
}
s->exponent_high_sizes[k] = j;
-#if 0
- ff_tlog(s->avctx, "%5d: coefs_end=%d high_band_start=%d
nb_high_bands=%d: ",
- s->frame_len >> k,
- s->coefs_end[k],
- s->high_band_start[k],
- s->exponent_high_sizes[k]);
- for (j = 0; j < s->exponent_high_sizes[k]; j++)
- ff_tlog(s->avctx, " %d", s->exponent_high_bands[k][j]);
- ff_tlog(s->avctx, "\n");
-#endif /* 0 */
}
}
diff --git a/libavcodec/wmaenc.c b/libavcodec/wmaenc.c
index e991bb8..800c000 100644
--- a/libavcodec/wmaenc.c
+++ b/libavcodec/wmaenc.c
@@ -386,7 +386,6 @@ static int encode_superframe(AVCodecContext *avctx,
AVPacket *avpkt,
return ret;
}
-#if 1
total_gain = 128;
for (i = 64; i; i >>= 1) {
int error = encode_frame(s, s->coefs, avpkt->data, avpkt->size,
@@ -394,22 +393,6 @@ static int encode_superframe(AVCodecContext *avctx,
AVPacket *avpkt,
if (error < 0)
total_gain -= i;
}
-#else
- total_gain = 90;
- best = encode_frame(s, s->coefs, avpkt->data, avpkt->size, total_gain);
- for (i = 32; i; i >>= 1) {
- int scoreL = encode_frame(s, s->coefs, avpkt->data, avpkt->size,
total_gain - i);
- int scoreR = encode_frame(s, s->coefs, avpkt->data, avpkt->size,
total_gain + i);
- av_log(NULL, AV_LOG_ERROR, "%d %d %d (%d)\n", scoreL, best, scoreR,
total_gain);
- if (scoreL < FFMIN(best, scoreR)) {
- best = scoreL;
- total_gain -= i;
- } else if (scoreR < best) {
- best = scoreR;
- total_gain += i;
- }
- }
-#endif /* 1 */
if ((i = encode_frame(s, s->coefs, avpkt->data, avpkt->size, total_gain))
>= 0) {
av_log(avctx, AV_LOG_ERROR, "required frame size too large. please "
_______________________________________________
libav-commits mailing list
libav-commits@libav.org
https://lists.libav.org/mailman/listinfo/libav-commits
