commit 0d515b29b14a34a57ae9d9ca6fcdd816afc0d360
author Urvang Joshi <urvang@google.com> Thu Sep 01 21:45:31 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Sep 01 21:45:32 2016 +0000
tree 3cee4fe5d3e9156fdd0764164b46bc4799cb7c13
parent f7ae12d7fdeca387f3094cc319c2a2e297686092
parent 340593e5309862a7a4bfda942f0353fec21b32e9

Merge "Add ALT_INTRA experiment." into nextgenv2

av1/common/reconintra.c

diff --git a/av1/common/reconintra.c b/av1/common/reconintra.c
index 8078f85..3dc1974 100644
--- a/av1/common/reconintra.c
+++ b/av1/common/reconintra.c
@@ -650,7 +650,7 @@
 // If angle > 0 && angle < 90, dx = -((int)(256 / t));
 // If angle > 90 && angle < 180, dx = (int)(256 / t);
 // If angle > 180 && angle < 270, dx = 1;
-static inline int get_dx(int angle) {
+static INLINE int get_dx(int angle) {
   if (angle > 0 && angle < 90) {
     return -dr_intra_derivative[angle];
   } else if (angle > 90 && angle < 180) {
@@ -665,7 +665,7 @@
 // If angle > 0 && angle < 90, dy = 1;
 // If angle > 90 && angle < 180, dy = (int)(256 * t);
 // If angle > 180 && angle < 270, dy = -((int)(256 * t));
-static inline int get_dy(int angle) {
+static INLINE int get_dy(int angle) {
   if (angle > 90 && angle < 180) {
     return dr_intra_derivative[angle - 90];
   } else if (angle > 180 && angle < 270) {

av1/decoder/decodeframe.c

diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index 1f1f358..638fa01 100644
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -3478,7 +3478,7 @@
     aom_internal_error(&cm->error, AOM_CODEC_MEM_ERROR,
                        "Failed to allocate bool decoder 0");
 #else
-  if (ans_read_init(&r, data, partition_size))
+  if (ans_read_init(&r, data, (int)partition_size))
     aom_internal_error(&cm->error, AOM_CODEC_MEM_ERROR,
                        "Failed to allocate compressed header ANS decoder");
 #endif  // !CONFIG_ANS

av1/encoder/firstpass.h

diff --git a/av1/encoder/firstpass.h b/av1/encoder/firstpass.h
index 2b161a1..eaaafff 100644
--- a/av1/encoder/firstpass.h
+++ b/av1/encoder/firstpass.h
@@ -182,7 +182,7 @@
                               int *scaled_frame_height);
 
 #if CONFIG_EXT_REFS
-static inline int get_number_of_extra_arfs(int interval, int arf_pending) {
+static INLINE int get_number_of_extra_arfs(int interval, int arf_pending) {
   if (arf_pending && MAX_EXT_ARFS > 0)
     return interval >= MIN_EXT_ARF_INTERVAL * (MAX_EXT_ARFS + 1)
                ? MAX_EXT_ARFS