coffee/libyuv
1
0
Fork 0
mirror of https://chromium.googlesource.com/libyuv/libyuv synced 2025-12-07 17:26:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix mips build on android ndk r14+

Browse Source 
Revert the workaround and fix it properly by passing the
additional necessary flag to the compiler.

BUG=libyuv:700

Change-Id: I1c893a8acb5079decbee6963b689424bf2f99f4f
Reviewed-on: https://chromium-review.googlesource.com/487881
Reviewed-by: Frank Barchard <fbarchard@google.com>
This commit is contained in:
Vignesh Venkatasubramanian 2017-04-25 23:14:59 -07:00 committed by Frank Barchard
parent 3b583396bf
commit 54289f1bb0
5 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Android.mk
View File

@ -47,6 +47,11 @@ LOCAL_SRC_FILES := \
source/video_common.cc
common_CFLAGS := -Wall -fexceptions
# Mips builds on NDK r14+ require -no-integrated-as to properly compile inline
# assembly.
ifneq ($(findstring mips, $(TARGET_ARCH_ABI)),)
common_CFLAGS += -no-integrated-as
endif
ifneq ($(LIBYUV_DISABLE_JPEG), "yes")
LOCAL_SRC_FILES += \
source/convert_jpeg.cc \

2
README.chromium
View File

@ -1,6 +1,6 @@
Name: libyuv
URL: http://code.google.com/p/libyuv/
Version: 1653
Version: 1654
License: BSD
License File: LICENSE

3
include/libyuv/row.h
View File

@ -357,8 +357,7 @@ extern "C" {
// The following are available on Mips platforms:
#if !defined(LIBYUV_DISABLE_DSPR2) && defined(__mips__) && \
(_MIPS_SIM == _MIPS_SIM_ABI32) && (__mips_isa_rev < 6)
// TODO(fbarchard): fix CopyRow compile error - issue #700
// #define HAS_COPYROW_MIPS
#define HAS_COPYROW_MIPS
#if defined(__mips_dsp) && (__mips_dsp_rev >= 2)
#define HAS_I422TOARGBROW_DSPR2
#define HAS_INTERPOLATEROW_DSPR2

2
include/libyuv/version.h
View File

@ -11,6 +11,6 @@
#ifndef INCLUDE_LIBYUV_VERSION_H_
#define INCLUDE_LIBYUV_VERSION_H_
#define LIBYUV_VERSION 1653
#define LIBYUV_VERSION 1654
#endif // INCLUDE_LIBYUV_VERSION_H_

1
source/row_dspr2.cc
View File

@ -19,7 +19,6 @@ extern "C" {
#if !defined(LIBYUV_DISABLE_DSPR2) && defined(__mips__) && \
(_MIPS_SIM == _MIPS_SIM_ABI32)
// TODO(fbarchard): fix sgtu in CopyRow_MIPS for android sdk r14. bug/700
#ifdef HAS_COPYROW_MIPS
void CopyRow_MIPS(const uint8* src, uint8* dst, int count) {
__asm__ __volatile__(