Bug 1295886 - P16. Enable FLAC C decoder on aarch64 machines. r=mshal

MozReview-Commit-ID: 9i3AaG5CGex

--HG--
extra : rebase_source : 2e6cc87d2e1629d5b44fd67627675c4460201023

media/ffvpx/config.h

@@ -7,7 +7,7 @@
 #ifndef MOZ_FFVPX_CONFIG_H
 #define MOZ_FFVPX_CONFIG_H
 #if defined(MOZ_FFVPX_FLACONLY)
-#if defined(MOZ_WIDGET_ANDROID)
+#if defined(MOZ_WIDGET_ANDROID) && !defined(HAVE_64BIT_BUILD)
 #include "config_android32.h"
 #else
 #include "config_flac.h"

media/ffvpx/ffvpxcommon.mozbuild

@@ -27,7 +27,7 @@ if CONFIG['FFVPX_ASFLAGS']:
             '-Pconfig_darwin64.asm',
             '-DPREFIX'
         ]
-    elif CONFIG['CPU_ARCH'] != 'arm':
+    elif CONFIG['CPU_ARCH'] != 'arm' and CONFIG['CPU_ARCH'] != 'aarch4':
         USE_YASM = True
         # Default to unix, similar to how ASFLAGS setup works in configure.in
         ASFLAGS += ['-Pconfig_unix64.asm']

old-configure.in

@@ -3221,9 +3221,11 @@ case "$CPU_ARCH" in
       dnl Use same conditional as MOZ_LIBAV_FFT to enable FFmpeg's ffvpx assembly decoder.
       FFVPX_ASFLAGS=$LIBAV_FFT_ASFLAGS
   ;;
-  arm*)
+  arm*|aarch64)
       MOZ_FFVPX=1
       MOZ_FFVPX_FLACONLY=1
+      dnl Use same conditional as MOZ_LIBVPX to enable FFmpeg's ffvpx assembly decoder.
+      dnl aarch 64 FLAC decoder for now will be C only.
       FFVPX_ASFLAGS=$VPX_ASFLAGS
   ;;
 esac