Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(26)

Side by Side Diff: webrtc/examples/androidapp/src/org/appspot/apprtc/ConnectActivity.java

Issue 1452423003: Add option to capture to texture in AppRTCDemo for Android. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: factory.setVideoHwAccelerationOptions. Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright 2014 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2014 The WebRTC Project Authors. All rights reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 private String keyprefResolution; 58 private String keyprefResolution;
59 private String keyprefFps; 59 private String keyprefFps;
60 private String keyprefCaptureQualitySlider; 60 private String keyprefCaptureQualitySlider;
61 private String keyprefVideoBitrateType; 61 private String keyprefVideoBitrateType;
62 private String keyprefVideoBitrateValue; 62 private String keyprefVideoBitrateValue;
63 private String keyprefVideoCodec; 63 private String keyprefVideoCodec;
64 private String keyprefAudioBitrateType; 64 private String keyprefAudioBitrateType;
65 private String keyprefAudioBitrateValue; 65 private String keyprefAudioBitrateValue;
66 private String keyprefAudioCodec; 66 private String keyprefAudioCodec;
67 private String keyprefHwCodecAcceleration; 67 private String keyprefHwCodecAcceleration;
68 private String keyprefCaptureToTexture;
68 private String keyprefNoAudioProcessingPipeline; 69 private String keyprefNoAudioProcessingPipeline;
69 private String keyprefOpenSLES; 70 private String keyprefOpenSLES;
70 private String keyprefDisplayHud; 71 private String keyprefDisplayHud;
71 private String keyprefRoomServerUrl; 72 private String keyprefRoomServerUrl;
72 private String keyprefRoom; 73 private String keyprefRoom;
73 private String keyprefRoomList; 74 private String keyprefRoomList;
74 private ArrayList<String> roomList; 75 private ArrayList<String> roomList;
75 private ArrayAdapter<String> adapter; 76 private ArrayAdapter<String> adapter;
76 77
77 @Override 78 @Override
78 public void onCreate(Bundle savedInstanceState) { 79 public void onCreate(Bundle savedInstanceState) {
79 super.onCreate(savedInstanceState); 80 super.onCreate(savedInstanceState);
80 81
81 // Get setting keys. 82 // Get setting keys.
82 PreferenceManager.setDefaultValues(this, R.xml.preferences, false); 83 PreferenceManager.setDefaultValues(this, R.xml.preferences, false);
83 sharedPref = PreferenceManager.getDefaultSharedPreferences(this); 84 sharedPref = PreferenceManager.getDefaultSharedPreferences(this);
84 keyprefVideoCallEnabled = getString(R.string.pref_videocall_key); 85 keyprefVideoCallEnabled = getString(R.string.pref_videocall_key);
85 keyprefResolution = getString(R.string.pref_resolution_key); 86 keyprefResolution = getString(R.string.pref_resolution_key);
86 keyprefFps = getString(R.string.pref_fps_key); 87 keyprefFps = getString(R.string.pref_fps_key);
87 keyprefCaptureQualitySlider = getString(R.string.pref_capturequalityslider_k ey); 88 keyprefCaptureQualitySlider = getString(R.string.pref_capturequalityslider_k ey);
88 keyprefVideoBitrateType = getString(R.string.pref_startvideobitrate_key); 89 keyprefVideoBitrateType = getString(R.string.pref_startvideobitrate_key);
89 keyprefVideoBitrateValue = getString(R.string.pref_startvideobitratevalue_ke y); 90 keyprefVideoBitrateValue = getString(R.string.pref_startvideobitratevalue_ke y);
90 keyprefVideoCodec = getString(R.string.pref_videocodec_key); 91 keyprefVideoCodec = getString(R.string.pref_videocodec_key);
91 keyprefHwCodecAcceleration = getString(R.string.pref_hwcodec_key); 92 keyprefHwCodecAcceleration = getString(R.string.pref_hwcodec_key);
93 keyprefCaptureToTexture = getString(R.string.pref_capturetotexture_key);
92 keyprefAudioBitrateType = getString(R.string.pref_startaudiobitrate_key); 94 keyprefAudioBitrateType = getString(R.string.pref_startaudiobitrate_key);
93 keyprefAudioBitrateValue = getString(R.string.pref_startaudiobitratevalue_ke y); 95 keyprefAudioBitrateValue = getString(R.string.pref_startaudiobitratevalue_ke y);
94 keyprefAudioCodec = getString(R.string.pref_audiocodec_key); 96 keyprefAudioCodec = getString(R.string.pref_audiocodec_key);
95 keyprefNoAudioProcessingPipeline = getString(R.string.pref_noaudioprocessing _key); 97 keyprefNoAudioProcessingPipeline = getString(R.string.pref_noaudioprocessing _key);
96 keyprefOpenSLES = getString(R.string.pref_opensles_key); 98 keyprefOpenSLES = getString(R.string.pref_opensles_key);
97 keyprefDisplayHud = getString(R.string.pref_displayhud_key); 99 keyprefDisplayHud = getString(R.string.pref_displayhud_key);
98 keyprefRoomServerUrl = getString(R.string.pref_room_server_url_key); 100 keyprefRoomServerUrl = getString(R.string.pref_room_server_url_key);
99 keyprefRoom = getString(R.string.pref_room_key); 101 keyprefRoom = getString(R.string.pref_room_key);
100 keyprefRoomList = getString(R.string.pref_room_list_key); 102 keyprefRoomList = getString(R.string.pref_room_list_key);
101 103
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
246 // Get default codecs. 248 // Get default codecs.
247 String videoCodec = sharedPref.getString(keyprefVideoCodec, 249 String videoCodec = sharedPref.getString(keyprefVideoCodec,
248 getString(R.string.pref_videocodec_default)); 250 getString(R.string.pref_videocodec_default));
249 String audioCodec = sharedPref.getString(keyprefAudioCodec, 251 String audioCodec = sharedPref.getString(keyprefAudioCodec,
250 getString(R.string.pref_audiocodec_default)); 252 getString(R.string.pref_audiocodec_default));
251 253
252 // Check HW codec flag. 254 // Check HW codec flag.
253 boolean hwCodec = sharedPref.getBoolean(keyprefHwCodecAcceleration, 255 boolean hwCodec = sharedPref.getBoolean(keyprefHwCodecAcceleration,
254 Boolean.valueOf(getString(R.string.pref_hwcodec_default))); 256 Boolean.valueOf(getString(R.string.pref_hwcodec_default)));
255 257
258 // Check Capture to texture.
259 boolean captureToTexture = sharedPref.getBoolean(keyprefCaptureToTexture,
260 Boolean.valueOf(getString(R.string.pref_capturetotexture_default)));
261
256 // Check Disable Audio Processing flag. 262 // Check Disable Audio Processing flag.
257 boolean noAudioProcessing = sharedPref.getBoolean( 263 boolean noAudioProcessing = sharedPref.getBoolean(
258 keyprefNoAudioProcessingPipeline, 264 keyprefNoAudioProcessingPipeline,
259 Boolean.valueOf(getString(R.string.pref_noaudioprocessing_default))); 265 Boolean.valueOf(getString(R.string.pref_noaudioprocessing_default)));
260 266
261 // Check OpenSL ES enabled flag. 267 // Check OpenSL ES enabled flag.
262 boolean useOpenSLES = sharedPref.getBoolean( 268 boolean useOpenSLES = sharedPref.getBoolean(
263 keyprefOpenSLES, 269 keyprefOpenSLES,
264 Boolean.valueOf(getString(R.string.pref_opensles_default))); 270 Boolean.valueOf(getString(R.string.pref_opensles_default)));
265 271
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
332 intent.putExtra(CallActivity.EXTRA_LOOPBACK, loopback); 338 intent.putExtra(CallActivity.EXTRA_LOOPBACK, loopback);
333 intent.putExtra(CallActivity.EXTRA_VIDEO_CALL, videoCallEnabled); 339 intent.putExtra(CallActivity.EXTRA_VIDEO_CALL, videoCallEnabled);
334 intent.putExtra(CallActivity.EXTRA_VIDEO_WIDTH, videoWidth); 340 intent.putExtra(CallActivity.EXTRA_VIDEO_WIDTH, videoWidth);
335 intent.putExtra(CallActivity.EXTRA_VIDEO_HEIGHT, videoHeight); 341 intent.putExtra(CallActivity.EXTRA_VIDEO_HEIGHT, videoHeight);
336 intent.putExtra(CallActivity.EXTRA_VIDEO_FPS, cameraFps); 342 intent.putExtra(CallActivity.EXTRA_VIDEO_FPS, cameraFps);
337 intent.putExtra(CallActivity.EXTRA_VIDEO_CAPTUREQUALITYSLIDER_ENABLED, 343 intent.putExtra(CallActivity.EXTRA_VIDEO_CAPTUREQUALITYSLIDER_ENABLED,
338 captureQualitySlider); 344 captureQualitySlider);
339 intent.putExtra(CallActivity.EXTRA_VIDEO_BITRATE, videoStartBitrate); 345 intent.putExtra(CallActivity.EXTRA_VIDEO_BITRATE, videoStartBitrate);
340 intent.putExtra(CallActivity.EXTRA_VIDEOCODEC, videoCodec); 346 intent.putExtra(CallActivity.EXTRA_VIDEOCODEC, videoCodec);
341 intent.putExtra(CallActivity.EXTRA_HWCODEC_ENABLED, hwCodec); 347 intent.putExtra(CallActivity.EXTRA_HWCODEC_ENABLED, hwCodec);
348 intent.putExtra(CallActivity.EXTRA_CAPTURETOTEXTURE_ENABLED, captureToText ure);
342 intent.putExtra(CallActivity.EXTRA_NOAUDIOPROCESSING_ENABLED, 349 intent.putExtra(CallActivity.EXTRA_NOAUDIOPROCESSING_ENABLED,
343 noAudioProcessing); 350 noAudioProcessing);
344 intent.putExtra(CallActivity.EXTRA_OPENSLES_ENABLED, useOpenSLES); 351 intent.putExtra(CallActivity.EXTRA_OPENSLES_ENABLED, useOpenSLES);
345 intent.putExtra(CallActivity.EXTRA_AUDIO_BITRATE, audioStartBitrate); 352 intent.putExtra(CallActivity.EXTRA_AUDIO_BITRATE, audioStartBitrate);
346 intent.putExtra(CallActivity.EXTRA_AUDIOCODEC, audioCodec); 353 intent.putExtra(CallActivity.EXTRA_AUDIOCODEC, audioCodec);
347 intent.putExtra(CallActivity.EXTRA_DISPLAY_HUD, displayHud); 354 intent.putExtra(CallActivity.EXTRA_DISPLAY_HUD, displayHud);
348 intent.putExtra(CallActivity.EXTRA_CMDLINE, commandLineRun); 355 intent.putExtra(CallActivity.EXTRA_CMDLINE, commandLineRun);
349 intent.putExtra(CallActivity.EXTRA_RUNTIME, runTimeMs); 356 intent.putExtra(CallActivity.EXTRA_RUNTIME, runTimeMs);
350 357
351 startActivityForResult(intent, CONNECTION_REQUEST); 358 startActivityForResult(intent, CONNECTION_REQUEST);
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
400 } 407 }
401 } 408 }
402 if (position != AdapterView.INVALID_POSITION) { 409 if (position != AdapterView.INVALID_POSITION) {
403 return adapter.getItem(position); 410 return adapter.getItem(position);
404 } else { 411 } else {
405 return null; 412 return null;
406 } 413 }
407 } 414 }
408 415
409 } 416 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698