From c8db9313866c4d7bcf34e45e486d2f909daa16d9 Mon Sep 17 00:00:00 2001 From: Kostya Shishkov Date: Sat, 6 Jun 2020 12:41:16 +0200 Subject: [PATCH] remove trailing whitespaces --- nihav-codec-support/src/test/enc_video.rs | 2 +- nihav-commonfmt/src/codecs/cinepakenc.rs | 2 +- nihav-commonfmt/src/demuxers/mov.rs | 2 +- nihav-commonfmt/src/muxers/avi.rs | 2 +- nihav-ms/src/codecs/msadpcm.rs | 4 ++-- nihav-ms/src/codecs/msvideo1enc.rs | 2 +- nihav-vivo/src/codecs/g723_1.rs | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/nihav-codec-support/src/test/enc_video.rs b/nihav-codec-support/src/test/enc_video.rs index 6f9e1ec..4a258de 100644 --- 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 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 f0a2805..a77e58a 100644 --- 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()); - + Ok(stream) }, } diff --git a/nihav-commonfmt/src/demuxers/mov.rs b/nihav-commonfmt/src/demuxers/mov.rs index 29c512d..5d66174 100644 --- 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; } - + Ok(KNOWN_HDLR_SIZE) } diff --git a/nihav-commonfmt/src/muxers/avi.rs b/nihav-commonfmt/src/muxers/avi.rs index 296b778..2583109 100644 --- 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, - max_size: u32, + max_size: u32, } struct AVIMuxer<'a> { diff --git a/nihav-ms/src/codecs/msadpcm.rs b/nihav-ms/src/codecs/msadpcm.rs index d47d922..d753882 100644 --- 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] = [ - 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] = [ @@ -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; - + Ok(stream) }, } diff --git a/nihav-ms/src/codecs/msvideo1enc.rs b/nihav-ms/src/codecs/msvideo1enc.rs index 6dd5a60..5b130ff 100644 --- 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; - + Ok(stream) }, } diff --git a/nihav-vivo/src/codecs/g723_1.rs b/nihav-vivo/src/codecs/g723_1.rs index 5824501..938ef33 100644 --- 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 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; -- 2.30.2