projects
/
nihav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
36294f2
)
remove trailing whitespace
author
Kostya Shishkov
<kostya.shiskov@gmail.com>
Fri, 10 Jul 2020 19:43:02 +0000
(21:43 +0200)
committer
Kostya Shishkov
<kostya.shiskov@gmail.com>
Fri, 10 Jul 2020 19:43:02 +0000
(21:43 +0200)
nihav-commonfmt/src/demuxers/mov.rs
patch
|
blob
|
blame
|
history
nihav-core/src/formats.rs
patch
|
blob
|
blame
|
history
nihav-ms/src/codecs/msrle.rs
patch
|
blob
|
blame
|
history
nihav-qt/src/codecs/qdm2qmf.rs
patch
|
blob
|
blame
|
history
nihav-qt/src/codecs/svq1.rs
patch
|
blob
|
blame
|
history
nihav-qt/src/codecs/svq3.rs
patch
|
blob
|
blame
|
history
diff --git
a/nihav-commonfmt/src/demuxers/mov.rs
b/nihav-commonfmt/src/demuxers/mov.rs
index 47cfbe3ef0eb9af414d11ee8f006ba46bc88cb75..0b6dd81074fa2cb06256d29ced593aa11fc50af3 100644
(file)
--- a/
nihav-commonfmt/src/demuxers/mov.rs
+++ b/
nihav-commonfmt/src/demuxers/mov.rs
@@
-239,7
+239,7
@@
fn read_cmov(dmx: &mut MOVDemuxer, strmgr: &mut StreamManager, size: u64) -> Dem
dmx.duration = ddmx.duration;
dmx.tb_den = ddmx.tb_den;
std::mem::swap(&mut dmx.pal, &mut ddmx.pal);
dmx.duration = ddmx.duration;
dmx.tb_den = ddmx.tb_den;
std::mem::swap(&mut dmx.pal, &mut ddmx.pal);
-
+
Ok(size)
}
Ok(size)
}
diff --git
a/nihav-core/src/formats.rs
b/nihav-core/src/formats.rs
index f96eb53028ba4283c35015241a6ed90f69cf0a4c..bb47838c252018d497e509f970d64acd7cc9da4e 100644
(file)
--- a/
nihav-core/src/formats.rs
+++ b/
nihav-core/src/formats.rs
@@
-769,7
+769,7
@@
impl NAPixelFormaton {
break;
}
}
break;
}
}
- name += if self.be { "be" } else { "le" };
+ name += if self.be { "be" } else { "le" };
return Some(name);
}
if depth == 24 || depth != 8 * self.components {
return Some(name);
}
if depth == 24 || depth != 8 * self.components {
@@
-779,7
+779,7
@@
impl NAPixelFormaton {
name.push('p');
}
if self.get_max_depth() > 8 {
name.push('p');
}
if self.get_max_depth() > 8 {
- name += if self.be { "be" } else { "le" };
+ name += if self.be { "be" } else { "le" };
}
Some(name)
},
}
Some(name)
},
diff --git
a/nihav-ms/src/codecs/msrle.rs
b/nihav-ms/src/codecs/msrle.rs
index e58691002e78ec3790e087c8ccdd40819ed12152..1cc330865c390e152e055d2c26d610b992d43d59 100644
(file)
--- a/
nihav-ms/src/codecs/msrle.rs
+++ b/
nihav-ms/src/codecs/msrle.rs
@@
-82,7
+82,7
@@
impl RleDecoder {
}
}
}
}
}
}
-
+
Ok(if has_skips { FrameType::P } else { FrameType::I })
}
Ok(if has_skips { FrameType::P } else { FrameType::I })
}
@@
-175,7
+175,6
@@
impl RleDecoder {
}
}
}
}
}
}
-
Ok(if has_skips { FrameType::P } else { FrameType::I })
}
Ok(if has_skips { FrameType::P } else { FrameType::I })
}
diff --git
a/nihav-qt/src/codecs/qdm2qmf.rs
b/nihav-qt/src/codecs/qdm2qmf.rs
index ece74c2bcc619b5bae9a3f1b4d7e26d29d19125c..bd018aa7717e24675670bada16de0f91f3f09224 100644
(file)
--- a/
nihav-qt/src/codecs/qdm2qmf.rs
+++ b/
nihav-qt/src/codecs/qdm2qmf.rs
@@
-394,7
+394,7
@@
unimplemented!();
let idx = br.read(8) as usize;
validate!(idx < self.tables.mod3.len());
for i in 0..5 {
let idx = br.read(8) as usize;
validate!(idx < self.tables.mod3.len());
for i in 0..5 {
- let k = self.tables.mod3[idx][i] as usize;
+ let k = self.tables.mod3[idx][i] as usize;
samples[i * 2] = QUANT_1BIT[jstereo as usize][k];
}
}
samples[i * 2] = QUANT_1BIT[jstereo as usize][k];
}
}
@@
-432,7
+432,7
@@
unimplemented!();
let idx = br.read(8) as usize;
validate!(idx < self.tables.mod3.len());
for i in 0..5 {
let idx = br.read(8) as usize;
validate!(idx < self.tables.mod3.len());
for i in 0..5 {
- let k = self.tables.mod3[idx][i] as usize;
+ let k = self.tables.mod3[idx][i] as usize;
samples[i] = QUANT_1BIT[jstereo as usize][k];
}
}
samples[i] = QUANT_1BIT[jstereo as usize][k];
}
}
@@
-448,7
+448,7
@@
unimplemented!();
let idx = br.read(7) as usize;
validate!(idx < self.tables.mod5.len());
for i in 0..3 {
let idx = br.read(7) as usize;
validate!(idx < self.tables.mod5.len());
for i in 0..3 {
- let k = self.tables.mod5[idx][i] as usize;
+ let k = self.tables.mod5[idx][i] as usize;
samples[i] = ((k as f32) - 2.0) * 0.5;
}
} else {
samples[i] = ((k as f32) - 2.0) * 0.5;
}
} else {
diff --git
a/nihav-qt/src/codecs/svq1.rs
b/nihav-qt/src/codecs/svq1.rs
index a6735bb9640e34e5d4c7de29790a840bae3bd775..c65e10d300390a0e97ced72d1893db8d160d089d 100644
(file)
--- a/
nihav-qt/src/codecs/svq1.rs
+++ b/
nihav-qt/src/codecs/svq1.rs
@@
-288,7
+288,7
@@
impl SVQ1Decoder {
let (w, h) = if plane == 0 {
((self.width + 15) & !15, (self.height + 15) & !15)
} else {
let (w, h) = if plane == 0 {
((self.width + 15) & !15, (self.height + 15) & !15)
} else {
- ((self.width / 4 + 15) & !15, (self.height / 4 + 15) & !15)
+ ((self.width / 4 + 15) & !15, (self.height / 4 + 15) & !15)
};
let mvstride = w / 8;
self.mvs.truncate(0);
};
let mvstride = w / 8;
self.mvs.truncate(0);
diff --git
a/nihav-qt/src/codecs/svq3.rs
b/nihav-qt/src/codecs/svq3.rs
index d166723dcd218c1653d5846aed37a2deec877e31..c900d3ca5386379a5cbb3eadaa23b32bd3c4bcc3 100644
(file)
--- a/
nihav-qt/src/codecs/svq3.rs
+++ b/
nihav-qt/src/codecs/svq3.rs
@@
-656,7
+656,7
@@
println!("slice offset {}", _offset);
}
}
}
}
}
}
-
+
Ok(())
}
fn do_mc_p(&mut self, br: &mut BitReader, mb_type: usize, sstate: &mut SState, dframe: &mut NASimpleVideoFrame<u8>) -> DecoderResult<()> {
Ok(())
}
fn do_mc_p(&mut self, br: &mut BitReader, mb_type: usize, sstate: &mut SState, dframe: &mut NASimpleVideoFrame<u8>) -> DecoderResult<()> {