Fix read_colr unit tests for the per-colour_type signature change

The per-colour_type colr change made read_colr take colour_type as an
argument that the caller reads first, but the read_colr_nclx and
read_colr_nclx_missing_full_range_flag tests, merged from the nclx
full_range_flag tolerance change, still called it with the old
two-argument signature, breaking the lib test build. Read colour_type
from the box before each call, mirroring read_ipco and
read_video_sample_entry.

Author: kinetiknz

mp4parse/src/tests.rs

@@ -1642,7 +1642,8 @@ fn read_colr_nclx() {
     let mut iter = super::BoxIter::new(&mut stream);
     let mut stream = iter.next_box().unwrap().unwrap();
     assert_eq!(stream.head.name, super::BoxType::ColourInformationBox);
-    match super::read_colr(&mut stream, ParseStrictness::Strict).unwrap() {
+    let colour_type = super::be_u32(&mut stream).unwrap().to_be_bytes();
+    match super::read_colr(&mut stream, colour_type, ParseStrictness::Strict).unwrap() {
         super::ParsedColourInformation::Supported(super::ColourInformation::Nclx(nclx)) => {
             assert_eq!(nclx.colour_primaries, 1);
             assert_eq!(nclx.transfer_characteristics, 1);
@@ -1668,7 +1669,8 @@ fn read_colr_nclx_missing_full_range_flag() {
         let mut stream = make_stream();
         let mut iter = super::BoxIter::new(&mut stream);
         let mut stream = iter.next_box().unwrap().unwrap();
-        let colr = super::read_colr(&mut stream, strictness)
+        let colour_type = super::be_u32(&mut stream).unwrap().to_be_bytes();
+        let colr = super::read_colr(&mut stream, colour_type, strictness)
             .expect("nclx missing full_range_flag should parse outside Strict");
         match colr {
             super::ParsedColourInformation::Supported(super::ColourInformation::Nclx(nclx)) => {
@@ -1684,7 +1686,8 @@ fn read_colr_nclx_missing_full_range_flag() {
     let mut stream = make_stream();
     let mut iter = super::BoxIter::new(&mut stream);
     let mut stream = iter.next_box().unwrap().unwrap();
-    match super::read_colr(&mut stream, ParseStrictness::Strict) {
+    let colour_type = super::be_u32(&mut stream).unwrap().to_be_bytes();
+    match super::read_colr(&mut stream, colour_type, ParseStrictness::Strict) {
         Err(Error::InvalidData(s)) => assert_eq!(s, Status::ColrBadSize),
         Ok(_) => panic!("nclx missing full_range_flag should be rejected under Strict"),
         Err(e) => panic!("unexpected error {:?}", e),