X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-flash%2Fsrc%2Fcodecs%2Fflashsv.rs;h=47f660f8425a9d3f863d928ee1fb3bc53c5a9490;hb=e6aaad5c5273cd814b5748b7faf3751835a37217;hp=26e0eb4e201d9bac69f448b0ab491a47a82001fd;hpb=92d9fb6993d2d3f6f7a016ee6796a98e6e989f21;p=nihav.git diff --git a/nihav-flash/src/codecs/flashsv.rs b/nihav-flash/src/codecs/flashsv.rs index 26e0eb4..47f660f 100644 --- a/nihav-flash/src/codecs/flashsv.rs +++ b/nihav-flash/src/codecs/flashsv.rs @@ -33,16 +33,10 @@ impl FSVShuffler { } fn has_last_frame(&self) -> bool { self.lastframe.is_some() } fn get_key_frame(&mut self) -> Option> { - match self.keyframe { - Some(ref frm) => Some(frm.clone()), - None => None, - } + self.keyframe.as_ref().cloned() } fn get_last_frame(&mut self) -> Option> { - match self.lastframe { - Some(ref frm) => Some(frm.clone()), - None => None, - } + self.lastframe.as_ref().cloned() } } @@ -347,6 +341,7 @@ mod test { let mut dec_reg = RegisteredDecoders::new(); flash_register_all_decoders(&mut dec_reg); + // sample: https://samples.mplayerhq.hu/FLV/flash_screen/screen.flv test_decoding("flv", "flashsv", "assets/Flash/screen.flv", Some(3000), &dmx_reg, &dec_reg, ExpectedTestResult::MD5Frames(vec![ [0xb45b899e, 0x417b17d5, 0x7bfe898b, 0x026b289f], @@ -367,6 +362,7 @@ mod test { let mut dec_reg = RegisteredDecoders::new(); flash_register_all_decoders(&mut dec_reg); + // sample created from https://samples.mplayerhq.hu/FLV/flash_screen/screen.flv by recoding test_decoding("flv", "flashsv2", "assets/Flash/screen2.flv", Some(4700), &dmx_reg, &dec_reg, ExpectedTestResult::MD5Frames(vec![ [0x55522afa, 0x9c7dd794, 0xdd67aa2e, 0x8b8c525e],