X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-commonfmt%2Fsrc%2Fdemuxers%2Fmov.rs;h=e147757fcac92e985b948eb1e15cb1d797c02cce;hb=2949bcfa141c1f25b9b1b4d5c346acc9cc3b0a2a;hp=29c512de3ae0039c9f5169d11fd2d0757f3c05e7;hpb=787b8d03074419d7f8e6b52daba02a3807444bc2;p=nihav.git

diff --git a/nihav-commonfmt/src/demuxers/mov.rs b/nihav-commonfmt/src/demuxers/mov.rs
index 29c512d..e147757 100644
--- a/nihav-commonfmt/src/demuxers/mov.rs
+++ b/nihav-commonfmt/src/demuxers/mov.rs
@@ -307,7 +307,7 @@ fn read_hdlr(track: &mut Track, br: &mut ByteReader, size: u64) -> DemuxerResult
         println!("Unknown stream type");
         track.stream_type = StreamType::Data;
     }
-    
+
     Ok(KNOWN_HDLR_SIZE)
 }
 
@@ -421,12 +421,50 @@ fn read_stsd(track: &mut Track, br: &mut ByteReader, size: u64) -> DemuxerResult
                                   br.read_skip(31)?; // actual compressor name
             let depth           = br.read_u16be()?;
             let ctable_id       = br.read_u16be()?;
-            validate!((depth <= 8) || (ctable_id == 0xFFFF));
+            let grayscale = depth > 0x20 || depth == 1;
+            let depth = if grayscale { depth & 0x1F } else { depth };
+            validate!(depth <= 8 || (ctable_id == 0xFFFF));
             if ctable_id == 0 {
                 let max_pal_size = start_pos + size - br.tell();
                 let mut pal = [0; 1024];
                 read_palette(br, max_pal_size, &mut pal)?;
                 track.pal = Some(Arc::new(pal));
+            } else if (depth <= 8) && !grayscale {
+                match depth & 0x1F {
+                    2 => {
+                        let mut pal = [0; 1024];
+                        (&mut pal[..4 * 4]).copy_from_slice(&MOV_DEFAULT_PAL_2BIT);
+                        track.pal = Some(Arc::new(pal));
+                    },
+                    4 => {
+                        let mut pal = [0; 1024];
+                        (&mut pal[..16 * 4]).copy_from_slice(&MOV_DEFAULT_PAL_4BIT);
+                        track.pal = Some(Arc::new(pal));
+                    },
+                    8 => {
+                        track.pal = Some(Arc::new(MOV_DEFAULT_PAL_8BIT));
+                    },
+                    _ => {},
+                };
+            } else if grayscale && ctable_id != 0xFFFF {
+                let mut pal = [0; 1024];
+                let cdepth = depth & 0x1F;
+                let size = 1 << cdepth;
+                for i in 0..size {
+                    let mut clr = ((size - 1 - i) as u8) << (8 - cdepth);
+                    let mut off = 8 - cdepth;
+                    while off >= cdepth {
+                        clr |= clr >> (8 - off);
+                        off -= cdepth;
+                    }
+                    if off > 0 {
+                        clr |= clr >> (8 - off);
+                    }
+                    pal[i * 4]     = clr;
+                    pal[i * 4 + 1] = clr;
+                    pal[i * 4 + 2] = clr;
+                }
+                track.pal = Some(Arc::new(pal));
             }
 // todo other atoms, put as extradata
             let cname = if let Some(name) = find_codec_from_mov_video_fourcc(&fcc) {
@@ -437,7 +475,8 @@ fn read_stsd(track: &mut Track, br: &mut ByteReader, size: u64) -> DemuxerResult
                     "unknown"
                 };
             let format = if depth > 8 { RGB24_FORMAT } else { PAL8_FORMAT };
