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

Unified Diff: trunk/src/chrome/test/data/webrtc/adapter.js

Issue 22840006: Revert 217770 "Landing https://codereview.chromium.org/18769010/." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 4 months 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 side-by-side diff with in-line comments
Download patch
Index: trunk/src/chrome/test/data/webrtc/adapter.js
===================================================================
--- trunk/src/chrome/test/data/webrtc/adapter.js (revision 217806)
+++ trunk/src/chrome/test/data/webrtc/adapter.js (working copy)
@@ -1,154 +0,0 @@
-var RTCPeerConnection = null;
-var getUserMedia = null;
-var attachMediaStream = null;
-var reattachMediaStream = null;
-var webrtcDetectedBrowser = null;
-var webrtcDetectedVersion = null;
-
-function trace(text) {
- // This function is used for logging.
- if (text[text.length - 1] == '\n') {
- text = text.substring(0, text.length - 1);
- }
- console.log((performance.now() / 1000).toFixed(3) + ": " + text);
-}
-
-if (navigator.mozGetUserMedia) {
- console.log("This appears to be Firefox");
-
- webrtcDetectedBrowser = "firefox";
-
- webrtcDetectedVersion =
- parseInt(navigator.userAgent.match(/Firefox\/([0-9]+)\./)[1]);
-
- // The RTCPeerConnection object.
- RTCPeerConnection = mozRTCPeerConnection;
-
- // The RTCSessionDescription object.
- RTCSessionDescription = mozRTCSessionDescription;
-
- // The RTCIceCandidate object.
- RTCIceCandidate = mozRTCIceCandidate;
-
- // Get UserMedia (only difference is the prefix).
- // Code from Adam Barth.
- getUserMedia = navigator.mozGetUserMedia.bind(navigator);
-
- // Creates iceServer from the url for FF.
- createIceServer = function(url, username, password) {
- var iceServer = null;
- var url_parts = url.split(':');
- if (url_parts[0].indexOf('stun') === 0) {
- // Create iceServer with stun url.
- iceServer = { 'url': url };
- } else if (url_parts[0].indexOf('turn') === 0 &&
- (url.indexOf('transport=udp') !== -1 ||
- url.indexOf('?transport') === -1)) {
- // Create iceServer with turn url.
- // Ignore the transport parameter from TURN url.
- var turn_url_parts = url.split("?");
- iceServer = { 'url': turn_url_parts[0],
- 'credential': password,
- 'username': username };
- }
- return iceServer;
- };
-
- // Attach a media stream to an element.
- attachMediaStream = function(element, stream) {
- console.log("Attaching media stream");
- element.mozSrcObject = stream;
- element.play();
- };
-
- reattachMediaStream = function(to, from) {
- console.log("Reattaching media stream");
- to.mozSrcObject = from.mozSrcObject;
- to.play();
- };
-
- // Fake get{Video,Audio}Tracks
- MediaStream.prototype.getVideoTracks = function() {
- return [];
- };
-
- MediaStream.prototype.getAudioTracks = function() {
- return [];
- };
-} else if (navigator.webkitGetUserMedia) {
- console.log("This appears to be Chrome");
-
- webrtcDetectedBrowser = "chrome";
- webrtcDetectedVersion =
- parseInt(navigator.userAgent.match(/Chrom(e|ium)\/([0-9]+)\./)[2]);
-
- // Creates iceServer from the url for Chrome.
- createIceServer = function(url, username, password) {
- var iceServer = null;
- var url_parts = url.split(':');
- if (url_parts[0].indexOf('stun') === 0) {
- // Create iceServer with stun url.
- iceServer = { 'url': url };
- } else if (url_parts[0].indexOf('turn') === 0) {
- if (webrtcDetectedVersion < 28) {
- // For pre-M28 chrome versions use old TURN format.
- var url_turn_parts = url.split("turn:");
- iceServer = { 'url': 'turn:' + username + '@' + url_turn_parts[1],
- 'credential': password };
- } else {
- // For Chrome M28 & above use new TURN format.
- iceServer = { 'url': url,
- 'credential': password,
- 'username': username };
- }
- }
- return iceServer;
- };
-
- // The RTCPeerConnection object.
- RTCPeerConnection = webkitRTCPeerConnection;
-
- // Get UserMedia (only difference is the prefix).
- // Code from Adam Barth.
- getUserMedia = navigator.webkitGetUserMedia.bind(navigator);
-
- // Attach a media stream to an element.
- attachMediaStream = function(element, stream) {
- if (typeof element.srcObject !== 'undefined') {
- element.srcObject = stream;
- } else if (typeof element.mozSrcObject !== 'undefined') {
- element.mozSrcObject = stream;
- } else if (typeof element.src !== 'undefined') {
- element.src = URL.createObjectURL(stream);
- } else {
- console.log('Error attaching stream to element.');
- }
- };
-
- reattachMediaStream = function(to, from) {
- to.src = from.src;
- };
-
- // The representation of tracks in a stream is changed in M26.
- // Unify them for earlier Chrome versions in the coexisting period.
- if (!webkitMediaStream.prototype.getVideoTracks) {
- webkitMediaStream.prototype.getVideoTracks = function() {
- return this.videoTracks;
- };
- webkitMediaStream.prototype.getAudioTracks = function() {
- return this.audioTracks;
- };
- }
-
- // New syntax of getXXXStreams method in M26.
- if (!webkitRTCPeerConnection.prototype.getLocalStreams) {
- webkitRTCPeerConnection.prototype.getLocalStreams = function() {
- return this.localStreams;
- };
- webkitRTCPeerConnection.prototype.getRemoteStreams = function() {
- return this.remoteStreams;
- };
- }
-} else {
- console.log("Browser does not appear to be WebRTC-capable");
-}
« no previous file with comments | « trunk/src/chrome/browser/media/webrtc_browsertest_base.cc ('k') | trunk/src/chrome/test/data/webrtc/getusermedia.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698