lynx
/
NekoX
mirror of https://github.com/NekoX-Dev/NekoX.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix libvpx builds

This commit is contained in:
luvletter2333 2022-02-04 00:45:21 +08:00
parent b1d798c8d3
commit db1ba95ae5
15 changed files with 35 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
TMessagesProj/jni/CMakeLists.txt
View File

@ -726,6 +726,7 @@ target_include_directories(${NATIVE_LIB} PUBLIC
third_party/libyuv/include
boringssl/include
ffmpeg/build/${ANDROID_ABI}/include
libvpx/build/${ANDROID_ABI}/include
emoji
exoplayer/include
exoplayer/libFLAC/include

12
TMessagesProj/jni/build_ffmpeg_clang.sh
View File

@ -48,9 +48,9 @@ function build_one {
--enable-x86asm \
--cross-prefix=$CROSS_PREFIX \
--sysroot="${LLVM_PREFIX}/sysroot" \
--extra-cflags="-Wl,-Bsymbolic -Os -DCONFIG_LINUX_PERF=0 -DANDROID $OPTIMIZE_CFLAGS -fPIE -pie --static -fPIC" \
--extra-cxxflags="-Wl,-Bsymbolic -Os -DCONFIG_LINUX_PERF=0 -DANDROID $OPTIMIZE_CFLAGS -fPIE -pie --static -fPIC" \
--extra-ldflags="-Wl,-Bsymbolic -Wl,-rpath-link=$PLATFORM/usr/lib -L$PLATFORM/usr/lib -nostdlib -lc -lm -ldl -fPIC" \
--extra-cflags="${INCLUDES} -Wl,-Bsymbolic -Os -DCONFIG_LINUX_PERF=0 -DANDROID $OPTIMIZE_CFLAGS -fPIE -pie --static -fPIC" \
--extra-cxxflags="${INCLUDES} -Wl,-Bsymbolic -Os -DCONFIG_LINUX_PERF=0 -DANDROID $OPTIMIZE_CFLAGS -fPIE -pie --static -fPIC" \
--extra-ldflags="${LIBS} -Wl,-Bsymbolic -Wl,-rpath-link=$PLATFORM/usr/lib -L$PLATFORM/usr/lib -nostdlib -lc -lm -ldl -fPIC" \
\
--enable-version3 \
--enable-gpl \
@ -181,7 +181,7 @@ function build {
CPU=arm64-v8a
OPTIMIZE_CFLAGS=
PREFIX=./build/$CPU
LIBVPXPREFIX=../libvpx/build/$CPU
LIBVPXPREFIX=../libvpx/build/arm64-v8a
ADDITIONAL_CONFIGURE_FLAG="--enable-neon --enable-optimizations"
build_one
;;
@ -212,8 +212,8 @@ function build {
BIN_MIDDLE=android
CPU=i686
OPTIMIZE_CFLAGS="-march=$CPU"
PREFIX=./build/$ARCH
LIBVPXPREFIX=../libvpx/build/$ARCH_NAME
PREFIX=./build/x86
LIBVPXPREFIX=../libvpx/build/x86
ADDITIONAL_CONFIGURE_FLAG="--disable-x86asm --disable-inline-asm --disable-asm"
build_one
;;

4
TMessagesProj/jni/build_libvpx_clang.sh
View File

@ -124,7 +124,7 @@ function build {
OPTIMIZE_CFLAGS="-O3 -march=x86-64 -mtune=intel -msse4.2 -mpopcnt -m64 -fPIC"
TARGET="x86_64-android-gcc"
PREFIX=./build/$CPU
CPU_DETECT="--enable-runtime-cpu-detect"
CPU_DETECT="--enable-runtime-cpu-detect"
build_one
;;
x86)
@ -136,7 +136,7 @@ function build {
CPU=i686
OPTIMIZE_CFLAGS="-O3 -march=i686 -mtune=intel -msse3 -mfpmath=sse -m32 -fPIC"
TARGET="x86-android-gcc"
PREFIX=./build/$CPU
PREFIX=./build/x86
CPU_DETECT="--enable-runtime-cpu-detect"
build_one
;;

2
TMessagesProj/jni/voip/CMakeLists.txt
View File

@ -425,6 +425,7 @@ target_include_directories(tgcalls_tp PUBLIC
third_party/libsrtp/include
third_party/libsrtp/config
third_party/libsrtp/crypto/include
libvpx/build/${ANDROID_ABI}/include
third_party)
#tgcalls+webrtc
@ -1685,6 +1686,7 @@ target_include_directories(tgcalls PUBLIC
third_party/usrsctplib
third_party
voip/libtgvoip
libvpx/build/${ANDROID_ABI}/include
ffmpeg/build/${ANDROID_ABI}/include)
if (${ANDROID_ABI} STREQUAL "armeabi-v7a")

8
TMessagesProj/jni/voip/webrtc/modules/video_coding/codecs/interface/libvpx_interface.h
View File

@ -15,10 +15,10 @@
#include <memory>
#include <libvpx/vp8cx.h>
#include <libvpx/vpx_codec.h>
#include <libvpx/vpx_encoder.h>
#include <libvpx/vpx_image.h>
#include <vpx/vp8cx.h>
#include <vpx/vpx_codec.h>
#include <vpx/vpx_encoder.h>
#include <vpx/vpx_image.h>
namespace webrtc {

6
TMessagesProj/jni/voip/webrtc/modules/video_coding/codecs/vp8/libvpx_vp8_decoder.cc
View File

@ -31,9 +31,9 @@
#include "system_wrappers/include/field_trial.h"
#include "system_wrappers/include/metrics.h"
#include "third_party/libyuv/include/libyuv/convert.h"
#include <libvpx/vp8.h>
#include <libvpx/vp8dx.h>
#include <libvpx/vpx_decoder.h>
#include <vpx/vp8.h>
#include <vpx/vp8dx.h>
#include <vpx/vpx_decoder.h>
namespace webrtc {
namespace {

4
TMessagesProj/jni/voip/webrtc/modules/video_coding/codecs/vp8/libvpx_vp8_decoder.h
View File

@ -19,8 +19,8 @@
#include "common_video/include/video_frame_buffer_pool.h"
#include "modules/video_coding/codecs/vp8/include/vp8.h"
#include "modules/video_coding/include/video_codec_interface.h"
#include <libvpx/vp8dx.h>
#include <libvpx/vpx_decoder.h>
#include <vpx/vp8dx.h>
#include <vpx/vpx_decoder.h>
namespace webrtc {

2
TMessagesProj/jni/voip/webrtc/modules/video_coding/codecs/vp8/libvpx_vp8_encoder.cc
View File

@ -40,7 +40,7 @@
#include "rtc_base/trace_event.h"
#include "system_wrappers/include/field_trial.h"
#include "third_party/libyuv/include/libyuv/scale.h"
#include <libvpx/vp8cx.h>
#include <vpx/vp8cx.h>
namespace webrtc {
namespace {

4
TMessagesProj/jni/voip/webrtc/modules/video_coding/codecs/vp8/libvpx_vp8_encoder.h
View File

@ -28,8 +28,8 @@
#include "rtc_base/experiments/cpu_speed_experiment.h"
#include "rtc_base/experiments/encoder_info_settings.h"
#include "rtc_base/experiments/rate_control_settings.h"
#include <libvpx/vp8cx.h>
#include <libvpx/vpx_encoder.h>
#include <vpx/vp8cx.h>
#include <vpx/vpx_encoder.h>
namespace webrtc {

4
TMessagesProj/jni/voip/webrtc/modules/video_coding/codecs/vp9/libvpx_vp9_decoder.cc
View File

@ -24,8 +24,8 @@
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
#include "third_party/libyuv/include/libyuv/convert.h"
#include <libvpx/vp8dx.h>
#include <libvpx/vpx_decoder.h>
#include <vpx/vp8dx.h>
#include <vpx/vpx_decoder.h>
namespace webrtc {
namespace {

2
TMessagesProj/jni/voip/webrtc/modules/video_coding/codecs/vp9/libvpx_vp9_decoder.h
View File

@ -19,7 +19,7 @@
#include "common_video/include/video_frame_buffer_pool.h"
#include "modules/video_coding/codecs/vp9/include/vp9.h"
#include "modules/video_coding/codecs/vp9/vp9_frame_buffer_pool.h"
#include <libvpx/vp8cx.h>
#include <vpx/vp8cx.h>
namespace webrtc {

4
TMessagesProj/jni/voip/webrtc/modules/video_coding/codecs/vp9/libvpx_vp9_encoder.cc
View File

@ -40,8 +40,8 @@
#include "rtc_base/time_utils.h"
#include "rtc_base/trace_event.h"
#include "third_party/libyuv/include/libyuv/convert.h"
#include <libvpx/vp8cx.h>
#include <libvpx/vpx_encoder.h>
#include <vpx/vp8cx.h>
#include <vpx/vpx_encoder.h>
namespace webrtc {

2
TMessagesProj/jni/voip/webrtc/modules/video_coding/codecs/vp9/libvpx_vp9_encoder.h
View File

@ -29,7 +29,7 @@
#include "modules/video_coding/svc/scalable_video_controller.h"
#include "modules/video_coding/utility/framerate_controller.h"
#include "rtc_base/experiments/encoder_info_settings.h"
#include <libvpx/vp8cx.h>
#include <vpx/vp8cx.h>
namespace webrtc {

6
TMessagesProj/jni/voip/webrtc/modules/video_coding/codecs/vp9/vp9.cc
View File

@ -18,9 +18,9 @@
#include "modules/video_coding/codecs/vp9/libvpx_vp9_decoder.h"
#include "modules/video_coding/codecs/vp9/libvpx_vp9_encoder.h"
#include "rtc_base/checks.h"
#include <libvpx/vp8cx.h>
#include <libvpx/vp8dx.h>
#include <libvpx/vpx_codec.h>
#include <vpx/vp8cx.h>
#include <vpx/vp8dx.h>
#include <vpx/vpx_codec.h>
namespace webrtc {

6
TMessagesProj/jni/voip/webrtc/modules/video_coding/codecs/vp9/vp9_frame_buffer_pool.cc
View File

@ -15,9 +15,9 @@
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
#include <libvpx/vpx_codec.h>
#include <libvpx/vpx_decoder.h>
#include <libvpx/vpx_frame_buffer.h>
#include <vpx/vpx_codec.h>
#include <vpx/vpx_decoder.h>
#include <vpx/vpx_frame_buffer.h>
namespace webrtc {