From fc838a04be386a42fdb793fade2449766fa494bb Mon Sep 17 00:00:00 2001 From: Alex Converse Date: Wed, 27 Apr 2016 14:03:04 -0700 Subject: [PATCH] buf_ans: Misc cleanup. Change-Id: I18a3ef2ee6cdda57abcd27683b30b4e3136182c0 --- vp10/encoder/bitstream.c | 2 ++ vp10/encoder/buf_ans.h | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/vp10/encoder/bitstream.c b/vp10/encoder/bitstream.c index 49ad37668..004f49c72 100644 --- a/vp10/encoder/bitstream.c +++ b/vp10/encoder/bitstream.c @@ -28,7 +28,9 @@ #include "vp10/common/seg_common.h" #include "vp10/common/tile_common.h" +#if CONFIG_ANS #include "vp10/encoder/buf_ans.h" +#endif // CONFIG_ANS #include "vp10/encoder/cost.h" #include "vp10/encoder/bitstream.h" #include "vp10/encoder/encodemv.h" diff --git a/vp10/encoder/buf_ans.h b/vp10/encoder/buf_ans.h index 11055d937..8697ee4dc 100644 --- a/vp10/encoder/buf_ans.h +++ b/vp10/encoder/buf_ans.h @@ -52,7 +52,7 @@ static INLINE void buf_ans_write_reset(struct BufAnsCoder *const c) { } static INLINE void buf_uabs_write(struct BufAnsCoder *const c, - uint8_t val, AnsP8 prob) { + uint8_t val, AnsP8 prob) { assert(c->offset <= c->size); if (c->offset == c->size) { vp10_buf_ans_grow(c); @@ -85,7 +85,8 @@ static INLINE void buf_ans_flush(const struct BufAnsCoder *const c, sym.cum_prob = c->buf[offset].val_start; rans_write(ans, &sym); } else { - uabs_write(ans, c->buf[offset].val_start, c->buf[offset].prob); + uabs_write(ans, (uint8_t)c->buf[offset].val_start, + (AnsP8)c->buf[offset].prob); } } } -- 2.50.0