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

Issue 218763007: Update MediaStreamTrack::Stop to latest draft. (Closed)

Created:
6 years, 8 months ago by perkj_chrome
Modified:
6 years, 8 months ago
CC:
chromium-reviews, fischman+watch_chromium.org, jam, mcasas+watch_chromium.org, feature-media-reviews_chromium.org, darin-cc_chromium.org, wjia+watch_chromium.org
Visibility:
Public.

Description

Update MediaStreamTrack::Stop to latest draft. MediaStreamTrack::Stop now only stop the source if there are no other tracks using the same source. BUG=357503 Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=264155

Patch Set 1 #

Patch Set 2 : Self review. #

Total comments: 14

Patch Set 3 : Addressed review comments and added tests. #

Total comments: 22

Patch Set 4 : Changed WebRtcAudioCapturer to always start. Addressed code review comments. #

Patch Set 5 : #

Patch Set 6 : Rebased #

Total comments: 6

Patch Set 7 : Fix mergeproblems. Addressed review comments. #

Patch Set 8 : Fixed test WebRtcGetUserMediaBrowserTest.TwoGetUserMediaAndStop #

Total comments: 8

Patch Set 9 : Rebased and addressed comments. #

Total comments: 2

Patch Set 10 : phoglunds comments #

Patch Set 11 : Rebased to 263546 #

Patch Set 12 : Fixed the build #

Patch Set 13 : Make sure audio source stop is triggered if initialization fail. #

Total comments: 4

Patch Set 14 : Addressed comments. #

