Compare commits

...

12 Commits

Author SHA1 Message Date
28c0e1731a add loongarch64 support for webrtc 2024-12-11 09:45:48 +08:00
cbd8cb1959 fix struct uc_mcontext
Change-Id: Ib95d9486a6bedbace3573bb88bf62a20116b2d3c
2024-11-27 11:47:14 +08:00
6905472e9c Snap for 11635697 from d96a44ca92af7933e7296d2cdc45a23c6a8ec2e1 to 24Q3-release
Change-Id: I108b6a77e1257883ee8fa5fe55f9d7086a4f91d8
2024-03-27 23:17:35 +00:00
d96a44ca92 Merge "Update LegacyStatsCollector to conform with Wc++11-narrowing" into main am: e4cabeb981 am: e1adbd1c31
Original change: https://android-review.googlesource.com/c/platform/external/webrtc/+/3014835

Change-Id: I4e27d51421b04ed7f51171718f4ea314edbc8110
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-26 20:56:51 +00:00
e1adbd1c31 Merge "Update LegacyStatsCollector to conform with Wc++11-narrowing" into main am: e4cabeb981
Original change: https://android-review.googlesource.com/c/platform/external/webrtc/+/3014835

Change-Id: Ic1f29705f40d36478dafd0c26852c8a9ac6549b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-26 20:42:10 +00:00
e4cabeb981 Merge "Update LegacyStatsCollector to conform with Wc++11-narrowing" into main 2024-03-26 20:26:23 +00:00
80b751e95e Update LegacyStatsCollector to conform with Wc++11-narrowing
Cherry-picked from upstream:
https://webrtc-review.googlesource.com/c/src/+/332240

Bug: 322868540
Change-Id: Ida6a1af5c324473a55ea4f3b143862ea016ff50a
2024-03-26 11:15:15 -07:00
16412f2dd9 Snap for 11617975 from b599ed68f855fedf5b400f749905bb54d0f70ba1 to 24Q3-release
Change-Id: Ie4959d6216a9d9c1ad1698067d23f427ba038a4e
2024-03-23 01:17:01 +00:00
b599ed68f8 Merge "Remove unused external/webrtc/Android.mk" into main am: fea80950c3 am: cc87a77917
Original change: https://android-review.googlesource.com/c/platform/external/webrtc/+/2996863

Change-Id: I8aaad0d34bf840c1d0eb6cbae64860517f14fb53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-22 01:58:23 +00:00
cc87a77917 Merge "Remove unused external/webrtc/Android.mk" into main am: fea80950c3
Original change: https://android-review.googlesource.com/c/platform/external/webrtc/+/2996863

Change-Id: I0d01d43a5d85d372e6c44c92df70bb2da5743b41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-22 01:30:56 +00:00
fea80950c3 Merge "Remove unused external/webrtc/Android.mk" into main 2024-03-22 01:14:40 +00:00
22aaec2c13 Remove unused external/webrtc/Android.mk
Bug: 329009166
Test: m nothing
Change-Id: I6febb21261be02de3fbf39447ae3d40f0280848f
2024-03-11 06:25:50 +00:00
4 changed files with 83 additions and 20 deletions

View File