-            let vhdr = NAVideoInfo::new(width, height, false, format);
+            let mut vhdr = NAVideoInfo::new(width, height, false, format);
+            vhdr.bits = depth as u8;
             let edata;
             if br.tell() - start_pos + 4 < size {
 //todo skip various common atoms
@@ -885,6 +924,289 @@ impl DemuxerCreator for MOVDemuxerCreator {
     fn get_name(&self) -> &'static str { "mov" }
 }
 
+const MOV_DEFAULT_PAL_2BIT: [u8; 4 * 4] = [
+    0x93, 0x65, 0x5E, 0x00,
+    0xFF, 0xFF, 0xFF, 0x00,
+    0xDF, 0xD0, 0xAB, 0x00,
+    0x00, 0x00, 0x00, 0x00
+];
+const MOV_DEFAULT_PAL_4BIT: [u8; 16 * 4] = [
+    0xFF, 0xFB, 0xFF, 0x00,
+    0xEF, 0xD9, 0xBB, 0x00,
+    0xE8, 0xC9, 0xB1, 0x00,
+    0x93, 0x65, 0x5E, 0x00,
+    0xFC, 0xDE, 0xE8, 0x00,
+    0x9D, 0x88, 0x91, 0x00,
+    0xFF, 0xFF, 0xFF, 0x00,
+    0xFF, 0xFF, 0xFF, 0x00,
+    0xFF, 0xFF, 0xFF, 0x00,
+    0x47, 0x48, 0x37, 0x00,
+    0x7A, 0x5E, 0x55, 0x00,
+    0xDF, 0xD0, 0xAB, 0x00,
+    0xFF, 0xFB, 0xF9, 0x00,
+    0xE8, 0xCA, 0xC5, 0x00,
+    0x8A, 0x7C, 0x77, 0x00,
+    0x00, 0x00, 0x00, 0x00
+];
+const MOV_DEFAULT_PAL_8BIT: [u8; 256 * 4] = [
+    0xFF, 0xFF, 0xFF, 0x00,
+    0xFF, 0xFF, 0xCC, 0x00,
+    0xFF, 0xFF, 0x99, 0x00,
+    0xFF, 0xFF, 0x66, 0x00,
+    0xFF, 0xFF, 0x33, 0x00,
+    0xFF, 0xFF, 0x00, 0x00,
+    0xFF, 0xCC, 0xFF, 0x00,
+    0xFF, 0xCC, 0xCC, 0x00,
+    0xFF, 0xCC, 0x99, 0x00,
+    0xFF, 0xCC, 0x66, 0x00,
+    0xFF, 0xCC, 0x33, 0x00,
+    0xFF, 0xCC, 0x00, 0x00,
+    0xFF, 0x99, 0xFF, 0x00,
+    0xFF, 0x99, 0xCC, 0x00,
+    0xFF, 0x99, 0x99, 0x00,
+    0xFF, 0x99, 0x66, 0x00,
+    0xFF, 0x99, 0x33, 0x00,
+    0xFF, 0x99, 0x00, 0x00,
+    0xFF, 0x66, 0xFF, 0x00,
+    0xFF, 0x66, 0xCC, 0x00,
+    0xFF, 0x66, 0x99, 0x00,
+    0xFF, 0x66, 0x66, 0x00,
+    0xFF, 0x66, 0x33, 0x00,
+    0xFF, 0x66, 0x00, 0x00,
+    0xFF, 0x33, 0xFF, 0x00,
+    0xFF, 0x33, 0xCC, 0x00,
+    0xFF, 0x33, 0x99, 0x00,
+    0xFF, 0x33, 0x66, 0x00,
+    0xFF, 0x33, 0x33, 0x00,
+    0xFF, 0x33, 0x00, 0x00,
+    0xFF, 0x00, 0xFF, 0x00,
+    0xFF, 0x00, 0xCC, 0x00,
+    0xFF, 0x00, 0x99, 0x00,
+    0xFF, 0x00, 0x66, 0x00,
+    0xFF, 0x00, 0x33, 0x00,
+    0xFF, 0x00, 0x00, 0x00,
+    0xCC, 0xFF, 0xFF, 0x00,
+    0xCC, 0xFF, 0xCC, 0x00,
+    0xCC, 0xFF, 0x99, 0x00,
+    0xCC, 0xFF, 0x66, 0x00,
+    0xCC, 0xFF, 0x33, 0x00,
+    0xCC, 0xFF, 0x00, 0x00,
+    0xCC, 0xCC, 0xFF, 0x00,
+    0xCC, 0xCC, 0xCC, 0x00,
+    0xCC, 0xCC, 0x99, 0x00,
+    0xCC, 0xCC, 0x66, 0x00,
+    0xCC, 0xCC, 0x33, 0x00,
+    0xCC, 0xCC, 0x00, 0x00,
+    0xCC, 0x99, 0xFF, 0x00,
+    0xCC, 0x99, 0xCC, 0x00,
+    0xCC, 0x99, 0x99, 0x00,
+    0xCC, 0x99, 0x66, 0x00,
+    0xCC, 0x99, 0x33, 0x00,
+    0xCC, 0x99, 0x00, 0x00,
+    0xCC, 0x66, 0xFF, 0x00,
+    0xCC, 0x66, 0xCC, 0x00,
+    0xCC, 0x66, 0x99, 0x00,
+    0xCC, 0x66, 0x66, 0x00,
+    0xCC, 0x66, 0x33, 0x00,
+    0xCC, 0x66, 0x00, 0x00,
+    0xCC, 0x33, 0xFF, 0x00,
+    0xCC, 0x33, 0xCC, 0x00,
+    0xCC, 0x33, 0x99, 0x00,
+    0xCC, 0x33, 0x66, 0x00,
+    0xCC, 0x33, 0x33, 0x00,
+    0xCC, 0x33, 0x00, 0x00,
+    0xCC, 0x00, 0xFF, 0x00,
+    0xCC, 0x00, 0xCC, 0x00,
+    0xCC, 0x00, 0x99, 0x00,
+    0xCC, 0x00, 0x66, 0x00,
+    0xCC, 0x00, 0x33, 0x00,
+    0xCC, 0x00, 0x00, 0x00,
+    0x99, 0xFF, 0xFF, 0x00,
+    0x99, 0xFF, 0xCC, 0x00,
+    0x99, 0xFF, 0x99, 0x00,
+    0x99, 0xFF, 0x66, 0x00,
+    0x99, 0xFF, 0x33, 0x00,
+    0x99, 0xFF, 0x00, 0x00,
+    0x99, 0xCC, 0xFF, 0x00,
+    0x99, 0xCC, 0xCC, 0x00,
+    0x99, 0xCC, 0x99, 0x00,
+    0x99, 0xCC, 0x66, 0x00,
+    0x99, 0xCC, 0x33, 0x00,
+    0x99, 0xCC, 0x00, 0x00,
+    0x99, 0x99, 0xFF, 0x00,
+    0x99, 0x99, 0xCC, 0x00,
+    0x99, 0x99, 0x99, 0x00,
+    0x99, 0x99, 0x66, 0x00,
+    0x99, 0x99, 0x33, 0x00,
+    0x99, 0x99, 0x00, 0x00,
+    0x99, 0x66, 0xFF, 0x00,
+    0x99, 0x66, 0xCC, 0x00,
+    0x99, 0x66, 0x99, 0x00,
+    0x99, 0x66, 0x66, 0x00,
+    0x99, 0x66, 0x33, 0x00,
+    0x99, 0x66, 0x00, 0x00,
+    0x99, 0x33, 0xFF, 0x00,
+    0x99, 0x33, 0xCC, 0x00,
+    0x99, 0x33, 0x99, 0x00,
+    0x99, 0x33, 0x66, 0x00,
+    0x99, 0x33, 0x33, 0x00,
+    0x99, 0x33, 0x00, 0x00,
+    0x99, 0x00, 0xFF, 0x00,
+    0x99, 0x00, 0xCC, 0x00,
+    0x99, 0x00, 0x99, 0x00,
+    0x99, 0x00, 0x66, 0x00,
+    0x99, 0x00, 0x33, 0x00,
+    0x99, 0x00, 0x00, 0x00,
+    0x66, 0xFF, 0xFF, 0x00,
+    0x66, 0xFF, 0xCC, 0x00,
+    0x66, 0xFF, 0x99, 0x00,
+    0x66, 0xFF, 0x66, 0x00,
+    0x66, 0xFF, 0x33, 0x00,
+    0x66, 0xFF, 0x00, 0x00,
+    0x66, 0xCC, 0xFF, 0x00,
+    0x66, 0xCC, 0xCC, 0x00,
+    0x66, 0xCC, 0x99, 0x00,
+    0x66, 0xCC, 0x66, 0x00,
+    0x66, 0xCC, 0x33, 0x00,
+    0x66, 0xCC, 0x00, 0x00,
+    0x66, 0x99, 0xFF, 0x00,
+    0x66, 0x99, 0xCC, 0x00,
+    0x66, 0x99, 0x99, 0x00,
+    0x66, 0x99, 0x66, 0x00,
+    0x66, 0x99, 0x33, 0x00,
+    0x66, 0x99, 0x00, 0x00,
+    0x66, 0x66, 0xFF, 0x00,
+    0x66, 0x66, 0xCC, 0x00,
+    0x66, 0x66, 0x99, 0x00,
+    0x66, 0x66, 0x66, 0x00,
+    0x66, 0x66, 0x33, 0x00,
+    0x66, 0x66, 0x00, 0x00,
+    0x66, 0x33, 0xFF, 0x00,
+    0x66, 0x33, 0xCC, 0x00,
+    0x66, 0x33, 0x99, 0x00,
+    0x66, 0x33, 0x66, 0x00,
+    0x66, 0x33, 0x33, 0x00,
+    0x66, 0x33, 0x00, 0x00,
+    0x66, 0x00, 0xFF, 0x00,
+    0x66, 0x00, 0xCC, 0x00,
+    0x66, 0x00, 0x99, 0x00,
+    0x66, 0x00, 0x66, 0x00,
+    0x66, 0x00, 0x33, 0x00,
+    0x66, 0x00, 0x00, 0x00,
+    0x33, 0xFF, 0xFF, 0x00,
+    0x33, 0xFF, 0xCC, 0x00,
+    0x33, 0xFF, 0x99, 0x00,
+    0x33, 0xFF, 0x66, 0x00,
+    0x33, 0xFF, 0x33, 0x00,
+    0x33, 0xFF, 0x00, 0x00,
+    0x33, 0xCC, 0xFF, 0x00,
+    0x33, 0xCC, 0xCC, 0x00,
+    0x33, 0xCC, 0x99, 0x00,
+    0x33, 0xCC, 0x66, 0x00,
+    0x33, 0xCC, 0x33, 0x00,
+    0x33, 0xCC, 0x00, 0x00,
+    0x33, 0x99, 0xFF, 0x00,
+    0x33, 0x99, 0xCC, 0x00,
+    0x33, 0x99, 0x99, 0x00,
+    0x33, 0x99, 0x66, 0x00,
+    0x33, 0x99, 0x33, 0x00,
+    0x33, 0x99, 0x00, 0x00,
+    0x33, 0x66, 0xFF, 0x00,
+    0x33, 0x66, 0xCC, 0x00,
+    0x33, 0x66, 0x99, 0x00,
+    0x33, 0x66, 0x66, 0x00,
+    0x33, 0x66, 0x33, 0x00,
+    0x33, 0x66, 0x00, 0x00,
+    0x33, 0x33, 0xFF, 0x00,
+    0x33, 0x33, 0xCC, 0x00,
+    0x33, 0x33, 0x99, 0x00,
+    0x33, 0x33, 0x66, 0x00,
+    0x33, 0x33, 0x33, 0x00,
+    0x33, 0x33, 0x00, 0x00,
+    0x33, 0x00, 0xFF, 0x00,
+    0x33, 0x00, 0xCC, 0x00,
+    0x33, 0x00, 0x99, 0x00,
+    0x33, 0x00, 0x66, 0x00,
+    0x33, 0x00, 0x33, 0x00,
+    0x33, 0x00, 0x00, 0x00,
+    0x00, 0xFF, 0xFF, 0x00,
+    0x00, 0xFF, 0xCC, 0x00,
+    0x00, 0xFF, 0x99, 0x00,
+    0x00, 0xFF, 0x66, 0x00,
+    0x00, 0xFF, 0x33, 0x00,
+    0x00, 0xFF, 0x00, 0x00,
+    0x00, 0xCC, 0xFF, 0x00,
+    0x00, 0xCC, 0xCC, 0x00,
+    0x00, 0xCC, 0x99, 0x00,
+    0x00, 0xCC, 0x66, 0x00,
+    0x00, 0xCC, 0x33, 0x00,
+    0x00, 0xCC, 0x00, 0x00,
+    0x00, 0x99, 0xFF, 0x00,
+    0x00, 0x99, 0xCC, 0x00,
+    0x00, 0x99, 0x99, 0x00,
+    0x00, 0x99, 0x66, 0x00,
+    0x00, 0x99, 0x33, 0x00,
+    0x00, 0x99, 0x00, 0x00,
+    0x00, 0x66, 0xFF, 0x00,
+    0x00, 0x66, 0xCC, 0x00,
+    0x00, 0x66, 0x99, 0x00,
+    0x00, 0x66, 0x66, 0x00,
+    0x00, 0x66, 0x33, 0x00,
+    0x00, 0x66, 0x00, 0x00,
+    0x00, 0x33, 0xFF, 0x00,
+    0x00, 0x33, 0xCC, 0x00,
+    0x00, 0x33, 0x99, 0x00,
+    0x00, 0x33, 0x66, 0x00,
+    0x00, 0x33, 0x33, 0x00,
+    0x00, 0x33, 0x00, 0x00,
+    0x00, 0x00, 0xFF, 0x00,
+    0x00, 0x00, 0xCC, 0x00,
+    0x00, 0x00, 0x99, 0x00,
+    0x00, 0x00, 0x66, 0x00,
+    0x00, 0x00, 0x33, 0x00,
+    0xEE, 0x00, 0x00, 0x00,
+    0xDD, 0x00, 0x00, 0x00,
+    0xBB, 0x00, 0x00, 0x00,
+    0xAA, 0x00, 0x00, 0x00,
+    0x88, 0x00, 0x00, 0x00,
+    0x77, 0x00, 0x00, 0x00,
+    0x55, 0x00, 0x00, 0x00,
+    0x44, 0x00, 0x00, 0x00,
+    0x22, 0x00, 0x00, 0x00,
+    0x11, 0x00, 0x00, 0x00,
+    0x00, 0xEE, 0x00, 0x00,
+    0x00, 0xDD, 0x00, 0x00,
+    0x00, 0xBB, 0x00, 0x00,
+    0x00, 0xAA, 0x00, 0x00,
+    0x00, 0x88, 0x00, 0x00,
+    0x00, 0x77, 0x00, 0x00,
+    0x00, 0x55, 0x00, 0x00,
+    0x00, 0x44, 0x00, 0x00,
+    0x00, 0x22, 0x00, 0x00,
+    0x00, 0x11, 0x00, 0x00,
+    0x00, 0x00, 0xEE, 0x00,
+    0x00, 0x00, 0xDD, 0x00,
+    0x00, 0x00, 0xBB, 0x00,
+    0x00, 0x00, 0xAA, 0x00,
+    0x00, 0x00, 0x88, 0x00,
+    0x00, 0x00, 0x77, 0x00,
+    0x00, 0x00, 0x55, 0x00,
+    0x00, 0x00, 0x44, 0x00,
+    0x00, 0x00, 0x22, 0x00,
+    0x00, 0x00, 0x11, 0x00,
+    0xEE, 0xEE, 0xEE, 0x00,
+    0xDD, 0xDD, 0xDD, 0x00,
+    0xBB, 0xBB, 0xBB, 0x00,
+    0xAA, 0xAA, 0xAA, 0x00,
+    0x88, 0x88, 0x88, 0x00,
+    0x77, 0x77, 0x77, 0x00,
+    0x55, 0x55, 0x55, 0x00,
+    0x44, 0x44, 0x44, 0x00,
+    0x22, 0x22, 0x22, 0x00,
+    0x11, 0x11, 0x11, 0x00,
+    0x00, 0x00, 0x00, 0x00
+];
+
 #[cfg(test)]
 mod test {
     use super::*;