Unified diffs Side-by-side diffs Delta from patch set Stats (+399 lines, -328 lines) Patch
M content/renderer/media/media_stream.h View 3 chunks +0 lines, -8 lines 0 comments Download
M content/renderer/media/media_stream.cc View 2 chunks +1 line, -8 lines 0 comments Download
M content/renderer/media/media_stream_audio_source.cc View 1 2 3 4 5 6 7 8 9 10 11 12 13 1 chunk +15 lines, -10 lines 0 comments Download
M content/renderer/media/media_stream_center.cc View 1 2 3 4 5 6 7 8 3 chunks +5 lines, -19 lines 0 comments Download
M content/renderer/media/media_stream_dependency_factory.h View 1 2 3 4 5 1 chunk +2 lines, -1 line 0 comments Download
M content/renderer/media/media_stream_dependency_factory.cc View 1 2 3 4 5 3 chunks +6 lines, -3 lines 0 comments Download
M content/renderer/media/media_stream_dependency_factory_unittest.cc View 2 chunks +0 lines, -2 lines 0 comments Download
M content/renderer/media/media_stream_impl.h View 4 chunks +9 lines, -21 lines 0 comments Download
M content/renderer/media/media_stream_impl.cc View 1 2 3 4 5 6 7 8 9 10 11 12 11 chunks +18 lines, -88 lines 0 comments Download
M content/renderer/media/media_stream_impl_unittest.cc View 1 2 3 4 5 6 7 8 9 10 11 12 10 chunks +91 lines, -51 lines 0 comments Download
M content/renderer/media/media_stream_track.h View 1 2 3 4 5 6 1 chunk +4 lines, -0 lines 0 comments Download
M content/renderer/media/media_stream_track.cc View 1 2 3 1 chunk +9 lines, -0 lines 0 comments Download
M content/renderer/media/media_stream_video_capture_source_unittest.cc View 1 2 3 4 5 6 4 chunks +10 lines, -5 lines 0 comments Download
M content/renderer/media/media_stream_video_capturer_source.cc View 1 2 3 4 5 6 1 chunk +1 line, -1 line 0 comments Download
M content/renderer/media/media_stream_video_source.cc View 1 2 3 4 5 6 7 8 9 10 3 chunks +12 lines, -8 lines 0 comments Download
M content/renderer/media/media_stream_video_source_unittest.cc View 1 2 3 4 5 6 7 8 9 10 10 chunks +22 lines, -16 lines 0 comments Download
M content/renderer/media/media_stream_video_track.h View 1 2 3 4 5 1 chunk +1 line, -0 lines 0 comments Download
M content/renderer/media/media_stream_video_track.cc View 1 2 3 4 5 2 chunks +10 lines, -1 line 0 comments Download
M content/renderer/media/media_stream_video_track_unittest.cc View 1 2 3 4 5 6 3 chunks +44 lines, -6 lines 0 comments Download
M content/renderer/media/mock_media_stream_dependency_factory.h View 1 2 3 4 5 6 7 8 9 10 11 12 3 chunks +7 lines, -2 lines 0 comments Download
M content/renderer/media/mock_media_stream_dependency_factory.cc View 1 2 3 4 5 6 7 8 9 10 11 12 4 chunks +13 lines, -5 lines 0 comments Download
M content/renderer/media/mock_media_stream_registry.cc View 1 2 3 4 5 6 1 chunk +0 lines, -1 line 0 comments Download
M content/renderer/media/rtc_peer_connection_handler_unittest.cc View 1 2 3 4 5 1 chunk +0 lines, -1 line 0 comments Download
M content/renderer/media/webrtc/media_stream_remote_video_source.cc View 1 2 3 4 5 6 7 8 9 10 1 chunk +4 lines, -2 lines 0 comments Download
M content/renderer/media/webrtc/webrtc_local_audio_track_adapter_unittest.cc View 1 2 3 4 5 1 chunk +1 line, -1 line 0 comments Download
M content/renderer/media/webrtc_audio_capturer.h View 1 2 3 4 5 6 7 8 9 10 5 chunks +17 lines, -5 lines 0 comments Download
M content/renderer/media/webrtc_audio_capturer.cc View 1 2 3 4 5 6 7 8 9 10 11 9 chunks +31 lines, -21 lines 0 comments Download
M content/renderer/media/webrtc_audio_capturer_unittest.cc View 1 2 3 4 5 1 chunk +3 lines, -3 lines 0 comments Download
M content/renderer/media/webrtc_local_audio_source_provider_unittest.cc View 1 2 3 4 5 6 1 chunk +1 line, -1 line 0 comments Download
M content/renderer/media/webrtc_local_audio_track.h View 1 2 3 4 5 1 chunk +1 line, -1 line 0 comments Download
M content/renderer/media/webrtc_local_audio_track_unittest.cc View 1 2 3 4 5 6 15 chunks +50 lines, -27 lines 0 comments Download
M content/test/data/media/getusermedia.html View 1 2 3 4 5 6 7 8 9 2 chunks +11 lines, -10 lines 0 comments Download

Messages

