Commit 191a9187 authored by Raphaël Zumer's avatar Raphaël Zumer

Fix 4:2:2 and 4:4:4 coding of sub-8x8 blocks

parent b0d56257
......@@ -585,13 +585,7 @@ impl FrameInvariants {
// Speed level decides the minimum partition size, i.e. higher speed --> larger min partition size,
// with exception that SBs on right or bottom frame borders split down to BLOCK_4X4.
// At speed = 0, RDO search is exhaustive.
let min_partition_size = if config.chroma_sampling == ChromaSampling::Cs444 ||
config.chroma_sampling == ChromaSampling::Cs422 {
config.speed_settings.min_block_size.max(BlockSize::BLOCK_8X8)
} else {
config.speed_settings.min_block_size
};
let min_partition_size = config.speed_settings.min_block_size;
let use_reduced_tx_set = config.speed_settings.reduced_tx_set;
let use_tx_domain_distortion = config.tune == Tune::Psnr && config.speed_settings.tx_domain_distortion;
......@@ -2285,9 +2279,9 @@ pub fn write_tx_blocks(fi: &FrameInvariants, fs: &mut FrameState,
let tx_bo =
BlockOffset {
x: bo.x + ((bx * uv_tx_size.width_mi()) << xdec) -
((bw * tx_size.width_mi() == 1) as usize),
((bw * tx_size.width_mi() == 1) as usize) * xdec,
y: bo.y + ((by * uv_tx_size.height_mi()) << ydec) -
((bh * tx_size.height_mi() == 1) as usize)
((bh * tx_size.height_mi() == 1) as usize) * ydec
};
let mut po = bo.plane_offset(&fs.input.planes[p].cfg);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment