Commit 242c35f3 authored by Ronald S. Bultje's avatar Ronald S. Bultje
Browse files

If Y/AC is 0 (but lossless=0), only allow coding DCT_DCT

This is consistent with what libaom does. Should fix #175.
parent 0fdee4da
Pipeline #2689 passed with stages
in 2 minutes and 58 seconds
...@@ -127,9 +127,13 @@ static inline enum TxfmTypeSet get_ext_txtp_set(const enum RectTxfmSize tx, ...@@ -127,9 +127,13 @@ static inline enum TxfmTypeSet get_ext_txtp_set(const enum RectTxfmSize tx,
const Av1FrameHeader *const hdr, const Av1FrameHeader *const hdr,
const int seg_id) const int seg_id)
{ {
if (hdr->segmentation.lossless[seg_id]) { if (!hdr->segmentation.qidx[seg_id]) {
assert(tx == (int) TX_4X4); if (hdr->segmentation.lossless[seg_id]) {
return TXTP_SET_LOSSLESS; assert(tx == (int) TX_4X4);
return TXTP_SET_LOSSLESS;
} else {
return TXTP_SET_DCT;
}
} }
const TxfmInfo *const t_dim = &dav1d_txfm_dimensions[tx]; const TxfmInfo *const t_dim = &dav1d_txfm_dimensions[tx];
......
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