Change "VP9" to "AV1"

Change-Id: I6f40ab4725f59bee3d05e3989c1510dfd847b7f9

CHANGELOG

 2015-11-09 v1.5.0 "Javan Whistling Duck"
-  This release improves upon the VP9 encoder and speeds up the encoding and
+  This release improves upon the AV1 encoder and speeds up the encoding and
   decoding processes.
 
   - Upgrading:
     This release is ABI incompatible with 1.4.0. It drops deprecated AOM
-    controls and adds a variety of VP9 controls for testing.
+    controls and adds a variety of AV1 controls for testing.
 
-    The aomenc utility now prefers VP9 by default.
+    The aomenc utility now prefers AV1 by default.
 
   - Enhancements:
-    Faster VP9 encoding and decoding
-    Smaller library size by combining functions used by AOM and VP9
+    Faster AV1 encoding and decoding
+    Smaller library size by combining functions used by AOM and AV1
 
   - Bug Fixes:
     A variety of fuzzing issues
 
 2015-04-03 v1.4.0 "Indian Runner Duck"
-  This release includes significant improvements to the VP9 codec.
+  This release includes significant improvements to the AV1 codec.
 
   - Upgrading:
     This release is ABI incompatible with 1.3.0. It drops the compatibility
     layer, requiring AOM_IMG_FMT_* instead of IMG_FMT_*, and adds several codec
-    controls for VP9.
+    controls for AV1.
 
   - Enhancements:
-    Faster VP9 encoding and decoding
-    Multithreaded VP9 decoding (tile and frame-based)
-    Multithreaded VP9 encoding - on by default
-    YUV 4:2:2 and 4:4:4 support in VP9
-    10 and 12bit support in VP9
+    Faster AV1 encoding and decoding
+    Multithreaded AV1 decoding (tile and frame-based)
+    Multithreaded AV1 encoding - on by default
+    YUV 4:2:2 and 4:4:4 support in AV1
+    10 and 12bit support in AV1
     64bit ARM support by replacing ARM assembly with intrinsics
 
   - Bug Fixes:
-    Fixes a VP9 bitstream issue in Profile 1. This only affected non-YUV 4:2:0
+    Fixes a AV1 bitstream issue in Profile 1. This only affected non-YUV 4:2:0
     files.
 
   - Known Issues:
     Frame Parallel decoding fails for segmented and non-420 files.
 
 2013-11-15 v1.3.0 "Forest"
-  This release introduces the VP9 codec in a backward-compatible way.
+  This release introduces the AV1 codec in a backward-compatible way.
   All existing users of AOM can continue to use the library without
-  modification. However, some AOM options do not map to VP9 in the same manner.
+  modification. However, some AOM options do not map to AV1 in the same manner.
 
-  The VP9 encoder in this release is not feature complete. Users interested in
+  The AV1 encoder in this release is not feature complete. Users interested in
   the encoder are advised to use the git master branch and discuss issues on
   libaom mailing lists.
 
@@ -78,7 +78,7 @@
       Add encoding option --static-thresh
 
   - Speed:
-      Miscellaneous speed optimizations for AOM and VP9.
+      Miscellaneous speed optimizations for AOM and AV1.
 
   - Quality:
       In general, quality is consistent with the Eider release.

aom/aom.h

