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

Side by Side Diff: chromecast/browser/media/cast_mojo_media_client.h

Issue 2016053003: Add audio_device_id in mojo media ServiceFactory CreateRenderer api. (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: Fix an error Created 4 years, 5 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 #ifndef CHROMECAST_BROWSER_MEDIA_CAST_MOJO_MEDIA_CLIENT_H_ 5 #ifndef CHROMECAST_BROWSER_MEDIA_CAST_MOJO_MEDIA_CLIENT_H_
6 #define CHROMECAST_BROWSER_MEDIA_CAST_MOJO_MEDIA_CLIENT_H_ 6 #define CHROMECAST_BROWSER_MEDIA_CAST_MOJO_MEDIA_CLIENT_H_
7 7
8 #include "chromecast/browser/media/media_pipeline_backend_factory.h" 8 #include "chromecast/browser/media/media_pipeline_backend_factory.h"
9 #include "media/mojo/services/mojo_media_client.h" 9 #include "media/mojo/services/mojo_media_client.h"
10 10
11 namespace chromecast { 11 namespace chromecast {
12 namespace media { 12 namespace media {
13 13
14 class CastMojoMediaClient : public ::media::MojoMediaClient { 14 class CastMojoMediaClient : public ::media::MojoMediaClient {
15 public: 15 public:
16 using CreateCdmFactoryCB = 16 using CreateCdmFactoryCB =
17 base::Callback<std::unique_ptr<::media::CdmFactory>()>; 17 base::Callback<std::unique_ptr<::media::CdmFactory>()>;
18 18
19 CastMojoMediaClient(const CreateMediaPipelineBackendCB& create_backend_cb, 19 CastMojoMediaClient(const CreateMediaPipelineBackendCB& create_backend_cb,
20 const CreateCdmFactoryCB& create_cdm_factory_cb); 20 const CreateCdmFactoryCB& create_cdm_factory_cb);
21 ~CastMojoMediaClient() override; 21 ~CastMojoMediaClient() override;
22 22
23 // MojoMediaClient overrides. 23 // MojoMediaClient overrides.
24 std::unique_ptr<::media::RendererFactory> CreateRendererFactory( 24 std::unique_ptr<::media::Renderer> CreateRenderer(
25 const scoped_refptr<::media::MediaLog>& media_log) override; 25 scoped_refptr<base::SingleThreadTaskRunner> media_task_runner,
26 std::unique_ptr<::media::CdmFactory> CreateCdmFactory( 26 scoped_refptr<::media::MediaLog> media_log,
kmackay 2016/07/12 16:55:45 Is CreateCdmFactory() supposed to be deleted?
tianyuwang1 2016/07/12 18:12:38 Nope. Added it back. Caused by a bad merge.
27 ::shell::mojom::InterfaceProvider* interface_provider) override; 27 const std::string& audio_device_id) override;
28 28
29 private: 29 private:
30 const CreateMediaPipelineBackendCB create_backend_cb_; 30 const CreateMediaPipelineBackendCB create_backend_cb_;
31 const CreateCdmFactoryCB create_cdm_factory_cb_; 31 const CreateCdmFactoryCB create_cdm_factory_cb_;
32 32
33 DISALLOW_COPY_AND_ASSIGN(CastMojoMediaClient); 33 DISALLOW_COPY_AND_ASSIGN(CastMojoMediaClient);
34 }; 34 };
35 35
36 } // namespace media 36 } // namespace media
37 } // namespace chromecast 37 } // namespace chromecast
38 38
39 #endif // CHROMECAST_BROWSER_MEDIA_CAST_MOJO_MEDIA_CLIENT_H_ 39 #endif // CHROMECAST_BROWSER_MEDIA_CAST_MOJO_MEDIA_CLIENT_H_
OLDNEW
« no previous file with comments | « chromecast/browser/cast_content_browser_client.cc ('k') | chromecast/browser/media/cast_mojo_media_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698