[FFmpeg-cvslog] vorbis_parser: add an AV prefix to VorbisParseContext
Anton Khirnov
git at videolan.org
Thu Nov 6 11:15:52 CET 2014
ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Wed Oct 29 14:33:32 2014 +0100| [6896f95b2483e52e717e2c75a4fd24fcb0e14b67] | committer: Anton Khirnov
vorbis_parser: add an AV prefix to VorbisParseContext
This is done in preparation for making it public.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6896f95b2483e52e717e2c75a4fd24fcb0e14b67
---
libavcodec/libvorbis.c | 2 +-
libavcodec/vorbis_parser.c | 14 +++++++-------
libavcodec/vorbis_parser.h | 10 +++++-----
libavformat/oggparsevorbis.c | 2 +-
4 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/libavcodec/libvorbis.c b/libavcodec/libvorbis.c
index 07973e6..fc4a0a4 100644
--- a/libavcodec/libvorbis.c
+++ b/libavcodec/libvorbis.c
@@ -58,7 +58,7 @@ typedef struct LibvorbisContext {
vorbis_comment vc; /**< VorbisComment info */
ogg_packet op; /**< ogg packet */
double iblock; /**< impulse block bias option */
- VorbisParseContext vp; /**< parse context to get durations */
+ AVVorbisParseContext vp; /**< parse context to get durations */
AudioFrameQueue afq; /**< frame queue for timestamps */
} LibvorbisContext;
diff --git a/libavcodec/vorbis_parser.c b/libavcodec/vorbis_parser.c
index cdca953..b088465 100644
--- a/libavcodec/vorbis_parser.c
+++ b/libavcodec/vorbis_parser.c
@@ -38,7 +38,7 @@ static const AVClass vorbis_parser_class = {
.version = LIBAVUTIL_VERSION_INT,
};
-static int parse_id_header(VorbisParseContext *s,
+static int parse_id_header(AVVorbisParseContext *s,
const uint8_t *buf, int buf_size)
{
/* Id header should be 30 bytes */
@@ -70,7 +70,7 @@ static int parse_id_header(VorbisParseContext *s,
return 0;
}
-static int parse_setup_header(VorbisParseContext *s,
+static int parse_setup_header(AVVorbisParseContext *s,
const uint8_t *buf, int buf_size)
{
GetBitContext gb, gb0;
@@ -181,7 +181,7 @@ bad_header:
return ret;
}
-int avpriv_vorbis_parse_extradata(AVCodecContext *avctx, VorbisParseContext *s)
+int avpriv_vorbis_parse_extradata(AVCodecContext *avctx, AVVorbisParseContext *s)
{
uint8_t *header_start[3];
int header_len[3];
@@ -209,7 +209,7 @@ int avpriv_vorbis_parse_extradata(AVCodecContext *avctx, VorbisParseContext *s)
return 0;
}
-int avpriv_vorbis_parse_frame(VorbisParseContext *s, const uint8_t *buf,
+int avpriv_vorbis_parse_frame(AVVorbisParseContext *s, const uint8_t *buf,
int buf_size)
{
int duration = 0;
@@ -242,7 +242,7 @@ int avpriv_vorbis_parse_frame(VorbisParseContext *s, const uint8_t *buf,
return duration;
}
-void avpriv_vorbis_parse_reset(VorbisParseContext *s)
+void avpriv_vorbis_parse_reset(AVVorbisParseContext *s)
{
if (s->valid_extradata)
s->previous_blocksize = s->mode_blocksize[0];
@@ -253,7 +253,7 @@ static int vorbis_parse(AVCodecParserContext *s1, AVCodecContext *avctx,
const uint8_t **poutbuf, int *poutbuf_size,
const uint8_t *buf, int buf_size)
{
- VorbisParseContext *s = s1->priv_data;
+ AVVorbisParseContext *s = s1->priv_data;
int duration;
if (!s->extradata_parsed && avctx->extradata && avctx->extradata_size)
@@ -273,7 +273,7 @@ end:
AVCodecParser ff_vorbis_parser = {
.codec_ids = { AV_CODEC_ID_VORBIS },
- .priv_data_size = sizeof(VorbisParseContext),
+ .priv_data_size = sizeof(AVVorbisParseContext),
.parser_parse = vorbis_parse,
};
#endif /* CONFIG_VORBIS_PARSER */
diff --git a/libavcodec/vorbis_parser.h b/libavcodec/vorbis_parser.h
index dec3876..414a04b 100644
--- a/libavcodec/vorbis_parser.h
+++ b/libavcodec/vorbis_parser.h
@@ -30,7 +30,7 @@
#include "avcodec.h"
-typedef struct VorbisParseContext {
+typedef struct AVVorbisParseContext {
const AVClass *class;
int extradata_parsed; ///< we have attempted to parse extradata
int valid_extradata; ///< extradata is valid, so we can calculate duration
@@ -40,7 +40,7 @@ typedef struct VorbisParseContext {
int mode_count; ///< number of modes
int mode_mask; ///< bitmask used to get the mode in each packet
int prev_mask; ///< bitmask used to get the previous mode flag in each packet
-} VorbisParseContext;
+} AVVorbisParseContext;
/**
* Initialize the Vorbis parser using headers in the extradata.
@@ -48,7 +48,7 @@ typedef struct VorbisParseContext {
* @param avctx codec context
* @param s Vorbis parser context
*/
-int avpriv_vorbis_parse_extradata(AVCodecContext *avctx, VorbisParseContext *s);
+int avpriv_vorbis_parse_extradata(AVCodecContext *avctx, AVVorbisParseContext *s);
/**
* Get the duration for a Vorbis packet.
@@ -60,9 +60,9 @@ int avpriv_vorbis_parse_extradata(AVCodecContext *avctx, VorbisParseContext *s);
* @param buf buffer containing a Vorbis frame
* @param buf_size size of the buffer
*/
-int avpriv_vorbis_parse_frame(VorbisParseContext *s, const uint8_t *buf,
+int avpriv_vorbis_parse_frame(AVVorbisParseContext *s, const uint8_t *buf,
int buf_size);
-void avpriv_vorbis_parse_reset(VorbisParseContext *s);
+void avpriv_vorbis_parse_reset(AVVorbisParseContext *s);
#endif /* AVCODEC_VORBIS_PARSER_H */
diff --git a/libavformat/oggparsevorbis.c b/libavformat/oggparsevorbis.c
index 6bd1411..27f04bf 100644
--- a/libavformat/oggparsevorbis.c
+++ b/libavformat/oggparsevorbis.c
@@ -208,7 +208,7 @@ int ff_vorbis_comment(AVFormatContext *as, AVDictionary **m,
struct oggvorbis_private {
unsigned int len[3];
unsigned char *packet[3];
- VorbisParseContext vp;
+ AVVorbisParseContext vp;
int64_t final_pts;
int final_duration;
};
More information about the ffmpeg-cvslog
mailing list