+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+/*!\defgroup vp8 AOM
+ * \ingroup codecs
+ * AOM is aom's newest video compression algorithm that uses motion
+ * compensated prediction, Discrete Cosine Transform (DCT) coding of the
+ * prediction error signal and context dependent entropy coding techniques
+ * based on arithmetic principles. It features:
+ *  - YUV 4:2:0 image format
+ *  - Macro-block based coding (16x16 luma plus two 8x8 chroma)
+ *  - 1/4 (1/8) pixel accuracy motion compensated prediction
+ *  - 4x4 DCT transform
+ *  - 128 level linear quantizer
+ *  - In loop deblocking filter
+ *  - Context-based entropy coding
+ *
+ * @{
+ */
+/*!\file
+ * \brief Provides controls common to both the AOM encoder and decoder.
+ */
+#ifndef AOM_AOM_H_
+#define AOM_AOM_H_
+
+#include "./aom_codec.h"
+#include "./aom_image.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*!\brief Control functions
+ *
+ * The set of macros define the control functions of AOM interface
+ */
+enum vp8_com_control_id {
+  AOM_SET_REFERENCE =
+      1, /**< pass in an external frame into decoder to be used as reference
+            frame */
+  AOM_COPY_REFERENCE = 2, /**< get a copy of reference frame from the decoder */
+  AOM_SET_POSTPROC = 3,   /**< set the decoder's post processing settings  */
+  AOM_SET_DBG_COLOR_REF_FRAME =
+      4, /**< set the reference frames to color for each macroblock */
+  AOM_SET_DBG_COLOR_MB_MODES = 5, /**< set which macro block modes to color */
+  AOM_SET_DBG_COLOR_B_MODES = 6,  /**< set which blocks modes to color */
+  AOM_SET_DBG_DISPLAY_MV = 7,     /**< set which motion vector modes to draw */
+
+  /* TODO(jkoleszar): The encoder incorrectly reuses some of these values (5+)
+   * for its control ids. These should be migrated to something like the
+   * AOM_DECODER_CTRL_ID_START range next time we're ready to break the ABI.
+   */
+  AV1_GET_REFERENCE = 128, /**< get a pointer to a reference frame */
+  AOM_COMMON_CTRL_ID_MAX,
+  AOM_DECODER_CTRL_ID_START = 256
+};
+
+/*!\brief post process flags
+ *
+ * The set of macros define AOM decoder post processing flags
+ */
+enum vp8_postproc_level {
+  AOM_NOFILTERING = 0,
+  AOM_DEBLOCK = 1 << 0,
+  AOM_DEMACROBLOCK = 1 << 1,
+  AOM_ADDNOISE = 1 << 2,
+  AOM_DEBUG_TXT_FRAME_INFO = 1 << 3, /**< print frame information */
+  AOM_DEBUG_TXT_MBLK_MODES =
+      1 << 4, /**< print macro block modes over each macro block */
+  AOM_DEBUG_TXT_DC_DIFF = 1 << 5,   /**< print dc diff for each macro block */
+  AOM_DEBUG_TXT_RATE_INFO = 1 << 6, /**< print video rate info (encoder only) */
+  AOM_MFQE = 1 << 10
+};
+
+/*!\brief post process flags
+ *
+ * This define a structure that describe the post processing settings. For
+ * the best objective measure (using the PSNR metric) set post_proc_flag
+ * to AOM_DEBLOCK and deblocking_level to 1.
+ */
+
+typedef struct vp8_postproc_cfg {
+  int post_proc_flag;   /**< the types of post processing to be done, should be
+                           combination of "vp8_postproc_level" */
+  int deblocking_level; /**< the strength of deblocking, valid range [0, 16] */
+  int noise_level; /**< the strength of additive noise, valid range [0, 16] */
+} vp8_postproc_cfg_t;
+
+/*!\brief reference frame type
+ *
+ * The set of macros define the type of AOM reference frames
+ */
+typedef enum aom_ref_frame_type {
+  AOM_LAST_FRAME = 1,
+  AOM_GOLD_FRAME = 2,
+  AOM_ALTR_FRAME = 4
+} aom_ref_frame_type_t;
+
+/*!\brief reference frame data struct
+ *
+ * Define the data struct to access vp8 reference frames.
+ */
+typedef struct aom_ref_frame {
+  aom_ref_frame_type_t frame_type; /**< which reference frame */
+  aom_image_t img;                 /**< reference frame data in image format */
+} aom_ref_frame_t;
+
+/*!\brief AV1 specific reference frame data struct
+ *
+ * Define the data struct to access vp9 reference frames.
+ */
+typedef struct vp9_ref_frame {
+  int idx;         /**< frame index to get (input) */
+  aom_image_t img; /**< img structure to populate (output) */
+} vp9_ref_frame_t;
+
+/*!\cond */
+/*!\brief vp8 decoder control function parameter type
+ *
+ * defines the data type for each of AOM decoder control function requires
+ */
+AOM_CTRL_USE_TYPE(AOM_SET_REFERENCE, aom_ref_frame_t *)
+#define AOM_CTRL_AOM_SET_REFERENCE
+AOM_CTRL_USE_TYPE(AOM_COPY_REFERENCE, aom_ref_frame_t *)
+#define AOM_CTRL_AOM_COPY_REFERENCE
+AOM_CTRL_USE_TYPE(AOM_SET_POSTPROC, vp8_postproc_cfg_t *)
+#define AOM_CTRL_AOM_SET_POSTPROC
+AOM_CTRL_USE_TYPE(AOM_SET_DBG_COLOR_REF_FRAME, int)
+#define AOM_CTRL_AOM_SET_DBG_COLOR_REF_FRAME
+AOM_CTRL_USE_TYPE(AOM_SET_DBG_COLOR_MB_MODES, int)
+#define AOM_CTRL_AOM_SET_DBG_COLOR_MB_MODES
+AOM_CTRL_USE_TYPE(AOM_SET_DBG_COLOR_B_MODES, int)
+#define AOM_CTRL_AOM_SET_DBG_COLOR_B_MODES
+AOM_CTRL_USE_TYPE(AOM_SET_DBG_DISPLAY_MV, int)
+#define AOM_CTRL_AOM_SET_DBG_DISPLAY_MV
+AOM_CTRL_USE_TYPE(AV1_GET_REFERENCE, vp9_ref_frame_t *)
+#define AOM_CTRL_AV1_GET_REFERENCE
+
+/*!\endcond */
+/*! @} - end defgroup vp8 */
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
+#endif  // AOM_AOM_H_

