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

Side by Side Diff: media/base/android/media_source_player.h

Issue 23545029: EME: Handle NO_KEY and resume playback after key is added. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase only Created 7 years, 3 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 | Annotate | Revision Log
« no previous file with comments | « media/base/android/media_player_android.cc ('k') | media/base/android/media_source_player.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 (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 #ifndef MEDIA_BASE_ANDROID_MEDIA_SOURCE_PLAYER_H_ 5 #ifndef MEDIA_BASE_ANDROID_MEDIA_SOURCE_PLAYER_H_
6 #define MEDIA_BASE_ANDROID_MEDIA_SOURCE_PLAYER_H_ 6 #define MEDIA_BASE_ANDROID_MEDIA_SOURCE_PLAYER_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 #include <map> 9 #include <map>
10 #include <string> 10 #include <string>
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 virtual bool IsPlaying() OVERRIDE; 60 virtual bool IsPlaying() OVERRIDE;
61 virtual bool CanPause() OVERRIDE; 61 virtual bool CanPause() OVERRIDE;
62 virtual bool CanSeekForward() OVERRIDE; 62 virtual bool CanSeekForward() OVERRIDE;
63 virtual bool CanSeekBackward() OVERRIDE; 63 virtual bool CanSeekBackward() OVERRIDE;
64 virtual bool IsPlayerReady() OVERRIDE; 64 virtual bool IsPlayerReady() OVERRIDE;
65 virtual void OnSeekRequestAck(unsigned seek_request_id) OVERRIDE; 65 virtual void OnSeekRequestAck(unsigned seek_request_id) OVERRIDE;
66 virtual void DemuxerReady(const DemuxerConfigs& configs) OVERRIDE; 66 virtual void DemuxerReady(const DemuxerConfigs& configs) OVERRIDE;
67 virtual void ReadFromDemuxerAck(const DemuxerData& data) OVERRIDE; 67 virtual void ReadFromDemuxerAck(const DemuxerData& data) OVERRIDE;
68 virtual void DurationChanged(const base::TimeDelta& duration) OVERRIDE; 68 virtual void DurationChanged(const base::TimeDelta& duration) OVERRIDE;
69 virtual void SetDrmBridge(MediaDrmBridge* drm_bridge) OVERRIDE; 69 virtual void SetDrmBridge(MediaDrmBridge* drm_bridge) OVERRIDE;
70 virtual void OnKeyAdded() OVERRIDE;
70 71
71 private: 72 private:
72 // Update the current timestamp. 73 // Update the current timestamp.
73 void UpdateTimestamps(const base::TimeDelta& presentation_timestamp, 74 void UpdateTimestamps(const base::TimeDelta& presentation_timestamp,
74 size_t audio_output_bytes); 75 size_t audio_output_bytes);
75 76
76 // Helper function for starting media playback. 77 // Helper function for starting media playback.
77 void StartInternal(); 78 void StartInternal();
78 79
79 // Playback is completed for one channel. 80 // Playback is completed for one channel.
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 211
211 MediaDrmBridge* drm_bridge_; 212 MediaDrmBridge* drm_bridge_;
212 213
213 friend class MediaSourcePlayerTest; 214 friend class MediaSourcePlayerTest;
214 DISALLOW_COPY_AND_ASSIGN(MediaSourcePlayer); 215 DISALLOW_COPY_AND_ASSIGN(MediaSourcePlayer);
215 }; 216 };
216 217
217 } // namespace media 218 } // namespace media
218 219
219 #endif // MEDIA_BASE_ANDROID_MEDIA_SOURCE_PLAYER_H_ 220 #endif // MEDIA_BASE_ANDROID_MEDIA_SOURCE_PLAYER_H_
OLDNEW
« no previous file with comments | « media/base/android/media_player_android.cc ('k') | media/base/android/media_source_player.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698