Commit 915681d9 authored by oshima@chromium.org's avatar oshima@chromium.org

Revert 288702 "Content browsertest for verifying that a black fr..."

Reason for revert: UNADDRESSABLE ACCESS reported on memory bot. See crbug.com/403070 for more details.

> Content browsertest for verifying that a black frame is sent on a peerconnection if a track is disabled.
> 
> BUG=398844,403070
> 
> Review URL: https://codereview.chromium.org/442313002

TBR=perkj@chromium.org

Review URL: https://codereview.chromium.org/466983002

Cr-Commit-Position: refs/heads/master@{#289083}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289083 0039d316-1c4b-4281-b951-d872f2087c98
parent 50660700
......@@ -123,13 +123,6 @@ IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest,
MakeTypicalPeerConnectionCall(javascript);
}
IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest,
CanSetupVideoCallAndDisableLocalVideo) {
const std::string javascript =
"callAndDisableLocalVideo({video: true});";
MakeTypicalPeerConnectionCall(javascript);
}
IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest,
CanSetupVideoCallWith16To9AspectRatio) {
const std::string javascript =
......
......@@ -58,20 +58,6 @@
waitForVideo('remote-view-2');
}
// Test that we can setup a call with a video track and that the remote peer
// receives black frames if the local video track is disabled.
function callAndDisableLocalVideo(constraints) {
createConnections(null);
navigator.webkitGetUserMedia(constraints,
addStreamToBothConnectionsAndNegotiate, printGetUserMediaError);
detectVideoPlaying('remote-view-1',
function () {
assertEquals(gLocalStream.getVideoTracks().length, 1);
gLocalStream.getVideoTracks()[0].enabled = false;
waitForBlackVideo('remote-view-1');
});
}
// Test that we can setup call with an audio and video track and check that
// the video resolution is as expected.
function callAndExpectResolution(constraints,
......
......@@ -52,14 +52,6 @@ function detectVideoStopped(videoElementName, callback) {
callback);
}
function detectBlackVideo(videoElementName, callback) {
detectVideo(videoElementName,
function (pixels, previous_pixels) {
return isVideoBlack(pixels);
},
callback);
}
function detectVideo(videoElementName, predicate, callback) {
console.log('Looking at video in element ' + videoElementName);
......@@ -105,11 +97,6 @@ function waitForVideoToStop(videoElement) {
detectVideoStopped(videoElement, function () { eventOccured(); });
}
function waitForBlackVideo(videoElement) {
addExpectedEvent();
detectBlackVideo(videoElement, function () { eventOccured(); });
}
// Calculates the current frame rate and compares to |expected_frame_rate|
// |callback| is triggered with value |true| if the calculated frame rate
// is +-1 the expected or |false| if five calculations fail to match
......@@ -184,16 +171,6 @@ function isVideoPlaying(pixels, previousPixels) {
return false;
}
function isVideoBlack(pixels) {
for (var i = 0; i < pixels.length; i++) {
// |pixels| is in RGBA. Ignore the alpha channel.
if (pixels[i] != 0 && (i + 1) % 4 != 0) {
return false;
}
}
return true;
}
// This function matches |left| and |right| and fails the test if the
// values don't match using normal javascript equality (i.e. the hard
// types of the operands aren't checked).
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment