virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

h264_parser: move the H264DSPContext to the parser context

Browse Source
This commit is contained in:
Anton Khirnov 2016-03-28 10:56:51 +02:00
parent 3176217c60
commit 113aeee6ae
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/h264_parser.c
View File

@ -46,6 +46,7 @@ typedef struct H264ParseContext {
H264Context h; H264Context h;
ParseContext pc; ParseContext pc;
H264ParamSets ps; H264ParamSets ps;
H264DSPContext h264dsp;
int got_first; int got_first;
} H264ParseContext; } H264ParseContext;
@ -53,7 +54,6 @@ typedef struct H264ParseContext {
static int h264_find_frame_end(H264ParseContext *p, const uint8_t *buf, static int h264_find_frame_end(H264ParseContext *p, const uint8_t *buf,
int buf_size) int buf_size)
{ {
H264Context *h = &p->h;
int i; int i;
uint32_t state; uint32_t state;
ParseContext *pc = &p->pc; ParseContext *pc = &p->pc;
@ -64,7 +64,7 @@ static int h264_find_frame_end(H264ParseContext *p, const uint8_t *buf,
for (i = 0; i < buf_size; i++) { for (i = 0; i < buf_size; i++) {
if (state == 7) { if (state == 7) {
i += h->h264dsp.startcode_find_candidate(buf + i, buf_size - i); i += p->h264dsp.startcode_find_candidate(buf + i, buf_size - i);
if (i < buf_size) if (i < buf_size)
state = 2; state = 2;
} else if (state <= 2) { } else if (state <= 2) {
@ -597,7 +597,7 @@ static av_cold int init(AVCodecParserContext *s)
h->nb_slice_ctx = 1; h->nb_slice_ctx = 1;
h->slice_context_count = 1; h->slice_context_count = 1;
ff_h264dsp_init(&h->h264dsp, 8, 1); ff_h264dsp_init(&p->h264dsp, 8, 1);
return 0; return 0;
} }