virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

lavc/h264_parser: pass logctx to h264_find_frame_end()

Browse Source 
This helps removing the H264Context from the H264ParseContext.
This commit is contained in:
Clément Bœsch
2016-06-19 12:34:38 +02:00
parent 0bf5fd2e19
commit 48ea5433c8
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/h264_parser.c
View File

@@ -59,7 +59,7 @@ 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, void *logctx)
{ {
H264Context *h = &p->h; H264Context *h = &p->h;
int i, j; int i, j;
@@ -73,7 +73,7 @@ static int h264_find_frame_end(H264ParseContext *p, const uint8_t *buf,
state = 7; state = 7;
if (p->is_avc && !p->nal_length_size) if (p->is_avc && !p->nal_length_size)
av_log(h->avctx, AV_LOG_ERROR, "AVC-parser: nal length size invalid\n"); av_log(logctx, AV_LOG_ERROR, "AVC-parser: nal length size invalid\n");
for (i = 0; i < buf_size; i++) { for (i = 0; i < buf_size; i++) {
if (i >= next_avc) { if (i >= next_avc) {
@@ -82,7 +82,7 @@ static int h264_find_frame_end(H264ParseContext *p, const uint8_t *buf,
for (j = 0; j < p->nal_length_size; j++) for (j = 0; j < p->nal_length_size; j++)
nalsize = (nalsize << 8) | buf[i++]; nalsize = (nalsize << 8) | buf[i++];
if (nalsize <= 0 || nalsize > buf_size - i) { if (nalsize <= 0 || nalsize > buf_size - i) {
av_log(h->avctx, AV_LOG_ERROR, "AVC-parser: nal size %d remaining %d\n", nalsize, buf_size - i); av_log(logctx, AV_LOG_ERROR, "AVC-parser: nal size %d remaining %d\n", nalsize, buf_size - i);
return buf_size; return buf_size;
} }
next_avc = i + nalsize; next_avc = i + nalsize;
@@ -585,7 +585,7 @@ static int h264_parse(AVCodecParserContext *s,
if (s->flags & PARSER_FLAG_COMPLETE_FRAMES) { if (s->flags & PARSER_FLAG_COMPLETE_FRAMES) {
next = buf_size; next = buf_size;
} else { } else {
next = h264_find_frame_end(p, buf, buf_size); next = h264_find_frame_end(p, buf, buf_size, avctx);
if (ff_combine_frame(pc, next, &buf, &buf_size) < 0) { if (ff_combine_frame(pc, next, &buf, &buf_size) < 0) {
*poutbuf = NULL; *poutbuf = NULL;
@@ -595,7 +595,7 @@ static int h264_parse(AVCodecParserContext *s,
if (next < 0 && next != END_NOT_FOUND) { if (next < 0 && next != END_NOT_FOUND) {
av_assert1(pc->last_index + next >= 0); av_assert1(pc->last_index + next >= 0);
h264_find_frame_end(p, &pc->buffer[pc->last_index + next], -next); // update state h264_find_frame_end(p, &pc->buffer[pc->last_index + next], -next, avctx); // update state
} }
} }