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

Unified Diff: media/base/android/legacy_media_source_player.h

Issue 1076013002: Added stub MediaSourcePlayer for developing behind the flag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Got rid of extra namespace, renamed players and the flag Created 5 years, 8 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 side-by-side diff with in-line comments
Download patch
Index: media/base/android/legacy_media_source_player.h
diff --git a/media/base/android/media_source_player.h b/media/base/android/legacy_media_source_player.h
similarity index 92%
copy from media/base/android/media_source_player.h
copy to media/base/android/legacy_media_source_player.h
index ab3bda3e72c3f4eaadd3647b7238a73b5ac81b61..9be7e7137e021b56707a8df12adbcc708c838e0a 100644
--- a/media/base/android/media_source_player.h
+++ b/media/base/android/legacy_media_source_player.h
@@ -2,8 +2,8 @@
// 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_SOURCE_PLAYER_H_
-#define MEDIA_BASE_ANDROID_MEDIA_SOURCE_PLAYER_H_
+#ifndef MEDIA_BASE_ANDROID_LEGACY_MEDIA_SOURCE_PLAYER_H_
+#define MEDIA_BASE_ANDROID_LEGACY_MEDIA_SOURCE_PLAYER_H_
#include <jni.h>
#include <map>
@@ -33,17 +33,17 @@ class VideoDecoderJob;
// This class handles media source extensions on Android. It uses Android
// MediaCodec to decode audio and video streams in two separate threads.
-class MEDIA_EXPORT MediaSourcePlayer : public MediaPlayerAndroid,
- public DemuxerAndroidClient {
+class MEDIA_EXPORT LegacyMediaSourcePlayer : public MediaPlayerAndroid,
+ public DemuxerAndroidClient {
public:
// Constructs a player with the given ID and demuxer. |manager| must outlive
// the lifetime of this object.
- MediaSourcePlayer(int player_id,
- MediaPlayerManager* manager,
- const RequestMediaResourcesCB& request_media_resources_cb,
- scoped_ptr<DemuxerAndroid> demuxer,
- const GURL& frame_url);
- ~MediaSourcePlayer() override;
+ LegacyMediaSourcePlayer(int player_id,
+ MediaPlayerManager* manager,
+ const RequestMediaResourcesCB& request_resources_cb,
+ scoped_ptr<DemuxerAndroid> demuxer,
+ const GURL& frame_url);
+ ~LegacyMediaSourcePlayer() override;
// MediaPlayerAndroid implementation.
void SetVideoSurface(gfx::ScopedJavaSurface surface) override;
@@ -268,13 +268,13 @@ class MEDIA_EXPORT MediaSourcePlayer : public MediaPlayerAndroid,
bool prerolling_;
// Weak pointer passed to media decoder jobs for callbacks.
- base::WeakPtr<MediaSourcePlayer> weak_this_;
+ base::WeakPtr<LegacyMediaSourcePlayer> weak_this_;
// NOTE: Weak pointers must be invalidated before all other member variables.
- base::WeakPtrFactory<MediaSourcePlayer> weak_factory_;
+ base::WeakPtrFactory<LegacyMediaSourcePlayer> weak_factory_;
- DISALLOW_COPY_AND_ASSIGN(MediaSourcePlayer);
+ DISALLOW_COPY_AND_ASSIGN(LegacyMediaSourcePlayer);
};
} // namespace media
-#endif // MEDIA_BASE_ANDROID_MEDIA_SOURCE_PLAYER_H_
+#endif // MEDIA_BASE_ANDROID_LEGACY_MEDIA_SOURCE_PLAYER_H_

Powered by Google App Engine
This is Rietveld 408576698