Parsing filesystem url before giving it to media player

media/base/android/media_player_bridge.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MEDIA_BASE_ANDROID_MEDIA_PLAYER_BRIDGE_H_
 #define MEDIA_BASE_ANDROID_MEDIA_PLAYER_BRIDGE_H_
 
 #include <jni.h>
 #include <map>
 #include <string>
 
 #include "base/android/scoped_java_ref.h"
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
+#include "base/string_util.h"

[palmer, 2013/03/18 19:54:34]

Do you need this?

[qinmin, 2013/03/18 22:27:59]

removed.
On 2013/03/18 19:54:34, Chris P. wrote:

 #include "base/time.h"
 #include "base/timer.h"
+#include "googleurl/src/gurl.h"
 #include "media/base/media_export.h"
 #include "media/base/android/media_player_listener.h"
 
 namespace media {
 
-class CookieGetter;
+class MediaResourceGetter;
 class MediaPlayerBridgeManager;
 
 // This class serves as a bridge for native code to call java functions inside
 // android mediaplayer class. For more information on android mediaplayer, check
 // http://developer.android.com/reference/android/media/MediaPlayer.html
 // The actual android mediaplayer instance is created lazily when Start(),
 // Pause(), SeekTo() gets called. As a result, media information may not
 // be available until one of those operations is performed. After that, we
 // will cache those information in case the mediaplayer gets released.
 class MEDIA_EXPORT MediaPlayerBridge {
@@ skipping 33 matching lines @@
   typedef base::Callback<void(int, base::TimeDelta)> TimeUpdateCB;
 
   static bool RegisterMediaPlayerBridge(JNIEnv* env);
 
   // Construct a MediaPlayerBridge object with all the needed media player
   // callbacks. This object needs to call |manager|'s RequestMediaResources()
   // before decoding the media stream. This allows |manager| to track
   // unused resources and free them when needed. On the other hand, it needs
   // to call ReleaseMediaResources() when it is done with decoding.
   MediaPlayerBridge(int player_id,
-                    const std::string& url,
-                    const std::string& first_party_for_cookies,
-                    CookieGetter* cookie_getter,
+                    const GURL& url,

[palmer, 2013/03/18 19:54:34]

Thanks for changing from string to GURL, btw.

+                    const GURL& first_party_for_cookies,
+                    MediaResourceGetter* resource_getter,
                     bool hide_url_log,
                     MediaPlayerBridgeManager* manager,
                     const MediaErrorCB& media_error_cb,
                     const VideoSizeChangedCB& video_size_changed_cb,
                     const BufferingUpdateCB& buffering_update_cb,
                     const MediaPreparedCB& media_prepared_cb,
                     const PlaybackCompleteCB& playback_complete_cb,
                     const SeekCompleteCB& seek_complete_cb,
                     const TimeUpdateCB& time_update_cb,
                     const MediaInterruptedCB& media_interrupted_cb);
@@ skipping 41 matching lines @@
   void OnPlaybackComplete();
   void OnSeekComplete();
   void OnMediaPrepared();
   void OnMediaInterrupted();
 
   // Prepare the player for playback, asynchronously. When succeeds,
   // OnMediaPrepared() will be called. Otherwise, OnMediaError() will
   // be called with an error type.
   void Prepare();
 
-  // Callback function passed to |cookies_retriever_|.
+  // Callback function passed to |resource_getter_|.
   void GetCookiesCallback(const std::string& cookies);
 
   int player_id() { return player_id_; }
   bool can_pause() { return can_pause_; }
   bool can_seek_forward() { return can_seek_forward_; }
   bool can_seek_backward() { return can_seek_backward_; }
   bool prepared() { return prepared_; }
 
  private:
   // Create the actual android media player.
   void InitializePlayer();
 
+  // Set the data source for the media player.
+  void SetDataSource(const std::string& url);
+
   // Functions that implements media player control.
   void StartInternal();
   void PauseInternal();
   void SeekInternal(base::TimeDelta time);
 
   // Callbacks when events are received.
   MediaErrorCB media_error_cb_;
   VideoSizeChangedCB video_size_changed_cb_;
   BufferingUpdateCB buffering_update_cb_;
   MediaPreparedCB media_prepared_cb_;
@@ skipping 10 matching lines @@
   // Whether the player is prepared for playback.
   bool prepared_;
 
   // Pending play event while player is preparing.
   bool pending_play_;
 
   // Pending seek time while player is preparing.
   base::TimeDelta pending_seek_;
 
   // Url for playback.
-  std::string url_;
+  GURL url_;
 
   // First party url for cookies.
-  std::string first_party_for_cookies_;
+  GURL first_party_for_cookies_;
 
   // Whether cookies are available.
   bool has_cookies_;
 
   // Hide url log from media player.
   bool hide_url_log_;
 
   // Stats about the media.
   base::TimeDelta duration_;
   int width_;
   int height_;
 
   // Meta data about actions can be taken.
   bool can_pause_;
   bool can_seek_forward_;
   bool can_seek_backward_;
 
-  // Cookies for |url_|
+  // Cookies for |url_|.
   std::string cookies_;
 
   // Resource manager for all the media players.
   MediaPlayerBridgeManager* manager_;
 
-  // Object for retrieving cookies for this media player.
-  scoped_ptr<CookieGetter> cookie_getter_;
+  // Object for retrieving resources for this media player.
+  scoped_ptr<MediaResourceGetter> resource_getter_;
 
   // Java MediaPlayer instance.
   base::android::ScopedJavaGlobalRef<jobject> j_media_player_;
 
   base::RepeatingTimer<MediaPlayerBridge> time_update_timer_;
 
   // Weak pointer passed to |listener_| for callbacks.
   base::WeakPtrFactory<MediaPlayerBridge> weak_this_;
 
   // Listener object that listens to all the media player events.
   MediaPlayerListener listener_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaPlayerBridge);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_ANDROID_MEDIA_PLAYER_BRIDGE_H_