X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-commonfmt%2Fsrc%2Fdemuxers%2Fmov.rs;h=5d661745e12648bd448b17cc559b3a1f1a1c7ed5;hb=c8db9313866c4d7bcf34e45e486d2f909daa16d9;hp=e7c9a421ac2edff292b4595a00859ecd5fdbbea9;hpb=00333698f014b2f8d0308ecea3489f42b779aec2;p=nihav.git diff --git a/nihav-commonfmt/src/demuxers/mov.rs b/nihav-commonfmt/src/demuxers/mov.rs index e7c9a42..5d66174 100644 --- a/nihav-commonfmt/src/demuxers/mov.rs +++ b/nihav-commonfmt/src/demuxers/mov.rs @@ -40,22 +40,21 @@ fn read_chunk_header(br: &mut ByteReader) -> DemuxerResult<(u32, u64)> { } } -fn read_palette(br: &mut ByteReader, size: u64, pal: &mut Vec) -> DemuxerResult { +fn read_palette(br: &mut ByteReader, size: u64, pal: &mut [u8; 1024]) -> DemuxerResult { let _seed = br.read_u32be()?; let _flags = br.read_u16be()?; let palsize = (br.read_u16be()? as usize) + 1; validate!(palsize <= 256); validate!((palsize as u64) * 8 + 8 == size); - pal.resize(palsize * 4, 0); for i in 0..palsize { let a = br.read_u16be()?; let r = br.read_u16be()?; let g = br.read_u16be()?; let b = br.read_u16be()?; - pal[i * 4] = a; - pal[i * 4 + 1] = r; - pal[i * 4 + 2] = g; - pal[i * 4 + 3] = b; + 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; } Ok(size) } @@ -75,6 +74,7 @@ const IGNORED_CHUNKS: &[u32] = &[ ]; const ROOT_CHUNK_HANDLERS: &[RootChunkHandler] = &[ + RootChunkHandler { ctype: mktag!(b"ftyp"), parse: read_ftyp }, RootChunkHandler { ctype: mktag!(b"mdat"), parse: read_mdat }, RootChunkHandler { ctype: mktag!(b"moov"), parse: read_moov }, ]; @@ -150,6 +150,11 @@ fn skip_chunk(_track: &mut Track, br: &mut ByteReader, size: u64) -> DemuxerResu Ok(size) } +fn read_ftyp(dmx: &mut MOVDemuxer, _strmgr: &mut StreamManager, size: u64) -> DemuxerResult { + dmx.src.skip64(size)?; + Ok(size) +} + fn read_mdat(dmx: &mut MOVDemuxer, _strmgr: &mut StreamManager, size: u64) -> DemuxerResult { dmx.mdat_pos = dmx.src.tell(); dmx.mdat_size = size; @@ -166,6 +171,7 @@ const MOOV_CHUNK_HANDLERS: &[RootChunkHandler] = &[ RootChunkHandler { ctype: mktag!(b"mvhd"), parse: read_mvhd }, RootChunkHandler { ctype: mktag!(b"ctab"), parse: read_ctab }, RootChunkHandler { ctype: mktag!(b"trak"), parse: read_trak }, + RootChunkHandler { ctype: mktag!(b"meta"), parse: read_meta }, ]; fn read_mvhd(dmx: &mut MOVDemuxer, _strmgr: &mut StreamManager, size: u64) -> DemuxerResult { @@ -197,7 +203,15 @@ fn read_mvhd(dmx: &mut MOVDemuxer, _strmgr: &mut StreamManager, size: u64) -> De } fn read_ctab(dmx: &mut MOVDemuxer, _strmgr: &mut StreamManager, size: u64) -> DemuxerResult { - read_palette(&mut dmx.src, size, &mut dmx.pal) + let mut pal = [0; 1024]; + let size = read_palette(&mut dmx.src, size, &mut pal)?; + dmx.pal = Some(Arc::new(pal)); + Ok(size) +} + +fn read_meta(dmx: &mut MOVDemuxer, _strmgr: &mut StreamManager, size: u64) -> DemuxerResult { + dmx.src.skip64(size)?; + Ok(size) } fn read_trak(dmx: &mut MOVDemuxer, strmgr: &mut StreamManager, size: u64) -> DemuxerResult { @@ -293,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) } @@ -410,7 +424,9 @@ fn read_stsd(track: &mut Track, br: &mut ByteReader, size: u64) -> DemuxerResult validate!((depth <= 8) || (ctable_id == 0xFFFF)); if ctable_id == 0 { let max_pal_size = start_pos + size - br.tell(); - read_palette(br, max_pal_size, &mut track.pal)?; + let mut pal = [0; 1024]; + read_palette(br, max_pal_size, &mut pal)?; + 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) { @@ -560,7 +576,7 @@ struct MOVDemuxer<'a> { cur_track: usize, tb_den: u32, duration: u32, - pal: Vec, + pal: Option>, } struct Track { @@ -587,7 +603,7 @@ struct Track { cur_sample: usize, samples_left: usize, last_offset: u64, - pal: Vec, + pal: Option>, } impl Track { @@ -616,7 +632,7 @@ impl Track { cur_sample: 0, samples_left: 0, last_offset: 0, - pal: Vec::new(), + pal: None, } } read_chunk_list!(track; "trak", read_trak, TRAK_CHUNK_HANDLERS); @@ -783,12 +799,17 @@ impl<'a> DemuxCore<'a> for MOVDemuxer<'a> { } let track = &mut self.tracks[self.cur_track]; self.cur_track += 1; + let first = track.cur_sample == 0; if let Some((pts, offset, size)) = track.get_next_chunk() { let str = strmgr.get_stream(track.track_str_id); if str.is_none() { return Err(DemuxerError::InvalidData); } let stream = str.unwrap(); self.src.seek(SeekFrom::Start(offset))?; - let pkt = self.src.read_packet(stream, pts, false, size)?; + let mut pkt = self.src.read_packet(stream, pts, false, size)?; + if let Some(ref pal) = track.pal { + let side_data = NASideData::Palette(first, pal.clone()); + pkt.add_side_data(side_data); + } return Ok(pkt); } } @@ -808,6 +829,12 @@ impl<'a> DemuxCore<'a> for MOVDemuxer<'a> { } } +impl<'a> NAOptionHandler for MOVDemuxer<'a> { + fn get_supported_options(&self) -> &[NAOptionDefinition] { &[] } + fn set_options(&mut self, _options: &[NAOption]) { } + fn query_option_value(&self, _name: &str) -> Option { None } +} + impl<'a> MOVDemuxer<'a> { fn new(io: &'a mut ByteReader<'a>) -> Self { MOVDemuxer { @@ -819,7 +846,7 @@ impl<'a> MOVDemuxer<'a> { cur_track: 0, tb_den: 0, duration: 0, - pal: Vec::new(), + pal: None, } } fn read_root(&mut self, strmgr: &mut StreamManager) -> DemuxerResult<()> {