int64_t channel_layout;
} __attribute__((packed));
-static uint8_t *resample_audio_buffer(AVCodecContext * avctx, AVFrame *samples,
- int *out_size, int out_sample_fmt)
+static int convert_audio_sample_fmt(const AVCodec *codec, int codec_type, bool encode)
+{
+ int audio_sample_fmt = AV_SAMPLE_FMT_NONE;
+
+ if (!codec) {
+ return audio_sample_fmt;
+ }
+
+ if (codec_type != AVMEDIA_TYPE_AUDIO) {
+ ERR("this codec_type is invalid %d\n", codec_type);
+ return audio_sample_fmt;
+ }
+
+ if (!strcmp(codec->name, "aac")) {
+ // FLOAT format
+ if (encode) {
+ audio_sample_fmt = AV_SAMPLE_FMT_FLTP;
+ } else {
+ audio_sample_fmt = AV_SAMPLE_FMT_FLT;
+ }
+ } else if (!strcmp(codec->name, "mp3") || !strcmp(codec->name, "mp3adu")) {
+ // S16 format
+ if (encode) {
+ audio_sample_fmt = AV_SAMPLE_FMT_S16P;
+ } else {
+ audio_sample_fmt = AV_SAMPLE_FMT_S16;
+ }
+ } else if (!strcmp(codec->name, "wmav1") || !strcmp(codec->name, "wmav2")) {
+ if (encode) {
+ audio_sample_fmt = AV_SAMPLE_FMT_FLTP;
+ } else {
+ audio_sample_fmt = AV_SAMPLE_FMT_FLT;
+ }
+ } else {
+ INFO("cannot handle %s codec\n", codec->name);
+ }
+
+ TRACE("convert audio sample_fmt %d\n", audio_sample_fmt);
+ return audio_sample_fmt;
+}
+
+static int fill_audio_into_frame(AVCodecContext *avctx, AVFrame *frame,
+ uint8_t *samples, int samples_size,
+ int nb_samples, int audio_sample_fmt)
+{
+ int result = 0;
+
+ if (!avctx) {
+ ERR("fill_audio. AVCodecContext is NULL!!\n");
+ return -1;
+ }
+
+ if (!frame) {
+ ERR("fill_audio. AVFrame is NULL!!\n");
+ return -1;
+ }
+
+ frame->nb_samples = nb_samples;
+ frame->format = audio_sample_fmt;
+ frame->channel_layout = avctx->channel_layout;
+
+ result =
+ avcodec_fill_audio_frame(frame, avctx->channels, audio_sample_fmt, (const uint8_t *)samples, samples_size, 0);
+ TRACE("fill audio in_frame. ret: %d in_frame->ch_layout %lld\n", result, frame->channel_layout);
+
+ return result;
+}
+
+static AVFrame *resample_audio(AVCodecContext *avctx, AVFrame *sample_frame,
+ int sample_buffer_size, int in_sample_fmt,
+ AVFrame *resample_frame, int *resample_buffer_size,
+ int resample_sample_fmt)
{
AVAudioResampleContext *avr = NULL;
- uint8_t *resampled_audio = NULL;
- int buffer_size = 0, out_linesize = 0;
- int nb_samples = samples->nb_samples;
- // int out_sample_fmt = avctx->sample_fmt - 5;
+ uint8_t *resample_buffer = NULL;
+ int buffer_size = 0;
+ int resample_nb_samples = sample_frame->nb_samples;
avr = avresample_alloc_context();
if (!avr) {
return NULL;
}
- TRACE("resample audio. channel_layout %lld sample_rate %d "
- "in_sample_fmt %d out_sample_fmt %d\n",
- avctx->channel_layout, avctx->sample_rate,
- avctx->sample_fmt, out_sample_fmt);
+ TRACE("channel_layout %lld sample_rate %d in_sample_fmt %d resample_sample_fmt %d\n",
+ avctx->channel_layout, avctx->sample_rate, avctx->sample_fmt, resample_sample_fmt);
av_opt_set_int(avr, "in_channel_layout", avctx->channel_layout, 0);
- av_opt_set_int(avr, "in_sample_fmt", avctx->sample_fmt, 0);
+ av_opt_set_int(avr, "in_sample_fmt", in_sample_fmt, 0);
av_opt_set_int(avr, "in_sample_rate", avctx->sample_rate, 0);
+
av_opt_set_int(avr, "out_channel_layout", avctx->channel_layout, 0);
- av_opt_set_int(avr, "out_sample_fmt", out_sample_fmt, 0);
+ av_opt_set_int(avr, "out_sample_fmt", resample_sample_fmt, 0);
av_opt_set_int(avr, "out_sample_rate", avctx->sample_rate, 0);
TRACE("open avresample context\n");
return NULL;
}
- *out_size =
- av_samples_get_buffer_size(&out_linesize, avctx->channels,
- nb_samples, out_sample_fmt, 0);
-
- TRACE("resample audio. out_linesize %d nb_samples %d\n", out_linesize, nb_samples);
+ resample_frame = avcodec_alloc_frame();
+ TRACE("resample audio. nb_samples %d sample_fmt %d\n", resample_nb_samples, resample_sample_fmt);
- if (*out_size < 0) {
- ERR("failed to get size of sample buffer %d\n", *out_size);
+ *resample_buffer_size = av_samples_get_buffer_size(NULL, avctx->channels, resample_nb_samples, resample_sample_fmt, 0);
+ if (*resample_buffer_size < 0) {
+ ERR("failed to get size of resample buffer %d\n", *resample_buffer_size);
avresample_close(avr);
avresample_free(&avr);
return NULL;
}
- resampled_audio = av_mallocz(*out_size);
- if (!resampled_audio) {
+ resample_buffer = av_mallocz(*resample_buffer_size);
+ if (!resample_buffer) {
ERR("failed to allocate resample buffer\n");
avresample_close(avr);
avresample_free(&avr);
return NULL;
}
- buffer_size = avresample_convert(avr, &resampled_audio,
- out_linesize, nb_samples,
- samples->data, samples->linesize[0],
- samples->nb_samples);
- TRACE("resample_audio out_size %d buffer_size %d\n", *out_size, buffer_size);
+ fill_audio_into_frame(avctx, resample_frame, resample_buffer,
+ *resample_buffer_size, resample_nb_samples, resample_sample_fmt);
+
+ buffer_size = avresample_convert(avr, resample_frame->data,
+ *resample_buffer_size, resample_nb_samples,
+ sample_frame->data, sample_buffer_size,
+ sample_frame->nb_samples);
+
+ TRACE("resample_audio buffer_size %d\n", buffer_size);
avresample_close(avr);
avresample_free(&avr);
- return resampled_audio;
+ return resample_frame;
}
+/*
+ * decode_audio >> raw audio_buffer >> resample
+ *
+ * audios sink cannot handle planar format, so it is required
+ * to resample audio buffer into linear format.
+ */
static bool codec_decode_audio(MaruBrillCodecState *s, int ctx_id, void *data_buf)
{
AVCodecContext *avctx;
uint8_t *tempbuf = NULL;
int tempbuf_size = 0;
- uint8_t *out_buf = NULL;
- int out_buf_size = 0;
+ AVFrame *resample_frame = NULL;
+ uint8_t *resample_buf = NULL;
+ int resample_buf_size = 0;
int out_sample_fmt = -1;
TRACE("enter: %s\n", __func__);
} else if (!audio_out) {
ERR("decode_audio. %d of AVFrame is NULL\n", ctx_id);
} else {
- // avcodec_get_frame_defaults(audio_out);
-
len = avcodec_decode_audio4(avctx, audio_out, &got_frame, &avpkt);
- TRACE("decode_audio. len %d, channel_layout %lld, got_frame %d\n",
+ TRACE("decode_audio. len %d, channel_layout %lld got_frame %d\n",
len, avctx->channel_layout, got_frame);
+
if (got_frame) {
if (av_sample_fmt_is_planar(avctx->sample_fmt)) {
- // convert PLANAR to LINEAR format
- out_sample_fmt = avctx->sample_fmt - 5;
+ out_sample_fmt = convert_audio_sample_fmt(avctx->codec, avctx->codec_type, 0);
- out_buf = resample_audio_buffer(avctx, audio_out, &out_buf_size, out_sample_fmt);
+ if (avctx->channel_layout == 0) {
+ avctx->channel_layout = av_get_default_channel_layout(avctx->channels);
+ TRACE("decode_audio. channel_layout %lld channels %d\n",
+ avctx->channel_layout, avctx->channels);
+ }
+ resample_frame = resample_audio(avctx, audio_out, audio_out->linesize[0],
+ avctx->sample_fmt, NULL, &resample_buf_size,
+ out_sample_fmt);
+ if (resample_frame) {
+ resample_buf = resample_frame->data[0];
+ } else {
+ ERR("failed to resample decoded audio buffer\n");
+ len = -1;
+ got_frame = 0;
+ }
} else {
- // TODO: not planar format
- INFO("decode_audio. cannot handle planar audio format\n");
- len = -1;
+ INFO("decode_audio. linear audio format\n");
+ resample_buf = audio_out->data[0];
+ resample_buf_size = audio_out->linesize[0];
}
}
}
} else {
tempbuf_size += (sizeof(out_sample_fmt) + sizeof(avctx->sample_rate)
+ sizeof(avctx->channels) + sizeof(avctx->channel_layout)
- + sizeof(out_buf_size) + out_buf_size);
+ + sizeof(resample_buf_size) + resample_buf_size);
}
tempbuf = g_malloc(tempbuf_size);
memcpy(tempbuf + size, &avctx->channel_layout, sizeof(avctx->channel_layout));
size += sizeof(avctx->channel_layout);
- memcpy(tempbuf + size, &out_buf_size, sizeof(out_buf_size));
- size += sizeof(out_buf_size);
- if (out_buf) {
+ memcpy(tempbuf + size, &resample_buf_size, sizeof(resample_buf_size));
+ size += sizeof(resample_buf_size);
+ if (resample_buf) {
TRACE("copy resampled audio buffer\n");
- memcpy(tempbuf + size, out_buf, out_buf_size);
+ memcpy(tempbuf + size, resample_buf, resample_buf_size);
}
}
}
brillcodec_push_writequeue(s, tempbuf, tempbuf_size, ctx_id, NULL);
- if (audio_out) {
- avcodec_free_frame(&audio_out);
- }
-
- if (out_buf) {
- TRACE("and release decoded_audio buffer\n");
- av_free(out_buf);
+ if (resample_frame) {
+ TRACE("release decoded frame\n");
+ av_free(resample_buf);
+ av_free(resample_frame);
}
TRACE("leave: %s\n", __func__);
AVPacket avpkt;
uint8_t *audio_in = NULL;
int32_t audio_in_size = 0;
- int ret = 0, got_pkt = 0, size = 0;
+ int ret = -1, got_pkt = 0, size = 0;
DeviceMemEntry *elem = NULL;
uint8_t *tempbuf = NULL;
int tempbuf_size = 0;
AVFrame *in_frame = NULL;
- AVFrame *resampled_frame = NULL;
- uint8_t *samples = NULL;
+ AVFrame *resample_frame = NULL;
int64_t in_timestamp = 0;
TRACE("enter: %s\n", __func__);
ERR("%d of AVCodec is NULL.\n", ctx_id);
} else {
int bytes_per_sample = 0;
- int audio_in_buffer_size = 0;
+ int nb_samples = 0;
int audio_in_sample_fmt = AV_SAMPLE_FMT_S16;
+ // audio input src can generate a buffer as an int format.
- in_frame = avcodec_alloc_frame();
- if (!in_frame) {
- // FIXME: error handling
- ERR("encode_audio. failed to allocate in_frame\n");
- ret = -1;
- }
+ int resample_buf_size = 0;
+ int resample_sample_fmt = 0;
bytes_per_sample = av_get_bytes_per_sample(audio_in_sample_fmt);
TRACE("bytes per sample %d, sample format %d\n", bytes_per_sample, audio_in_sample_fmt);
- in_frame->nb_samples = audio_in_size / (bytes_per_sample * avctx->channels);
- TRACE("in_frame->nb_samples %d\n", in_frame->nb_samples);
-
- in_frame->format = audio_in_sample_fmt;
- in_frame->channel_layout = avctx->channel_layout;
-
- audio_in_buffer_size = av_samples_get_buffer_size(NULL, avctx->channels, avctx->frame_size, audio_in_sample_fmt, 0);
- TRACE("audio_in_buffer_size: %d, audio_in_size %d\n", audio_in_buffer_size, audio_in_size);
-
- {
- samples = av_mallocz(audio_in_buffer_size);
- memcpy(samples, audio_in, audio_in_size);
-
- // g_free(audio_in);
- // audio_in = NULL;
-
- ret = avcodec_fill_audio_frame(in_frame, avctx->channels, AV_SAMPLE_FMT_S16, (const uint8_t *)samples, audio_in_size, 0);
- TRACE("fill in_frame. ret: %d frame->ch_layout %lld\n", ret, in_frame->channel_layout);
- }
-
- {
- AVAudioResampleContext *avr = NULL;
- uint8_t *resampled_audio = NULL;
- int resampled_buffer_size = 0, resampled_linesize = 0, convert_size;
- int resampled_nb_samples = 0;
- int resampled_sample_fmt = AV_SAMPLE_FMT_FLTP;
-
- avr = avresample_alloc_context();
-
- av_opt_set_int(avr, "in_channel_layout", avctx->channel_layout, 0);
- av_opt_set_int(avr, "in_sample_fmt", audio_in_sample_fmt , 0);
- av_opt_set_int(avr, "in_sample_rate", avctx->sample_rate, 0);
- av_opt_set_int(avr, "out_channel_layout", avctx->channel_layout, 0);
- av_opt_set_int(avr, "out_sample_fmt", resampled_sample_fmt, 0);
- av_opt_set_int(avr, "out_sample_rate", avctx->sample_rate, 0);
-
- resampled_nb_samples = in_frame->nb_samples; // av_get_bytes_per_samples(resampled_sample_fmt);
-
- if (avresample_open(avr) < 0) {
- ERR("failed to open avresample context\n");
- avresample_free(&avr);
- }
-
- resampled_buffer_size = av_samples_get_buffer_size(&resampled_linesize, avctx->channels, resampled_nb_samples, resampled_sample_fmt, 0);
- if (resampled_buffer_size < 0) {
- ERR("failed to get size of sample buffer %d\n", resampled_buffer_size);
- avresample_close(avr);
- avresample_free(&avr);
- }
-
- TRACE("resampled nb_samples %d linesize %d out_size %d\n", resampled_nb_samples, resampled_linesize, resampled_buffer_size);
-
- resampled_audio = av_mallocz(resampled_buffer_size);
- if (!resampled_audio) {
- ERR("failed to allocate resample buffer\n");
- avresample_close(avr);
- avresample_free(&avr);
- }
+ nb_samples = audio_in_size / (bytes_per_sample * avctx->channels);
+ TRACE("nb_samples %d\n", nb_samples);
- // in_frame->nb_samples = nb_samples;
- resampled_frame = avcodec_alloc_frame();
- if (!resampled_frame) {
- // FIXME: error handling
- ERR("encode_audio. failed to allocate resampled_frame\n");
- ret = -1;
+ in_frame = avcodec_alloc_frame();
+ if (!in_frame) {
+ ERR("encode_audio. failed to allocate in_frame\n");
+ } else {
+ // prepare audio_in frame
+ ret = fill_audio_into_frame(avctx, in_frame, audio_in, audio_in_size, nb_samples, audio_in_sample_fmt);
+ if (ret < 0) {
+ ERR("failed to fill audio into frame\n");
+ } else {
+ resample_sample_fmt =
+ convert_audio_sample_fmt(avctx->codec, avctx->codec_type, 1);
+ resample_frame = resample_audio(avctx, in_frame, audio_in_size,
+ audio_in_sample_fmt, NULL, &resample_buf_size,
+ resample_sample_fmt);
+
+ if (resample_frame) {
+ av_init_packet(&avpkt);
+ avpkt.data = NULL;
+ avpkt.size = 0;
+
+ ret = avcodec_encode_audio2(avctx, &avpkt, (const AVFrame *)resample_frame, &got_pkt);
+ TRACE("encode audio. ret %d got_pkt %d avpkt.size %d frame_number %d\n",
+ ret, got_pkt, avpkt.size, avctx->frame_number);
+ }
}
-
-
- bytes_per_sample = av_get_bytes_per_sample(audio_in_sample_fmt);
- TRACE("bytes per sample %d, sample format %d\n", bytes_per_sample, audio_in_sample_fmt);
-
- resampled_frame->nb_samples = in_frame->nb_samples;
- TRACE("resampled_frame->nb_samples %d\n", resampled_frame->nb_samples);
-
- resampled_frame->format = resampled_sample_fmt;
- resampled_frame->channel_layout = avctx->channel_layout;
-
- ret = avcodec_fill_audio_frame(resampled_frame, avctx->channels, resampled_sample_fmt,
- (const uint8_t *)resampled_audio, resampled_buffer_size, 0);
- TRACE("fill resampled_frame ret: %d frame->ch_layout %lld\n", ret, in_frame->channel_layout);
-
- convert_size = avresample_convert(avr, resampled_frame->data, resampled_buffer_size, resampled_nb_samples,
- in_frame->data, audio_in_size, in_frame->nb_samples);
-
- TRACE("resample_audio convert_size %d\n", convert_size);
-
- avresample_close(avr);
- avresample_free(&avr);
- }
-
- if (ret == 0) {
- av_init_packet(&avpkt);
- // packet data will be allocated by encoder
- avpkt.data = NULL;
- avpkt.size = 0;
-
- ret = avcodec_encode_audio2(avctx, &avpkt, (const AVFrame *)resampled_frame, &got_pkt);
- TRACE("encode audio. ret %d got_pkt %d avpkt.size %d frame_number %d coded_frame %p\n",
- ret, got_pkt, avpkt.size, avctx->frame_number, avctx->coded_frame);
}
}
if (ret < 0) {
ERR("failed to encode audio. ctx_id %d ret %d\n", ctx_id, ret);
} else {
- // tempbuf_size += (max_size); // len;
tempbuf_size += (sizeof(avpkt.size) + avpkt.size);
}
TRACE("encode_audio. writequeue elem buffer size %d\n", tempbuf_size);
}
brillcodec_push_writequeue(s, tempbuf, tempbuf_size, ctx_id, NULL);
+
if (in_frame) {
- avcodec_free_frame(&in_frame);
+ av_free(in_frame);
}
- if (resampled_frame) {
- avcodec_free_frame(&resampled_frame);
+ if (resample_frame) {
+ av_free(resample_frame->data[0]);
+ av_free(resample_frame);
}
TRACE("[%s] leave:\n", __func__);
ret = avcodec_open2(avctx, codec, NULL);
INFO("avcodec_open. ret 0x%x ctx_id %d\n", ret, ctx_id);
- TRACE("channels %d sample_rate %d sample_fmt %d "
+ INFO("channels %d sample_rate %d sample_fmt %d "
"channel_layout %lld frame_size %d\n",
avctx->channels, avctx->sample_rate, avctx->sample_fmt,
avctx->channel_layout, avctx->frame_size);
if (frame) {
TRACE("free frame\n");
- // av_free(frame);
avcodec_free_frame(&frame);
CONTEXT(s, ctx_id)->frame = NULL;
}
projects / sdk / emulator / qemu.git / commitdiff