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

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

Issue 1341883003: Prepare MediaDrmBridge to work with MediaCodecPlayer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bug526755
Patch Set: Fixed MediaDrmBridgeTest unit tests Created 5 years, 2 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/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 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 bool is_audio, MediaCodecStatus status, 87 bool is_audio, MediaCodecStatus status,
88 base::TimeDelta current_presentation_timestamp, 88 base::TimeDelta current_presentation_timestamp,
89 base::TimeDelta max_presentation_timestamp); 89 base::TimeDelta max_presentation_timestamp);
90 90
91 bool IsPrerollFinished(bool is_audio) const; 91 bool IsPrerollFinished(bool is_audio) const;
92 92
93 // Gets MediaCrypto object from |drm_bridge_|. 93 // Gets MediaCrypto object from |drm_bridge_|.
94 base::android::ScopedJavaLocalRef<jobject> GetMediaCrypto(); 94 base::android::ScopedJavaLocalRef<jobject> GetMediaCrypto();
95 95
96 // Callback to notify that MediaCrypto is ready in |drm_bridge_|. 96 // Callback to notify that MediaCrypto is ready in |drm_bridge_|.
97 void OnMediaCryptoReady(); 97 void OnMediaCryptoReady(MediaDrmBridge::JavaObjectPtr media_crypto,
98 bool needs_protected_surface);
98 99
99 // Handle pending events if all the decoder jobs are not currently decoding. 100 // Handle pending events if all the decoder jobs are not currently decoding.
100 void ProcessPendingEvents(); 101 void ProcessPendingEvents();
101 102
102 // Flush the decoders and clean up all the data needs to be decoded. 103 // Flush the decoders and clean up all the data needs to be decoded.
103 void ClearDecodingData(); 104 void ClearDecodingData();
104 105
105 // Called to decode more data. 106 // Called to decode more data.
106 void DecodeMoreAudio(); 107 void DecodeMoreAudio();
107 void DecodeMoreVideo(); 108 void DecodeMoreVideo();
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
271 base::WeakPtr<MediaSourcePlayer> weak_this_; 272 base::WeakPtr<MediaSourcePlayer> weak_this_;
272 // NOTE: Weak pointers must be invalidated before all other member variables. 273 // NOTE: Weak pointers must be invalidated before all other member variables.
273 base::WeakPtrFactory<MediaSourcePlayer> weak_factory_; 274 base::WeakPtrFactory<MediaSourcePlayer> weak_factory_;
274 275
275 DISALLOW_COPY_AND_ASSIGN(MediaSourcePlayer); 276 DISALLOW_COPY_AND_ASSIGN(MediaSourcePlayer);
276 }; 277 };
277 278
278 } // namespace media 279 } // namespace media
279 280
280 #endif // MEDIA_BASE_ANDROID_MEDIA_SOURCE_PLAYER_H_ 281 #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