Commit e49b5844 authored by Xiaohan Wang's avatar Xiaohan Wang Committed by Commit Bot

media: Use DefaultCdmFactory when ENABLE_MOJO_CDM is false

When ENABLE_MOJO_CDM is false, we should still support ClearKey key
system, hence use DefaultCdmFactory in this case.

Thanks to yucliu@ for finding this issue.

Change-Id: I72d730497daefb6c0c2709915a9ee3ec482e1125
Reviewed-on: https://chromium-review.googlesource.com/c/1324191Reviewed-by: default avatarYuchen Liu <yucliu@chromium.org>
Commit-Queue: Xiaohan Wang <xhwang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#606198}
parent e771fb28
......@@ -66,6 +66,8 @@
#if BUILDFLAG(ENABLE_MOJO_CDM)
#include "media/mojo/clients/mojo_cdm_factory.h" // nogncheck
#else
#include "media/cdm/default_cdm_factory.h"
#endif
#if BUILDFLAG(ENABLE_MOJO_RENDERER)
......@@ -622,6 +624,8 @@ media::CdmFactory* MediaFactory::GetCdmFactory() {
#if BUILDFLAG(ENABLE_MOJO_CDM)
cdm_factory_.reset(new media::MojoCdmFactory(GetMediaInterfaceFactory()));
#else
cdm_factory_.reset(new media::DefaultCdmFactory());
#endif // BUILDFLAG(ENABLE_MOJO_CDM)
return cdm_factory_.get();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment