projects
/
nihav.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make all codec crates export just register_all functions and document them
[nihav.git]
/
nihav-game
/
src
/
codecs
/
bmv3.rs
diff --git
a/nihav-game/src/codecs/bmv3.rs
b/nihav-game/src/codecs/bmv3.rs
index efc3c7edde037f0ba83008cb6e60d11fcaf33724..3fafb6d38dcb088a374bc5323d7e6ddfe3e9cd36 100644
(file)
--- a/
nihav-game/src/codecs/bmv3.rs
+++ b/
nihav-game/src/codecs/bmv3.rs
@@
-499,10
+499,12
@@
impl NADecoder for BMV3VideoDecoder {
frm.set_frame_type(if self.is_intra { FrameType::I } else { FrameType::P });
Ok(frm.into_ref())
}
frm.set_frame_type(if self.is_intra { FrameType::I } else { FrameType::P });
Ok(frm.into_ref())
}
+ fn flush(&mut self) {
+ }
}
}
-pub fn get_decoder_video() -> Box<dyn NADecoder> {
+pub fn get_decoder_video() -> Box<dyn NADecoder
+ Send
> {
Box::new(BMV3VideoDecoder::new())
}
Box::new(BMV3VideoDecoder::new())
}
@@
-589,9
+591,11
@@
impl NADecoder for BMV3AudioDecoder {
Err(DecoderError::InvalidData)
}
}
Err(DecoderError::InvalidData)
}
}
+ fn flush(&mut self) {
+ }
}
}
-pub fn get_decoder_audio() -> Box<dyn NADecoder> {
+pub fn get_decoder_audio() -> Box<dyn NADecoder
+ Send
> {
Box::new(BMV3AudioDecoder::new())
}
Box::new(BMV3AudioDecoder::new())
}
@@
-600,8
+604,8
@@
mod test {
use nihav_core::codecs::RegisteredDecoders;
use nihav_core::demuxers::RegisteredDemuxers;
use nihav_core::test::dec_video::*;
use nihav_core::codecs::RegisteredDecoders;
use nihav_core::demuxers::RegisteredDemuxers;
use nihav_core::test::dec_video::*;
- use crate::
codecs::
game_register_all_codecs;
- use crate::
demuxers::
game_register_all_demuxers;
+ use crate::game_register_all_codecs;
+ use crate::game_register_all_demuxers;
#[test]
fn test_bmv_video() {
let mut dmx_reg = RegisteredDemuxers::new();
#[test]
fn test_bmv_video() {
let mut dmx_reg = RegisteredDemuxers::new();
@@
-620,7
+624,7
@@
mod test {
game_register_all_codecs(&mut dec_reg);
let file = "assets/Game/DW3-Loffnote.bmv";
game_register_all_codecs(&mut dec_reg);
let file = "assets/Game/DW3-Loffnote.bmv";
- test_decode_audio("bmv3", file, None,
"bmv3"
, &dmx_reg, &dec_reg);
+ test_decode_audio("bmv3", file, None,
None/*Some("bmv3")*/
, &dmx_reg, &dec_reg);
}
}
}
}