RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

libopus: decode directly to the user-provided AVFrame

This commit is contained in:
Justin Ruggles 2012-12-23 18:45:55 -05:00
parent 0cd08367dd
commit 19b2cb268f
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libavcodec/libopusdec.c
View File

@ -32,7 +32,6 @@
struct libopus_context { struct libopus_context {
OpusMSDecoder *dec; OpusMSDecoder *dec;
AVFrame frame;
}; };
#define OPUS_HEAD_SIZE 19 #define OPUS_HEAD_SIZE 19
@ -95,8 +94,7 @@ static av_cold int libopus_decode_init(AVCodecContext *avc)
opus_strerror(ret)); opus_strerror(ret));
avc->delay = 3840; /* Decoder delay (in samples) at 48kHz */ avc->delay = 3840; /* Decoder delay (in samples) at 48kHz */
avcodec_get_frame_defaults(&opus->frame);
avc->coded_frame = &opus->frame;
return 0; return 0;
} }
@ -110,14 +108,15 @@ static av_cold int libopus_decode_close(AVCodecContext *avc)
#define MAX_FRAME_SIZE (960 * 6) #define MAX_FRAME_SIZE (960 * 6)
static int libopus_decode(AVCodecContext *avc, void *frame, static int libopus_decode(AVCodecContext *avc, void *data,
int *got_frame_ptr, AVPacket *pkt) int *got_frame_ptr, AVPacket *pkt)
{ {
struct libopus_context *opus = avc->priv_data; struct libopus_context *opus = avc->priv_data;
AVFrame *frame = data;
int ret, nb_samples; int ret, nb_samples;
opus->frame.nb_samples = MAX_FRAME_SIZE; frame->nb_samples = MAX_FRAME_SIZE;
ret = ff_get_buffer(avc, &opus->frame); ret = ff_get_buffer(avc, frame);
if (ret < 0) { if (ret < 0) {
av_log(avc, AV_LOG_ERROR, "get_buffer() failed\n"); av_log(avc, AV_LOG_ERROR, "get_buffer() failed\n");
return ret; return ret;
@ -125,12 +124,12 @@ static int libopus_decode(AVCodecContext *avc, void *frame,
if (avc->sample_fmt == AV_SAMPLE_FMT_S16) if (avc->sample_fmt == AV_SAMPLE_FMT_S16)
nb_samples = opus_multistream_decode(opus->dec, pkt->data, pkt->size, nb_samples = opus_multistream_decode(opus->dec, pkt->data, pkt->size,
(opus_int16 *)opus->frame.data[0], (opus_int16 *)frame->data[0],
opus->frame.nb_samples, 0); frame->nb_samples, 0);
else else
nb_samples = opus_multistream_decode_float(opus->dec, pkt->data, pkt->size, nb_samples = opus_multistream_decode_float(opus->dec, pkt->data, pkt->size,
(float *)opus->frame.data[0], (float *)frame->data[0],
opus->frame.nb_samples, 0); frame->nb_samples, 0);
if (nb_samples < 0) { if (nb_samples < 0) {
av_log(avc, AV_LOG_ERROR, "Decoding error: %s\n", av_log(avc, AV_LOG_ERROR, "Decoding error: %s\n",
@ -138,9 +137,9 @@ static int libopus_decode(AVCodecContext *avc, void *frame,
return ff_opus_error_to_averror(nb_samples); return ff_opus_error_to_averror(nb_samples);
} }
opus->frame.nb_samples = nb_samples; frame->nb_samples = nb_samples;
*(AVFrame *)frame = opus->frame; *got_frame_ptr = 1;
*got_frame_ptr = 1;
return pkt->size; return pkt->size;
} }