use nihav_core::frame::{NAVideoBuffer, NASimpleVideoFrame};
-use nihav_core::codecs::MV;
-use nihav_core::codecs::blockdsp::edge_emu;
+use nihav_codec_support::codecs::MV;
+use nihav_codec_support::codecs::blockdsp::edge_emu;
fn clip8(val: i16) -> u8 { val.min(255).max(0) as u8 }
let str_q = strength!(diff_p1p0[0] + diff_p1p0[1] + diff_p1p0[2] + diff_p1p0[3], lim2);
if str_p + str_q > 2 {
let msum = ((mode1 + mode2 + str_q + str_p) >> 1) as i16;
- let (maxprod, weak) = if (str_q == 1) || (str_p == 1) { (512, true) } else { (384, false) };
+ let (maxprod, weak) = if (str_q == 1) || (str_p == 1) { (512, true) } else { (384, false) };
for y in 0..4 {
let diff_p0q0 = diff!(dst, offset, offset - step);
if (diff_p0q0 != 0) && (lim1 * diff_p0q0.abs() < maxprod) {
luma_mc(dst, doffset, dstride, src, soffset, sstride, w, h, cx, cy);
} else {
let mut ebuf: [u8; 70*70] = [0; 70*70];
- edge_emu(prev_frame, (x as isize) + (dx as isize) - 2, (y as isize) + (dy as isize) - 2, w+5, h+5, &mut ebuf, 70, 0);
+ edge_emu(prev_frame, (x as isize) + (dx as isize) - 2, (y as isize) + (dy as isize) - 2, w+5, h+5, &mut ebuf, 70, 0, 0);
luma_mc(dst, doffset, dstride, &ebuf, 70*2 + 2, 70, w, h, cx, cy);
}
}
chroma_mc(frame.data, doffset, dstride, src, soffset, sstride, cw, ch, cx, cy);
} else {
let mut ebuf: [u8; 40*40] = [0; 40*40];
- edge_emu(prev_frame, ((x >> 1) as isize) + (dx as isize), ((y >> 1) as isize) + (dy as isize), cw+1, ch+1, &mut ebuf, 40, comp);
+ edge_emu(prev_frame, ((x >> 1) as isize) + (dx as isize), ((y >> 1) as isize) + (dy as isize), cw+1, ch+1, &mut ebuf, 40, comp, 0);
chroma_mc(frame.data, doffset, dstride, &ebuf, 0, 40, cw, ch, cx, cy);
}
}
let inv_angle = RV60_IPRED_INV_ANGLE[angle - 10];
let add_size = (size * (ang_weight as usize) + 31) >> 5;
if size <= 16 {
- for i in 0..size+1 {
+ for i in 0..=size {
filtered1[32-1 + i] = self.l[i];
}
- for i in 0..size+1 {
+ for i in 0..=size {
filtered2[32-1 + i] = self.t[i];
}
} else {
let inv_angle = RV60_IPRED_INV_ANGLE[26 - angle];
let add_size = (size * (ang_weight as usize) + 31) >> 5;
if size <= 16 {
- for i in 0..size+1 {
+ for i in 0..=size {
filtered1[32-1 + i] = self.t[i];
}
- for i in 0..size+1 {
+ for i in 0..=size {
filtered2[32-1 + i] = self.l[i];
}
} else {