projects
/
nihav.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rename register_all_codecs to register_all_decoders
[nihav.git]
/
nihav-ms
/
src
/
codecs
/
msadpcm.rs
diff --git
a/nihav-ms/src/codecs/msadpcm.rs
b/nihav-ms/src/codecs/msadpcm.rs
index d753882b98e7ef98552ec4f19c16d867111c5cbf..44baedbe3fa487af1030dfcabd2b1744379c6efb 100644
(file)
--- a/
nihav-ms/src/codecs/msadpcm.rs
+++ b/
nihav-ms/src/codecs/msadpcm.rs
@@
-58,6
+58,7
@@
impl MSADPCMDecoder {
}
impl NADecoder for MSADPCMDecoder {
}
impl NADecoder for MSADPCMDecoder {
+ #[allow(clippy::int_plus_one)]
fn init(&mut self, _supp: &mut NADecoderSupport, info: NACodecInfoRef) -> DecoderResult<()> {
if let NACodecTypeInfo::Audio(ainfo) = info.get_properties() {
self.block_len = ainfo.get_block_len();
fn init(&mut self, _supp: &mut NADecoderSupport, info: NACodecInfoRef) -> DecoderResult<()> {
if let NACodecTypeInfo::Audio(ainfo) = info.get_properties() {
self.block_len = ainfo.get_block_len();
@@
-96,7
+97,7
@@
impl NADecoder for MSADPCMDecoder {
if let NACodecTypeInfo::Audio(_) = info.get_properties() {
let pktbuf = pkt.get_buffer();
let channels = self.chmap.num_channels();
if let NACodecTypeInfo::Audio(_) = info.get_properties() {
let pktbuf = pkt.get_buffer();
let channels = self.chmap.num_channels();
- validate!(
pktbuf.len() > 0
&& (pktbuf.len() % self.block_len) == 0);
+ validate!(
!pktbuf.is_empty()
&& (pktbuf.len() % self.block_len) == 0);
let nblocks = pktbuf.len() / self.block_len;
let nsamples = nblocks * self.block_samps;
let abuf = alloc_audio_buffer(self.ainfo, nsamples, self.chmap.clone())?;
let nblocks = pktbuf.len() / self.block_len;
let nsamples = nblocks * self.block_samps;
let abuf = alloc_audio_buffer(self.ainfo, nsamples, self.chmap.clone())?;
@@
-186,7
+187,7
@@
const DEFAULT_BLOCK_LEN: usize = 256;
impl MSADPCMEncoder {
fn new() -> Self { Self::default() }
fn encode_packet(&mut self) -> EncoderResult<NAPacket> {
impl MSADPCMEncoder {
fn new() -> Self { Self::default() }
fn encode_packet(&mut self) -> EncoderResult<NAPacket> {
- if self.samples.
len() == 0
{
+ if self.samples.
is_empty()
{
return Err(EncoderError::TryAgain);
}
let len = (self.samples.len() / self.channels).min(self.block_len);
return Err(EncoderError::TryAgain);
}
let len = (self.samples.len() / self.channels).min(self.block_len);
@@
-302,9
+303,9
@@
impl NAEncoder for MSADPCMEncoder {
NACodecTypeInfo::None => {
let mut ofmt = EncodeParameters::default();
ofmt.format = NACodecTypeInfo::Audio(NAAudioInfo::new(0, 1, SND_S16_FORMAT, DEFAULT_BLOCK_LEN));
NACodecTypeInfo::None => {
let mut ofmt = EncodeParameters::default();
ofmt.format = NACodecTypeInfo::Audio(NAAudioInfo::new(0, 1, SND_S16_FORMAT, DEFAULT_BLOCK_LEN));
- return Ok(ofmt);
+ Ok(ofmt)
},
},
- NACodecTypeInfo::Video(_) =>
return
Err(EncoderError::FormatError),
+ NACodecTypeInfo::Video(_) => Err(EncoderError::FormatError),
NACodecTypeInfo::Audio(ainfo) => {
let mut outinfo = ainfo;
outinfo.channels = outinfo.channels.min(2);
NACodecTypeInfo::Audio(ainfo) => {
let mut outinfo = ainfo;
outinfo.channels = outinfo.channels.min(2);
@@
-322,9
+323,9
@@
impl NAEncoder for MSADPCMEncoder {
}
let mut ofmt = *encinfo;
ofmt.format = NACodecTypeInfo::Audio(outinfo);
}
let mut ofmt = *encinfo;
ofmt.format = NACodecTypeInfo::Audio(outinfo);
- return Ok(ofmt);
+ Ok(ofmt)
}
}
- }
;
+ }
}
fn init(&mut self, stream_id: u32, encinfo: EncodeParameters) -> EncoderResult<NAStreamRef> {
match encinfo.format {
}
fn init(&mut self, stream_id: u32, encinfo: EncodeParameters) -> EncoderResult<NAStreamRef> {
match encinfo.format {
@@
-418,10
+419,10
@@
mod test {
let mut dmx_reg = RegisteredDemuxers::new();
generic_register_all_demuxers(&mut dmx_reg);
let mut dec_reg = RegisteredDecoders::new();
let mut dmx_reg = RegisteredDemuxers::new();
generic_register_all_demuxers(&mut dmx_reg);
let mut dec_reg = RegisteredDecoders::new();
- ms_register_all_
codec
s(&mut dec_reg);
+ ms_register_all_
decoder
s(&mut dec_reg);
test_decoding("avi", "ms-adpcm", "assets/MS/dance.avi", None, &dmx_reg, &dec_reg,
test_decoding("avi", "ms-adpcm", "assets/MS/dance.avi", None, &dmx_reg, &dec_reg,
- ExpectedTestResult::MD5([0x
9d6619e1, 0x60d83560, 0xfe5c1fb7, 0xad5d130d
]));
+ ExpectedTestResult::MD5([0x
f5e3fc84, 0xbcabc11c, 0x33c6874e, 0xe05ecd14
]));
}
#[cfg(feature="encoder_ms_adpcm")]
#[test]
}
#[cfg(feature="encoder_ms_adpcm")]
#[test]
@@
-429,8
+430,8
@@
mod test {
let mut dmx_reg = RegisteredDemuxers::new();
generic_register_all_demuxers(&mut dmx_reg);
let mut dec_reg = RegisteredDecoders::new();
let mut dmx_reg = RegisteredDemuxers::new();
generic_register_all_demuxers(&mut dmx_reg);
let mut dec_reg = RegisteredDecoders::new();
- generic_register_all_
codec
s(&mut dec_reg);
- ms_register_all_
codec
s(&mut dec_reg);
+ generic_register_all_
decoder
s(&mut dec_reg);
+ ms_register_all_
decoder
s(&mut dec_reg);
let mut mux_reg = RegisteredMuxers::new();
generic_register_all_muxers(&mut mux_reg);
let mut enc_reg = RegisteredEncoders::new();
let mut mux_reg = RegisteredMuxers::new();
generic_register_all_muxers(&mut mux_reg);
let mut enc_reg = RegisteredEncoders::new();
@@
-463,6
+464,7
@@
mod test {
tb_den: 0,
flags: 0,
};
tb_den: 0,
flags: 0,
};
- test_encoding_to_file(&dec_config, &enc_config, enc_params);
+ test_encoding_md5(&dec_config, &enc_config, enc_params,
+ &[0xe1591a1e, 0x816d0239, 0x4cc42291, 0x4e6b69cb]);
}
}
}
}