Merge remote-tracking branch 'origin/vp9-preview' into experimental

vp9/common/vp9_findnearmv.h

@@ -150,7 +150,8 @@ static B_PREDICTION_MODE left_block_mode(const MODE_INFO *cur_mb, int b) {
     if (cur_mb->mbmi.mode < I8X8_PRED) {
       return pred_mode_conv(cur_mb->mbmi.mode);
     } else if (cur_mb->mbmi.mode == I8X8_PRED) {
-      return pred_mode_conv((cur_mb->bmi + 3 + b)->as_mode.first);
+      return pred_mode_conv(
+          (MB_PREDICTION_MODE)(cur_mb->bmi + 3 + b)->as_mode.first);
     } else if (cur_mb->mbmi.mode == B_PRED) {
       return ((cur_mb->bmi + 3 + b)->as_mode.first);
     } else {
@@ -169,7 +170,8 @@ static B_PREDICTION_MODE above_block_mode(const MODE_INFO *cur_mb,
     if (cur_mb->mbmi.mode < I8X8_PRED) {
       return pred_mode_conv(cur_mb->mbmi.mode);
     } else if (cur_mb->mbmi.mode == I8X8_PRED) {
-      return pred_mode_conv((cur_mb->bmi + 12 + b)->as_mode.first);
+      return pred_mode_conv(
+          (MB_PREDICTION_MODE)(cur_mb->bmi + 12 + b)->as_mode.first);
     } else if (cur_mb->mbmi.mode == B_PRED) {
       return ((cur_mb->bmi + 12 + b)->as_mode.first);
     } else {

vp9/decoder/vp9_asm_dec_offsets.c

@@ -14,25 +14,6 @@
 
 BEGIN
 
-DEFINE(detok_scan,                              offsetof(DETOK, scan));
-DEFINE(detok_ptr_block2leftabove,               offsetof(DETOK, ptr_block2leftabove));
-DEFINE(detok_coef_tree_ptr,                     offsetof(DETOK, vp9_coef_tree_ptr));
-DEFINE(detok_norm_ptr,                          offsetof(DETOK, norm_ptr));
-DEFINE(detok_ptr_coef_bands_x,                  offsetof(DETOK, ptr_coef_bands_x));
-
-DEFINE(detok_A,                                 offsetof(DETOK, A));
-DEFINE(detok_L,                                 offsetof(DETOK, L));
-
-DEFINE(detok_qcoeff_start_ptr,                  offsetof(DETOK, qcoeff_start_ptr));
-DEFINE(detok_coef_probs,                        offsetof(DETOK, coef_probs));
-DEFINE(detok_eob,                               offsetof(DETOK, eob));
-
-DEFINE(bool_decoder_user_buffer_end,            offsetof(BOOL_DECODER, user_buffer_end));
-DEFINE(bool_decoder_user_buffer,                offsetof(BOOL_DECODER, user_buffer));
-DEFINE(bool_decoder_value,                      offsetof(BOOL_DECODER, value));
-DEFINE(bool_decoder_count,                      offsetof(BOOL_DECODER, count));
-DEFINE(bool_decoder_range,                      offsetof(BOOL_DECODER, range));
-
 END
 
 /* add asserts for any offset that is not supported by assembly code */

vp9/encoder/vp9_asm_enc_offsets.c

@@ -34,47 +34,6 @@ DEFINE(vp9_blockd_dequant,                      offsetof(BLOCKD, dequant));
 DEFINE(vp9_blockd_dqcoeff,                      offsetof(BLOCKD, dqcoeff));
 DEFINE(vp9_blockd_eob,                          offsetof(BLOCKD, eob));
 
-/* subtract */
-DEFINE(vp9_block_base_src,                      offsetof(BLOCK, base_src));
-DEFINE(vp9_block_src,                           offsetof(BLOCK, src));
-DEFINE(vp9_block_src_diff,                      offsetof(BLOCK, src_diff));
-DEFINE(vp9_block_src_stride,                    offsetof(BLOCK, src_stride));
-
-DEFINE(vp9_blockd_predictor,                    offsetof(BLOCKD, predictor));
-
-/* pack tokens */
-DEFINE(vp9_writer_lowvalue,                     offsetof(vp9_writer, lowvalue));
-DEFINE(vp9_writer_range,                        offsetof(vp9_writer, range));
-DEFINE(vp9_writer_value,                        offsetof(vp9_writer, value));
-DEFINE(vp9_writer_count,                        offsetof(vp9_writer, count));
-DEFINE(vp9_writer_pos,                          offsetof(vp9_writer, pos));
-DEFINE(vp9_writer_buffer,                       offsetof(vp9_writer, buffer));
-
-DEFINE(tokenextra_token,                        offsetof(TOKENEXTRA, Token));
-DEFINE(tokenextra_extra,                        offsetof(TOKENEXTRA, Extra));
-DEFINE(tokenextra_context_tree,                 offsetof(TOKENEXTRA, context_tree));
-DEFINE(tokenextra_skip_eob_node,                offsetof(TOKENEXTRA, skip_eob_node));
-DEFINE(TOKENEXTRA_SZ,                           sizeof(TOKENEXTRA));
-
-DEFINE(vp9_extra_bit_struct_sz,                 sizeof(vp9_extra_bit_struct));
-
-DEFINE(vp9_token_value,                         offsetof(vp9_token, value));
-DEFINE(vp9_token_len,                           offsetof(vp9_token, Len));
-
-DEFINE(vp9_extra_bit_struct_tree,               offsetof(vp9_extra_bit_struct, tree));
-DEFINE(vp9_extra_bit_struct_prob,               offsetof(vp9_extra_bit_struct, prob));
-DEFINE(vp9_extra_bit_struct_len,                offsetof(vp9_extra_bit_struct, Len));
-DEFINE(vp9_extra_bit_struct_base_val,           offsetof(vp9_extra_bit_struct, base_val));
-
-DEFINE(vp9_comp_tplist,                         offsetof(VP9_COMP, tplist));
-DEFINE(vp9_comp_common,                         offsetof(VP9_COMP, common));
-
-DEFINE(tokenlist_start,                         offsetof(TOKENLIST, start));
-DEFINE(tokenlist_stop,                          offsetof(TOKENLIST, stop));
-DEFINE(TOKENLIST_SZ,                            sizeof(TOKENLIST));
-
-DEFINE(vp9_common_mb_rows,                      offsetof(VP9_COMMON, mb_rows));
-
 END
 
 /* add asserts for any offset that is not supported by assembly code

vp9/encoder/vp9_firstpass.c

@@ -780,7 +780,7 @@ void vp9_first_pass(VP9_COMP *cpi) {
     else
       recon_file = fopen(filename, "ab");
 
-    if (fwrite(lst_yv12->buffer_alloc, lst_yv12->frame_size, 1, recon_file));
+    (void)fwrite(lst_yv12->buffer_alloc, lst_yv12->frame_size, 1, recon_file);
     fclose(recon_file);
   }