Skip to content

Commit 9ab46e1

Browse files
outman-zhououtman-zhou
authored
Merge pull request #1311 from Tencent/ft/master/merge2409
2.1 merge to master
2 parents c559159 + c5ba0ed commit 9ab46e1

143 files changed

Lines changed: 8941 additions & 6207 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎clang_format_ignore.txt‎

Lines changed: 34 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,34 @@
1-
mars/boost
2-
mars/googletest
3-
mars/googlemock
4-
mars/rapidjson
5-
mars/log/crypt/micro-ecc-master
6-
mars/comm/UWP/zlib
7-
mars/openssl
8-
mars/zstd/tests
9-
samples
1+
mars/mars/boost
2+
mars/mars/googletest
3+
mars/mars/googlemock
4+
mars/mars/rapidjson
5+
mars/mars/log/crypt/micro-ecc-master
6+
mars/mars/comm/UWP/zlib
7+
mars/mars/openssl
8+
mars/mars/zstd/tests
9+
mars/samples
10+
11+
mars-private/mars/mmjpeg
12+
mars-private/mars/protobuf
13+
mars-private/mars/cdn/src/proto
14+
mars-private/mars/cdn/src/protocol
15+
mars-private/mars/openssl
16+
mars-private/mars/vfs
17+
mars-private/mars/smc/src/protobuf
18+
19+
mars-private/mars/andromeda/andromeda.h
20+
mars-private/mars/andromeda/cronet_android_jni_callback.h
21+
mars-private/mars/andromeda/cronet_file_task_runer_wrapper.h
22+
mars-private/mars/andromeda/http_cronet_context_builder.h
23+
mars-private/mars/andromeda/http_network_estimate_callback.h
24+
mars-private/mars/andromeda/http_result_callback.h
25+
mars-private/mars/andromeda/http_with_cronet.h
26+
27+
mars-wechat/mars/webp
28+
mars-wechat/mars/accessory
29+
30+
build
31+
cmake_build
32+
tools
33+
mmnet
34+
openssl-build-tools

‎mars/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ add_subdirectory(zstd/build/cmake/lib zstd)
2424

2525
project (mars)
2626

27-
include(comm/CMakeUtils.txt)
27+
include(comm/utils.cmake)
2828

2929
include_directories(.)
3030
include_directories(..)

‎mars/app/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ message(STATUS "CMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}")
55

66
project (app)
77

8-
include(../comm/CMakeUtils.txt)
8+
include(../comm/utils.cmake)
99
include(../comm/CMakeExtraFlags.txt)
1010

1111
include_directories(.)

‎mars/app/app_manager.cc‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
#include "mars/comm/objc/data_protect_attr.h"
1111
#endif
1212

13-
#include "mars/baseevent/baseprjevent.h"
1413
#include "mars/comm/dns/dns.h"
1514
#include "mars/comm/xlogger/xlogger.h"
1615

@@ -51,7 +50,7 @@ mars::comm::ProxyInfo AppManager::GetProxyInfo(const std::string& _host) {
5150
}
5251

5352
if (!slproxymutex_.try_lock_for(std::chrono::milliseconds(500))) {
54-
return mars::comm::ProxyInfo();
53+
return {};
5554
}
5655

5756
if (slproxycount_ < 3 || 5 * 1000 > gettickspan(slproxytimetick_)) {
@@ -65,7 +64,7 @@ mars::comm::ProxyInfo AppManager::GetProxyInfo(const std::string& _host) {
6564
return proxy_info_;
6665
}
6766

68-
return mars::comm::ProxyInfo();
67+
return {};
6968
}
7069

7170
std::string AppManager::GetAppFilePath() {

‎mars/baseevent/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ message(STATUS "CMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}")
55

66
project (baseevent)
77

8-
include(../comm/CMakeUtils.txt)
8+
include(../comm/utils.cmake)
99
include(../comm/CMakeExtraFlags.txt)
1010

1111

‎mars/baseevent/base_logic.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,13 @@
2222

2323
#include <stdint.h>
2424

25+
#include <string>
26+
2527
namespace mars {
2628
namespace baseevent {
2729
void OnCreate();
2830
void OnInitBeforeOnCreate(int _encoder_status);
31+
void OnInitBeforeOnCreateV2(int _encoder_status, std::string _encoder_name);
2932
void OnDestroy();
3033
void OnSingalCrash(int _sig);
3134
void OnExceptionCrash();

‎mars/baseevent/baseprjevent.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424

2525
extern boost::signals2::signal<void()>& GetSignalOnCreate();
2626
extern boost::signals2::signal<void(int _encoder_version)>& GetSignalOnInitBeforeOnCreate();
27+
extern boost::signals2::signal<void(int _encoder_version, std::string _encoder_name)>&
28+
GetSignalOnInitBeforeOnCreateV2();
2729
extern boost::signals2::signal<void()>& GetSignalOnDestroy();
2830
extern boost::signals2::signal<void(int _sig)>& GetSignalOnSingalCrash();
2931
extern boost::signals2::signal<void()>& GetSignalOnExceptionCrash();

‎mars/baseevent/src/baseprj.cc‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@ void OnInitBeforeOnCreate(int _encoder_status) {
3737
GetSignalOnInitBeforeOnCreate()(_encoder_status);
3838
}
3939

40+
void OnInitBeforeOnCreateV2(int _encoder_status, std::string _encoder_name) {
41+
GetSignalOnInitBeforeOnCreateV2()(_encoder_status, _encoder_name);
42+
}
43+
4044
void OnDestroy() {
4145
GetSignalOnDestroy()();
4246
}

‎mars/baseevent/src/baseprjevent.cc‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@ boost::signals2::signal<void(int _encoder_version)>& GetSignalOnInitBeforeOnCrea
2929
return SignalOnInitBeforeOnCreate;
3030
}
3131

32+
boost::signals2::signal<void(int _encoder_version, std::string _encoder_name)>& GetSignalOnInitBeforeOnCreateV2() {
33+
static boost::signals2::signal<void(int _encoder_version, std::string _encoder_name)> SignalOnInitBeforeOnCreateV2;
34+
return SignalOnInitBeforeOnCreateV2;
35+
}
36+
3237
boost::signals2::signal<void()>& GetSignalOnDestroy() {
3338
static boost::signals2::signal<void()> SignalOnDestroy;
3439
return SignalOnDestroy;

‎mars/boost/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ add_compile_options(-w) # 屏蔽所有编译警告
66

77
project (mars-boost)
88

9-
include(../comm/CMakeUtils.txt)
9+
include(../comm/utils.cmake)
1010

1111
include_directories(.)
1212
include_directories(..)

0 commit comments

Comments
 (0)