---
libavcodec/wmaenc.c | 49 ++++++++++++++++++++++++++++++++++---------------
1 files changed, 34 insertions(+), 15 deletions(-)
diff --git a/libavcodec/wmaenc.c b/libavcodec/wmaenc.c
index c762a72..8c9c4e2 100644
--- a/libavcodec/wmaenc.c
+++ b/libavcodec/wmaenc.c
@@ -20,6 +20,7 @@
*/
#include "avcodec.h"
+#include "internal.h"
#include "wma.h"
#undef NDEBUG
@@ -71,10 +72,16 @@ static int encode_init(AVCodecContext * avctx){
for(i = 0; i < s->nb_block_sizes; i++)
ff_mdct_init(&s->mdct_ctx[i], s->frame_len_bits - i + 1, 0, 1.0);
- avctx->block_align=
s->block_align= avctx->bit_rate*(int64_t)s->frame_len /
(avctx->sample_rate*8);
+ s->block_align = FFMIN(s->block_align, MAX_CODED_SUPERFRAME_SIZE);
+ avctx->block_align = s->block_align;
//av_log(NULL, AV_LOG_ERROR, "%d %d %d %d\n", s->block_align, avctx->bit_rate,
s->frame_len, avctx->sample_rate);
- avctx->frame_size= s->frame_len;
+ avctx->frame_size = avctx->delay = s->frame_len;
+
+#if FF_API_OLD_ENCODE_AUDIO
+ avctx->coded_frame = &s->frame;
+ avcodec_get_frame_defaults(avctx->coded_frame);
+#endif
return 0;
}
@@ -332,16 +339,17 @@ static int encode_frame(WMACodecContext *s, float
(*src_coefs)[BLOCK_MAX_SIZE],
return put_bits_count(&s->pb)/8 - s->block_align;
}
-static int encode_superframe(AVCodecContext *avctx,
- unsigned char *buf, int buf_size, void *data){
+static int encode_superframe(AVCodecContext *avctx, AVPacket *avpkt,
+ const AVFrame *frame, int *got_packet_ptr)
+{
WMACodecContext *s = avctx->priv_data;
- const short *samples = data;
- int i, total_gain;
+ const int16_t *samples = (const int16_t *)frame->data[0];
+ int i, total_gain, ret;
s->block_len_bits= s->frame_len_bits; //required by non variable block len
s->block_len = 1 << s->block_len_bits;
- apply_window_and_mdct(avctx, samples, avctx->frame_size);
+ apply_window_and_mdct(avctx, samples, frame->nb_samples);
if (s->ms_stereo) {
float a, b;
@@ -355,19 +363,25 @@ static int encode_superframe(AVCodecContext *avctx,
}
}
+ if ((ret = ff_alloc_packet(avpkt, MAX_CODED_SUPERFRAME_SIZE))) {
+ av_log(avctx, AV_LOG_ERROR, "Error getting output packet\n");
+ return ret;
+ }
+
#if 1
total_gain= 128;
for(i=64; i; i>>=1){
- int error= encode_frame(s, s->coefs, buf, buf_size, total_gain-i);
+ int error = encode_frame(s, s->coefs, avpkt->data, avpkt->size,
+ total_gain - i);
if(error<0)
total_gain-= i;
}
#else
total_gain= 90;
- best= encode_frame(s, s->coefs, buf, buf_size, total_gain);
+ 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, buf, buf_size, total_gain-i);
- int scoreR= encode_frame(s, s->coefs, buf, buf_size, total_gain+i);
+ 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;
@@ -379,7 +393,7 @@ static int encode_superframe(AVCodecContext *avctx,
}
#endif
- encode_frame(s, s->coefs, buf, buf_size, total_gain);
+ encode_frame(s, s->coefs, avpkt->data, avpkt->size, total_gain);
assert((put_bits_count(&s->pb) & 7) == 0);
i= s->block_align - (put_bits_count(&s->pb)+7)/8;
assert(i>=0);
@@ -387,7 +401,12 @@ static int encode_superframe(AVCodecContext *avctx,
put_bits(&s->pb, 8, 'N');
flush_put_bits(&s->pb);
- return put_bits_ptr(&s->pb) - s->pb.buf;
+
+ if (frame->pts != AV_NOPTS_VALUE)
+ avpkt->pts = frame->pts - ff_samples_to_time_base(avctx, avctx->delay);
+ avpkt->size = put_bits_count(&s->pb)/8;
+ *got_packet_ptr = 1;
+ return 0;
}
AVCodec ff_wmav1_encoder = {
@@ -396,7 +415,7 @@ AVCodec ff_wmav1_encoder = {
.id = CODEC_ID_WMAV1,
.priv_data_size = sizeof(WMACodecContext),
.init = encode_init,
- .encode = encode_superframe,
+ .encode2 = encode_superframe,
.close = ff_wma_end,
.sample_fmts = (const enum
AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE},
.long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio 1"),
@@ -408,7 +427,7 @@ AVCodec ff_wmav2_encoder = {
.id = CODEC_ID_WMAV2,
.priv_data_size = sizeof(WMACodecContext),
.init = encode_init,
- .encode = encode_superframe,
+ .encode2 = encode_superframe,
.close = ff_wma_end,
.sample_fmts = (const enum
AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE},
.long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio 2"),
--
1.7.1
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
