Commit 3b583396 authored by Frank Barchard's avatar Frank Barchard

Disable CopyRow_MIPS

CopyRow_MIPS produces a compile error on some compilers.

TBR=kjellander@chromium.org
BUG=libyuv:700
TEST=try bots

Change-Id: Ie88f2006ef5cf14bffaf80fd4c0dd1caa409c569
Reviewed-on: https://chromium-review.googlesource.com/486127Reviewed-by: 's avatarFrank Barchard <fbarchard@google.com>
parent 996a2bbd
Name: libyuv Name: libyuv
URL: http://code.google.com/p/libyuv/ URL: http://code.google.com/p/libyuv/
Version: 1652 Version: 1653
License: BSD License: BSD
License File: LICENSE License File: LICENSE
......
...@@ -357,7 +357,8 @@ extern "C" { ...@@ -357,7 +357,8 @@ extern "C" {
// The following are available on Mips platforms: // The following are available on Mips platforms:
#if !defined(LIBYUV_DISABLE_DSPR2) && defined(__mips__) && \ #if !defined(LIBYUV_DISABLE_DSPR2) && defined(__mips__) && \
(_MIPS_SIM == _MIPS_SIM_ABI32) && (__mips_isa_rev < 6) (_MIPS_SIM == _MIPS_SIM_ABI32) && (__mips_isa_rev < 6)
#define HAS_COPYROW_MIPS // TODO(fbarchard): fix CopyRow compile error - issue #700
// #define HAS_COPYROW_MIPS
#if defined(__mips_dsp) && (__mips_dsp_rev >= 2) #if defined(__mips_dsp) && (__mips_dsp_rev >= 2)
#define HAS_I422TOARGBROW_DSPR2 #define HAS_I422TOARGBROW_DSPR2
#define HAS_INTERPOLATEROW_DSPR2 #define HAS_INTERPOLATEROW_DSPR2
......
...@@ -11,6 +11,6 @@ ...@@ -11,6 +11,6 @@
#ifndef INCLUDE_LIBYUV_VERSION_H_ #ifndef INCLUDE_LIBYUV_VERSION_H_
#define INCLUDE_LIBYUV_VERSION_H_ #define INCLUDE_LIBYUV_VERSION_H_
#define LIBYUV_VERSION 1652 #define LIBYUV_VERSION 1653
#endif // INCLUDE_LIBYUV_VERSION_H_ #endif // INCLUDE_LIBYUV_VERSION_H_
...@@ -19,6 +19,7 @@ extern "C" { ...@@ -19,6 +19,7 @@ extern "C" {
#if !defined(LIBYUV_DISABLE_DSPR2) && defined(__mips__) && \ #if !defined(LIBYUV_DISABLE_DSPR2) && defined(__mips__) && \
(_MIPS_SIM == _MIPS_SIM_ABI32) (_MIPS_SIM == _MIPS_SIM_ABI32)
// TODO(fbarchard): fix sgtu in CopyRow_MIPS for android sdk r14. bug/700
#ifdef HAS_COPYROW_MIPS #ifdef HAS_COPYROW_MIPS
void CopyRow_MIPS(const uint8* src, uint8* dst, int count) { void CopyRow_MIPS(const uint8* src, uint8* dst, int count) {
__asm__ __volatile__( __asm__ __volatile__(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment