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

Side by Side Diff: media/mojo/services/android_mojo_media_client.cc

Issue 1899363002: Finish plumbing MojoVideoDecoder. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove CHECKs on GPU side. Created 4 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
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/mojo/services/android_mojo_media_client.h" 5 #include "media/mojo/services/android_mojo_media_client.h"
6 6
7 #include "base/memory/ptr_util.h" 7 #include "base/memory/ptr_util.h"
8 #include "media/base/android/android_cdm_factory.h" 8 #include "media/base/android/android_cdm_factory.h"
9 #include "media/base/audio_decoder.h"
10 #include "media/base/cdm_factory.h"
9 #include "media/filters/android/media_codec_audio_decoder.h" 11 #include "media/filters/android/media_codec_audio_decoder.h"
10 #include "media/mojo/interfaces/provision_fetcher.mojom.h" 12 #include "media/mojo/interfaces/provision_fetcher.mojom.h"
11 #include "media/mojo/services/mojo_provision_fetcher.h" 13 #include "media/mojo/services/mojo_provision_fetcher.h"
12 #include "services/shell/public/cpp/connect.h" 14 #include "services/shell/public/cpp/connect.h"
13 15
14 namespace media { 16 namespace media {
15 17
16 namespace { 18 namespace {
17 19
18 std::unique_ptr<ProvisionFetcher> CreateProvisionFetcher( 20 std::unique_ptr<ProvisionFetcher> CreateProvisionFetcher(
(...skipping 17 matching lines...) Expand all
36 return base::WrapUnique(new MediaCodecAudioDecoder(task_runner)); 38 return base::WrapUnique(new MediaCodecAudioDecoder(task_runner));
37 } 39 }
38 40
39 std::unique_ptr<CdmFactory> AndroidMojoMediaClient::CreateCdmFactory( 41 std::unique_ptr<CdmFactory> AndroidMojoMediaClient::CreateCdmFactory(
40 shell::mojom::InterfaceProvider* interface_provider) { 42 shell::mojom::InterfaceProvider* interface_provider) {
41 return base::WrapUnique(new AndroidCdmFactory( 43 return base::WrapUnique(new AndroidCdmFactory(
42 base::Bind(&CreateProvisionFetcher, interface_provider))); 44 base::Bind(&CreateProvisionFetcher, interface_provider)));
43 } 45 }
44 46
45 } // namespace media 47 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698