增加arm64-v8a平台的ffmpeg动态库

增加arm64-v8a平台的ffmpeg动态库
pull/107/head
xufulong 5 years ago
parent 50e8d72e98
commit 1480f1f8a8
  1. 7
      app/CMakeLists.txt
  2. 2
      app/build.gradle
  3. BIN
      app/libs/arm64-v8a/libffmpeg.so
  4. 26
      app/src/main/cpp/include/arm64-v8a/libavcodec/arm/mathops.h
  5. 0
      app/src/main/cpp/include/arm64-v8a/libavutil/arm/timer.h
  6. 0
      app/src/main/cpp/include/armeabi-v7a/libavcodec/arm/mathops.h
  7. 0
      app/src/main/cpp/include/armeabi-v7a/libavutil/arm/timer.h
  8. 24
      app/src/main/cpp/include/libavcodec/mathops.h
  9. 20
      app/src/main/cpp/include/libavutil/timer.h

@ -52,6 +52,13 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
include_directories(src/main/cpp)
include_directories(src/main/cpp/include)
if(${CMAKE_ANDROID_ARCH_ABI} MATCHES "armeabi-v7a")
include_directories(src/main/cpp/include/armeabi-v7a)
message("This is armeabi-v7a")
elseif(${CMAKE_ANDROID_ARCH_ABI} MATCHES "arm64-v8a")
include_directories(src/main/cpp/include/arm64-v8a)
message("This is arm64-v8a")
endif()
find_library( # Sets the name of the path variable.
log-lib

@ -17,7 +17,7 @@ android {
}
}
ndk {
abiFilters "armeabi-v7a"
abiFilters "armeabi-v7a", "arm64-v8a"
}
}
buildTypes {

Binary file not shown.

@ -0,0 +1,26 @@
/*
* simple math operations
* Copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at> et al
*
* This file is part of FFmpeg.
*
* FFmpeg is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* FFmpeg is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef AVCODEC_ARM_MATHOPS_H
#define AVCODEC_ARM_MATHOPS_H
#endif /* AVCODEC_ARM_MATHOPS_H */

@ -35,17 +35,19 @@ extern const uint8_t ff_crop_tab[256 + 2 * MAX_NEG_CROP];
extern const uint8_t ff_zigzag_direct[64];
extern const uint8_t ff_zigzag_scan[16+1];
#if ARCH_ARM
# include "arm/mathops.h"
#elif ARCH_AVR32
# include "avr32/mathops.h"
#elif ARCH_MIPS
# include "mips/mathops.h"
#elif ARCH_PPC
# include "ppc/mathops.h"
#elif ARCH_X86
# include "x86/mathops.h"
#endif
//TODO
#include "libavcodec/arm/mathops.h"
//#if ARCH_ARM
//# include "arm/mathops.h"
//#elif ARCH_AVR32
//# include "avr32/mathops.h"
//#elif ARCH_MIPS
//# include "mips/mathops.h"
//#elif ARCH_PPC
//# include "ppc/mathops.h"
//#elif ARCH_X86
//# include "x86/mathops.h"
//#endif
/* generic implementation */

@ -38,15 +38,17 @@
#include "log.h"
#if ARCH_AARCH64
# include "aarch64/timer.h"
#elif ARCH_ARM
# include "arm/timer.h"
#elif ARCH_PPC
# include "ppc/timer.h"
#elif ARCH_X86
# include "x86/timer.h"
#endif
//TODO
#include "libavutil/arm/timer.h"
//#if ARCH_AARCH64
//# include "aarch64/timer.h"
//#elif ARCH_ARM
//# include "arm/timer.h"
//#elif ARCH_PPC
//# include "ppc/timer.h"
//#elif ARCH_X86
//# include "x86/timer.h"
//#endif
#if !defined(AV_READ_TIME)
# if HAVE_GETHRTIME

Loading…
Cancel
Save