aom/aom_decoder.h

@@ -322,7 +322,7 @@ aom_codec_err_t aom_codec_register_put_slice_cb(aom_codec_ctx_t *ctx,
  * will result in an error code being returned, usually AOM_CODEC_ERROR.
  *
  * \note
- * Currently this only works with VP9.
+ * Currently this only works with AV1.
  * @{
  */
 
@@ -348,7 +348,7 @@ aom_codec_err_t aom_codec_register_put_slice_cb(aom_codec_ctx_t *ctx,
  *     using external frame buffers.
  *
  * \note
- * When decoding VP9, the application may be required to pass in at least
+ * When decoding AV1, the application may be required to pass in at least
  * #AOM_MAXIMUM_WORK_BUFFERS external frame
  * buffers.
  */

aom/aom_encoder.h

@@ -702,7 +702,7 @@ typedef struct aom_codec_enc_cfg {
   /*!\brief Temporal layering mode indicating which temporal layering scheme to
    * use.
    *
-   * The value (refer to VP9E_TEMPORAL_LAYERING_MODE) specifies the
+   * The value (refer to AV1E_TEMPORAL_LAYERING_MODE) specifies the
    * temporal layering mode to use.
    *
    */
@@ -798,7 +798,7 @@ aom_codec_err_t aom_codec_enc_init_multi_ver(
  *
  * \param[in]    iface     Pointer to the algorithm interface to use.
  * \param[out]   cfg       Configuration buffer to populate.
- * \param[in]    reserved  Must set to 0 for AOM and VP9.
+ * \param[in]    reserved  Must set to 0 for AOM and AV1.
  *
  * \retval #AOM_CODEC_OK
  *     The configuration was populated.

aom/aom_frame_buffer.h

@@ -29,7 +29,7 @@ extern "C" {
  */
 #define AOM_MAXIMUM_WORK_BUFFERS 8
 
-/*!\brief The maximum number of reference buffers that a VP9 encoder may use.
+/*!\brief The maximum number of reference buffers that a AV1 encoder may use.
  */
 #define AOM_MAXIMUM_REF_BUFFERS 8
 

aom/aomdx.h

+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+/*!\defgroup vp8_decoder WebM AOM/AV1 Decoder
+ * \ingroup vp8
+ *
+ * @{
+ */
+/*!\file
+ * \brief Provides definitions for using AOM or AV1 within the aom Decoder
+ *        interface.
+ */
+#ifndef AOM_AOMDX_H_
+#define AOM_AOMDX_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Include controls common to both the encoder and decoder */
+#include "./aom.h"
+
+/*!\name Algorithm interface for AV1
+ *
+ * This interface provides the capability to decode AV1 streams.
+ * @{
+ */
+extern aom_codec_iface_t aom_codec_av1_dx_algo;
+extern aom_codec_iface_t *aom_codec_av1_dx(void);
+/*!@} - end algorithm interface member group*/
+
+/*!\enum vp8_dec_control_id
+ * \brief AOM decoder control functions
+ *
+ * This set of macros define the control functions available for the AOM
+ * decoder interface.
+ *
+ * \sa #aom_codec_control
+ */
+enum vp8_dec_control_id {
+  /** control function to get info on which reference frames were updated
+   *  by the last decode
+   */
+  AOMD_GET_LAST_REF_UPDATES = AOM_DECODER_CTRL_ID_START,
+
+  /** check if the indicated frame is corrupted */
+  AOMD_GET_FRAME_CORRUPTED,
+
+  /** control function to get info on which reference frames were used
+   *  by the last decode
+   */
+  AOMD_GET_LAST_REF_USED,
+
+  /** decryption function to decrypt encoded buffer data immediately
+   * before decoding. Takes a aom_decrypt_init, which contains
+   * a callback function and opaque context pointer.
+   */
+  AOMD_SET_DECRYPTOR,
+ // AOMD_SET_DECRYPTOR = AOMD_SET_DECRYPTOR,
+
+  /** control function to get the dimensions that the current frame is decoded
+   * at. This may be different to the intended display size for the frame as
+   * specified in the wrapper or frame header (see AV1D_GET_DISPLAY_SIZE). */
+  AV1D_GET_FRAME_SIZE,
+
+  /** control function to get the current frame's intended display dimensions
+   * (as specified in the wrapper or frame header). This may be different to
+   * the decoded dimensions of this frame (see AV1D_GET_FRAME_SIZE). */
+  AV1D_GET_DISPLAY_SIZE,
+
+  /** control function to get the bit depth of the stream. */
+  AV1D_GET_BIT_DEPTH,
+
+  /** control function to set the byte alignment of the planes in the reference
+   * buffers. Valid values are power of 2, from 32 to 1024. A value of 0 sets
+   * legacy alignment. I.e. Y plane is aligned to 32 bytes, U plane directly
+   * follows Y plane, and V plane directly follows U plane. Default value is 0.
+   */
+  AV1_SET_BYTE_ALIGNMENT,
+
+  /** control function to invert the decoding order to from right to left. The
+   * function is used in a test to confirm the decoding independence of tile
+   * columns. The function may be used in application where this order
+   * of decoding is desired.
+   *
+   * TODO(yaowu): Rework the unit test that uses this control, and in a future
+   *              release, this test-only control shall be removed.
+   */
+  AV1_INVERT_TILE_DECODE_ORDER,
+
+  /** control function to set the skip loop filter flag. Valid values are
+   * integers. The decoder will skip the loop filter when its value is set to
+   * nonzero. If the loop filter is skipped the decoder may accumulate decode
+   * artifacts. The default value is 0.
+   */
+  AV1_SET_SKIP_LOOP_FILTER,
+
+  AOM_DECODER_CTRL_ID_MAX
+};
+
+/** Decrypt n bytes of data from input -> output, using the decrypt_state
+ *  passed in AOMD_SET_DECRYPTOR.
+ */
+typedef void (*aom_decrypt_cb)(void *decrypt_state, const unsigned char *input,
+                               unsigned char *output, int count);
+
+/*!\brief Structure to hold decryption state
+ *
+ * Defines a structure to hold the decryption state and access function.
+ */
+typedef struct aom_decrypt_init {
+  /*! Decrypt callback. */
+  aom_decrypt_cb decrypt_cb;
+
+  /*! Decryption state. */
+  void *decrypt_state;
+} aom_decrypt_init;
+
+/*!\brief A deprecated alias for aom_decrypt_init.
+ */
+typedef aom_decrypt_init vp8_decrypt_init;
+
+/*!\cond */
+/*!\brief AOM decoder control function parameter type
+ *
+ * Defines the data types that AOMD control functions take. Note that
+ * additional common controls are defined in aom.h
+ *
+ */
+
+AOM_CTRL_USE_TYPE(AOMD_GET_LAST_REF_UPDATES, int *)
+#define AOM_CTRL_AOMD_GET_LAST_REF_UPDATES
+AOM_CTRL_USE_TYPE(AOMD_GET_FRAME_CORRUPTED, int *)
+#define AOM_CTRL_AOMD_GET_FRAME_CORRUPTED
+AOM_CTRL_USE_TYPE(AOMD_GET_LAST_REF_USED, int *)
+#define AOM_CTRL_AOMD_GET_LAST_REF_USED
+AOM_CTRL_USE_TYPE(AOMD_SET_DECRYPTOR, aom_decrypt_init *)
+#define AOM_CTRL_AOMD_SET_DECRYPTOR
+//AOM_CTRL_USE_TYPE(AOMD_SET_DECRYPTOR, aom_decrypt_init *)
+//#define AOM_CTRL_AOMD_SET_DECRYPTOR
+AOM_CTRL_USE_TYPE(AV1D_GET_DISPLAY_SIZE, int *)
+#define AOM_CTRL_AV1D_GET_DISPLAY_SIZE
+AOM_CTRL_USE_TYPE(AV1D_GET_BIT_DEPTH, unsigned int *)
+#define AOM_CTRL_AV1D_GET_BIT_DEPTH
+AOM_CTRL_USE_TYPE(AV1D_GET_FRAME_SIZE, int *)
+#define AOM_CTRL_AV1D_GET_FRAME_SIZE
+AOM_CTRL_USE_TYPE(AV1_INVERT_TILE_DECODE_ORDER, int)
+#define AOM_CTRL_AV1_INVERT_TILE_DECODE_ORDER
+
+/*!\endcond */
+/*! @} - end defgroup vp8_decoder */
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
+#endif  // AOM_AOMDX_H_

aom/internal/aom_codec_internal.h

@@ -240,7 +240,7 @@ typedef aom_image_t *(*aom_codec_get_frame_fn_t)(aom_codec_alg_priv_t *ctx,
  *     using external frame buffers.
  *
  * \note
- * When decoding VP9, the application may be required to pass in at least
+ * When decoding AV1, the application may be required to pass in at least
  * #AOM_MAXIMUM_WORK_BUFFERS external frame
  * buffers.
  */

aom/src/svc_encodeframe.c

@@ -11,7 +11,7 @@
 
 /**
  * @file
- * VP9 SVC encoding support via libaom
+ * AV1 SVC encoding support via libaom
  */
 
 #include <assert.h>
@@ -492,8 +492,8 @@ aom_codec_err_t aom_svc_init(SvcContext *svc_ctx, aom_codec_ctx_t *codec_ctx,
     return res;
   }
   if (svc_ctx->spatial_layers > 1 || svc_ctx->temporal_layers > 1) {
-    aom_codec_control(codec_ctx, VP9E_SET_SVC, 1);
-    aom_codec_control(codec_ctx, VP9E_SET_SVC_PARAMETERS, &si->svc_params);
+    aom_codec_control(codec_ctx, AV1E_SET_SVC, 1);
+    aom_codec_control(codec_ctx, AV1E_SET_SVC_PARAMETERS, &si->svc_params);
   }
   return AOM_CODEC_OK;
 }

aom_dsp/arm/aom_convolve8_avg_neon_asm.asm

@@ -14,8 +14,8 @@
     ; w%4 == 0
     ; h%4 == 0
     ; taps == 8
-    ; VP9_FILTER_WEIGHT == 128
-    ; VP9_FILTER_SHIFT == 7
+    ; AV1_FILTER_WEIGHT == 128
+    ; AV1_FILTER_SHIFT == 7
 
     EXPORT  |aom_convolve8_avg_horiz_neon|
     EXPORT  |aom_convolve8_avg_vert_neon|

aom_dsp/arm/aom_convolve8_neon_asm.asm

@@ -14,8 +14,8 @@
     ; w%4 == 0
     ; h%4 == 0
     ; taps == 8
-    ; VP9_FILTER_WEIGHT == 128
-    ; VP9_FILTER_SHIFT == 7
+    ; AV1_FILTER_WEIGHT == 128
+    ; AV1_FILTER_SHIFT == 7
 
     EXPORT  |aom_convolve8_horiz_neon|
     EXPORT  |aom_convolve8_vert_neon|

aom_dsp/mips/inv_txfm_msa.h

@@ -16,7 +16,7 @@
 #include "aom_dsp/mips/txfm_macros_msa.h"
 #include "aom_dsp/txfm_common.h"
 
-#define VP9_ADST8(in0, in1, in2, in3, in4, in5, in6, in7, out0, out1, out2,  \
+#define AV1_ADST8(in0, in1, in2, in3, in4, in5, in6, in7, out0, out1, out2,  \
                   out3, out4, out5, out6, out7)                              \
   {                                                                          \
     v8i16 cnst0_m, cnst1_m, cnst2_m, cnst3_m, cnst4_m;                       \
@@ -182,7 +182,7 @@
     PCKEV_H2_SH(int2_m, int2_m, int3_m, int3_m, out2, out3);           \
   }
 
-#define VP9_SET_CONST_PAIR(mask_h, idx1_h, idx2_h)    \
+#define AV1_SET_CONST_PAIR(mask_h, idx1_h, idx2_h)    \
   ({                                                  \
     v8i16 c0_m, c1_m;                                 \
                                                       \
@@ -193,7 +193,7 @@
   })
 
 /* multiply and add macro */
-#define VP9_MADD(inp0, inp1, inp2, inp3, cst0, cst1, cst2, cst3, out0, out1,  \
+#define AV1_MADD(inp0, inp1, inp2, inp3, cst0, cst1, cst2, cst3, out0, out1,  \
                  out2, out3)                                                  \
   {                                                                           \
     v8i16 madd_s0_m, madd_s1_m, madd_s2_m, madd_s3_m;                         \
@@ -221,13 +221,13 @@
     v8i16 mask_m = { cospi_28_64, cospi_4_64,  cospi_20_64,  cospi_12_64,     \
                      cospi_16_64, -cospi_4_64, -cospi_20_64, -cospi_16_64 };  \
                                                                               \
-    k0_m = VP9_SET_CONST_PAIR(mask_m, 0, 5);                                  \
-    k1_m = VP9_SET_CONST_PAIR(mask_m, 1, 0);                                  \
-    k2_m = VP9_SET_CONST_PAIR(mask_m, 6, 3);                                  \
-    k3_m = VP9_SET_CONST_PAIR(mask_m, 3, 2);                                  \
-    VP9_MADD(in1, in7, in3, in5, k0_m, k1_m, k2_m, k3_m, in1, in7, in3, in5); \
+    k0_m = AV1_SET_CONST_PAIR(mask_m, 0, 5);                                  \
+    k1_m = AV1_SET_CONST_PAIR(mask_m, 1, 0);                                  \
+    k2_m = AV1_SET_CONST_PAIR(mask_m, 6, 3);                                  \
+    k3_m = AV1_SET_CONST_PAIR(mask_m, 3, 2);                                  \
+    AV1_MADD(in1, in7, in3, in5, k0_m, k1_m, k2_m, k3_m, in1, in7, in3, in5); \
     SUB2(in1, in3, in7, in5, res0_m, res1_m);                                 \
-    k0_m = VP9_SET_CONST_PAIR(mask_m, 4, 7);                                  \
+    k0_m = AV1_SET_CONST_PAIR(mask_m, 4, 7);                                  \
     k1_m = __msa_splati_h(mask_m, 4);                                         \
                                                                               \
     ILVRL_H2_SH(res0_m, res1_m, res2_m, res3_m);                              \
@@ -239,13 +239,13 @@
     tp7_m = in7 + in5;                                                        \
     k2_m = AOM_SET_COSPI_PAIR(cospi_24_64, -cospi_8_64);                      \
     k3_m = AOM_SET_COSPI_PAIR(cospi_8_64, cospi_24_64);                       \
-    VP9_MADD(in0, in4, in2, in6, k1_m, k0_m, k2_m, k3_m, in0, in4, in2, in6); \
+    AV1_MADD(in0, in4, in2, in6, k1_m, k0_m, k2_m, k3_m, in0, in4, in2, in6); \
     BUTTERFLY_4(in0, in4, in2, in6, tp0_m, tp1_m, tp2_m, tp3_m);              \
     BUTTERFLY_8(tp0_m, tp1_m, tp2_m, tp3_m, tp4_m, tp5_m, tp6_m, tp7_m, out0, \
                 out1, out2, out3, out4, out5, out6, out7);                    \
   }
 
-#define VP9_IADST8x8_1D(in0, in1, in2, in3, in4, in5, in6, in7, out0, out1,   \
+#define AV1_IADST8x8_1D(in0, in1, in2, in3, in4, in5, in6, in7, out0, out1,   \
                         out2, out3, out4, out5, out6, out7)                   \
   {                                                                           \
     v4i32 r0_m, r1_m, r2_m, r3_m, r4_m, r5_m, r6_m, r7_m;                     \
@@ -259,13 +259,13 @@
       -cospi_24_64, cospi_8_64, cospi_16_64, -cospi_16_64, 0, 0, 0, 0         \
     };                                                                        \
                                                                               \
-    k0_m = VP9_SET_CONST_PAIR(mask1_m, 0, 1);                                 \
-    k1_m = VP9_SET_CONST_PAIR(mask1_m, 1, 2);                                 \
+    k0_m = AV1_SET_CONST_PAIR(mask1_m, 0, 1);                                 \
+    k1_m = AV1_SET_CONST_PAIR(mask1_m, 1, 2);                                 \
     ILVRL_H2_SH(in1, in0, in_s1, in_s0);                                      \
     DOTP_SH4_SW(in_s1, in_s0, in_s1, in_s0, k0_m, k0_m, k1_m, k1_m, r0_m,     \
                 r1_m, r2_m, r3_m);                                            \
-    k0_m = VP9_SET_CONST_PAIR(mask1_m, 6, 7);                                 \
-    k1_m = VP9_SET_CONST_PAIR(mask2_m, 0, 1);                                 \
+    k0_m = AV1_SET_CONST_PAIR(mask1_m, 6, 7);                                 \
+    k1_m = AV1_SET_CONST_PAIR(mask2_m, 0, 1);                                 \
     ILVRL_H2_SH(in5, in4, in_s1, in_s0);                                      \
     DOTP_SH4_SW(in_s1, in_s0, in_s1, in_s0, k0_m, k0_m, k1_m, k1_m, r4_m,     \
                 r5_m, r6_m, r7_m);                                            \
@@ -277,13 +277,13 @@
          m3_m);                                                               \
     SRARI_W4_SW(m0_m, m1_m, m2_m, m3_m, DCT_CONST_BITS);                      \
     PCKEV_H2_SW(m1_m, m0_m, m3_m, m2_m, t0_m, t1_m);                          \
-    k0_m = VP9_SET_CONST_PAIR(mask1_m, 3, 4);                                 \
-    k1_m = VP9_SET_CONST_PAIR(mask1_m, 4, 5);                                 \
+    k0_m = AV1_SET_CONST_PAIR(mask1_m, 3, 4);                                 \
+    k1_m = AV1_SET_CONST_PAIR(mask1_m, 4, 5);                                 \
     ILVRL_H2_SH(in3, in2, in_s1, in_s0);                                      \
     DOTP_SH4_SW(in_s1, in_s0, in_s1, in_s0, k0_m, k0_m, k1_m, k1_m, r0_m,     \
                 r1_m, r2_m, r3_m);                                            \
-    k0_m = VP9_SET_CONST_PAIR(mask2_m, 2, 3);                                 \
-    k1_m = VP9_SET_CONST_PAIR(mask2_m, 3, 4);                                 \
+    k0_m = AV1_SET_CONST_PAIR(mask2_m, 2, 3);                                 \
+    k1_m = AV1_SET_CONST_PAIR(mask2_m, 3, 4);                                 \
     ILVRL_H2_SH(in7, in6, in_s1, in_s0);                                      \
     DOTP_SH4_SW(in_s1, in_s0, in_s1, in_s0, k0_m, k0_m, k1_m, k1_m, r4_m,     \
                 r5_m, r6_m, r7_m);                                            \
@@ -297,12 +297,12 @@
     PCKEV_H2_SW(m1_m, m0_m, m3_m, m2_m, r2_m, r3_m);                          \
     ILVRL_H2_SW(r3_m, r2_m, m2_m, m3_m);                                      \
     BUTTERFLY_4(res0_m, res1_m, res3_m, res2_m, out0, in7, in4, in3);         \
-    k0_m = VP9_SET_CONST_PAIR(mask2_m, 5, 6);                                 \
-    k1_m = VP9_SET_CONST_PAIR(mask2_m, 6, 7);                                 \
+    k0_m = AV1_SET_CONST_PAIR(mask2_m, 5, 6);                                 \
+    k1_m = AV1_SET_CONST_PAIR(mask2_m, 6, 7);                                 \
     ILVRL_H2_SH(t1_m, t0_m, in_s1, in_s0);                                    \
     DOTP_SH4_SW(in_s1, in_s0, in_s1, in_s0, k0_m, k0_m, k1_m, k1_m, r0_m,     \
                 r1_m, r2_m, r3_m);                                            \
-    k1_m = VP9_SET_CONST_PAIR(mask3_m, 0, 1);                                 \
+    k1_m = AV1_SET_CONST_PAIR(mask3_m, 0, 1);                                 \
     DOTP_SH4_SW(m2_m, m3_m, m2_m, m3_m, k0_m, k0_m, k1_m, k1_m, r4_m, r5_m,   \
                 r6_m, r7_m);                                                  \
     ADD4(r0_m, r6_m, r1_m, r7_m, r2_m, r4_m, r3_m, r5_m, m0_m, m1_m, m2_m,    \
@@ -313,8 +313,8 @@
          m3_m);                                                               \
     SRARI_W4_SW(m0_m, m1_m, m2_m, m3_m, DCT_CONST_BITS);                      \
     PCKEV_H2_SH(m1_m, m0_m, m3_m, m2_m, in2, in5);                            \
-    k0_m = VP9_SET_CONST_PAIR(mask3_m, 2, 2);                                 \
-    k1_m = VP9_SET_CONST_PAIR(mask3_m, 2, 3);                                 \
+    k0_m = AV1_SET_CONST_PAIR(mask3_m, 2, 2);                                 \
+    k1_m = AV1_SET_CONST_PAIR(mask3_m, 2, 3);                                 \
     ILVRL_H2_SH(in4, in3, in_s1, in_s0);                                      \
     DOTP_SH4_SW(in_s1, in_s0, in_s1, in_s0, k0_m, k0_m, k1_m, k1_m, m0_m,     \
                 m1_m, m2_m, m3_m);                                            \

aomdec.c

@@ -777,7 +777,7 @@ static int main_loop(int argc, const char **argv_) {
           int render_height = aom_input_ctx.height;
           if (!render_width || !render_height) {
             int render_size[2];
-            if (aom_codec_control(&decoder, VP9D_GET_DISPLAY_SIZE,