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

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: rebase to ToT 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') | no next file with comments »
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 "base/run_loop.h" 7 #include "base/run_loop.h"
8 #include "content/public/renderer/media_stream_renderer_factory.h" 8 #include "content/public/renderer/media_stream_renderer_factory.h"
9 #include "content/renderer/media/webmediaplayer_ms.h" 9 #include "content/renderer/media/webmediaplayer_ms.h"
10 #include "content/renderer/media/webmediaplayer_ms_compositor.h" 10 #include "content/renderer/media/webmediaplayer_ms_compositor.h"
(...skipping 380 matching lines...) Expand 10 before | Expand all | Expand 10 after
391 void repaint() override {} 391 void repaint() override {}
392 void durationChanged() override {} 392 void durationChanged() override {}
393 void sizeChanged() override; 393 void sizeChanged() override;
394 void playbackStateChanged() override {} 394 void playbackStateChanged() override {}
395 void setWebLayer(blink::WebLayer* layer) override; 395 void setWebLayer(blink::WebLayer* layer) override;
396 blink::WebMediaPlayer::TrackId addAudioTrack(const blink::WebString& id, 396 blink::WebMediaPlayer::TrackId addAudioTrack(const blink::WebString& id,
397 AudioTrackKind, 397 AudioTrackKind,
398 const blink::WebString& label, 398 const blink::WebString& label,
399 const blink::WebString& language, 399 const blink::WebString& language,
400 bool enabled) override { 400 bool enabled) override {
401 return 0; 401 return blink::WebMediaPlayer::TrackId();
402 } 402 }
403 void removeAudioTrack(blink::WebMediaPlayer::TrackId) override {} 403 void removeAudioTrack(blink::WebMediaPlayer::TrackId) override {}
404 blink::WebMediaPlayer::TrackId addVideoTrack(const blink::WebString& id, 404 blink::WebMediaPlayer::TrackId addVideoTrack(const blink::WebString& id,
405 VideoTrackKind, 405 VideoTrackKind,
406 const blink::WebString& label, 406 const blink::WebString& label,
407 const blink::WebString& language, 407 const blink::WebString& language,
408 bool selected) override { 408 bool selected) override {
409 return 0; 409 return blink::WebMediaPlayer::TrackId();
410 } 410 }
411 void removeVideoTrack(blink::WebMediaPlayer::TrackId) override {} 411 void removeVideoTrack(blink::WebMediaPlayer::TrackId) override {}
412 void addTextTrack(blink::WebInbandTextTrack*) override {} 412 void addTextTrack(blink::WebInbandTextTrack*) override {}
413 void removeTextTrack(blink::WebInbandTextTrack*) override {} 413 void removeTextTrack(blink::WebInbandTextTrack*) override {}
414 void mediaSourceOpened(blink::WebMediaSource*) override {} 414 void mediaSourceOpened(blink::WebMediaSource*) override {}
415 void requestSeek(double) override {} 415 void requestSeek(double) override {}
416 void remoteRouteAvailabilityChanged(bool) override {} 416 void remoteRouteAvailabilityChanged(bool) override {}
417 void connectedToRemoteDevice() override {} 417 void connectedToRemoteDevice() override {}
418 void disconnectedFromRemoteDevice() override {} 418 void disconnectedFromRemoteDevice() override {}
419 void cancelledRemotePlaybackRequest() override {} 419 void cancelledRemotePlaybackRequest() override {}
(...skipping 411 matching lines...) Expand 10 before | Expand all | Expand 10 after
831 // OnShown() should restart after a forced suspension. 831 // OnShown() should restart after a forced suspension.
832 player_->OnShown(); 832 player_->OnShown();
833 EXPECT_FALSE(player_->paused()); 833 EXPECT_FALSE(player_->paused());
834 EXPECT_CALL(*this, DoSetWebLayer(false)); 834 EXPECT_CALL(*this, DoSetWebLayer(false));
835 835
836 message_loop_.RunUntilIdle(); 836 message_loop_.RunUntilIdle();
837 } 837 }
838 #endif 838 #endif
839 839
840 } // namespace content 840 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | media/base/media_track.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698