@@ -7,7 +7,7 @@ use crate::error::Result;
7
7
use super :: * ;
8
8
9
9
const OBU_EXTENSION_S1T1 : u8 = 0b0010_1000 ;
10
- const NEW_CODED_VIDEO_SEQUENCE_BIT : u8 = 0b00_00_1000 ;
10
+ const NEW_CODED_VIDEO_SEQUENCE_BIT : u8 = 0b0000_1000 ;
11
11
12
12
struct Av1Obu {
13
13
header : u8 ,
@@ -51,8 +51,8 @@ fn build_av1_frame(obus: &Vec<Av1Obu>) -> Bytes {
51
51
if obu. header & OBU_HAS_SIZE_BIT != 0 {
52
52
// write size in leb128 format.
53
53
let mut payload_size = obu. payload . len ( ) ;
54
- while payload_size >= 0b_1000_0000 {
55
- raw. push ( 0b_1000_0000 | ( payload_size & 0b_0111_1111 ) as u8 ) ;
54
+ while payload_size >= 0b1000_0000 {
55
+ raw. push ( 0b1000_0000 | ( payload_size & 0b0111_1111 ) as u8 ) ;
56
56
payload_size >>= 7 ;
57
57
}
58
58
raw. push ( payload_size as u8 ) ;
@@ -71,7 +71,7 @@ fn test_packetize_one_obu_without_size_and_extension() -> Result<()> {
71
71
assert_eq ! (
72
72
payloader. payload( 1200 , & frame) ?,
73
73
vec![ vec![
74
- 0b00_01_0000 , // aggregation header
74
+ 0b0001_0000 , // aggregation header
75
75
OBU_TYPE_FRAME << 3 , // header
76
76
1 ,
77
77
2 ,
@@ -95,7 +95,7 @@ fn test_packetize_one_obu_without_size_with_extension() -> Result<()> {
95
95
assert_eq ! (
96
96
payloader. payload( 1200 , & frame) ?,
97
97
vec![ vec![
98
- 0b00_01_0000 , // aggregation header
98
+ 0b0001_0000 , // aggregation header
99
99
OBU_TYPE_FRAME << 3 | OBU_HAS_EXTENSION_BIT , // header
100
100
OBU_EXTENSION_S1T1 , // extension header
101
101
2 ,
@@ -118,7 +118,7 @@ fn removes_obu_size_field_without_extension() -> Result<()> {
118
118
assert_eq ! (
119
119
payloader. payload( 1200 , & frame) ?,
120
120
vec![ vec![
121
- 0b00_01_0000 , // aggregation header
121
+ 0b0001_0000 , // aggregation header
122
122
OBU_TYPE_FRAME << 3 , // header
123
123
11 ,
124
124
12 ,
@@ -141,7 +141,7 @@ fn removes_obu_size_field_with_extension() -> Result<()> {
141
141
assert_eq ! (
142
142
payloader. payload( 1200 , & frame) ?,
143
143
vec![ vec![
144
- 0b00_01_0000 , // aggregation header
144
+ 0b0001_0000 , // aggregation header
145
145
OBU_TYPE_FRAME << 3 | OBU_HAS_EXTENSION_BIT , // header
146
146
OBU_EXTENSION_S1T1 , // extension header
147
147
1 ,
@@ -167,7 +167,7 @@ fn test_omits_size_for_last_obu_when_three_obus_fits_into_the_packet() -> Result
167
167
assert_eq ! (
168
168
payloader. payload( 1200 , & frame) ?,
169
169
vec![ vec![
170
- 0b00_11_1000 , // aggregation header
170
+ 0b0011_1000 , // aggregation header
171
171
7 , // size of the first OBU
172
172
OBU_TYPE_SEQUENCE_HEADER << 3 , // header of the first OBU
173
173
1 ,
@@ -206,7 +206,7 @@ fn test_use_size_for_all_obus_when_four_obus_fits_into_the_packet() -> Result<()
206
206
assert_eq ! (
207
207
payloader. payload( 1200 , & frame) ?,
208
208
vec![ vec![
209
- 0b00_00_1000 , // aggregation header
209
+ 0b0000_1000 , // aggregation header
210
210
7 , // size of the first OBU
211
211
OBU_TYPE_SEQUENCE_HEADER << 3 , // header of the first OBU
212
212
1 ,
@@ -252,7 +252,7 @@ fn test_discards_temporal_delimiter_and_tile_list_obu() -> Result<()> {
252
252
assert_eq ! (
253
253
payloader. payload( 1200 , & frame) ?,
254
254
vec![ vec![
255
- 0b00_11_0000 , // aggregation header
255
+ 0b0011_0000 , // aggregation header
256
256
1 , // size of the first OBU
257
257
OBU_TYPE_METADATA << 3 , // header of the first OBU
258
258
4 , // size of the second OBU
@@ -290,15 +290,15 @@ fn test_split_two_obus_into_two_packet_force_split_obu_header() -> Result<()> {
290
290
payloader. payload( 6 , & frame) ?,
291
291
vec![
292
292
vec![
293
- 0b01_10_0000 , // aggregation header
293
+ 0b0110_0000 , // aggregation header
294
294
3 , // size of the first OBU
295
295
OBU_TYPE_FRAME_HEADER << 3 | OBU_HAS_EXTENSION_BIT , // header of the first OBU
296
296
OBU_EXTENSION_S1T1 , // extension header
297
297
21 ,
298
298
OBU_TYPE_TILE_GROUP << 3 | OBU_HAS_EXTENSION_BIT , // header of the second OBU
299
299
] ,
300
300
vec![
301
- 0b10_01_0000 , // aggregation header
301
+ 0b1001_0000 , // aggregation header
302
302
OBU_EXTENSION_S1T1 ,
303
303
11 ,
304
304
12 ,
@@ -358,7 +358,7 @@ fn test_split_single_obu_into_two_packets() -> Result<()> {
358
358
payloader. payload( 8 , & frame) ?,
359
359
vec![
360
360
vec![
361
- 0b01_01_0000 , // aggregation header
361
+ 0b0101_0000 , // aggregation header
362
362
OBU_TYPE_FRAME << 3 , // header
363
363
11 ,
364
364
12 ,
@@ -368,7 +368,7 @@ fn test_split_single_obu_into_two_packets() -> Result<()> {
368
368
16
369
369
] ,
370
370
vec![
371
- 0b10_01_0000 , // aggregation header
371
+ 0b1001_0000 , // aggregation header
372
372
17 ,
373
373
18 ,
374
374
19
@@ -389,7 +389,7 @@ fn test_split_single_obu_into_many_packets() -> Result<()> {
389
389
assert_eq ! ( result. len( ) , 13 ) ;
390
390
assert_eq ! ( result[ 0 ] , {
391
391
let mut ret = vec![
392
- 0b01_01_0000 , // aggregation header
392
+ 0b0101_0000 , // aggregation header
393
393
OBU_TYPE_FRAME << 3 , // header
394
394
] ;
395
395
ret. extend( vec![ 27 ; 98 ] ) ;
@@ -398,15 +398,15 @@ fn test_split_single_obu_into_many_packets() -> Result<()> {
398
398
for packet in result. iter ( ) . take ( 12 ) . skip ( 1 ) {
399
399
assert_eq ! ( packet. to_vec( ) , {
400
400
let mut ret = vec![
401
- 0b11_01_0000 , // aggregation header
401
+ 0b1101_0000 , // aggregation header
402
402
] ;
403
403
ret. extend( vec![ 27 ; 99 ] ) ;
404
404
ret
405
405
} ) ;
406
406
}
407
407
assert_eq ! ( result[ 12 ] , {
408
408
let mut ret = vec![
409
- 0b10_01_0000 , // aggregation header
409
+ 0b1001_0000 , // aggregation header
410
410
] ;
411
411
ret. extend( vec![ 27 ; 13 ] ) ;
412
412
ret
@@ -429,7 +429,7 @@ fn test_split_two_obus_into_two_packets() -> Result<()> {
429
429
result,
430
430
vec![
431
431
vec![
432
- 0b01_10_1000 , // aggregation header
432
+ 0b0110_1000 , // aggregation header
433
433
3 , // size of the first OBU
434
434
OBU_TYPE_SEQUENCE_HEADER << 3 , // header
435
435
11 ,
@@ -439,7 +439,7 @@ fn test_split_two_obus_into_two_packets() -> Result<()> {
439
439
2
440
440
] ,
441
441
vec![
442
- 0b10_01_0000 , // aggregation header
442
+ 0b1001_0000 , // aggregation header
443
443
3 ,
444
444
4 ,
445
445
5 ,
0 commit comments