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
/
msvideo1enc.rs
diff --git
a/nihav-ms/src/codecs/msvideo1enc.rs
b/nihav-ms/src/codecs/msvideo1enc.rs
index c6e4e8d24a4e2496ea8ed2b0aafc579478dc0f80..b2233c230b7de7061dba27371da5c2fb12d72fee 100644
(file)
--- a/
nihav-ms/src/codecs/msvideo1enc.rs
+++ b/
nihav-ms/src/codecs/msvideo1enc.rs
@@
-6,7
+6,7
@@
use nihav_codec_support::vq::*;
struct Pixel16(u16);
impl Pixel16 {
struct Pixel16(u16);
impl Pixel16 {
- fn unpack(
&
self) -> (u8, u8, u8) {
+ fn unpack(self) -> (u8, u8, u8) {
(((self.0 >> 10) & 0x1F) as u8, ((self.0 >> 5) & 0x1F) as u8, (self.0 & 0x1F) as u8)
}
fn pack(r: u8, g: u8, b: u8) -> Self {
(((self.0 >> 10) & 0x1F) as u8, ((self.0 >> 5) & 0x1F) as u8, (self.0 & 0x1F) as u8)
}
fn pack(r: u8, g: u8, b: u8) -> Self {
@@
-409,7
+409,7
@@
impl NAEncoder for MSVideo1Encoder {
ofmt.format = NACodecTypeInfo::Video(NAVideoInfo::new(0, 0, true, RGB555_FORMAT));
Ok(ofmt)
},
ofmt.format = NACodecTypeInfo::Video(NAVideoInfo::new(0, 0, true, RGB555_FORMAT));
Ok(ofmt)
},
- NACodecTypeInfo::Audio(_) =>
return
Err(EncoderError::FormatError),
+ NACodecTypeInfo::Audio(_) => Err(EncoderError::FormatError),
NACodecTypeInfo::Video(vinfo) => {
let outinfo = NAVideoInfo::new((vinfo.width + 3) & !3, (vinfo.height + 3) & !3, true, RGB555_FORMAT);
let mut ofmt = *encinfo;
NACodecTypeInfo::Video(vinfo) => {
let outinfo = NAVideoInfo::new((vinfo.width + 3) & !3, (vinfo.height + 3) & !3, true, RGB555_FORMAT);
let mut ofmt = *encinfo;
@@
-431,11
+431,11
@@
impl NAEncoder for MSVideo1Encoder {
}
let out_info = NAVideoInfo::new(vinfo.width, vinfo.height, true, RGB555_FORMAT);
}
let out_info = NAVideoInfo::new(vinfo.width, vinfo.height, true, RGB555_FORMAT);
- let info = NACodecInfo::new("msvideo1", NACodecTypeInfo::Video(out_info
.clone()
), None);
+ let info = NACodecInfo::new("msvideo1", NACodecTypeInfo::Video(out_info), None);
let mut stream = NAStream::new(StreamType::Video, stream_id, info, encinfo.tb_num, encinfo.tb_den);
stream.set_num(stream_id as usize);
let stream = stream.into_ref();
let mut stream = NAStream::new(StreamType::Video, stream_id, info, encinfo.tb_num, encinfo.tb_den);
stream.set_num(stream_id as usize);
let stream = stream.into_ref();
- if
let Err(_) = self.pool.prealloc_video(out_info, 2
) {
+ if
self.pool.prealloc_video(out_info, 2).is_err(
) {
return Err(EncoderError::AllocError);
}
return Err(EncoderError::AllocError);
}
@@
-534,8
+534,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();
@@
-545,7
+545,7
@@
mod test {
demuxer: "avi",
in_name: "assets/Misc/TalkingHead_352x288.avi",
stream_type: StreamType::Video,
demuxer: "avi",
in_name: "assets/Misc/TalkingHead_352x288.avi",
stream_type: StreamType::Video,
- limit: Some(3
2
),
+ limit: Some(3),
dmx_reg, dec_reg,
};
let enc_config = EncoderTestParams {
dmx_reg, dec_reg,
};
let enc_config = EncoderTestParams {
@@
-569,6
+569,8
@@
mod test {
tb_den: 0,
flags: 0,
};
tb_den: 0,
flags: 0,
};
- test_encoding_to_file(&dec_config, &enc_config, enc_params);
+ //test_encoding_to_file(&dec_config, &enc_config, enc_params);
+ test_encoding_md5(&dec_config, &enc_config, enc_params,
+ &[0x8f0d3f66, 0xb91a6ee5, 0x59e4933e, 0x59c6fb0b]);
}
}
}
}