diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2013-10-03 09:34:26 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-10-03 09:34:26 -0700 |
| commit | 6cb6987d4d9a2655bc9b294aff1a89519071384b (patch) | |
| tree | 3a2ace400cd77ef855d98476890f43df243aa87c /vp9 | |
| parent | ece99b3da099deced394d4d3fad0df06623957f5 (diff) | |
| parent | 68a3e4a8887688c3ebef56ed65d9cf31529d4191 (diff) | |
| download | libvpx-6cb6987d4d9a2655bc9b294aff1a89519071384b.tar libvpx-6cb6987d4d9a2655bc9b294aff1a89519071384b.tar.gz libvpx-6cb6987d4d9a2655bc9b294aff1a89519071384b.tar.bz2 libvpx-6cb6987d4d9a2655bc9b294aff1a89519071384b.zip | |
Merge "BITSTREAM - RESTORING BILINEAR INTERPOLATION FILTER SUPPORT"
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/decoder/vp9_decodframe.c | 3 | ||||
| -rw-r--r-- | vp9/encoder/vp9_bitstream.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/vp9/decoder/vp9_decodframe.c b/vp9/decoder/vp9_decodframe.c index 018f94954..809366302 100644 --- a/vp9/decoder/vp9_decodframe.c +++ b/vp9/decoder/vp9_decodframe.c @@ -503,7 +503,8 @@ static INTERPOLATIONFILTERTYPE read_interp_filter_type( struct vp9_read_bit_buffer *rb) { const INTERPOLATIONFILTERTYPE literal_to_type[] = { EIGHTTAP_SMOOTH, EIGHTTAP, - EIGHTTAP_SHARP }; + EIGHTTAP_SHARP, + BILINEAR }; return vp9_rb_read_bit(rb) ? SWITCHABLE : literal_to_type[vp9_rb_read_literal(rb, 2)]; } diff --git a/vp9/encoder/vp9_bitstream.c b/vp9/encoder/vp9_bitstream.c index 20dd8e175..f7778a453 100644 --- a/vp9/encoder/vp9_bitstream.c +++ b/vp9/encoder/vp9_bitstream.c @@ -1152,7 +1152,7 @@ static void encode_txfm_probs(VP9_COMP *cpi, vp9_writer *w) { static void write_interp_filter_type(INTERPOLATIONFILTERTYPE type, struct vp9_write_bit_buffer *wb) { - const int type_to_literal[] = { 1, 0, 2 }; + const int type_to_literal[] = { 1, 0, 2, 3 }; vp9_wb_write_bit(wb, type == SWITCHABLE); if (type != SWITCHABLE) |