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

Side by Side Diff: media/blink/webmediaplayer_impl_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 | « media/blink/webmediaplayer_impl.cc ('k') | media/blink/websourcebuffer_impl.cc » ('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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 "media/blink/webmediaplayer_impl.h" 5 #include "media/blink/webmediaplayer_impl.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include <memory> 9 #include <memory>
10 10
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 void durationChanged() override {} 49 void durationChanged() override {}
50 void sizeChanged() override {} 50 void sizeChanged() override {}
51 void playbackStateChanged() override {} 51 void playbackStateChanged() override {}
52 void setWebLayer(blink::WebLayer*) override {} 52 void setWebLayer(blink::WebLayer*) override {}
53 blink::WebMediaPlayer::TrackId addAudioTrack( 53 blink::WebMediaPlayer::TrackId addAudioTrack(
54 const blink::WebString& id, 54 const blink::WebString& id,
55 blink::WebMediaPlayerClient::AudioTrackKind, 55 blink::WebMediaPlayerClient::AudioTrackKind,
56 const blink::WebString& label, 56 const blink::WebString& label,
57 const blink::WebString& language, 57 const blink::WebString& language,
58 bool enabled) override { 58 bool enabled) override {
59 return 0; 59 return blink::WebMediaPlayer::TrackId();
60 } 60 }
61 void removeAudioTrack(blink::WebMediaPlayer::TrackId) override {} 61 void removeAudioTrack(blink::WebMediaPlayer::TrackId) override {}
62 blink::WebMediaPlayer::TrackId addVideoTrack( 62 blink::WebMediaPlayer::TrackId addVideoTrack(
63 const blink::WebString& id, 63 const blink::WebString& id,
64 blink::WebMediaPlayerClient::VideoTrackKind, 64 blink::WebMediaPlayerClient::VideoTrackKind,
65 const blink::WebString& label, 65 const blink::WebString& label,
66 const blink::WebString& language, 66 const blink::WebString& language,
67 bool selected) override { 67 bool selected) override {
68 return 0; 68 return blink::WebMediaPlayer::TrackId();
69 } 69 }
70 void removeVideoTrack(blink::WebMediaPlayer::TrackId) override {} 70 void removeVideoTrack(blink::WebMediaPlayer::TrackId) override {}
71 void addTextTrack(blink::WebInbandTextTrack*) override {} 71 void addTextTrack(blink::WebInbandTextTrack*) override {}
72 void removeTextTrack(blink::WebInbandTextTrack*) override {} 72 void removeTextTrack(blink::WebInbandTextTrack*) override {}
73 void mediaSourceOpened(blink::WebMediaSource*) override {} 73 void mediaSourceOpened(blink::WebMediaSource*) override {}
74 void requestSeek(double) override {} 74 void requestSeek(double) override {}
75 void remoteRouteAvailabilityChanged(bool) override {} 75 void remoteRouteAvailabilityChanged(bool) override {}
76 void connectedToRemoteDevice() override {} 76 void connectedToRemoteDevice() override {}
77 void disconnectedFromRemoteDevice() override {} 77 void disconnectedFromRemoteDevice() override {}
78 void cancelledRemotePlaybackRequest() override {} 78 void cancelledRemotePlaybackRequest() override {}
(...skipping 350 matching lines...) Expand 10 before | Expand all | Expand 10 after
429 EXPECT_FALSE(state.is_suspended); 429 EXPECT_FALSE(state.is_suspended);
430 430
431 SetPaused(false); 431 SetPaused(false);
432 state = ComputePlayStateSuspended(); 432 state = ComputePlayStateSuspended();
433 EXPECT_EQ(WebMediaPlayerImpl::DelegateState::PLAYING, state.delegate_state); 433 EXPECT_EQ(WebMediaPlayerImpl::DelegateState::PLAYING, state.delegate_state);
434 EXPECT_TRUE(state.is_memory_reporting_enabled); 434 EXPECT_TRUE(state.is_memory_reporting_enabled);
435 EXPECT_FALSE(state.is_suspended); 435 EXPECT_FALSE(state.is_suspended);
436 } 436 }
437 437
438 } // namespace media 438 } // namespace media
OLDNEW
« no previous file with comments | « media/blink/webmediaplayer_impl.cc ('k') | media/blink/websourcebuffer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698