virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-05-13 21:26:33 +02:00
Code Issues Releases Activity

wma: Kill non-compiling disabled cruft

Browse Source
This commit is contained in:
Diego Biurrun 2016-08-02 12:01:12 +02:00
parent aa37d2bf45
commit a972fc1c0a
2 changed files with 0 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/wma.c
View File

@ -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_bands[k][j++] = end - start;
} }
s->exponent_high_sizes[k] = j; 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 */
} }
} }

17
libavcodec/wmaenc.c
View File

@ -386,7 +386,6 @@ static int encode_superframe(AVCodecContext *avctx, AVPacket *avpkt,
return ret; return ret;
} }
#if 1
total_gain = 128; total_gain = 128;
for (i = 64; i; i >>= 1) { for (i = 64; i; i >>= 1) {
int error = encode_frame(s, s->coefs, avpkt->data, avpkt->size, 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) if (error < 0)
total_gain -= i; 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) { 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 " av_log(avctx, AV_LOG_ERROR, "required frame size too large. please "