| Index: content/renderer/media/android/media_source_delegate.h
|
| diff --git a/content/renderer/media/android/media_source_delegate.h b/content/renderer/media/android/media_source_delegate.h
|
| index e627a1fb2ee92e30f055f7d4e72d88db1ab0048f..c872efba9fea4a8aa40d457cef8c0701495b0ad8 100644
|
| --- a/content/renderer/media/android/media_source_delegate.h
|
| +++ b/content/renderer/media/android/media_source_delegate.h
|
| @@ -67,12 +67,6 @@ class MediaSourceDelegate : public media::DemuxerHost {
|
| const UpdateNetworkStateCB& update_network_state_cb,
|
| const DurationChangeCB& duration_change_cb);
|
|
|
| -#if defined(GOOGLE_TV)
|
| - void InitializeMediaStream(
|
| - media::Demuxer* demuxer,
|
| - const UpdateNetworkStateCB& update_network_state_cb);
|
| -#endif
|
| -
|
| const blink::WebTimeRanges& Buffered();
|
| size_t DecodedFrameCount() const;
|
| size_t DroppedFrameCount() const;
|
| @@ -100,8 +94,6 @@ class MediaSourceDelegate : public media::DemuxerHost {
|
| // cached data since last keyframe. See http://crbug.com/304234.
|
| void Seek(const base::TimeDelta& seek_time, bool is_browser_seek);
|
|
|
| - void NotifyKeyAdded(const std::string& key_system);
|
| -
|
| // Called when DemuxerStreamPlayer needs to read data from ChunkDemuxer.
|
| void OnReadFromDemuxer(media::DemuxerStream::Type type);
|
|
|
| @@ -211,7 +203,6 @@ class MediaSourceDelegate : public media::DemuxerHost {
|
| DurationChangeCB duration_change_cb_;
|
|
|
| scoped_ptr<media::ChunkDemuxer> chunk_demuxer_;
|
| - media::Demuxer* demuxer_;
|
| bool is_demuxer_ready_;
|
|
|
| media::SetDecryptorReadyCB set_decryptor_ready_cb_;
|
| @@ -230,10 +221,6 @@ class MediaSourceDelegate : public media::DemuxerHost {
|
| MediaSourceOpenedCB media_source_opened_cb_;
|
| media::Demuxer::NeedKeyCB need_key_cb_;
|
|
|
| - // The currently selected key system. Empty string means that no key system
|
| - // has been selected.
|
| - blink::WebString current_key_system_;
|
| -
|
| // Temporary for EME v0.1. In the future the init data type should be passed
|
| // through GenerateKeyRequest() directly from WebKit.
|
| std::string init_data_type_;
|
| @@ -251,11 +238,6 @@ class MediaSourceDelegate : public media::DemuxerHost {
|
| base::TimeDelta browser_seek_time_;
|
| bool expecting_regular_seek_;
|
|
|
| -#if defined(GOOGLE_TV)
|
| - bool key_added_;
|
| - std::string key_system_;
|
| -#endif // defined(GOOGLE_TV)
|
| -
|
| size_t access_unit_size_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(MediaSourceDelegate);
|
|
|