media/base/cdm_promise_adapter.h - Issue 1341883003: Prepare MediaDrmBridge to work with MediaCodecPlayer

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: media/base/cdm_promise_adapter.h

Issue 1341883003: Prepare MediaDrmBridge to work with MediaCodecPlayer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bug526755

Patch Set: Cleanup of MediaDrmBridge 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

Index: media/base/cdm_promise_adapter.h

diff --git a/media/base/cdm_promise_adapter.h b/media/base/cdm_promise_adapter.h

index b078c0dd0a5393ba22174cc5e34a1161fad19d06..901f0563f76d89f4aeb51e9183d72ab3c84a30a3 100644

--- a/media/base/cdm_promise_adapter.h

+++ b/media/base/cdm_promise_adapter.h

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

#include "base/containers/scoped_ptr_hash_map.h"

#include "base/macros.h"

#include "base/memory/scoped_ptr.h"

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

#include "media/base/cdm_promise.h"

#include "media/base/media_export.h"

@@ -51,6 +52,8 @@ class MEDIA_EXPORT CdmPromiseAdapter {

uint32_t next_promise_id_;

PromiseMap promises_;

+ base::Lock lock_;

Tima Vaisburd 2015/09/14 20:42:33 I need to recall why I need this lock. It would be

DISALLOW_COPY_AND_ASSIGN(CdmPromiseAdapter);

};

« no previous file with comments | « media/base/browser_cdm_factory.cc ('k') | media/base/cdm_promise_adapter.cc » ('j') | media/cdm/player_tracker_impl.h » ('J')