content/browser/media/android/browser_demuxer_android.h - Issue 1076013002: Added stub MediaSourcePlayer for developing behind the flag

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/media/android/browser_demuxer_android.h

Issue 1076013002: Added stub MediaSourcePlayer for developing behind the flag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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

« no previous file with comments | « chrome/browser/about_flags.cc ('k') | content/browser/media/android/browser_demuxer_android.cc » ('j') | content/browser/media/android/browser_demuxer_android.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/media/android/browser_demuxer_android.h

diff --git a/content/browser/media/android/browser_demuxer_android.h b/content/browser/media/android/browser_demuxer_android.h

index 407e0b3288663ab1c37541a92a266b6f9a270db5..05c10989eed4e8dc7812dc6716d131ae2c68ed6c 100644

--- a/content/browser/media/android/browser_demuxer_android.h

+++ b/content/browser/media/android/browser_demuxer_android.h

@@ -6,6 +6,7 @@

#define CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_DEMUXER_ANDROID_H_

#include "base/id_map.h"

+#include "base/synchronization/lock.h"

#include "content/public/browser/browser_message_filter.h"

#include "media/base/android/demuxer_android.h"

@@ -53,7 +54,12 @@ class CONTENT_EXPORT BrowserDemuxerAndroid : public BrowserMessageFilter {

void OnDurationChanged(int demuxer_client_id,

const base::TimeDelta& duration);

+ media::DemuxerAndroidClient* Lookup(int demuxer_client_id);

IDMap<media::DemuxerAndroidClient> demuxer_clients_;

+ base::Lock lock_;

+ bool enable_media_player_v2_;

DISALLOW_COPY_AND_ASSIGN(BrowserDemuxerAndroid);

};