From f83283a334a6faa3d9b48932a0e085decbad9d68 Mon Sep 17 00:00:00 2001 From: Matt Vander Vliet Date: Tue, 3 Oct 2017 09:56:43 -0600 Subject: [PATCH 1/2] CB-13384: (browser) Added deprecation of video.src compatibility --- src/browser/CameraProxy.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/browser/CameraProxy.js b/src/browser/CameraProxy.js index 38f241f9f..568b8cec6 100644 --- a/src/browser/CameraProxy.js +++ b/src/browser/CameraProxy.js @@ -102,7 +102,11 @@ function capture (success, errorCallback, opts) { var successCallback = function (stream) { localMediaStream = stream; - video.src = window.URL.createObjectURL(localMediaStream); + try { + video.src = window.URL.createObjectURL(localMediaStream); + } catch (e) { + video.srcObject = localMediaStream; + } video.play(); document.body.appendChild(parent); From cee7ca886745f51b3bafc8ac7ee175ee4c8acf51 Mon Sep 17 00:00:00 2001 From: Matt Vander Vliet Date: Thu, 24 May 2018 08:52:42 -0600 Subject: [PATCH 2/2] CB-13384: Updated to reflect property detection rather than deprecation exception. --- src/browser/CameraProxy.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/browser/CameraProxy.js b/src/browser/CameraProxy.js index 568b8cec6..7eb86bb36 100644 --- a/src/browser/CameraProxy.js +++ b/src/browser/CameraProxy.js @@ -102,13 +102,12 @@ function capture (success, errorCallback, opts) { var successCallback = function (stream) { localMediaStream = stream; - try { - video.src = window.URL.createObjectURL(localMediaStream); - } catch (e) { + if ('srcObject' in video) { video.srcObject = localMediaStream; + } else { + video.src = window.URL.createObjectURL(localMediaStream); } video.play(); - document.body.appendChild(parent); };