fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 07:28:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

vl/rbsp: add a check for emulation prevention three byte

Browse source 
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 <leo.liu@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
This commit is contained in:
Leo Liu 2016-08-08 16:01:23 -04:00
parent bc5df3b321
commit 6575ebdc45
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/gallium/auxiliary/vl/vl_rbsp.h
View file

@ -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;
}
}
}
/**