projects
/
nihav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
89f25cd
)
remove trailing whitespaces
author
Kostya Shishkov
<kostya.shishkov@gmail.com>
Sat, 6 Jun 2020 10:41:16 +0000
(12:41 +0200)
committer
Kostya Shishkov
<kostya.shishkov@gmail.com>
Sat, 6 Jun 2020 10:49:55 +0000
(12:49 +0200)
nihav-codec-support/src/test/enc_video.rs
patch
|
blob
|
blame
|
history
nihav-commonfmt/src/codecs/cinepakenc.rs
patch
|
blob
|
blame
|
history
nihav-commonfmt/src/demuxers/mov.rs
patch
|
blob
|
blame
|
history
nihav-commonfmt/src/muxers/avi.rs
patch
|
blob
|
blame
|
history
nihav-ms/src/codecs/msadpcm.rs
patch
|
blob
|
blame
|
history
nihav-ms/src/codecs/msvideo1enc.rs
patch
|
blob
|
blame
|
history
nihav-vivo/src/codecs/g723_1.rs
patch
|
blob
|
blame
|
history
diff --git
a/nihav-codec-support/src/test/enc_video.rs
b/nihav-codec-support/src/test/enc_video.rs
index 6f9e1ec2c69ffe36c0326226853bcd61d99b31a5..4a258de07863ef7f185647ad16c8e55f413fd6a1 100644
(file)
--- a/
nihav-codec-support/src/test/enc_video.rs
+++ b/
nihav-codec-support/src/test/enc_video.rs
@@
-258,7
+258,7
@@
pub fn test_encoding_to_file(dec_config: &DecoderTestParams, enc_config: &Encode
let mut encoder = (encfunc)();
let out_str = encoder.init(0, enc_params).unwrap();
out_sm.add_stream(NAStream::clone(&out_str));
let mut encoder = (encfunc)();
let out_str = encoder.init(0, enc_params).unwrap();
out_sm.add_stream(NAStream::clone(&out_str));
-
+
let mux_f = enc_config.mux_reg.find_muxer(enc_config.muxer).unwrap();
let out_name = "assets/test_out/".to_owned() + enc_config.out_name;
let file = File::create(&out_name).unwrap();
let mux_f = enc_config.mux_reg.find_muxer(enc_config.muxer).unwrap();
let out_name = "assets/test_out/".to_owned() + enc_config.out_name;
let file = File::create(&out_name).unwrap();
diff --git
a/nihav-commonfmt/src/codecs/cinepakenc.rs
b/nihav-commonfmt/src/codecs/cinepakenc.rs
index f0a28059bcd56e17328dde94c5fd39d3b20715c5..a77e58a4283f9f4010c6dd92783bdf69e5f838f5 100644
(file)
--- a/
nihav-commonfmt/src/codecs/cinepakenc.rs
+++ b/
nihav-commonfmt/src/codecs/cinepakenc.rs
@@
-945,7
+945,7
@@
impl NAEncoder for CinepakEncoder {
let buf = alloc_video_buffer(out_info, 2)?;
self.lastfrm = Some(buf.get_vbuf().unwrap());
let buf = alloc_video_buffer(out_info, 2)?;
self.lastfrm = Some(buf.get_vbuf().unwrap());
-
+
Ok(stream)
},
}
Ok(stream)
},
}
diff --git
a/nihav-commonfmt/src/demuxers/mov.rs
b/nihav-commonfmt/src/demuxers/mov.rs
index 29c512de3ae0039c9f5169d11fd2d0757f3c05e7..5d661745e12648bd448b17cc559b3a1f1a1c7ed5 100644
(file)
--- a/
nihav-commonfmt/src/demuxers/mov.rs
+++ b/
nihav-commonfmt/src/demuxers/mov.rs
@@
-307,7
+307,7
@@
fn read_hdlr(track: &mut Track, br: &mut ByteReader, size: u64) -> DemuxerResult
println!("Unknown stream type");
track.stream_type = StreamType::Data;
}
println!("Unknown stream type");
track.stream_type = StreamType::Data;
}
-
+
Ok(KNOWN_HDLR_SIZE)
}
Ok(KNOWN_HDLR_SIZE)
}
diff --git
a/nihav-commonfmt/src/muxers/avi.rs
b/nihav-commonfmt/src/muxers/avi.rs
index 296b778937b78db0e27be25830e3b330fad8af2b..25831098d318d3e513bd9c55fa647362e13cbb1b 100644
(file)
--- a/
nihav-commonfmt/src/muxers/avi.rs
+++ b/
nihav-commonfmt/src/muxers/avi.rs
@@
-15,7
+15,7
@@
struct AVIStream {
strh_pos: u64,
nframes: u32,
is_video: bool,
strh_pos: u64,
nframes: u32,
is_video: bool,
- max_size: u32,
+ max_size: u32,
}
struct AVIMuxer<'a> {
}
struct AVIMuxer<'a> {
diff --git
a/nihav-ms/src/codecs/msadpcm.rs
b/nihav-ms/src/codecs/msadpcm.rs
index d47d9224f083e04bdf5be2acb2ad99a8e2d1d279..d753882b98e7ef98552ec4f19c16d867111c5cbf 100644
(file)
--- a/
nihav-ms/src/codecs/msadpcm.rs
+++ b/
nihav-ms/src/codecs/msadpcm.rs
@@
-3,7
+3,7
@@
use nihav_core::io::byteio::*;
use std::str::FromStr;
const ADAPT_TABLE: [i32; 16] = [
use std::str::FromStr;
const ADAPT_TABLE: [i32; 16] = [
- 230, 230, 230, 230, 307, 409, 512, 614,
+ 230, 230, 230, 230, 307, 409, 512, 614,
768, 614, 512, 409, 307, 230, 230, 230
];
const ADAPT_COEFFS: [[i32; 2]; 7] = [
768, 614, 512, 409, 307, 230, 230, 230
];
const ADAPT_COEFFS: [[i32; 2]; 7] = [
@@
-354,7
+354,7
@@
impl NAEncoder for MSADPCMEncoder {
self.samples = Vec::with_capacity(self.block_len * self.channels);
self.srate = ainfo.sample_rate;
self.flush = false;
self.samples = Vec::with_capacity(self.block_len * self.channels);
self.srate = ainfo.sample_rate;
self.flush = false;
-
+
Ok(stream)
},
}
Ok(stream)
},
}
diff --git
a/nihav-ms/src/codecs/msvideo1enc.rs
b/nihav-ms/src/codecs/msvideo1enc.rs
index 6dd5a6052247c22075e71b238329044bc929cc37..5b130ff3c25e52f1f8ac157ce4807136671e3335 100644
(file)
--- a/
nihav-ms/src/codecs/msvideo1enc.rs
+++ b/
nihav-ms/src/codecs/msvideo1enc.rs
@@
-441,7
+441,7
@@
impl NAEncoder for MSVideo1Encoder {
self.stream = Some(stream.clone());
self.quality = encinfo.quality;
self.stream = Some(stream.clone());
self.quality = encinfo.quality;
-
+
Ok(stream)
},
}
Ok(stream)
},
}
diff --git
a/nihav-vivo/src/codecs/g723_1.rs
b/nihav-vivo/src/codecs/g723_1.rs
index 5824501afac16f652ecae99a2dffe8b9787230d5..938ef3304a31af2110344662b73765df817dd4bd 100644
(file)
--- a/
nihav-vivo/src/codecs/g723_1.rs
+++ b/
nihav-vivo/src/codecs/g723_1.rs
@@
-147,7
+147,7
@@
impl Subframe {
let max_energy = tgt_energy.max(fwd_energy).max(fwd_res_energy).max(bwd_energy).max(bwd_res_energy);
let scale = norm_bits(max_energy, 31);
let max_energy = tgt_energy.max(fwd_energy).max(fwd_res_energy).max(bwd_energy).max(bwd_res_energy);
let scale = norm_bits(max_energy, 31);
- let tgt_energy = tgt_energy << scale >> 16;
+ let tgt_energy = tgt_energy << scale >> 16;
let fwd_energy = fwd_energy << scale >> 16;
let fwd_res_energy = fwd_res_energy << scale >> 16;
let bwd_energy = bwd_energy << scale >> 16;
let fwd_energy = fwd_energy << scale >> 16;
let fwd_res_energy = fwd_res_energy << scale >> 16;
let bwd_energy = bwd_energy << scale >> 16;