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

Side by Side Diff: content/renderer/media/android/media_source_delegate.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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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 CONTENT_RENDERER_MEDIA_ANDROID_MEDIA_SOURCE_DELEGATE_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_ANDROID_MEDIA_SOURCE_DELEGATE_H_
6 #define CONTENT_RENDERER_MEDIA_ANDROID_MEDIA_SOURCE_DELEGATE_H_ 6 #define CONTENT_RENDERER_MEDIA_ANDROID_MEDIA_SOURCE_DELEGATE_H_
7 7
8 #include <string>
9 #include <vector>
10
8 #include "base/callback.h" 11 #include "base/callback.h"
9 #include "base/memory/ref_counted.h" 12 #include "base/memory/ref_counted.h"
10 #include "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
11 #include "base/memory/weak_ptr.h" 14 #include "base/memory/weak_ptr.h"
12 #include "base/message_loop/message_loop.h" 15 #include "base/message_loop/message_loop.h"
13 #include "base/time/time.h" 16 #include "base/time/time.h"
14 #include "media/base/decryptor.h" 17 #include "media/base/decryptor.h"
15 #include "media/base/demuxer.h" 18 #include "media/base/demuxer.h"
16 #include "media/base/media_keys.h" 19 #include "media/base/media_keys.h"
17 #include "media/base/pipeline_status.h" 20 #include "media/base/pipeline_status.h"
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
226 // through GenerateKeyRequest() directly from WebKit. 229 // through GenerateKeyRequest() directly from WebKit.
227 std::string init_data_type_; 230 std::string init_data_type_;
228 231
229 // Lock used to serialize access for |seeking_|. 232 // Lock used to serialize access for |seeking_|.
230 mutable base::Lock seeking_lock_; 233 mutable base::Lock seeking_lock_;
231 bool seeking_; 234 bool seeking_;
232 235
233 base::TimeDelta last_seek_time_; 236 base::TimeDelta last_seek_time_;
234 unsigned last_seek_request_id_; 237 unsigned last_seek_request_id_;
235 238
239 #if defined(GOOGLE_TV)
236 bool key_added_; 240 bool key_added_;
237 std::string key_system_; 241 std::string key_system_;
242 #endif // defined(GOOGLE_TV)
238 243
239 size_t access_unit_size_; 244 size_t access_unit_size_;
240 245
241 DISALLOW_COPY_AND_ASSIGN(MediaSourceDelegate); 246 DISALLOW_COPY_AND_ASSIGN(MediaSourceDelegate);
242 }; 247 };
243 248
244 } // namespace content 249 } // namespace content
245 250
246 #endif // CONTENT_RENDERER_MEDIA_ANDROID_MEDIA_SOURCE_DELEGATE_H_ 251 #endif // CONTENT_RENDERER_MEDIA_ANDROID_MEDIA_SOURCE_DELEGATE_H_
OLDNEW
« no previous file with comments | « content/common/media/media_player_messages_android.h ('k') | content/renderer/media/android/media_source_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698