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

Side by Side Diff: content/renderer/media/android/webmediaplayer_android.h

Issue 496683002: Updating buffered duration of local resource in android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressing comments Created 6 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
« no previous file with comments | « no previous file | content/renderer/media/android/webmediaplayer_android.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 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_WEBMEDIAPLAYER_ANDROID_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
6 #define CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ 6 #define CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after
278 int demuxer_client_id); 278 int demuxer_client_id);
279 void Pause(bool is_media_related_action); 279 void Pause(bool is_media_related_action);
280 void DrawRemotePlaybackText(const std::string& remote_playback_message); 280 void DrawRemotePlaybackText(const std::string& remote_playback_message);
281 void ReallocateVideoFrame(); 281 void ReallocateVideoFrame();
282 void SetCurrentFrameInternal(scoped_refptr<media::VideoFrame>& frame); 282 void SetCurrentFrameInternal(scoped_refptr<media::VideoFrame>& frame);
283 void DidLoadMediaInfo(MediaInfoLoader::Status status, 283 void DidLoadMediaInfo(MediaInfoLoader::Status status,
284 const GURL& redirected_url, 284 const GURL& redirected_url,
285 const GURL& first_party_for_cookies, 285 const GURL& first_party_for_cookies,
286 bool allow_stored_credentials); 286 bool allow_stored_credentials);
287 bool IsKeySystemSupported(const std::string& key_system); 287 bool IsKeySystemSupported(const std::string& key_system);
288 bool IsLocalResource();
288 289
289 // Actually do the work for generateKeyRequest/addKey so they can easily 290 // Actually do the work for generateKeyRequest/addKey so they can easily
290 // report results to UMA. 291 // report results to UMA.
291 MediaKeyException GenerateKeyRequestInternal(const std::string& key_system, 292 MediaKeyException GenerateKeyRequestInternal(const std::string& key_system,
292 const unsigned char* init_data, 293 const unsigned char* init_data,
293 unsigned init_data_length); 294 unsigned init_data_length);
294 MediaKeyException AddKeyInternal(const std::string& key_system, 295 MediaKeyException AddKeyInternal(const std::string& key_system,
295 const unsigned char* key, 296 const unsigned char* key,
296 unsigned key_length, 297 unsigned key_length,
297 const unsigned char* init_data, 298 const unsigned char* init_data,
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
476 // side CDM will be used. This is similar to WebMediaPlayerImpl. For other key 477 // side CDM will be used. This is similar to WebMediaPlayerImpl. For other key
477 // systems, a browser side CDM will be used and we set CDM by calling 478 // systems, a browser side CDM will be used and we set CDM by calling
478 // player_manager_->SetCdm() directly. 479 // player_manager_->SetCdm() directly.
479 media::DecryptorReadyCB decryptor_ready_cb_; 480 media::DecryptorReadyCB decryptor_ready_cb_;
480 481
481 SkBitmap bitmap_; 482 SkBitmap bitmap_;
482 483
483 // Whether stored credentials are allowed to be passed to the server. 484 // Whether stored credentials are allowed to be passed to the server.
484 bool allow_stored_credentials_; 485 bool allow_stored_credentials_;
485 486
487 // Whether the resource is local.
488 bool is_local_resource_;
489
486 // NOTE: Weak pointers must be invalidated before all other member variables. 490 // NOTE: Weak pointers must be invalidated before all other member variables.
487 base::WeakPtrFactory<WebMediaPlayerAndroid> weak_factory_; 491 base::WeakPtrFactory<WebMediaPlayerAndroid> weak_factory_;
488 492
489 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid); 493 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid);
490 }; 494 };
491 495
492 } // namespace content 496 } // namespace content
493 497
494 #endif // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ 498 #endif // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
OLDNEW
« no previous file with comments | « no previous file | content/renderer/media/android/webmediaplayer_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698