From 65c9a1ebbddabc81691f38415ae3db84a8ecf6f6 Mon Sep 17 00:00:00 2001
From: Yushin Cho <ycho@mozilla.com>
Date: Tue, 24 Jul 2018 10:24:01 -0700
Subject: [PATCH] Fix the bug that intra size was used for inter_tx_cdf[]
---
src/context.rs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/context.rs b/src/context.rs
index c7837b9d..5f5fb584 100644
--- a/src/context.rs
+++ b/src/context.rs
@@ -700,7 +700,7 @@ extern "C" {
static default_intra_ext_tx_cdf:
[[[[u16; TX_TYPES + 1]; INTRA_MODES]; TX_SIZES]; TX_SETS_INTRA];
static default_inter_ext_tx_cdf:
- [[[u16; TX_TYPES + 1]; TX_SIZES]; TX_SETS_INTRA];
+ [[[u16; TX_TYPES + 1]; TX_SIZES]; TX_SETS_INTER];
static default_skip_cdfs: [[u16; 3]; SKIP_CONTEXTS];
static default_intra_inter_cdf: [[u16; 3]; INTRA_INTER_CONTEXTS];
static default_angle_delta_cdf:
@@ -750,7 +750,7 @@ pub struct CDFContext {
uv_mode_cdf: [[[u16; UV_INTRA_MODES + 1]; INTRA_MODES]; 2],
intra_tx_cdf:
[[[[u16; TX_TYPES + 1]; INTRA_MODES]; TX_SIZES]; TX_SETS_INTRA],
- inter_tx_cdf: [[[u16; TX_TYPES + 1]; TX_SIZES]; TX_SETS_INTRA],
+ inter_tx_cdf: [[[u16; TX_TYPES + 1]; TX_SIZES]; TX_SETS_INTER],
skip_cdfs: [[u16; 3]; SKIP_CONTEXTS],
intra_inter_cdfs: [[u16; 3]; INTRA_INTER_CONTEXTS],
angle_delta_cdf: [[u16; 2 * MAX_ANGLE_DELTA + 1 + 1]; DIRECTIONAL_MODES],
--
GitLab