diff options
Diffstat (limited to 'libavcodec/vorbis_parser.c')
| -rw-r--r-- | libavcodec/vorbis_parser.c | 44 |
1 files changed, 33 insertions, 11 deletions
diff --git a/libavcodec/vorbis_parser.c b/libavcodec/vorbis_parser.c index c413135fa8..1e2cab3927 100644 --- a/libavcodec/vorbis_parser.c +++ b/libavcodec/vorbis_parser.c @@ -1,20 +1,20 @@ /* * Copyright (c) 2012 Justin Ruggles * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -165,7 +165,7 @@ static int parse_setup_header(AVCodecContext *avctx, VorbisParseContext *s, skip_bits_long(&gb, got_framing_bit); for (i = mode_count - 1; i >= 0; i--) { skip_bits_long(&gb, 40); - s->mode_blocksize[i] = s->blocksize[get_bits1(&gb)]; + s->mode_blocksize[i] = get_bits1(&gb); } bad_header: @@ -196,13 +196,13 @@ int avpriv_vorbis_parse_extradata(AVCodecContext *avctx, VorbisParseContext *s) return ret; s->valid_extradata = 1; - s->previous_blocksize = s->mode_blocksize[0]; + s->previous_blocksize = s->blocksize[s->mode_blocksize[0]]; return 0; } -int avpriv_vorbis_parse_frame(VorbisParseContext *s, const uint8_t *buf, - int buf_size) +int avpriv_vorbis_parse_frame_flags(VorbisParseContext *s, const uint8_t *buf, + int buf_size, int *flags) { int duration = 0; @@ -211,6 +211,22 @@ int avpriv_vorbis_parse_frame(VorbisParseContext *s, const uint8_t *buf, int previous_blocksize = s->previous_blocksize; if (buf[0] & 1) { + /* If the user doesn't care about special packets, it's a bad one. */ + if (!flags) + goto bad_packet; + + /* Set the flag for which kind of special packet it is. */ + if (buf[0] == 1) + *flags |= VORBIS_FLAG_HEADER; + else if (buf[0] == 3) + *flags |= VORBIS_FLAG_COMMENT; + else + goto bad_packet; + + /* Special packets have no duration. */ + return 0; + +bad_packet: av_log(s->avctx, AV_LOG_ERROR, "Invalid packet\n"); return AVERROR_INVALIDDATA; } @@ -222,11 +238,11 @@ int avpriv_vorbis_parse_frame(VorbisParseContext *s, const uint8_t *buf, av_log(s->avctx, AV_LOG_ERROR, "Invalid mode in packet\n"); return AVERROR_INVALIDDATA; } - if (mode) { + if(s->mode_blocksize[mode]){ int flag = !!(buf[0] & s->prev_mask); previous_blocksize = s->blocksize[flag]; } - current_blocksize = s->mode_blocksize[mode]; + current_blocksize = s->blocksize[s->mode_blocksize[mode]]; duration = (previous_blocksize + current_blocksize) >> 2; s->previous_blocksize = current_blocksize; } @@ -234,10 +250,16 @@ int avpriv_vorbis_parse_frame(VorbisParseContext *s, const uint8_t *buf, return duration; } +int avpriv_vorbis_parse_frame(VorbisParseContext *s, const uint8_t *buf, + int buf_size) +{ + return avpriv_vorbis_parse_frame_flags(s, buf, buf_size, NULL); +} + void avpriv_vorbis_parse_reset(VorbisParseContext *s) { if (s->valid_extradata) - s->previous_blocksize = s->mode_blocksize[0]; + s->previous_blocksize = s->blocksize[0]; } #if CONFIG_VORBIS_PARSER |