RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-15 11:17:49 +00:00
Code Issues Projects Releases Wiki Activity

mpeg4video parser: move specific fields into private context

Browse Source 
This obviates using ParseContext1, which is slated for removal.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
This commit is contained in:
Rafaël Carré 2012-02-09 20:26:17 -05:00 committed by Diego Biurrun
parent 53a09964f0
commit e40924887a
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libavcodec/mpeg4video_parser.c
View File

@ -25,6 +25,11 @@
#include "mpeg4video.h" #include "mpeg4video.h"
#include "mpeg4video_parser.h" #include "mpeg4video_parser.h"
struct Mp4vParseContext {
ParseContext pc;
struct MpegEncContext enc;
int first_picture;
};
int ff_mpeg4_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size){ int ff_mpeg4_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size){
int vop_found, i; int vop_found, i;
@ -68,8 +73,8 @@ static int av_mpeg4_decode_header(AVCodecParserContext *s1,
AVCodecContext *avctx, AVCodecContext *avctx,
const uint8_t *buf, int buf_size) const uint8_t *buf, int buf_size)
{ {
ParseContext1 *pc = s1->priv_data; struct Mp4vParseContext *pc = s1->priv_data;
MpegEncContext *s = pc->enc; MpegEncContext *s = &pc->enc;
GetBitContext gb1, *gb = &gb1; GetBitContext gb1, *gb = &gb1;
int ret; int ret;
@ -93,13 +98,10 @@ static int av_mpeg4_decode_header(AVCodecParserContext *s1,
static av_cold int mpeg4video_parse_init(AVCodecParserContext *s) static av_cold int mpeg4video_parse_init(AVCodecParserContext *s)
{ {
ParseContext1 *pc = s->priv_data; struct Mp4vParseContext *pc = s->priv_data;
pc->enc = av_mallocz(sizeof(MpegEncContext));
if (!pc->enc)
return -1;
pc->first_picture = 1; pc->first_picture = 1;
pc->enc->slice_context_count = 1; pc->enc.slice_context_count = 1;
return 0; return 0;
} }
@ -132,9 +134,9 @@ static int mpeg4video_parse(AVCodecParserContext *s,
AVCodecParser ff_mpeg4video_parser = { AVCodecParser ff_mpeg4video_parser = {
.codec_ids = { CODEC_ID_MPEG4 }, .codec_ids = { CODEC_ID_MPEG4 },
.priv_data_size = sizeof(ParseContext1), .priv_data_size = sizeof(struct Mp4vParseContext),
.parser_init = mpeg4video_parse_init, .parser_init = mpeg4video_parse_init,
.parser_parse = mpeg4video_parse, .parser_parse = mpeg4video_parse,
.parser_close = ff_parse1_close, .parser_close = ff_parse_close,
.split = ff_mpeg4video_split, .split = ff_mpeg4video_split,
}; };