media/cdm/default_cdm_factory.cc - Issue 2831963003: EME: Allow temporary sessions to be removed for ClearKey only.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: media/cdm/default_cdm_factory.cc

Issue 2831963003: EME: Allow temporary sessions to be removed for ClearKey only. (Closed)

Patch Set: rebase Created 3 years, 7 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 unified diff | Download patch

« no previous file with comments | « media/cdm/aes_decryptor_unittest.cc ('k') | media/cdm/ppapi/external_clear_key/clear_key_cdm.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "media/cdm/default_cdm_factory.h"	5 #include "media/cdm/default_cdm_factory.h"

6	6

7 #include "base/bind.h"	7 #include "base/bind.h"

8 #include "base/bind_helpers.h"	8 #include "base/bind_helpers.h"

9 #include "base/location.h"	9 #include "base/location.h"

10 #include "base/single_thread_task_runner.h"	10 #include "base/single_thread_task_runner.h"

(...skipping 40 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
51	51

52 if (!ShouldCreateAesDecryptor(key_system)) {	52 if (!ShouldCreateAesDecryptor(key_system)) {

53 base::ThreadTaskRunnerHandle::Get()->PostTask(	53 base::ThreadTaskRunnerHandle::Get()->PostTask(

54 FROM_HERE,	54 FROM_HERE,

55 base::Bind(cdm_created_cb, nullptr, "Unsupported key system."));	55 base::Bind(cdm_created_cb, nullptr, "Unsupported key system."));

56 return;	56 return;

57 }	57 }

58	58

59 scoped_refptr<ContentDecryptionModule> cdm(	59 scoped_refptr<ContentDecryptionModule> cdm(

60 new AesDecryptor(security_origin, session_message_cb, session_closed_cb,	60 new AesDecryptor(security_origin, session_message_cb, session_closed_cb,

61 session_keys_change_cb));	61 session_keys_change_cb, session_expiration_update_cb));

62 base::ThreadTaskRunnerHandle::Get()->PostTask(	62 base::ThreadTaskRunnerHandle::Get()->PostTask(

63 FROM_HERE, base::Bind(cdm_created_cb, cdm, ""));	63 FROM_HERE, base::Bind(cdm_created_cb, cdm, ""));

64 }	64 }

65	65

66 } // namespace media	66 } // namespace media

OLD	NEW