Skip to content

Commit

Permalink
Added: Measurement function
Browse files Browse the repository at this point in the history
  • Loading branch information
@lgs96
lgs96 committed Apr 25, 2024
1 parent 4c1358f commit 5296bfb
Show file tree
Hide file tree
Showing 8 changed files with 162 additions and 54 deletions.
10 changes: 6 additions & 4 deletions app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apply plugin: 'com.android.application'

android {
namespace = "org.appspot.apprtc"
compileSdkVersion 30
compileSdkVersion 31

// sourceSets.main {
// jniLibs.srcDir 'libs'
Expand All @@ -13,7 +13,7 @@ android {
defaultConfig {
applicationId "org.appspot.apprtc"
minSdkVersion 21
targetSdkVersion 30
targetSdkVersion 31

versionCode 1032006
versionName "r1032006"
Expand Down Expand Up @@ -47,11 +47,13 @@ repositories {
}

dependencies {
implementation 'org.webrtc:google-webrtc:1.0.+'
//implementation 'org.webrtc:google-webrtc:1.0.+'
implementation 'com.opencsv:opencsv:4.4'
implementation files('libs/autobanh.jar')
implementation 'androidx.annotation:annotation:1.2.0'
implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0'
implementation 'androidx.core:core:1.7.0'
implementation 'org.jetbrains:annotations:15.0'
implementation 'com.google.code.gson:gson:2.8.8'
//implementation(name:'libwebrtc', ext:'aar')
implementation(name:'libwebrtc', ext:'aar')
}
4 changes: 4 additions & 0 deletions app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
android:glEsVersion="0x00020000"
android:required="true" />

<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
Expand Down Expand Up @@ -62,6 +63,7 @@

<activity
android:name=".ConnectActivity"
android:exported="true"
android:label="@string/app_name"
android:theme="@style/AppTheme"
android:windowSoftInputMode="adjustPan">
Expand All @@ -86,10 +88,12 @@
</activity>
<activity
android:name=".SettingsActivity"
android:exported="false"
android:label="@string/settings_name"
android:theme="@style/AppTheme"></activity>
<activity
android:name=".CallActivity"
android:exported="true"
android:configChanges="orientation|smallestScreenSize|screenSize|screenLayout"
android:label="@string/app_name"
android:screenOrientation="fullUser"
Expand Down
19 changes: 19 additions & 0 deletions app/src/main/java/org/appspot/apprtc/CallActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@
import android.app.Activity;
import android.app.AlertDialog;
import android.app.FragmentTransaction;
import android.app.admin.DevicePolicyManager;
import android.content.BroadcastReceiver;
import android.content.ComponentName;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
Expand Down Expand Up @@ -48,6 +50,7 @@
import org.appspot.apprtc.AppRTCClient.SignalingParameters;
import org.appspot.apprtc.PeerConnectionClient.DataChannelParameters;
import org.appspot.apprtc.PeerConnectionClient.PeerConnectionParameters;
import org.appspot.apprtc.profiler.MyDeviceAdminReceiver;
import org.appspot.apprtc.profiler.ProfilingService;
import org.webrtc.Camera1Enumerator;
import org.webrtc.Camera2Enumerator;
Expand Down Expand Up @@ -142,6 +145,9 @@ public class CallActivity extends Activity implements AppRTCClient.SignalingEven
// Goodsol
private Intent record_intent;

private DevicePolicyManager devicePolicyManager;
private ComponentName adminComponent;

private static class ProxyVideoSink implements VideoSink {
private VideoSink target;

Expand Down Expand Up @@ -402,6 +408,19 @@ public void run() {
} else {
startCall();
}

/*
devicePolicyManager = (DevicePolicyManager) getSystemService(DEVICE_POLICY_SERVICE);
adminComponent = new ComponentName(this, MyDeviceAdminReceiver.class);
if (!devicePolicyManager.isAdminActive(adminComponent)) {
Intent policyIntent = new Intent(DevicePolicyManager.ACTION_ADD_DEVICE_ADMIN);
policyIntent.putExtra(DevicePolicyManager.EXTRA_DEVICE_ADMIN, adminComponent);
policyIntent.putExtra(DevicePolicyManager.EXTRA_ADD_EXPLANATION,
"Additional text explaining why this needs to be added.");
startActivityForResult(policyIntent, 1);
}
*/
}

@TargetApi(17)
Expand Down
51 changes: 37 additions & 14 deletions app/src/main/java/org/appspot/apprtc/HudFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,11 @@
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.os.Build;
import android.os.Bundle;
import androidx.annotation.Nullable;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;

import android.os.Environment;
import android.util.Log;
Expand All @@ -42,6 +45,7 @@
import java.util.Map;
import com.opencsv.CSVWriter;


/**
* Fragment for HUD statistics display.
*/
Expand Down Expand Up @@ -83,6 +87,7 @@ public class HudFragment extends Fragment {
add("BatteryCapacity");
add("BatteryCurrentAvg");
add("BatteryPowerAvg");
add("BatteryPowerIns");
add("CPULittle");
add("CPUBig1");
add("CPUBig2");
Expand Down Expand Up @@ -133,6 +138,7 @@ public class HudFragment extends Fragment {
@Override
public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);

new Thread(new Runnable() {
@Override
public void run() {
Expand Down Expand Up @@ -189,18 +195,19 @@ public void onReceive(Context context, Intent intent) {
if ("org.appspot.apprtc.UPDATE_HUD_FRAGMENT".equals(intent.getAction())) {
battery_info [0] = intent.getFloatExtra("BatteryCapacity", 0);
battery_info [1] = intent.getFloatExtra("BatteryCurrent", 0);
battery_info [2] = intent.getIntExtra("BatteryPower", 0);
battery_info [2] = intent.getIntExtra("BatteryPowerAvg", 0);
battery_info [3] = intent.getIntExtra("BatteryPowerIns", 0);

battery_info [3] = intent.getIntExtra("CpuLittle", 0);
battery_info [4] = intent.getIntExtra("CpuBig1", 0);
battery_info [5] = intent.getIntExtra("CpuBig2", 0);
battery_info [4] = intent.getIntExtra("CpuLittle", 0);
battery_info [5] = intent.getIntExtra("CpuBig1", 0);
battery_info [6] = intent.getIntExtra("CpuBig2", 0);

battery_info [6] = intent.getFloatExtra("SkinTemp", 0);
battery_info [7] = intent.getFloatExtra("CpuTemp", 0);
battery_info [8] = intent.getFloatExtra("SkinState", 0);
battery_info [7] = intent.getFloatExtra("SkinTemp", 0);
battery_info [8] = intent.getFloatExtra("CpuTemp", 0);
battery_info [9] = intent.getFloatExtra("SkinState", 0);

battery_info [9] = intent.getIntExtra("LteInfo", 0);
battery_info [10] = intent.getIntExtra("NrInfo", 0);
battery_info [10] = intent.getIntExtra("LteInfo", 0);
battery_info [11] = intent.getIntExtra("NrInfo", 0);

stats = intent.getStringExtra("Stats");

Expand All @@ -209,6 +216,13 @@ public void onReceive(Context context, Intent intent) {
}
};


IntentFilter filter = new IntentFilter("org.appspot.apprtc.UPDATE_HUD_FRAGMENT");
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
LocalBroadcastManager.getInstance(getContext()).registerReceiver(updateReceiver,
filter);
}

} catch (IOException e) {
e.printStackTrace();
}
Expand Down Expand Up @@ -282,7 +296,11 @@ public void onStop() {
isRunning = false;
Intent serviceIntent = new Intent(getActivity(), ProfilingService.class);
getActivity().stopService(serviceIntent);
requireContext().unregisterReceiver(updateReceiver);

if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
LocalBroadcastManager.getInstance(getContext()).unregisterReceiver(updateReceiver);
}

super.onStop();
}

Expand Down Expand Up @@ -334,15 +352,13 @@ public void run() {
if (report.id.contains("send")) {
String trackId = reportMap.get("googTrackId");
if (trackId != null && trackId.contains(PeerConnectionClient.VIDEO_TRACK_ID)) {
/*
valuesSent[0] = String.format("%.3f", elapsedSeconds);
for (int i = 1; i < combinedSentList.size(); i++) {
if (reportMap.containsKey(combinedSentList.get(i))) {
Log.i("Goodsol CSV", report.id + " " + combinedSentList.get(i));
valuesSent[i] = reportMap.get(combinedSentList.get(i));
}
}
*/
}
} else if (report.id.contains("recv")) {
String frameWidth = reportMap.get("googFrameWidthReceived");
Expand Down Expand Up @@ -378,8 +394,15 @@ else if (report.id.equals("bweforvideo")) {
}
}
// Temp info
for (int i = computeToExtractSent.size() + networkToExtractSent.size(); i < combinedSentList.size(); i++) {
//valuesSent[i] = String.valueOf(battery_info[i - computeToExtractSent.size()]);
try {
int previous_size = computeToExtractSent.size() + networkToExtractSent.size();
for (int i = previous_size + 1; i < combinedSentList.size(); i++) {
//Log.e("Thermal", "Error in writing the temp info" + String.valueOf(i - 1 - previous_size));
valuesSent[i] = String.valueOf(battery_info[i - 1 - previous_size]);
}
}
catch (Exception e){
Log.e("Thermal", "Error in writing the temp info");
}

try {
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/appspot/apprtc/profiler/Profiler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ public static void configureTargets() {
if (model_name.contains("Pixel 7 Pro")) {
NET_INTERFACE = "rmnet1";
TZONE_MODEM_SKIN = "/sys/class/thermal/thermal_zone12/temp"; // cellular emergency is triggered by neutral_therm (thermal_zone6)
TZONE_CPU = "/sys/class/thermal/thermal_zone3/temp";
TZONE_CPU = "/sys/class/thermal/thermal_zone0/temp";
CLOCK_LITTLE = "/sys/devices/system/cpu/cpufreq/policy0/cpuinfo_cur_freq";
CLOCK_BIG1 = "/sys/devices/system/cpu/cpufreq/policy4/cpuinfo_cur_freq";
CLOCK_BIG2 = "/sys/devices/system/cpu/cpufreq/policy6/cpuinfo_cur_freq";
Expand Down
Loading

0 comments on commit 5296bfb

Please sign in to comment.