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

Unified Diff: media/base/android/media_codec_player.cc

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, 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/base/android/media_codec_player.h ('k') | media/base/android/media_codec_player_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/android/media_codec_player.cc
diff --git a/media/base/android/media_codec_player.cc b/media/base/android/media_codec_player.cc
index 997a3e04ba196aeedc46775e78252417a5c0b283..85f2a1df189ad36257785fa5b550ef7b301dc1f2 100644
--- a/media/base/android/media_codec_player.cc
+++ b/media/base/android/media_codec_player.cc
@@ -13,6 +13,7 @@
#include "media/base/android/media_codec_audio_decoder.h"
#include "media/base/android/media_codec_video_decoder.h"
#include "media/base/android/media_player_manager.h"
+#include "media/base/android/media_task_runner.h"
#include "media/base/timestamp_constants.h"
#define RUN_ON_MEDIA_THREAD(METHOD, ...) \
@@ -28,22 +29,6 @@
namespace media {
-class MediaThread : public base::Thread {
- public:
- MediaThread() : base::Thread("BrowserMediaThread") {
- Start();
- }
-};
-
-// Create media thread
-base::LazyInstance<MediaThread>::Leaky
- g_media_thread = LAZY_INSTANCE_INITIALIZER;
-
-
-scoped_refptr<base::SingleThreadTaskRunner> GetMediaTaskRunner() {
- return g_media_thread.Pointer()->task_runner();
-}
-
// MediaCodecPlayer implementation.
MediaCodecPlayer::MediaCodecPlayer(
« no previous file with comments | « media/base/android/media_codec_player.h ('k') | media/base/android/media_codec_player_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698