@ -148,6 +148,8 @@ cc_defaults {
}, },
riscv64: { riscv64: {
}, },
loongarch64: {
},
x86_64: { x86_64: {
cflags: [ cflags: [
"-mavx2", "-mavx2",
@ -351,6 +353,9 @@ cc_library_static {
riscv64: { riscv64: {
enabled: false, enabled: false,
}, },
loongarch64: {
enabled: false,
},
}, },
} }
@ -1844,6 +1849,9 @@ cc_library_static {
riscv64: { riscv64: {
enabled: false, enabled: false,
}, },
loongarch64: {
enabled: false,
},
}, },
} }
@ -1907,6 +1915,12 @@ cc_library_static {
"common_audio/signal_processing/filter_ar_fast_q12.c", "common_audio/signal_processing/filter_ar_fast_q12.c",
], ],
}, },
loongarch64: {
srcs: [
"common_audio/signal_processing/complex_bit_reverse.c",
"common_audio/signal_processing/filter_ar_fast_q12.c",
],
},
x86_64: { x86_64: {
srcs: [ srcs: [
"common_audio/signal_processing/complex_bit_reverse.c", "common_audio/signal_processing/complex_bit_reverse.c",
@ -1940,6 +1954,9 @@ cc_library_static {
riscv64: { riscv64: {
enabled: false, enabled: false,
}, },
loongarch64: {
enabled: false,
},
x86_64: { x86_64: {
enabled: false, enabled: false,
}, },
@ -1974,6 +1991,9 @@ cc_library_static {
riscv64: { riscv64: {
enabled: false, enabled: false,
}, },
loongarch64: {
enabled: false,
},
x86_64: { x86_64: {
enabled: false, enabled: false,
}, },
@ -1999,6 +2019,9 @@ cc_library_static {
riscv64: { riscv64: {
enabled: false, enabled: false,
}, },
loongarch64: {
enabled: false,
},
x86_64: { x86_64: {
enabled: false, enabled: false,
}, },
@ -2029,6 +2052,9 @@ cc_library_static {
riscv64: { riscv64: {
enabled: false, enabled: false,
}, },
loongarch64: {
enabled: false,
},
}, },
} }
@ -2210,6 +2236,12 @@ cc_library_static {
"-DHAVE_SSE42=0", "-DHAVE_SSE42=0",
], ],
}, },
loongarch64: {
cflags: [
"-DHAVE_MM_PREFETCH=0",
"-DHAVE_SSE42=0",
],
},
x86_64: { x86_64: {
cflags: [ cflags: [
"-DHAVE_MM_PREFETCH=1", "-DHAVE_MM_PREFETCH=1",
@ -2260,6 +2292,12 @@ cc_library_static {
"-DHAVE_SSE42=0", "-DHAVE_SSE42=0",
], ],
}, },
loongarch64: {
cflags: [
"-DHAVE_MM_PREFETCH=0",
"-DHAVE_SSE42=0",
],
},
x86_64: { x86_64: {
cflags: [ cflags: [
"-DHAVE_MM_PREFETCH=1", "-DHAVE_MM_PREFETCH=1",
@ -2309,6 +2347,12 @@ cc_library_static {
"-DHAVE_SSE42=0", "-DHAVE_SSE42=0",
], ],
}, },
loongarch64: {
cflags: [
"-DHAVE_MM_PREFETCH=0",
"-DHAVE_SSE42=0",
],
},
x86_64: { x86_64: {
cflags: [ cflags: [
"-DHAVE_MM_PREFETCH=1", "-DHAVE_MM_PREFETCH=1",
@ -4361,6 +4405,9 @@ cc_library_static {
riscv64: { riscv64: {
enabled: false, enabled: false,
}, },
loongarch64: {
enabled: false,
},
}, },
} }
@ -5120,6 +5167,9 @@ cc_library_static {
riscv64: { riscv64: {
srcs: ["common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c"], srcs: ["common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c"],
}, },
loongarch64: {
srcs: ["common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c"],
},
x86_64: { x86_64: {
srcs: ["common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c"], srcs: ["common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c"],
}, },

View File

View File

@ -187,9 +187,10 @@ void ExtractStats(const cricket::VoiceReceiverInfo& info,
{StatsReport::kStatsValueNameAccelerateRate, info.accelerate_rate}, {StatsReport::kStatsValueNameAccelerateRate, info.accelerate_rate},
{StatsReport::kStatsValueNamePreemptiveExpandRate, {StatsReport::kStatsValueNamePreemptiveExpandRate,
info.preemptive_expand_rate}, info.preemptive_expand_rate},
{StatsReport::kStatsValueNameTotalAudioEnergy, info.total_output_energy}, {StatsReport::kStatsValueNameTotalAudioEnergy,
static_cast<float>(info.total_output_energy)},
{StatsReport::kStatsValueNameTotalSamplesDuration, {StatsReport::kStatsValueNameTotalSamplesDuration,
info.total_output_duration}}; static_cast<float>(info.total_output_duration)}};
const IntForAdd ints[] = { const IntForAdd ints[] = {
{StatsReport::kStatsValueNameCurrentDelayMs, info.delay_estimate_ms}, {StatsReport::kStatsValueNameCurrentDelayMs, info.delay_estimate_ms},
@ -243,9 +244,10 @@ void ExtractStats(const cricket::VoiceSenderInfo& info,
SetAudioProcessingStats(report, info.apm_statistics); SetAudioProcessingStats(report, info.apm_statistics);
const FloatForAdd floats[] = { const FloatForAdd floats[] = {
{StatsReport::kStatsValueNameTotalAudioEnergy, info.total_input_energy}, {StatsReport::kStatsValueNameTotalAudioEnergy,
static_cast<float>(info.total_input_energy)},
{StatsReport::kStatsValueNameTotalSamplesDuration, {StatsReport::kStatsValueNameTotalSamplesDuration,
info.total_input_duration}}; static_cast<float>(info.total_input_duration)}};
RTC_DCHECK_GE(info.audio_level, 0); RTC_DCHECK_GE(info.audio_level, 0);
const IntForAdd ints[] = { const IntForAdd ints[] = {
@ -339,7 +341,8 @@ void ExtractStats(const cricket::VideoReceiverInfo& info,
{StatsReport::kStatsValueNamePlisSent, info.plis_sent}, {StatsReport::kStatsValueNamePlisSent, info.plis_sent},
{StatsReport::kStatsValueNameRenderDelayMs, info.render_delay_ms}, {StatsReport::kStatsValueNameRenderDelayMs, info.render_delay_ms},
{StatsReport::kStatsValueNameTargetDelayMs, info.target_delay_ms}, {StatsReport::kStatsValueNameTargetDelayMs, info.target_delay_ms},
{StatsReport::kStatsValueNameFramesDecoded, info.frames_decoded}, {StatsReport::kStatsValueNameFramesDecoded,
static_cast<int>(info.frames_decoded)},
}; };
for (const auto& i : ints) for (const auto& i : ints)
@ -383,15 +386,19 @@ void ExtractStats(const cricket::VideoSenderInfo& info,
info.encode_usage_percent}, info.encode_usage_percent},
{StatsReport::kStatsValueNameFirsReceived, info.firs_rcvd}, {StatsReport::kStatsValueNameFirsReceived, info.firs_rcvd},
{StatsReport::kStatsValueNameFrameHeightSent, info.send_frame_height}, {StatsReport::kStatsValueNameFrameHeightSent, info.send_frame_height},
{StatsReport::kStatsValueNameFrameRateInput, round(info.framerate_input)}, {StatsReport::kStatsValueNameFrameRateInput,
static_cast<int>(round(info.framerate_input))},
{StatsReport::kStatsValueNameFrameRateSent, info.framerate_sent}, {StatsReport::kStatsValueNameFrameRateSent, info.framerate_sent},
{StatsReport::kStatsValueNameFrameWidthSent, info.send_frame_width}, {StatsReport::kStatsValueNameFrameWidthSent, info.send_frame_width},
{StatsReport::kStatsValueNameNacksReceived, info.nacks_rcvd}, {StatsReport::kStatsValueNameNacksReceived,
static_cast<int>(info.nacks_rcvd)},
{StatsReport::kStatsValueNamePacketsLost, info.packets_lost}, {StatsReport::kStatsValueNamePacketsLost, info.packets_lost},
{StatsReport::kStatsValueNamePacketsSent, info.packets_sent}, {StatsReport::kStatsValueNamePacketsSent, info.packets_sent},
{StatsReport::kStatsValueNamePlisReceived, info.plis_rcvd}, {StatsReport::kStatsValueNamePlisReceived, info.plis_rcvd},
{StatsReport::kStatsValueNameFramesEncoded, info.frames_encoded}, {StatsReport::kStatsValueNameFramesEncoded,
{StatsReport::kStatsValueNameHugeFramesSent, info.huge_frames_sent}, static_cast<int>(info.frames_encoded)},
{StatsReport::kStatsValueNameHugeFramesSent,
static_cast<int>(info.huge_frames_sent)},
}; };
for (const auto& i : ints) for (const auto& i : ints)
@ -780,19 +787,25 @@ StatsReport* LegacyStatsCollector::AddConnectionInfoReport(
AddCandidateReport(remote_candidate_stats, false)->id()); AddCandidateReport(remote_candidate_stats, false)->id());
const Int64ForAdd int64s[] = { const Int64ForAdd int64s[] = {
{StatsReport::kStatsValueNameBytesReceived, info.recv_total_bytes}, {StatsReport::kStatsValueNameBytesReceived,
{StatsReport::kStatsValueNameBytesSent, info.sent_total_bytes}, static_cast<int64_t>(info.recv_total_bytes)},
{StatsReport::kStatsValueNamePacketsSent, info.sent_total_packets}, {StatsReport::kStatsValueNameBytesSent,
{StatsReport::kStatsValueNameRtt, info.rtt}, static_cast<int64_t>(info.sent_total_bytes)},
{StatsReport::kStatsValueNamePacketsSent,
static_cast<int64_t>(info.sent_total_packets)},
{StatsReport::kStatsValueNameRtt, static_cast<int64_t>(info.rtt)},
{StatsReport::kStatsValueNameSendPacketsDiscarded, {StatsReport::kStatsValueNameSendPacketsDiscarded,
info.sent_discarded_packets}, static_cast<int64_t>(info.sent_discarded_packets)},
{StatsReport::kStatsValueNameSentPingRequestsTotal, {StatsReport::kStatsValueNameSentPingRequestsTotal,
info.sent_ping_requests_total}, static_cast<int64_t>(info.sent_ping_requests_total)},
{StatsReport::kStatsValueNameSentPingRequestsBeforeFirstResponse, {StatsReport::kStatsValueNameSentPingRequestsBeforeFirstResponse,
info.sent_ping_requests_before_first_response}, static_cast<int64_t>(info.sent_ping_requests_before_first_response)},
{StatsReport::kStatsValueNameSentPingResponses, info.sent_ping_responses}, {StatsReport::kStatsValueNameSentPingResponses,
{StatsReport::kStatsValueNameRecvPingRequests, info.recv_ping_requests}, static_cast<int64_t>(info.sent_ping_responses)},
{StatsReport::kStatsValueNameRecvPingResponses, info.recv_ping_responses}, {StatsReport::kStatsValueNameRecvPingRequests,
static_cast<int64_t>(info.recv_ping_requests)},
{StatsReport::kStatsValueNameRecvPingResponses,
static_cast<int64_t>(info.recv_ping_responses)},
}; };
for (const auto& i : int64s) for (const auto& i : int64s)
report->AddInt64(i.name, i.value); report->AddInt64(i.name, i.value);

View File

@ -194,7 +194,7 @@ void* GetProgramCounter(void* const vuc) {
#elif defined(__e2k__) #elif defined(__e2k__)
return reinterpret_cast<void*>(context->uc_mcontext.cr0_hi); return reinterpret_cast<void*>(context->uc_mcontext.cr0_hi);
#elif defined(__loongarch__) #elif defined(__loongarch__)
return reinterpret_cast<void*>(context->uc_mcontext.__pc); return reinterpret_cast<void*>(context->uc_mcontext.sc_pc);
#else #else
#error "Undefined Architecture." #error "Undefined Architecture."
#endif #endif