generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avcodec/h264: simplify find_start_code()

Browse Source 
this also uses avpriv_find_start_code(), though no speed change is expected as
the area searched is generally small

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 3b678da5e3)

Conflicts:

	libavcodec/h264.h
This commit is contained in:
Michael Niedermayer
2014-10-27 04:24:20 +01:00
parent 667fe8c75b
commit 76587eea64
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libavcodec/h264.h
View File

@@ -37,6 +37,7 @@
#include "h264dsp.h" #include "h264dsp.h"
#include "h264pred.h" #include "h264pred.h"
#include "h264qpel.h" #include "h264qpel.h"
#include "internal.h" // for avpriv_find_start_code()
#include "rectangle.h" #include "rectangle.h"
#define MAX_SPS_COUNT 32 #define MAX_SPS_COUNT 32
@@ -1031,20 +1032,11 @@ static av_always_inline int get_dct8x8_allowed(H264Context *h)
static inline int find_start_code(const uint8_t *buf, int buf_size, static inline int find_start_code(const uint8_t *buf, int buf_size,
int buf_index, int next_avc) int buf_index, int next_avc)
{ {
// start code prefix search uint32_t state = -1;
for (; buf_index + 3 < next_avc; buf_index++)
// This should always succeed in the first iteration.
if (buf[buf_index] == 0 &&
buf[buf_index + 1] == 0 &&
buf[buf_index + 2] == 1)
break;
buf_index += 3; buf_index = avpriv_find_start_code(buf + buf_index, buf + next_avc + 1, &state) - buf - 1;
if (buf_index >= buf_size) return FFMIN(buf_index, buf_size);
return buf_size;
return buf_index;
} }
static inline int get_avc_nalsize(H264Context *h, const uint8_t *buf, static inline int get_avc_nalsize(H264Context *h, const uint8_t *buf,