Bug 1295886 - P16. Enable FLAC C decoder on aarch64 machines. r?Build
MozReview-Commit-ID: 9i3AaG5CGex
--- a/media/ffvpx/config.h
+++ b/media/ffvpx/config.h
@@ -2,17 +2,17 @@
/* vim:set ts=2 sw=2 sts=2 et cindent: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#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"
#endif
#else // MOZ_FFVPX_FLACONLY
#if defined(XP_WIN)
// Avoid conflicts with mozilla-config.h
#if !defined(_MSC_VER)
--- a/media/ffvpx/ffvpxcommon.mozbuild
+++ b/media/ffvpx/ffvpxcommon.mozbuild
@@ -22,17 +22,17 @@ if CONFIG['FFVPX_ASFLAGS']:
ASFLAGS += ['-Pconfig_win64.asm']
elif CONFIG['OS_ARCH'] == 'Darwin':
USE_YASM = True
# 32/64-bit macosx assemblers need to prefix symbols with an underscore.
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']
if USE_YASM:
# default disabled components
ASFLAGS += ['-Pdefaults_disabled.asm']
if int(CONFIG['YASM_MAJOR_VERSION']) == 1 and int(CONFIG['YASM_MINOR_VERSION']) < 2:
--- a/old-configure.in
+++ b/old-configure.in
@@ -3216,19 +3216,21 @@ dnl ====================================
MOZ_FFVPX=
MOZ_FFVPX_FLACONLY=
case "$CPU_ARCH" in
x86|x86_64)
MOZ_FFVPX=1
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
if test -n "$MOZ_FFVPX"; then
AC_DEFINE(MOZ_FFVPX)
fi
if test -n "$MOZ_FFVPX_FLACONLY"; then