From 3c744ddf3e65d81f910ac6d88af4330a45812e8d Mon Sep 17 00:00:00 2001 From: DyncEric Date: Tue, 20 Sep 2016 22:13:17 +0800 Subject: [PATCH] 1, Add logo 2, Fixed set metadata isn't checked result. 3, Fix ndk-build failed when used gcc4.9 to support higher version of ndk --- AnyCore/anyrtmpush.cc | 4 +++- Prj-Android/jni/Application.mk | 4 ++-- README.md | 2 +- webrtc/Android.mk | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/AnyCore/anyrtmpush.cc b/AnyCore/anyrtmpush.cc index d9e3246..256d22c 100644 --- a/AnyCore/anyrtmpush.cc +++ b/AnyCore/anyrtmpush.cc @@ -506,7 +506,9 @@ void AnyRtmpPush::DoSendData() } else if(dataPtr->_type == META_DATA){ int ret = srs_rtmp_write_packet(rtmp_, SRS_RTMP_TYPE_SCRIPT, dataPtr->_dts, (char*)dataPtr->_data, dataPtr->_dataLen); - srs_human_trace("send metadata failed. ret=%d", ret); + if (ret != 0) { + srs_human_trace("send metadata failed. ret=%d", ret); + } return; } diff --git a/Prj-Android/jni/Application.mk b/Prj-Android/jni/Application.mk index 157d6c3..41e50a8 100644 --- a/Prj-Android/jni/Application.mk +++ b/Prj-Android/jni/Application.mk @@ -4,12 +4,12 @@ APP_ABI := armeabi-v7a #armeabi-v7a arm64-v8a NDK_PATH := /cygdrive/c/Android/NDK/android-ndk-r10e -NDK_STL_INC := $(NDK_PATH)/sources/cxx-stl/gnu-libstdc++/4.8/include +NDK_STL_INC := $(NDK_PATH)/sources/cxx-stl/gnu-libstdc++/4.9/include APP_OPTIM := release APP_CFLAGS += -O3 #APP_STL := gnustl_shared APP_STL := gnustl_static -NDK_TOOLCHAIN_VERSION = 4.8 +NDK_TOOLCHAIN_VERSION = 4.9 APP_PLATFORM := android-14 \ No newline at end of file diff --git a/README.md b/README.md index f8d7b70..4b78045 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # AnyRTC-RTMP - +AnyRTC-RTMP
本次开源的客户端基于RTMP协议的推流拉流客户端，由我司CTO亲自操刀设计，采用跨平台架构一套代码支持Android、iOS、Windows等平台。
直播涉及的流程：『采集->编码->传输->解码->播放』本项目统统包含，这不是软文，这是实实在在的商业级实战代码；无论是你新手还是老司机，我们都热烈欢迎您前来筑码。 diff --git a/webrtc/Android.mk b/webrtc/Android.mk index 4c81a41..f3f2efc 100644 --- a/webrtc/Android.mk +++ b/webrtc/Android.mk @@ -137,7 +137,7 @@ LOCAL_MODULE := libwebrtc LOCAL_MODULE_TAGS := optional LOCAL_CFLAGS := -std=gnu++11 -frtti -D__UCLIBC__ -DWEBRTC_POSIX -DWEBRTC_LINUX -DWEBRTC_ANDROID -D__STDC_FORMAT_MACROS -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -LOCAL_CFLAGS += -DWEBRTC_THREAD_RR -DWEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE -DWEBRTC_USE_H264 -DWEBRTC_INITIALIZE_FFMPEG +LOCAL_CFLAGS += -DWEBRTC_THREAD_RR -DWEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE -DWEBRTC_USE_H264 -DWEBRTC_INITIALIZE_FFMPEG -DNO_STL include $(BUILD_STATIC_LIBRARY) -- Gitee