Total messages: 31 (0 generated)
perkj_chrome
Hej Can you please review?
6 years, 8 months ago (2014-03-31 17:22:04 UTC) #1
no longer working on chromium
Great work, thanks. https://codereview.chromium.org/218763007/diff/20001/content/renderer/media/media_stream_center.cc File content/renderer/media/media_stream_center.cc (right): https://codereview.chromium.org/218763007/diff/20001/content/renderer/media/media_stream_center.cc#newcode131 content/renderer/media/media_stream_center.cc:131: return false; Can this happen? Add ...
6 years, 8 months ago (2014-04-01 18:29:58 UTC) #2
perkj_chrome
PTAL- I know there is an error in MediaStreamVideoSource unittests that I need to fix.... ...
6 years, 8 months ago (2014-04-02 13:35:49 UTC) #3
no longer working on chromium
https://codereview.chromium.org/218763007/diff/40001/content/renderer/media/webrtc_audio_capturer.cc File content/renderer/media/webrtc_audio_capturer.cc (right): https://codereview.chromium.org/218763007/diff/40001/content/renderer/media/webrtc_audio_capturer.cc#newcode284 content/renderer/media/webrtc_audio_capturer.cc:284: audio_source_->StopSource(); you will trigger WebRtcAudioCapturerer::Stop() here, but if a ...
6 years, 8 months ago (2014-04-02 13:50:56 UTC) #4
tommi (sloooow) - chröme
https://codereview.chromium.org/218763007/diff/40001/content/renderer/media/media_stream_impl.cc File content/renderer/media/media_stream_impl.cc (right): https://codereview.chromium.org/218763007/diff/40001/content/renderer/media/media_stream_impl.cc#newcode526 content/renderer/media/media_stream_impl.cc:526: DeleteUserMediaRequestInfo(request); Previously we didn't delete the request on success. ...
6 years, 8 months ago (2014-04-03 08:53:16 UTC) #5
perkj_chrome
PTAL https://codereview.chromium.org/218763007/diff/40001/content/renderer/media/media_stream_impl.cc File content/renderer/media/media_stream_impl.cc (right): https://codereview.chromium.org/218763007/diff/40001/content/renderer/media/media_stream_impl.cc#newcode526 content/renderer/media/media_stream_impl.cc:526: DeleteUserMediaRequestInfo(request); On 2014/04/03 08:53:16, tommi wrote: > Previously ...
6 years, 8 months ago (2014-04-03 11:58:33 UTC) #6
no longer working on chromium
lgtm on audio.
6 years, 8 months ago (2014-04-03 12:15:13 UTC) #7
perkj_chrome
Tommi?
6 years, 8 months ago (2014-04-07 08:15:37 UTC) #8
tommi (sloooow) - chröme
lgtm % nits https://codereview.chromium.org/218763007/diff/40001/content/renderer/media/media_stream_track.h File content/renderer/media/media_stream_track.h (right): https://codereview.chromium.org/218763007/diff/40001/content/renderer/media/media_stream_track.h#newcode38 content/renderer/media/media_stream_track.h:38: // TODO(xians): Make pure virtual when ...
6 years, 8 months ago (2014-04-07 10:05:43 UTC) #9
perkj_chrome
https://codereview.chromium.org/218763007/diff/40001/content/renderer/media/media_stream_track.h File content/renderer/media/media_stream_track.h (right): https://codereview.chromium.org/218763007/diff/40001/content/renderer/media/media_stream_track.h#newcode38 content/renderer/media/media_stream_track.h:38: // TODO(xians): Make pure virtual when remote audio tracks ...
6 years, 8 months ago (2014-04-07 15:33:51 UTC) #10
perkj_chrome
The CQ bit was checked by perkj@chromium.org
6 years, 8 months ago (2014-04-07 15:34:13 UTC) #11
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/perkj@chromium.org/218763007/120001
6 years, 8 months ago (2014-04-07 15:34:23 UTC) #12
commit-bot: I haz the power
The CQ bit was unchecked by commit-bot@chromium.org
6 years, 8 months ago (2014-04-07 15:59:35 UTC) #13
commit-bot: I haz the power
Try jobs failed on following builders: tryserver.chromium on win_chromium_compile_dbg
6 years, 8 months ago (2014-04-07 15:59:36 UTC) #14
perkj_chrome
phoglund, would you mind taking a look at the change in getusermedia.html? alpha, can you ...
6 years, 8 months ago (2014-04-08 07:44:12 UTC) #15
perkj_chrome
And actually add phoglund and hclam. phoglund, can you take a look at getusermedia.html. Alpha, ...
6 years, 8 months ago (2014-04-08 10:05:56 UTC) #16
phoglund_chromium
https://codereview.chromium.org/218763007/diff/140001/content/test/data/media/getusermedia.html File content/test/data/media/getusermedia.html (right): https://codereview.chromium.org/218763007/diff/140001/content/test/data/media/getusermedia.html#newcode174 content/test/data/media/getusermedia.html:174: stopBothVideoTracksAndVerify(stream), This is wrong; you're supposed to pass in ...
6 years, 8 months ago (2014-04-08 12:04:21 UTC) #17
perkj_chrome
Patrik, can you please take another look? https://codereview.chromium.org/218763007/diff/140001/content/test/data/media/getusermedia.html File content/test/data/media/getusermedia.html (right): https://codereview.chromium.org/218763007/diff/140001/content/test/data/media/getusermedia.html#newcode174 content/test/data/media/getusermedia.html:174: stopBothVideoTracksAndVerify(stream), On ...
6 years, 8 months ago (2014-04-09 15:31:31 UTC) #18
phoglund_chromium
https://codereview.chromium.org/218763007/diff/140001/content/test/data/media/getusermedia.html File content/test/data/media/getusermedia.html (right): https://codereview.chromium.org/218763007/diff/140001/content/test/data/media/getusermedia.html#newcode183 content/test/data/media/getusermedia.html:183: // Make sure the original track is still playing ...
6 years, 8 months ago (2014-04-09 15:51:30 UTC) #19
perkj_chrome
Alpha, do you have time to help me with the failing TabAudio tests? https://codereview.chromium.org/218763007/diff/140001/content/test/data/media/getusermedia.html File ...
6 years, 8 months ago (2014-04-10 11:25:08 UTC) #20
Alpha Left Google
I think the problem is that instead of calling stop on a MediaStream you want ...
6 years, 8 months ago (2014-04-10 20:58:36 UTC) #21
phoglund_chromium
lgtm
6 years, 8 months ago (2014-04-11 11:12:14 UTC) #22
perkj_chrome
Thanks a lot Alpha for your pointers. It turned out that the tab capture test ...
6 years, 8 months ago (2014-04-15 09:11:31 UTC) #23
no longer working on chromium
lgtm with two nits. https://codereview.chromium.org/218763007/diff/250001/content/renderer/media/media_stream_audio_source.cc File content/renderer/media/media_stream_audio_source.cc (right): https://codereview.chromium.org/218763007/diff/250001/content/renderer/media/media_stream_audio_source.cc#newcode40 content/renderer/media/media_stream_audio_source.cc:40: if(!factory_->InitializeMediaStreamAudioSource(render_view_id_, nit, add an empty ...
6 years, 8 months ago (2014-04-15 10:33:27 UTC) #24
perkj_chrome
done https://codereview.chromium.org/218763007/diff/250001/content/renderer/media/media_stream_audio_source.cc File content/renderer/media/media_stream_audio_source.cc (right): https://codereview.chromium.org/218763007/diff/250001/content/renderer/media/media_stream_audio_source.cc#newcode40 content/renderer/media/media_stream_audio_source.cc:40: if(!factory_->InitializeMediaStreamAudioSource(render_view_id_, On 2014/04/15 10:33:28, xians1 wrote: > nit, ...
6 years, 8 months ago (2014-04-15 11:00:43 UTC) #25
perkj_chrome
The CQ bit was checked by perkj@chromium.org
6 years, 8 months ago (2014-04-15 11:01:45 UTC) #26
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/perkj@chromium.org/218763007/270001
6 years, 8 months ago (2014-04-15 11:02:14 UTC) #27
perkj_chrome
The CQ bit was unchecked by perkj@chromium.org
6 years, 8 months ago (2014-04-15 12:36:00 UTC) #28
perkj_chrome
The CQ bit was checked by perkj@chromium.org
6 years, 8 months ago (2014-04-16 05:20:04 UTC) #29
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/perkj@chromium.org/218763007/270001
6 years, 8 months ago (2014-04-16 05:20:59 UTC) #30
commit-bot: I haz the power
6 years, 8 months ago (2014-04-16 09:31:05 UTC) #31
Message was sent while issue was closed.
Change committed as 264155

Powered by Google App Engine
This is Rietveld 408576698