}
}
fn encode_intra(&mut self, bw: &mut ByteWriter, buf: NABufferType) -> EncoderResult<()> {
- let bpp = buf_type_to_bpp(&buf);
+ let mut bpp = buf_type_to_bpp(&buf);
if let NABufferType::None = buf {
if self.bpp == 0 {
return Err(EncoderError::FormatError);
}
self.frm1.copy_from_slice(&self.frm2);
+ bpp = self.bpp;
} else {
if bpp == 0 {
return Err(EncoderError::FormatError);
}
bw.write_buf(&self.frm1[..self.width * self.height * bm])?;
} else {
- self.tmp_buf.truncate(0);
+ self.tmp_buf.clear();
if bpp == 8 {
self.tmp_buf.extend_from_slice(&self.pal);
}
let mut db = Vec::new();
std::mem::swap(&mut db, &mut self.zbuf);
- db.truncate(0);
+ db.clear();
let mut wr = DeflateWriter::new(db);
self.compr.write_zlib_header(&mut wr);
self.compr.compress(&self.tmp_buf, &mut wr);
self.frm1.copy_from_slice(&self.frm2);
bw.write_byte(0)?;
- self.tmp_buf.truncate(0);
+ self.tmp_buf.clear();
let tile_w = (self.width + self.tile_w - 1) / self.tile_w;
let tile_h = (self.height + self.tile_h - 1) / self.tile_h;
let mv_size = (tile_w * tile_h * 2 + 3) & !3;
let mut db = Vec::new();
std::mem::swap(&mut db, &mut self.zbuf);
- db.truncate(0);
+ db.clear();
let mut wr = DeflateWriter::new(db);
self.compr.compress(&self.tmp_buf, &mut wr);
self.compr.compress_flush(&mut wr);
return Err(EncoderError::FormatError);
}
- self.tmp_buf.truncate(0);
+ self.tmp_buf.clear();
if let (NABufferType::Video(ref vbuf), true) = (&buf, bpp == 8) {
let mut npal = [0; 768];
let off = vbuf.get_offset(1);
let mut db = Vec::new();
std::mem::swap(&mut db, &mut self.zbuf);
- db.truncate(0);
+ db.clear();
let mut wr = DeflateWriter::new(db);
self.compr.compress(&self.tmp_buf, &mut wr);
self.compr.compress_flush(&mut wr);
fn negotiate_format(&self, encinfo: &EncodeParameters) -> EncoderResult<EncodeParameters> {
match encinfo.format {
NACodecTypeInfo::None => {
- let mut ofmt = EncodeParameters::default();
- ofmt.format = NACodecTypeInfo::Video(NAVideoInfo::new(0, 0, true, YUV420_FORMAT));
- Ok(ofmt)
+ Ok(EncodeParameters {
+ format: NACodecTypeInfo::Video(NAVideoInfo::new(0, 0, true, YUV420_FORMAT)),
+ ..Default::default()
+ })
},
NACodecTypeInfo::Audio(_) => Err(EncoderError::FormatError),
NACodecTypeInfo::Video(vinfo) => {
}
}
}
+ fn get_capabilities(&self) -> u64 { ENC_CAPS_SKIPFRAME }
fn init(&mut self, stream_id: u32, encinfo: EncodeParameters) -> EncoderResult<NAStreamRef> {
match encinfo.format {
NACodecTypeInfo::None => Err(EncoderError::FormatError),
use nihav_codec_support::test::enc_video::*;
use super::{RGB555_FORMAT, RGB24_0_FORMAT};
+ // samples are from https://samples.mplayerhq.hu/V-codecs/ZMBV/
#[test]
fn test_zmbv_encoder_8bit() {
let mut dmx_reg = RegisteredDemuxers::new();
tb_den: 0,
flags: 0,
};
- let enc_options = &[];
+ let enc_options = &[
+ NAOption { name: "range", value: NAValue::Int(16) },
+ ];
//test_encoding_to_file(&dec_config, &enc_config, enc_params, enc_options);
test_encoding_md5(&dec_config, &enc_config, enc_params, enc_options,
- &[0x50df10e2, 0x606f3268, 0xdd4bc2ff, 0x844e7d87]);
+ &[0x18bd3754, 0x97007f81, 0xff2bcd07, 0x739c48dc]);
}
#[test]
tb_den: 0,
flags: 0,
};
- let enc_options = &[];
+ let enc_options = &[
+ NAOption { name: "range", value: NAValue::Int(16) },
+ ];
//test_encoding_to_file(&dec_config, &enc_config, enc_params, enc_options);
test_encoding_md5(&dec_config, &enc_config, enc_params, enc_options,
- &[0x0b4cb528, 0x66c91f6c, 0x1c2187a5, 0x2723a08d]);
+ &[0x00311257, 0xd26a0e9e, 0xfd4b003f, 0x7c962d7b]);
}
#[test]
tb_den: 0,
flags: 0,
};
- let enc_options = &[];
+ let enc_options = &[
+ NAOption { name: "range", value: NAValue::Int(16) },
+ ];
//test_encoding_to_file(&dec_config, &enc_config, enc_params, enc_options);
test_encoding_md5(&dec_config, &enc_config, enc_params, enc_options,
- &[0x1a522743, 0x6c320a6e, 0xd08539e1, 0x03fc17ea]);
+ &[0x4eea104f, 0x2ebe544b, 0x54deb0f9, 0xe5ca88f4]);
}
#[test]
tb_den: 0,
flags: 0,
};
- let enc_options = &[];
+ let enc_options = &[
+ NAOption { name: "range", value: NAValue::Int(16) },
+ ];
//test_encoding_to_file(&dec_config, &enc_config, enc_params, enc_options);
test_encoding_md5(&dec_config, &enc_config, enc_params, enc_options,
- &[0x3880e045, 0xe6c88dc7, 0x21066058, 0xc789f1e9]);
+ &[0xffceb4bd, 0xb1beccd9, 0x4983e7f6, 0xf46e33ba]);
}
}