Skip to content

Commit 8026ccf

Browse files
xiaowei-guanxiaowei-guan
authored
Code format (#1198)
* Code format and add format.sh * Update format command Only format files end with mm
1 parent c23220a commit 8026ccf

Some content is hidden

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

50 files changed

+4316
-4139
lines changed

Diff for: ‎common/cpp/flutter_webrtc_plugin.cc

+9-5
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ class FlutterWebRTCPluginImpl : public FlutterWebRTCPlugin {
5252
std::unique_ptr<MethodResult> result) {
5353
// handle method call and forward to webrtc native sdk.
5454
auto method_call_proxy = MethodCallProxy::Create(method_call);
55-
webrtc_->HandleMethodCall(*method_call_proxy.get(), MethodResultProxy::Create(std::move(result)));
55+
webrtc_->HandleMethodCall(*method_call_proxy.get(),
56+
MethodResultProxy::Create(std::move(result)));
5657
}
5758

5859
private:
@@ -65,10 +66,13 @@ class FlutterWebRTCPluginImpl : public FlutterWebRTCPlugin {
6566
} // namespace flutter_webrtc_plugin
6667

6768
#if defined(_WINDOWS)
68-
void FlutterWebRTCPluginRegisterWithRegistrar( FlutterDesktopPluginRegistrarRef registrar){
69+
void FlutterWebRTCPluginRegisterWithRegistrar(
70+
FlutterDesktopPluginRegistrarRef registrar) {
6971
#else
70-
void flutter_web_r_t_c_plugin_register_with_registrar(FlPluginRegistrar* registrar) {
72+
void flutter_web_r_t_c_plugin_register_with_registrar(
73+
FlPluginRegistrar* registrar) {
7174
#endif
72-
static auto *plugin_registrar = new flutter::PluginRegistrar(registrar);
73-
flutter_webrtc_plugin::FlutterWebRTCPluginImpl::RegisterWithRegistrar(plugin_registrar);
75+
static auto* plugin_registrar = new flutter::PluginRegistrar(registrar);
76+
flutter_webrtc_plugin::FlutterWebRTCPluginImpl::RegisterWithRegistrar(
77+
plugin_registrar);
7478
}

Diff for: ‎common/cpp/include/flutter_common.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
#include <flutter/standard_method_codec.h>
1111
#include <flutter/texture_registrar.h>
1212

13-
#include <string>
14-
#include <memory>
1513
#include <list>
14+
#include <memory>
15+
#include <string>
1616

1717
typedef flutter::EncodableValue EncodableValue;
1818
typedef flutter::EncodableMap EncodableMap;

Diff for: ‎common/cpp/include/flutter_peerconnection.h

+6-4
Original file line numberDiff line numberDiff line change
@@ -131,9 +131,10 @@ class FlutterPeerConnection {
131131
std::string rtpTransceiverId,
132132
std::unique_ptr<MethodResultProxy> resulte);
133133

134-
void RtpTransceiverGetCurrentDirection(RTCPeerConnection* pc,
135-
std::string rtpTransceiverId,
136-
std::unique_ptr<MethodResultProxy> resulte);
134+
void RtpTransceiverGetCurrentDirection(
135+
RTCPeerConnection* pc,
136+
std::string rtpTransceiverId,
137+
std::unique_ptr<MethodResultProxy> resulte);
137138

138139
void SetConfiguration(RTCPeerConnection* pc,
139140
const EncodableMap& configuration,
@@ -151,7 +152,8 @@ class FlutterPeerConnection {
151152
std::string direction,
152153
std::unique_ptr<MethodResultProxy> resulte);
153154

154-
void GetSenders(RTCPeerConnection* pc, std::unique_ptr<MethodResultProxy> resulte);
155+
void GetSenders(RTCPeerConnection* pc,
156+
std::unique_ptr<MethodResultProxy> resulte);
155157

156158
void AddIceCandidate(RTCIceCandidate* candidate,
157159
RTCPeerConnection* pc,

Diff for: ‎common/cpp/include/flutter_webrtc/flutter_web_r_t_c_plugin.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ typedef struct {
3939

4040
FLUTTER_PLUGIN_EXPORT GType flutter_webrtc_plugin_get_type();
4141

42-
FLUTTER_PLUGIN_EXPORT void flutter_web_r_t_c_plugin_register_with_registrar(FlPluginRegistrar* registrar);
42+
FLUTTER_PLUGIN_EXPORT void flutter_web_r_t_c_plugin_register_with_registrar(
43+
FlPluginRegistrar* registrar);
4344

4445
G_END_DECLS
4546

Diff for: ‎common/cpp/include/flutter_webrtc_base.h

+4-3
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313

1414
#include "rtc_audio_device.h"
1515
#include "rtc_desktop_device.h"
16+
#include "rtc_dtmf_sender.h"
1617
#include "rtc_media_stream.h"
1718
#include "rtc_media_track.h"
1819
#include "rtc_mediaconstraints.h"
1920
#include "rtc_peerconnection.h"
2021
#include "rtc_peerconnection_factory.h"
21-
#include "rtc_dtmf_sender.h"
2222
#include "rtc_video_device.h"
2323

2424
#include "uuidxx.h"
@@ -60,8 +60,9 @@ class FlutterWebRTCBase {
6060

6161
void RemovePeerConnectionObserversForId(const std::string& id);
6262

63-
scoped_refptr<RTCMediaStream> MediaStreamForId(const std::string& id,
64-
std::string peerConnectionId = std::string());
63+
scoped_refptr<RTCMediaStream> MediaStreamForId(
64+
const std::string& id,
65+
std::string peerConnectionId = std::string());
6566

6667
void RemoveStreamForId(const std::string& id);
6768

Diff for: ‎common/cpp/src/flutter_data_channel.cc

+5-4
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,11 @@ void FlutterDataChannel::CreateDataChannel(
6868
result->Success(EncodableValue(params));
6969
}
7070

71-
void FlutterDataChannel::DataChannelSend(RTCDataChannel* data_channel,
72-
const std::string& type,
73-
const EncodableValue& data,
74-
std::unique_ptr<MethodResultProxy> result) {
71+
void FlutterDataChannel::DataChannelSend(
72+
RTCDataChannel* data_channel,
73+
const std::string& type,
74+
const EncodableValue& data,
75+
std::unique_ptr<MethodResultProxy> result) {
7576
bool is_binary = type == "binary";
7677
if (is_binary && TypeIs<std::vector<uint8_t>>(data)) {
7778
std::vector<uint8_t> buffer = GetValue<std::vector<uint8_t>>(data);

Diff for: ‎common/cpp/src/flutter_media_stream.cc

+3-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@ FlutterMediaStream::FlutterMediaStream(FlutterWebRTCBase* base) : base_(base) {
1414
});
1515
}
1616

17-
void FlutterMediaStream::GetUserMedia(const EncodableMap& constraints,
18-
std::unique_ptr<MethodResultProxy> result) {
17+
void FlutterMediaStream::GetUserMedia(
18+
const EncodableMap& constraints,
19+
std::unique_ptr<MethodResultProxy> result) {
1920
std::string uuid = base_->GenerateUUID();
2021
scoped_refptr<RTCMediaStream> stream =
2122
base_->factory_->CreateStream(uuid.c_str());

Diff for: ‎common/cpp/src/flutter_peerconnection.cc

+68-62
Original file line numberDiff line numberDiff line change
@@ -271,9 +271,10 @@ void FlutterPeerConnection::RTCPeerConnectionDispose(
271271
result->Success();
272272
}
273273

274-
void FlutterPeerConnection::CreateOffer(const EncodableMap& constraintsMap,
275-
RTCPeerConnection* pc,
276-
std::unique_ptr<MethodResultProxy> result) {
274+
void FlutterPeerConnection::CreateOffer(
275+
const EncodableMap& constraintsMap,
276+
RTCPeerConnection* pc,
277+
std::unique_ptr<MethodResultProxy> result) {
277278
scoped_refptr<RTCMediaConstraints> constraints =
278279
base_->ParseMediaConstraints(constraintsMap);
279280
std::shared_ptr<MethodResultProxy> result_ptr(result.release());
@@ -290,9 +291,10 @@ void FlutterPeerConnection::CreateOffer(const EncodableMap& constraintsMap,
290291
constraints);
291292
}
292293

293-
void FlutterPeerConnection::CreateAnswer(const EncodableMap& constraintsMap,
294-
RTCPeerConnection* pc,
295-
std::unique_ptr<MethodResultProxy> result) {
294+
void FlutterPeerConnection::CreateAnswer(
295+
const EncodableMap& constraintsMap,
296+
RTCPeerConnection* pc,
297+
std::unique_ptr<MethodResultProxy> result) {
296298
scoped_refptr<RTCMediaConstraints> constraints =
297299
base_->ParseMediaConstraints(constraintsMap);
298300
std::shared_ptr<MethodResultProxy> result_ptr(result.release());
@@ -725,8 +727,9 @@ void FlutterPeerConnection::RtpTransceiverSetDirection(
725727
}
726728
}
727729

728-
void FlutterPeerConnection::GetSenders(RTCPeerConnection* pc,
729-
std::unique_ptr<MethodResultProxy> result) {
730+
void FlutterPeerConnection::GetSenders(
731+
RTCPeerConnection* pc,
732+
std::unique_ptr<MethodResultProxy> result) {
730733
std::shared_ptr<MethodResultProxy> result_ptr(result.release());
731734

732735
EncodableMap map;
@@ -752,57 +755,58 @@ void FlutterPeerConnection::AddIceCandidate(
752755
EncodableMap statsToMap(const scoped_refptr<MediaRTCStats>& stats) {
753756
EncodableMap report_map;
754757
report_map[EncodableValue("id")] = EncodableValue(stats->id().std_string());
755-
report_map[EncodableValue("type")] = EncodableValue(stats->type().std_string());
758+
report_map[EncodableValue("type")] =
759+
EncodableValue(stats->type().std_string());
756760
report_map[EncodableValue("timestamp")] =
757761
EncodableValue(double(stats->timestamp_us()));
758762
EncodableMap values;
759763
auto members = stats->Members();
760764
for (int i = 0; i < members.size(); i++) {
761765
auto member = members[i];
762-
if(!member->IsDefined()) {
766+
if (!member->IsDefined()) {
763767
continue;
764768
}
765-
switch (member->GetType())
766-
{
767-
case RTCStatsMember::Type::kBool:
768-
values[EncodableValue(member->GetName().std_string())] =
769-
EncodableValue(member->ValueBool());
770-
break;
771-
case RTCStatsMember::Type::kInt32:
772-
values[EncodableValue(member->GetName().std_string())] =
773-
EncodableValue(member->ValueInt32());
774-
break;
775-
case RTCStatsMember::Type::kUint32:
776-
values[EncodableValue(member->GetName().std_string())] =
777-
EncodableValue((int64_t)member->ValueUint32());
778-
break;
779-
case RTCStatsMember::Type::kInt64:
780-
values[EncodableValue(member->GetName().std_string())] =
781-
EncodableValue(member->ValueInt64());
782-
break;
783-
case RTCStatsMember::Type::kUint64:
784-
values[EncodableValue(member->GetName().std_string())] =
785-
EncodableValue((int64_t)member->ValueUint64());
786-
break;
787-
case RTCStatsMember::Type::kDouble:
788-
values[EncodableValue(member->GetName().std_string())] =
789-
EncodableValue(member->ValueDouble());
790-
break;
791-
case RTCStatsMember::Type::kString:
792-
values[EncodableValue(member->GetName().std_string())] =
793-
EncodableValue(member->ValueString().std_string());
794-
break;
795-
default:
796-
break;
769+
switch (member->GetType()) {
770+
case RTCStatsMember::Type::kBool:
771+
values[EncodableValue(member->GetName().std_string())] =
772+
EncodableValue(member->ValueBool());
773+
break;
774+
case RTCStatsMember::Type::kInt32:
775+
values[EncodableValue(member->GetName().std_string())] =
776+
EncodableValue(member->ValueInt32());
777+
break;
778+
case RTCStatsMember::Type::kUint32:
779+
values[EncodableValue(member->GetName().std_string())] =
780+
EncodableValue((int64_t)member->ValueUint32());
781+
break;
782+
case RTCStatsMember::Type::kInt64:
783+
values[EncodableValue(member->GetName().std_string())] =
784+
EncodableValue(member->ValueInt64());
785+
break;
786+
case RTCStatsMember::Type::kUint64:
787+
values[EncodableValue(member->GetName().std_string())] =
788+
EncodableValue((int64_t)member->ValueUint64());
789+
break;
790+
case RTCStatsMember::Type::kDouble:
791+
values[EncodableValue(member->GetName().std_string())] =
792+
EncodableValue(member->ValueDouble());
793+
break;
794+
case RTCStatsMember::Type::kString:
795+
values[EncodableValue(member->GetName().std_string())] =
796+
EncodableValue(member->ValueString().std_string());
797+
break;
798+
default:
799+
break;
797800
}
798801
}
799802
report_map[EncodableValue("values")] = EncodableValue(values);
800803
return report_map;
801804
}
802805

803-
void FlutterPeerConnection::GetStats(const std::string& track_id,
804-
RTCPeerConnection* pc,
805-
std::unique_ptr<MethodResultProxy> result) {
806+
void FlutterPeerConnection::GetStats(
807+
const std::string& track_id,
808+
RTCPeerConnection* pc,
809+
std::unique_ptr<MethodResultProxy> result) {
806810
std::shared_ptr<MethodResultProxy> result_ptr(result.release());
807811
scoped_refptr<RTCMediaTrack> track = base_->MediaTracksForId(track_id);
808812
if (track != nullptr) {
@@ -849,23 +853,23 @@ void FlutterPeerConnection::GetStats(const std::string& track_id,
849853
return;
850854
}
851855
}
852-
if(!found) {
856+
if (!found) {
853857
result_ptr->Error("GetStats", "Track not found");
854858
}
855859
} else {
856860
pc->GetStats(
857861
[result_ptr](const vector<scoped_refptr<MediaRTCStats>> reports) {
858-
std::vector<EncodableValue> list;
859-
for (int i = 0; i < reports.size(); i++) {
860-
list.push_back(EncodableValue(statsToMap(reports[i])));
861-
}
862-
EncodableMap params;
863-
params[EncodableValue("stats")] = EncodableValue(list);
864-
result_ptr->Success(EncodableValue(params));
865-
},
862+
std::vector<EncodableValue> list;
863+
for (int i = 0; i < reports.size(); i++) {
864+
list.push_back(EncodableValue(statsToMap(reports[i])));
865+
}
866+
EncodableMap params;
867+
params[EncodableValue("stats")] = EncodableValue(list);
868+
result_ptr->Success(EncodableValue(params));
869+
},
866870
[result_ptr](const char* error) {
867871
result_ptr->Error("GetStats", error);
868-
});
872+
});
869873
}
870874
}
871875

@@ -899,10 +903,11 @@ void FlutterPeerConnection::MediaStreamRemoveTrack(
899903
result_ptr->Success();
900904
}
901905

902-
void FlutterPeerConnection::AddTrack(RTCPeerConnection* pc,
903-
scoped_refptr<RTCMediaTrack> track,
904-
std::list<std::string> streamIds,
905-
std::unique_ptr<MethodResultProxy> result) {
906+
void FlutterPeerConnection::AddTrack(
907+
RTCPeerConnection* pc,
908+
scoped_refptr<RTCMediaTrack> track,
909+
std::list<std::string> streamIds,
910+
std::unique_ptr<MethodResultProxy> result) {
906911
std::shared_ptr<MethodResultProxy> result_ptr(result.release());
907912
std::string kind = track->kind().std_string();
908913
std::vector<string> streamids;
@@ -938,9 +943,10 @@ FlutterPeerConnection::GetRtpSenderById(RTCPeerConnection* pc, std::string id) {
938943
return result;
939944
}
940945

941-
void FlutterPeerConnection::RemoveTrack(RTCPeerConnection* pc,
942-
std::string senderId,
943-
std::unique_ptr<MethodResultProxy> result) {
946+
void FlutterPeerConnection::RemoveTrack(
947+
RTCPeerConnection* pc,
948+
std::string senderId,
949+
std::unique_ptr<MethodResultProxy> result) {
944950
auto sender = GetRtpSenderById(pc, senderId);
945951
if (nullptr == sender.get()) {
946952
result->Error("RemoveTrack", "not find RtpSender ");

Diff for: ‎common/cpp/src/flutter_screen_capture.cc

+7-7
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ void FlutterScreenCapture::UpdateDesktopSources(
7575
return;
7676
}
7777
auto map = EncodableMap();
78-
map[EncodableValue("result")] = true;
78+
map[EncodableValue("result")] = true;
7979
result->Success(EncodableValue(map));
8080
}
8181

@@ -135,23 +135,23 @@ void FlutterScreenCapture::OnMediaSourceThumbnailChanged(
135135
}
136136

137137
void FlutterScreenCapture::OnStart(scoped_refptr<RTCDesktopCapturer> capturer) {
138-
//std::cout << " OnStart: " << capturer->source()->id().std_string()
138+
// std::cout << " OnStart: " << capturer->source()->id().std_string()
139139
// << std::endl;
140140
}
141141

142142
void FlutterScreenCapture::OnPaused(
143143
scoped_refptr<RTCDesktopCapturer> capturer) {
144-
//std::cout << " OnPaused: " << capturer->source()->id().std_string()
144+
// std::cout << " OnPaused: " << capturer->source()->id().std_string()
145145
// << std::endl;
146146
}
147147

148148
void FlutterScreenCapture::OnStop(scoped_refptr<RTCDesktopCapturer> capturer) {
149-
//std::cout << " OnStop: " << capturer->source()->id().std_string()
149+
// std::cout << " OnStop: " << capturer->source()->id().std_string()
150150
// << std::endl;
151151
}
152152

153153
void FlutterScreenCapture::OnError(scoped_refptr<RTCDesktopCapturer> capturer) {
154-
//std::cout << " OnError: " << capturer->source()->id().std_string()
154+
// std::cout << " OnError: " << capturer->source()->id().std_string()
155155
// << std::endl;
156156
}
157157

@@ -180,7 +180,7 @@ void FlutterScreenCapture::GetDisplayMedia(
180180
const EncodableMap& constraints,
181181
std::unique_ptr<MethodResultProxy> result) {
182182
std::string source_id = "0";
183-
//DesktopType source_type = kScreen;
183+
// DesktopType source_type = kScreen;
184184
double fps = 30.0;
185185

186186
const EncodableMap video = findMap(constraints, "video");
@@ -193,7 +193,7 @@ void FlutterScreenCapture::GetDisplayMedia(
193193
return;
194194
}
195195
if (source_id != "0") {
196-
//source_type = DesktopType::kWindow;
196+
// source_type = DesktopType::kWindow;
197197
}
198198
}
199199
const EncodableMap mandatory = findMap(video, "mandatory");

Diff for: ‎common/cpp/src/flutter_video_renderer.cc

+4-3
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,10 @@ void FlutterVideoRendererManager::CreateVideoRendererTexture(
123123
result->Success(EncodableValue(params));
124124
}
125125

126-
void FlutterVideoRendererManager::SetMediaStream(int64_t texture_id,
127-
const std::string& stream_id,
128-
const std::string& peerConnectionId) {
126+
void FlutterVideoRendererManager::SetMediaStream(
127+
int64_t texture_id,
128+
const std::string& stream_id,
129+
const std::string& peerConnectionId) {
129130
scoped_refptr<RTCMediaStream> stream =
130131
base_->MediaStreamForId(stream_id, peerConnectionId);
131132

0 commit comments

Comments
 (0)