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

Side by Side Diff: content/renderer/media/webmediaplayer_ms_unittest.cc

Issue 2050043002: Generate and assign media track ids in demuxers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@use-streamparser-trackid
Patch Set: Remove Demuxer::GetDemuxerStreamByTrackId Created 4 years, 6 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 unified diff | Download patch
« no previous file with comments | « no previous file | media/base/media_track.h » ('j') | media/base/media_track.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <stddef.h> 5 #include <stddef.h>
6 6
7 #include "content/public/renderer/media_stream_renderer_factory.h" 7 #include "content/public/renderer/media_stream_renderer_factory.h"
8 #include "content/renderer/media/webmediaplayer_ms.h" 8 #include "content/renderer/media/webmediaplayer_ms.h"
9 #include "content/renderer/media/webmediaplayer_ms_compositor.h" 9 #include "content/renderer/media/webmediaplayer_ms_compositor.h"
10 #include "content/renderer/render_frame_impl.h" 10 #include "content/renderer/render_frame_impl.h"
(...skipping 375 matching lines...) Expand 10 before | Expand all | Expand 10 after
386 void repaint() override {} 386 void repaint() override {}
387 void durationChanged() override {} 387 void durationChanged() override {}
388 void sizeChanged() override; 388 void sizeChanged() override;
389 void playbackStateChanged() override {} 389 void playbackStateChanged() override {}
390 void setWebLayer(blink::WebLayer* layer) override; 390 void setWebLayer(blink::WebLayer* layer) override;
391 blink::WebMediaPlayer::TrackId addAudioTrack(const blink::WebString& id, 391 blink::WebMediaPlayer::TrackId addAudioTrack(const blink::WebString& id,
392 AudioTrackKind, 392 AudioTrackKind,
393 const blink::WebString& label, 393 const blink::WebString& label,
394 const blink::WebString& language, 394 const blink::WebString& language,
395 bool enabled) override { 395 bool enabled) override {
396 return 0; 396 return blink::WebMediaPlayer::TrackId();
397 } 397 }
398 void removeAudioTrack(blink::WebMediaPlayer::TrackId) override {} 398 void removeAudioTrack(blink::WebMediaPlayer::TrackId) override {}
399 blink::WebMediaPlayer::TrackId addVideoTrack(const blink::WebString& id, 399 blink::WebMediaPlayer::TrackId addVideoTrack(const blink::WebString& id,
400 VideoTrackKind, 400 VideoTrackKind,
401 const blink::WebString& label, 401 const blink::WebString& label,
402 const blink::WebString& language, 402 const blink::WebString& language,
403 bool selected) override { 403 bool selected) override {
404 return 0; 404 return blink::WebMediaPlayer::TrackId();
405 } 405 }
406 void removeVideoTrack(blink::WebMediaPlayer::TrackId) override {} 406 void removeVideoTrack(blink::WebMediaPlayer::TrackId) override {}
407 void addTextTrack(blink::WebInbandTextTrack*) override {} 407 void addTextTrack(blink::WebInbandTextTrack*) override {}
408 void removeTextTrack(blink::WebInbandTextTrack*) override {} 408 void removeTextTrack(blink::WebInbandTextTrack*) override {}
409 void mediaSourceOpened(blink::WebMediaSource*) override {} 409 void mediaSourceOpened(blink::WebMediaSource*) override {}
410 void requestSeek(double) override {} 410 void requestSeek(double) override {}
411 void remoteRouteAvailabilityChanged(bool) override {} 411 void remoteRouteAvailabilityChanged(bool) override {}
412 void connectedToRemoteDevice() override {} 412 void connectedToRemoteDevice() override {}
413 void disconnectedFromRemoteDevice() override {} 413 void disconnectedFromRemoteDevice() override {}
414 void cancelledRemotePlaybackRequest() override {} 414 void cancelledRemotePlaybackRequest() override {}
(...skipping 409 matching lines...) Expand 10 before | Expand all | Expand 10 after
824 EXPECT_TRUE(player_.paused()); 824 EXPECT_TRUE(player_.paused());
825 825
826 // OnShown() should restart after a forced suspension. 826 // OnShown() should restart after a forced suspension.
827 player_.OnShown(); 827 player_.OnShown();
828 EXPECT_FALSE(player_.paused()); 828 EXPECT_FALSE(player_.paused());
829 EXPECT_CALL(*this, DoSetWebLayer(false)); 829 EXPECT_CALL(*this, DoSetWebLayer(false));
830 } 830 }
831 #endif 831 #endif
832 832
833 } // namespace content 833 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | media/base/media_track.h » ('j') | media/base/media_track.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698