projects
/
nihav.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix clippy warnings for update to rustc 1.46
[nihav.git]
/
nihav-commonfmt
/
src
/
codecs
/
ts102366.rs
diff --git
a/nihav-commonfmt/src/codecs/ts102366.rs
b/nihav-commonfmt/src/codecs/ts102366.rs
index 55460497a651cb875f899ef2cc68400ce3a9857a..de6a5adb391c0446d745280cfa29f30c4e7bbfa5 100644
(file)
--- a/
nihav-commonfmt/src/codecs/ts102366.rs
+++ b/
nihav-commonfmt/src/codecs/ts102366.rs
@@
-2,7
+2,7
@@
use nihav_core::formats::*;
use nihav_core::frame::*;
use nihav_core::codecs::*;
use nihav_core::io::bitreader::*;
use nihav_core::frame::*;
use nihav_core::codecs::*;
use nihav_core::io::bitreader::*;
-use nihav_co
re
::dsp::fft::*;
+use nihav_co
dec_support
::dsp::fft::*;
use std::str::FromStr;
use std::f32::consts;
use std::str::FromStr;
use std::f32::consts;
@@
-831,6
+831,7
@@
impl AudioBlock {
bap_buf_fill: [0; 3],
}
}
bap_buf_fill: [0; 3],
}
}
+ #[allow(clippy::cognitive_complexity)]
fn read(&mut self, br: &mut BitReader, bsi: &BSI, fscod: usize, blk_no: usize) -> DecoderResult<bool> {
let channels = bsi.acmod.get_num_channels();
let is_stereo = bsi.acmod == ACMode::Stereo;
fn read(&mut self, br: &mut BitReader, bsi: &BSI, fscod: usize, blk_no: usize) -> DecoderResult<bool> {
let channels = bsi.acmod.get_num_channels();
let is_stereo = bsi.acmod == ACMode::Stereo;
@@
-1240,6
+1241,12
@@
impl NADecoder for AudioDecoder {
}
}
}
}
+impl NAOptionHandler for AudioDecoder {
+ fn get_supported_options(&self) -> &[NAOptionDefinition] { &[] }
+ fn set_options(&mut self, _options: &[NAOption]) { }
+ fn query_option_value(&self, _name: &str) -> Option<NAValue> { None }
+}
+
pub fn get_decoder() -> Box<dyn NADecoder + Send> {
Box::new(AudioDecoder::new())
}
pub fn get_decoder() -> Box<dyn NADecoder + Send> {
Box::new(AudioDecoder::new())
}
@@
-1248,15
+1255,15
@@
pub fn get_decoder() -> Box<dyn NADecoder + Send> {
mod test {
use nihav_core::codecs::RegisteredDecoders;
use nihav_core::demuxers::RegisteredDemuxers;
mod test {
use nihav_core::codecs::RegisteredDecoders;
use nihav_core::demuxers::RegisteredDemuxers;
- use nihav_co
re
::test::dec_video::test_decode_audio;
- use crate::
codecs::generic_register_all_codec
s;
- use nihav_realmedia::
demuxers::
realmedia_register_all_demuxers;
+ use nihav_co
dec_support
::test::dec_video::test_decode_audio;
+ use crate::
generic_register_all_decoder
s;
+ use nihav_realmedia::realmedia_register_all_demuxers;
#[test]
fn test_ts102366() {
let mut dmx_reg = RegisteredDemuxers::new();
realmedia_register_all_demuxers(&mut dmx_reg);
let mut dec_reg = RegisteredDecoders::new();
#[test]
fn test_ts102366() {
let mut dmx_reg = RegisteredDemuxers::new();
realmedia_register_all_demuxers(&mut dmx_reg);
let mut dec_reg = RegisteredDecoders::new();
- generic_register_all_
codec
s(&mut dec_reg);
+ generic_register_all_
decoder
s(&mut dec_reg);
let file = "assets/RV/sp_sample1.rm";
test_decode_audio("realmedia", file, Some(12000), None/*Some("ac3")*/, &dmx_reg, &dec_reg);
let file = "assets/RV/sp_sample1.rm";
test_decode_audio("realmedia", file, Some(12000), None/*Some("ac3")*/, &dmx_reg, &dec_reg);