diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-06 12:05:17 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-06 12:05:17 +0100 |
| commit | f74be3669daa8b471fb8919fa980d9bed3207af2 (patch) | |
| tree | bfdf6fa599e90dab47753d0b7974421d6766023f /libavcodec/vorbis_parser.c | |
| parent | 7ffdc7bef2f9d7e90487f816a97a3496b0639450 (diff) | |
| parent | 2f3fadfbe3c6ad52fad5c614b6067c5401227959 (diff) | |
| download | ffmpeg-f74be3669daa8b471fb8919fa980d9bed3207af2.tar.gz | |
Merge commit '2f3fadfbe3c6ad52fad5c614b6067c5401227959'
* commit '2f3fadfbe3c6ad52fad5c614b6067c5401227959':
lavc,lavf: switch to the new vorbis parse API
Conflicts:
libavformat/oggparsevorbis.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vorbis_parser.c')
| -rw-r--r-- | libavcodec/vorbis_parser.c | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/libavcodec/vorbis_parser.c b/libavcodec/vorbis_parser.c index ab08a6a2dd..0d72fb1b90 100644 --- a/libavcodec/vorbis_parser.c +++ b/libavcodec/vorbis_parser.c @@ -316,18 +316,25 @@ int avpriv_vorbis_parse_frame_flags(AVVorbisParseContext *s, const uint8_t *buf, #endif #if CONFIG_VORBIS_PARSER + +typedef struct VorbisParseContext { + AVVorbisParseContext *vp; +} VorbisParseContext; + static int vorbis_parse(AVCodecParserContext *s1, AVCodecContext *avctx, const uint8_t **poutbuf, int *poutbuf_size, const uint8_t *buf, int buf_size) { - AVVorbisParseContext *s = s1->priv_data; + VorbisParseContext *s = s1->priv_data; int duration; - if (!s->extradata_parsed && avctx->extradata && avctx->extradata_size) - if (avpriv_vorbis_parse_extradata(avctx, s)) + if (!s->vp && avctx->extradata && avctx->extradata_size) { + s->vp = av_vorbis_parse_init(avctx->extradata, avctx->extradata_size); + if (!s->vp) goto end; + } - if ((duration = avpriv_vorbis_parse_frame(s, buf, buf_size)) >= 0) + if ((duration = av_vorbis_parse_frame(s->vp, buf, buf_size)) >= 0) s1->duration = duration; end: @@ -338,9 +345,16 @@ end: return buf_size; } +static void vorbis_parser_close(AVCodecParserContext *ctx) +{ + VorbisParseContext *s = ctx->priv_data; + av_vorbis_parse_free(&s->vp); +} + AVCodecParser ff_vorbis_parser = { .codec_ids = { AV_CODEC_ID_VORBIS }, - .priv_data_size = sizeof(AVVorbisParseContext), + .priv_data_size = sizeof(VorbisParseContext), .parser_parse = vorbis_parse, + .parser_close = vorbis_parser_close, }; #endif /* CONFIG_VORBIS_PARSER */ |