Merge upstream-master and enable ARM64

We bring in the latest WebRTC changes and turn on arm.
This adds a new third party lib: crc32c, and includes a workaround
for handling a depencency issue for arm.

Bug: 191745658
Change-Id: Ic5be99911990ef14a5f733f19394032b20f85024

1 files changed, 6 insertions, 16 deletions

diff --git a/third_party/libaom/source/libaom/aom/aom_encoder.h b/third_party/libaom/source/libaom/aom/aom_encoder.h
index 48e705646d..a98c8d8270 100644
--- a/third_party/libaom/source/libaom/aom/aom_encoder.h
+++ b/third_party/libaom/source/libaom/aom/aom_encoder.h
@@ -31,6 +31,7 @@ extern "C" {
 #endif
 
 #include "aom/aom_codec.h"
+#include "aom/aom_external_partition.h"
 
 /*!\brief Current ABI version number
  *
@@ -41,7 +42,7 @@ extern "C" {
  * fields to structures
  */
 #define AOM_ENCODER_ABI_VERSION \
-  (9 + AOM_CODEC_ABI_VERSION) /**<\hideinitializer*/
+  (9 + AOM_CODEC_ABI_VERSION + AOM_EXT_PART_ABI_VERSION) /**<\hideinitializer*/
 
 /*! \brief Encoder capabilities bitfield
  *
@@ -142,15 +143,8 @@ typedef struct aom_codec_cx_pkt {
       double psnr_hbd[4];
     } psnr;              /**< data for PSNR packet */
     aom_fixed_buf_t raw; /**< data for arbitrary packets */
-
-    /* This packet size is fixed to allow codecs to extend this
-     * interface without having to manage storage for raw packets,
-     * i.e., if it's smaller than 128 bytes, you can store in the
-     * packet list directly.
-     */
-    char pad[128 - sizeof(enum aom_codec_cx_pkt_kind)]; /**< fixed sz */
-  } data;                                               /**< packet data */
-} aom_codec_cx_pkt_t; /**< alias for struct aom_codec_cx_pkt */
+  } data;                /**< packet data */
+} aom_codec_cx_pkt_t;    /**< alias for struct aom_codec_cx_pkt */
 
 /*!\brief Rational Number
  *
@@ -300,10 +294,6 @@ typedef struct cfg_options {
    *
    */
   unsigned int disable_smooth_intra;
-  /*!\brief disable D45 to D203 intra modes
-   *
-   */
-  unsigned int disable_diagonal_intra;
   /*!\brief disable filter intra
    *
    */
@@ -880,11 +870,11 @@ typedef struct aom_codec_enc_cfg {
    */
   unsigned int use_fixed_qp_offsets;
 
-/*!\brief Number of fixed QP offsets
+/*!\brief Max number of fixed QP offsets
  *
  * This defines the number of elements in the fixed_qp_offsets array.
  */
-#define FIXED_QP_OFFSET_COUNT 5
+#define FIXED_QP_OFFSET_COUNT 6
 
   /*!\brief Array of fixed QP offsets
    *