From e66339296b3d2a3f077bf96a7c221c18d96ae630 Mon Sep 17 00:00:00 2001
From: glaznev <glaznev@webrtc.org>
Date: Tue, 17 Nov 2015 04:05:29 -0800
Subject: Add OpenSL ES enable setting to AppRTCDemo.

Disable OpenSL ES by default.
Plus remove no longer used CPU overuse detection option.

Review URL: https://codereview.webrtc.org/1449083002

Cr-Commit-Position: refs/heads/master@{#10670}
---
 webrtc/examples/androidapp/res/xml/preferences.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'webrtc/examples/androidapp/res/xml/preferences.xml')

diff --git a/webrtc/examples/androidapp/res/xml/preferences.xml b/webrtc/examples/androidapp/res/xml/preferences.xml
index c580e0cb77..8c111e0dfa 100644
--- a/webrtc/examples/androidapp/res/xml/preferences.xml
+++ b/webrtc/examples/androidapp/res/xml/preferences.xml
@@ -94,18 +94,18 @@
             android:title="@string/pref_noaudioprocessing_title"
             android:dialogTitle="@string/pref_noaudioprocessing_dlg"
             android:defaultValue="@string/pref_noaudioprocessing_default" />
+
+        <CheckBoxPreference
+            android:key="@string/pref_opensles_key"
+            android:title="@string/pref_opensles_title"
+            android:dialogTitle="@string/pref_opensles_dlg"
+            android:defaultValue="@string/pref_opensles_default" />
     </PreferenceCategory>
 
     <PreferenceCategory
         android:key="@string/pref_miscsettings_key"
         android:title="@string/pref_miscsettings_title">
 
-        <CheckBoxPreference
-            android:key="@string/pref_cpu_usage_detection_key"
-            android:title="@string/pref_cpu_usage_detection_title"
-            android:dialogTitle="@string/pref_cpu_usage_detection_dlg"
-            android:defaultValue="@string/pref_cpu_usage_detection_default" />
-
         <EditTextPreference
             android:key="@string/pref_room_server_url_key"
             android:title="@string/pref_room_server_url_title"
-- 
cgit v1.2.3


From d48015364d1a3545ea503ce03ec49762a480d42c Mon Sep 17 00:00:00 2001
From: Per <perkj@chromium.org>
Date: Tue, 24 Nov 2015 11:13:23 +0100
Subject: Add option to capture to texture in AppRTCDemo for Android.

The purpose is to be able to easier test and find differences between the path when capturing to textures or byte buffers.

This require https://codereview.webrtc.org/1403713002/ to work.

BUG=webrtc:4993
R=magjed@webrtc.org
TBR=glaznew@webrtc.org

Review URL: https://codereview.webrtc.org/1452423003 .

Cr-Commit-Position: refs/heads/master@{#10766}
---
 webrtc/examples/androidapp/res/xml/preferences.xml | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'webrtc/examples/androidapp/res/xml/preferences.xml')

diff --git a/webrtc/examples/androidapp/res/xml/preferences.xml b/webrtc/examples/androidapp/res/xml/preferences.xml
index 8c111e0dfa..b54f2445e2 100644
--- a/webrtc/examples/androidapp/res/xml/preferences.xml
+++ b/webrtc/examples/androidapp/res/xml/preferences.xml
@@ -60,6 +60,12 @@
             android:title="@string/pref_hwcodec_title"
             android:dialogTitle="@string/pref_hwcodec_dlg"
             android:defaultValue="@string/pref_hwcodec_default" />
+
+        <CheckBoxPreference
+            android:key="@string/pref_capturetotexture_key"
+            android:title="@string/pref_capturetotexture_title"
+            android:dialogTitle="@string/pref_capturetotexture_dlg"
+            android:defaultValue="@string/pref_capturetotexture_default" />
     </PreferenceCategory>
 
     <PreferenceCategory
-- 
cgit v1.2.3


From 6f28cf0b951a9d41246f022f48a6cd035fad151d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20Bostr=C3=B6m?= <pbos@webrtc.org>
Date: Mon, 7 Dec 2015 23:17:15 +0100
Subject: Implement standalone event tracing in AppRTCDemo.

Logs tracing events (TRACE_EVENT0 and friends) to storage in a format
compatible with chrome://tracing which can be used for performance
evaluation, finding lock contention and other sweet things). Tracing is
still basic and doesn't contain thread metadata or logging of tracing
arguments.

BUG=webrtc:5158
R=tommi@webrtc.org

Review URL: https://codereview.webrtc.org/1457383002 .

Cr-Commit-Position: refs/heads/master@{#10921}
---
 webrtc/examples/androidapp/res/xml/preferences.xml | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'webrtc/examples/androidapp/res/xml/preferences.xml')

diff --git a/webrtc/examples/androidapp/res/xml/preferences.xml b/webrtc/examples/androidapp/res/xml/preferences.xml
index b54f2445e2..6915f4bf63 100644
--- a/webrtc/examples/androidapp/res/xml/preferences.xml
+++ b/webrtc/examples/androidapp/res/xml/preferences.xml
@@ -124,6 +124,12 @@
             android:title="@string/pref_displayhud_title"
             android:dialogTitle="@string/pref_displayhud_dlg"
            android:defaultValue="@string/pref_displayhud_default" />
+
+        <CheckBoxPreference
+            android:key="@string/pref_tracing_key"
+            android:title="@string/pref_tracing_title"
+            android:dialogTitle="@string/pref_tracing_dlg"
+           android:defaultValue="@string/pref_tracing_default" />
     </PreferenceCategory>
 
 </PreferenceScreen>
-- 
cgit v1.2.3


From 0b0a88b918062ee50a36a8e8b5d7f0cc040046fb Mon Sep 17 00:00:00 2001
From: aluebs <aluebs@webrtc.org>
Date: Thu, 10 Dec 2015 23:28:42 -0800
Subject: Add aecdump support to AppRTCDemo

Review URL: https://codereview.webrtc.org/1514473008

Cr-Commit-Position: refs/heads/master@{#10985}
---
 webrtc/examples/androidapp/res/xml/preferences.xml | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'webrtc/examples/androidapp/res/xml/preferences.xml')

diff --git a/webrtc/examples/androidapp/res/xml/preferences.xml b/webrtc/examples/androidapp/res/xml/preferences.xml
index 6915f4bf63..0c6f916a2d 100644
--- a/webrtc/examples/androidapp/res/xml/preferences.xml
+++ b/webrtc/examples/androidapp/res/xml/preferences.xml
@@ -101,6 +101,12 @@
             android:dialogTitle="@string/pref_noaudioprocessing_dlg"
             android:defaultValue="@string/pref_noaudioprocessing_default" />
 
+        <CheckBoxPreference
+            android:key="@string/pref_aecdump_key"
+            android:title="@string/pref_aecdump_title"
+            android:dialogTitle="@string/pref_aecdump_dlg"
+            android:defaultValue="@string/pref_aecdump_default" />
+
         <CheckBoxPreference
             android:key="@string/pref_opensles_key"
             android:title="@string/pref_opensles_title"
-- 
cgit v1.2.3