| Index: media/blink/webmediaplayer_impl.h
|
| diff --git a/media/blink/webmediaplayer_impl.h b/media/blink/webmediaplayer_impl.h
|
| index 73a1ce9e14c5591a87b77d9144a2cd9bd527d8b9..35c607491251625077edb418d8cfb5fba266824c 100644
|
| --- a/media/blink/webmediaplayer_impl.h
|
| +++ b/media/blink/webmediaplayer_impl.h
|
| @@ -18,6 +18,7 @@
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/threading/thread.h"
|
| #include "build/build_config.h"
|
| +#include "media/base/media_tracks.h"
|
| #include "media/base/pipeline_impl.h"
|
| #include "media/base/renderer_factory.h"
|
| #include "media/base/surface_manager.h"
|
| @@ -261,6 +262,9 @@ class MEDIA_BLINK_EXPORT WebMediaPlayerImpl
|
| void OnEncryptedMediaInitData(EmeInitDataType init_data_type,
|
| const std::vector<uint8_t>& init_data);
|
|
|
| + // Called when the demuxer encounters new media tracks.
|
| + void OnMediaTracksUpdated(scoped_ptr<MediaTracks> tracks);
|
| +
|
| // Called when a decoder detects that the key needed to decrypt the stream
|
| // is not available.
|
| void OnWaitingForDecryptionKey();
|
| @@ -454,6 +458,9 @@ class MEDIA_BLINK_EXPORT WebMediaPlayerImpl
|
| // This will be null everywhere but Android.
|
| SurfaceManager* surface_manager_;
|
|
|
| + std::vector<blink::WebMediaPlayer::TrackId> blink_audio_tracks_;
|
| + std::vector<blink::WebMediaPlayer::TrackId> blink_video_tracks_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl);
|
| };
|
|
|
|
|