Commit d1f07e92 authored by Guido Urdaneta's avatar Guido Urdaneta Committed by Commit Bot

Revert "Don't trigger end of track when starting a new disabled track"

This reverts commit 447c696a.

Reason for revert: Introduces a regression. See https://crbug.com/813243

Original change's description:
> Don't trigger end of track when starting a new disabled track
>
> Fix reporting a size of 2x2 on the video element during the loading
> phase.
>
> Bug: 684288
> Change-Id: Id4adceefaf4c3df57a1ba41fd285862d72792b1a
> Reviewed-on: https://chromium-review.googlesource.com/806215
> Commit-Queue: Florent Castelli <orphis@chromium.org>
> Commit-Queue: Guido Urdaneta <guidou@chromium.org>
> Reviewed-by: Guido Urdaneta <guidou@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#523152}

TBR=guidou@chromium.org,orphis@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 684288, 813243
Change-Id: I60bc092c23d1840a9c7e95b4b1d8d02c52c6fb46
Reviewed-on: https://chromium-review.googlesource.com/924190
Commit-Queue: Guido Urdaneta <guidou@chromium.org>
Reviewed-by: default avatarGuido Urdaneta <guidou@chromium.org>
Cr-Commit-Position: refs/heads/master@{#537675}
parent 018f4318
...@@ -803,13 +803,6 @@ IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest, ...@@ -803,13 +803,6 @@ IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest,
ExecuteJavascriptAndWaitForOk("concurrentGetUserMediaStop()"); ExecuteJavascriptAndWaitForOk("concurrentGetUserMediaStop()");
} }
IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest, DisabledTrackVideoSize) {
ASSERT_TRUE(embedded_test_server()->Start());
GURL url(embedded_test_server()->GetURL("/media/getusermedia.html"));
NavigateToURL(shell(), url);
ExecuteJavascriptAndWaitForOk("disabledTrackVideoSize()");
}
IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest, IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest,
GetUserMediaAfterStopElementCapture) { GetUserMediaAfterStopElementCapture) {
ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(embedded_test_server()->Start());
......
...@@ -200,7 +200,8 @@ void MediaStreamVideoRendererSink::Start() { ...@@ -200,7 +200,8 @@ void MediaStreamVideoRendererSink::Start() {
true); true);
if (video_track_.Source().GetReadyState() == if (video_track_.Source().GetReadyState() ==
blink::WebMediaStreamSource::kReadyStateEnded) { blink::WebMediaStreamSource::kReadyStateEnded ||
!video_track_.IsEnabled()) {
io_task_runner_->PostTask( io_task_runner_->PostTask(
FROM_HERE, base::BindOnce(&FrameDeliverer::RenderEndOfStream, FROM_HERE, base::BindOnce(&FrameDeliverer::RenderEndOfStream,
base::Unretained(frame_deliverer_.get()))); base::Unretained(frame_deliverer_.get())));
......
...@@ -796,24 +796,6 @@ ...@@ -796,24 +796,6 @@
} }
} }
function disabledTrackVideoSize() {
var videoElement = $('local-view-1');
navigator.mediaDevices.getUserMedia({
audio: true,
video: { width: { exact: 320 }, height: { exact: 240 }}
}).then(stream => {
stream.getVideoTracks()[0].enabled = false;
videoElement.onloadedmetadata = () => {
assertEquals(320, videoElement.videoWidth);
assertEquals(240, videoElement.videoHeight);
reportTestSuccess();
};
videoElement.srcObject = stream;
}).catch(failTest);
}
function getUserMediaAfterStopCanvasCapture() { function getUserMediaAfterStopCanvasCapture() {
var canvas = document.createElement('canvas'); var canvas = document.createElement('canvas');
canvas.width = canvas.height = 64; canvas.width = canvas.height = 64;
......
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