Unify coding order of MC filters between blocks and frame header.
In VP9, the order for frame header was: [0] smooth, [1] regular, [2] sharp, [3] bilinear. Per-block, the order was [0] regular, [1] smooth and [2] sharp. For VP10, swap smooth/regular in the frame header so that the block ordering and frame header ordering are interchangeable. See issue #1046. Change-Id: Ic9ec5964874375e40cd59bef50b489a76cbe4365
This commit is contained in:

committed by
Yaowu Xu

parent
e5732bcf05
commit
ecd34e6494
@@ -852,11 +852,9 @@ static void encode_txfm_probs(VP10_COMMON *cm, vpx_writer *w,
|
||||
|
||||
static void write_interp_filter(INTERP_FILTER filter,
|
||||
struct vpx_write_bit_buffer *wb) {
|
||||
const int filter_to_literal[] = { 1, 0, 2, 3 };
|
||||
|
||||
vpx_wb_write_bit(wb, filter == SWITCHABLE);
|
||||
if (filter != SWITCHABLE)
|
||||
vpx_wb_write_literal(wb, filter_to_literal[filter], 2);
|
||||
vpx_wb_write_literal(wb, filter, 2);
|
||||
}
|
||||
|
||||
static void fix_interp_filter(VP10_COMMON *cm, FRAME_COUNTS *counts) {
|
||||
|
Reference in New Issue
Block a user