X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;ds=sidebyside;f=nihav-commonfmt%2Fsrc%2Fdemuxers%2Fmov.rs;h=aea8ecb8dfc149816a2f3fe8b7f51bd66cf9d4bc;hb=999c25f70cce9929567ece9cb285a900f56727f7;hp=4a11758af28488b8f549aee7ce83d341419a4743;hpb=9559c2c8fa6591e52cf582fd94c8897a4c4c1de1;p=nihav.git

diff --git a/nihav-commonfmt/src/demuxers/mov.rs b/nihav-commonfmt/src/demuxers/mov.rs
index 4a11758..aea8ecb 100644
--- a/nihav-commonfmt/src/demuxers/mov.rs
+++ b/nihav-commonfmt/src/demuxers/mov.rs
@@ -43,10 +43,11 @@ fn read_chunk_header(br: &mut ByteReader) -> DemuxerResult<(u32, u64)> {
 
 fn read_palette(br: &mut ByteReader, size: u64, pal: &mut [u8; 1024]) -> DemuxerResult<u64> {
     let _seed           = br.read_u32be()?;
-    let _flags          = br.read_u16be()?;
+    let flags           = br.read_u16be()?;
     let palsize         = (br.read_u16be()? as usize) + 1;
     validate!(palsize <= 256);
-    validate!((palsize as u64) * 8 + 8 == size);
+    validate!(flags == 0 || flags == 0x4000 || flags == 0x8000);
+    validate!((palsize as u64) * 8 + 8 <= size);
     for i in 0..palsize {
         let a           = br.read_u16be()?;
         let r           = br.read_u16be()?;
@@ -55,7 +56,12 @@ fn read_palette(br: &mut ByteReader, size: u64, pal: &mut [u8; 1024]) -> Demuxer
         pal[i * 4]     = (r >> 8) as u8;
         pal[i * 4 + 1] = (g >> 8) as u8;
         pal[i * 4 + 2] = (b >> 8) as u8;
-        pal[i * 4 + 3] = (a >> 8) as u8;
+        if flags == 0x8000 {
+            pal[i * 4 + 3] = (a >> 8) as u8;
+        }
+    }
+    if flags == 0x4000 {
+        br.read_skip(8)?;
     }
     Ok(size)
 }
@@ -791,7 +797,7 @@ fn read_stts(track: &mut Track, br: &mut ByteReader, size: u64) -> DemuxerResult
         validate!(tb_num != 0);
         track.rescale(tb_num);
     } else {
-        track.time_to_sample.truncate(0);
+        track.time_to_sample.clear();
         track.time_to_sample.reserve(entries);
         for _ in 0..entries {
             let count       = br.read_u32be()?;
@@ -1148,7 +1154,7 @@ struct RLESearcher<T> {
 impl<T:Default+Copy> RLESearcher<T> {
     fn new() -> Self { Self::default() }
     fn resize(&mut self, size: usize) {
-        self.array.truncate(0);
+        self.array.clear();
         self.array.reserve(size);
     }
     fn reserve(&mut self, size: usize) {
@@ -2045,6 +2051,7 @@ mod test {
 
     #[test]
     fn test_mov_demux() {
+        // sample: https://samples.mplayerhq.hu/V-codecs/IV32/cubes.mov
         let mut file = File::open("assets/Indeo/cubes.mov").unwrap();
         let mut fr = FileReader::new_read(&mut file);
         let mut br = ByteReader::new(&mut fr);
@@ -2066,6 +2073,7 @@ mod test {
 
     #[test]
     fn test_dash_demux() {
+        // sample: a stream downloaded with youtube-dl
         let mut file = File::open("assets/ITU/dash.m4a").unwrap();
         let mut fr = FileReader::new_read(&mut file);
         let mut br = ByteReader::new(&mut fr);