@@ -7,7 +7,7 @@ use crate::error::Result;
77use super :: * ;
88
99const 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 ;
1111
1212struct Av1Obu {
1313 header : u8 ,
@@ -51,8 +51,8 @@ fn build_av1_frame(obus: &Vec<Av1Obu>) -> Bytes {
5151 if obu. header & OBU_HAS_SIZE_BIT != 0 {
5252 // write size in leb128 format.
5353 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 ) ;
5656 payload_size >>= 7 ;
5757 }
5858 raw. push ( payload_size as u8 ) ;
@@ -71,7 +71,7 @@ fn test_packetize_one_obu_without_size_and_extension() -> Result<()> {
7171 assert_eq ! (
7272 payloader. payload( 1200 , & frame) ?,
7373 vec![ vec![
74- 0b00_01_0000 , // aggregation header
74+ 0b0001_0000 , // aggregation header
7575 OBU_TYPE_FRAME << 3 , // header
7676 1 ,
7777 2 ,
@@ -95,7 +95,7 @@ fn test_packetize_one_obu_without_size_with_extension() -> Result<()> {
9595 assert_eq ! (
9696 payloader. payload( 1200 , & frame) ?,
9797 vec![ vec![
98- 0b00_01_0000 , // aggregation header
98+ 0b0001_0000 , // aggregation header
9999 OBU_TYPE_FRAME << 3 | OBU_HAS_EXTENSION_BIT , // header
100100 OBU_EXTENSION_S1T1 , // extension header
101101 2 ,
@@ -118,7 +118,7 @@ fn removes_obu_size_field_without_extension() -> Result<()> {
118118 assert_eq ! (
119119 payloader. payload( 1200 , & frame) ?,
120120 vec![ vec![
121- 0b00_01_0000 , // aggregation header
121+ 0b0001_0000 , // aggregation header
122122 OBU_TYPE_FRAME << 3 , // header
123123 11 ,
124124 12 ,
@@ -141,7 +141,7 @@ fn removes_obu_size_field_with_extension() -> Result<()> {
141141 assert_eq ! (
142142 payloader. payload( 1200 , & frame) ?,
143143 vec![ vec![
144- 0b00_01_0000 , // aggregation header
144+ 0b0001_0000 , // aggregation header
145145 OBU_TYPE_FRAME << 3 | OBU_HAS_EXTENSION_BIT , // header
146146 OBU_EXTENSION_S1T1 , // extension header
147147 1 ,
@@ -167,7 +167,7 @@ fn test_omits_size_for_last_obu_when_three_obus_fits_into_the_packet() -> Result
167167 assert_eq ! (
168168 payloader. payload( 1200 , & frame) ?,
169169 vec![ vec![
170- 0b00_11_1000 , // aggregation header
170+ 0b0011_1000 , // aggregation header
171171 7 , // size of the first OBU
172172 OBU_TYPE_SEQUENCE_HEADER << 3 , // header of the first OBU
173173 1 ,
@@ -206,7 +206,7 @@ fn test_use_size_for_all_obus_when_four_obus_fits_into_the_packet() -> Result<()
206206 assert_eq ! (
207207 payloader. payload( 1200 , & frame) ?,
208208 vec![ vec![
209- 0b00_00_1000 , // aggregation header
209+ 0b0000_1000 , // aggregation header
210210 7 , // size of the first OBU
211211 OBU_TYPE_SEQUENCE_HEADER << 3 , // header of the first OBU
212212 1 ,
@@ -252,7 +252,7 @@ fn test_discards_temporal_delimiter_and_tile_list_obu() -> Result<()> {
252252 assert_eq ! (
253253 payloader. payload( 1200 , & frame) ?,
254254 vec![ vec![
255- 0b00_11_0000 , // aggregation header
255+ 0b0011_0000 , // aggregation header
256256 1 , // size of the first OBU
257257 OBU_TYPE_METADATA << 3 , // header of the first OBU
258258 4 , // size of the second OBU
@@ -290,15 +290,15 @@ fn test_split_two_obus_into_two_packet_force_split_obu_header() -> Result<()> {
290290 payloader. payload( 6 , & frame) ?,
291291 vec![
292292 vec![
293- 0b01_10_0000 , // aggregation header
293+ 0b0110_0000 , // aggregation header
294294 3 , // size of the first OBU
295295 OBU_TYPE_FRAME_HEADER << 3 | OBU_HAS_EXTENSION_BIT , // header of the first OBU
296296 OBU_EXTENSION_S1T1 , // extension header
297297 21 ,
298298 OBU_TYPE_TILE_GROUP << 3 | OBU_HAS_EXTENSION_BIT , // header of the second OBU
299299 ] ,
300300 vec![
301- 0b10_01_0000 , // aggregation header
301+ 0b1001_0000 , // aggregation header
302302 OBU_EXTENSION_S1T1 ,
303303 11 ,
304304 12 ,
@@ -358,7 +358,7 @@ fn test_split_single_obu_into_two_packets() -> Result<()> {
358358 payloader. payload( 8 , & frame) ?,
359359 vec![
360360 vec![
361- 0b01_01_0000 , // aggregation header
361+ 0b0101_0000 , // aggregation header
362362 OBU_TYPE_FRAME << 3 , // header
363363 11 ,
364364 12 ,
@@ -368,7 +368,7 @@ fn test_split_single_obu_into_two_packets() -> Result<()> {
368368 16
369369 ] ,
370370 vec![
371- 0b10_01_0000 , // aggregation header
371+ 0b1001_0000 , // aggregation header
372372 17 ,
373373 18 ,
374374 19
@@ -389,7 +389,7 @@ fn test_split_single_obu_into_many_packets() -> Result<()> {
389389 assert_eq ! ( result. len( ) , 13 ) ;
390390 assert_eq ! ( result[ 0 ] , {
391391 let mut ret = vec![
392- 0b01_01_0000 , // aggregation header
392+ 0b0101_0000 , // aggregation header
393393 OBU_TYPE_FRAME << 3 , // header
394394 ] ;
395395 ret. extend( vec![ 27 ; 98 ] ) ;
@@ -398,15 +398,15 @@ fn test_split_single_obu_into_many_packets() -> Result<()> {
398398 for packet in result. iter ( ) . take ( 12 ) . skip ( 1 ) {
399399 assert_eq ! ( packet. to_vec( ) , {
400400 let mut ret = vec![
401- 0b11_01_0000 , // aggregation header
401+ 0b1101_0000 , // aggregation header
402402 ] ;
403403 ret. extend( vec![ 27 ; 99 ] ) ;
404404 ret
405405 } ) ;
406406 }
407407 assert_eq ! ( result[ 12 ] , {
408408 let mut ret = vec![
409- 0b10_01_0000 , // aggregation header
409+ 0b1001_0000 , // aggregation header
410410 ] ;
411411 ret. extend( vec![ 27 ; 13 ] ) ;
412412 ret
@@ -429,7 +429,7 @@ fn test_split_two_obus_into_two_packets() -> Result<()> {
429429 result,
430430 vec![
431431 vec![
432- 0b01_10_1000 , // aggregation header
432+ 0b0110_1000 , // aggregation header
433433 3 , // size of the first OBU
434434 OBU_TYPE_SEQUENCE_HEADER << 3 , // header
435435 11 ,
@@ -439,7 +439,7 @@ fn test_split_two_obus_into_two_packets() -> Result<()> {
439439 2
440440 ] ,
441441 vec![
442- 0b10_01_0000 , // aggregation header
442+ 0b1001_0000 , // aggregation header
443443 3 ,
444444 4 ,
445445 5 ,
0 commit comments