diff options
| author | Leo Liu <[email protected]> | 2016-08-08 16:01:23 -0400 |
|---|---|---|
| committer | Leo Liu <[email protected]> | 2016-08-10 09:52:44 -0400 |
| commit | 6575ebdc4570b54ad98eaa2db19703a636acdc9d (patch) | |
| tree | 4e7bb73b3fcf1de937e64fac20de13d8888e9ab4 | |
| parent | bc5df3b321c5393b2f10115cfa5acc8f11bd7146 (diff) | |
vl/rbsp: add a check for emulation prevention three byte
This is the case when the "00 00 03" is very close to the beginning of
nal unit header
v2: move the check to rbsp init
Signed-off-by: Leo Liu <[email protected]>
Reviewed-by: Christian König <[email protected]>
| -rw-r--r-- | src/gallium/auxiliary/vl/vl_rbsp.h | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/gallium/auxiliary/vl/vl_rbsp.h b/src/gallium/auxiliary/vl/vl_rbsp.h index 7867238c49e..c8bebff4de6 100644 --- a/src/gallium/auxiliary/vl/vl_rbsp.h +++ b/src/gallium/auxiliary/vl/vl_rbsp.h @@ -50,7 +50,8 @@ struct vl_rbsp { */ static inline void vl_rbsp_init(struct vl_rbsp *rbsp, struct vl_vlc *nal, unsigned num_bits) { - unsigned bits_left = vl_vlc_bits_left(nal); + unsigned valid, bits_left = vl_vlc_bits_left(nal); + int i; /* copy the position */ rbsp->nal = *nal; @@ -62,10 +63,19 @@ static inline void vl_rbsp_init(struct vl_rbsp *rbsp, struct vl_vlc *nal, unsign if (vl_vlc_peekbits(nal, 24) == 0x000001 || vl_vlc_peekbits(nal, 32) == 0x00000001) { vl_vlc_limit(&rbsp->nal, bits_left - vl_vlc_bits_left(nal)); - return; + break; } vl_vlc_eatbits(nal, 8); } + + valid = vl_vlc_valid_bits(&rbsp->nal); + /* search for the emulation prevention three byte */ + for (i = 24; i <= valid; i += 8) { + if ((vl_vlc_peekbits(&rbsp->nal, i) & 0xffffff) == 0x3) { + vl_vlc_removebits(&rbsp->nal, i - 8, 8); + i += 8; + } + } } /** |