Commit d96d8e12 authored by Michael Niedermayer's avatar Michael Niedermayer

avcodec/libspeexdec: support zygoaudio

Fixes Ticket1873
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 2ae2c605
...@@ -33,6 +33,7 @@ typedef struct { ...@@ -33,6 +33,7 @@ typedef struct {
SpeexStereoState stereo; SpeexStereoState stereo;
void *dec_state; void *dec_state;
int frame_size; int frame_size;
int pktsize;
} LibSpeexContext; } LibSpeexContext;
...@@ -50,14 +51,20 @@ static av_cold int libspeex_decode_init(AVCodecContext *avctx) ...@@ -50,14 +51,20 @@ static av_cold int libspeex_decode_init(AVCodecContext *avctx)
av_log(avctx, AV_LOG_WARNING, "Invalid Speex header\n"); av_log(avctx, AV_LOG_WARNING, "Invalid Speex header\n");
} }
if (avctx->codec_tag == MKTAG('S', 'P', 'X', 'N')) { if (avctx->codec_tag == MKTAG('S', 'P', 'X', 'N')) {
int quality;
if (!avctx->extradata || avctx->extradata && avctx->extradata_size < 47) { if (!avctx->extradata || avctx->extradata && avctx->extradata_size < 47) {
av_log(avctx, AV_LOG_ERROR, "Missing or invalid extradata.\n"); av_log(avctx, AV_LOG_ERROR, "Missing or invalid extradata.\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
if (avctx->extradata[37] != 10) {
quality = avctx->extradata[37];
if (quality > 10) {
av_log(avctx, AV_LOG_ERROR, "Unsupported quality mode.\n"); av_log(avctx, AV_LOG_ERROR, "Unsupported quality mode.\n");
return AVERROR_PATCHWELCOME; return AVERROR_PATCHWELCOME;
} }
s->pktsize = ((int[]){5,10,15,20,20,28,28,38,38,46,62})[quality];
spx_mode = 0; spx_mode = 0;
} else if (header) { } else if (header) {
avctx->sample_rate = header->rate; avctx->sample_rate = header->rate;
...@@ -143,9 +150,11 @@ static int libspeex_decode_frame(AVCodecContext *avctx, void *data, ...@@ -143,9 +150,11 @@ static int libspeex_decode_frame(AVCodecContext *avctx, void *data,
*got_frame_ptr = 0; *got_frame_ptr = 0;
return buf_size; return buf_size;
} }
if (s->pktsize && buf_size == 62)
buf_size = s->pktsize;
/* set new buffer */ /* set new buffer */
speex_bits_read_from(&s->bits, buf, buf_size); speex_bits_read_from(&s->bits, buf, buf_size);
consumed = buf_size; consumed = avpkt->size;
} }
/* decode a single frame */ /* decode a single frame */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment