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

Side by Side Diff: media/blink/webmediaplayer_util.h

Issue 1809093003: Moving SwitchOutputDevice out of OutputDevice interface, eliminating OutputDevice (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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/blink/webmediaplayer_params.cc ('k') | media/blink/webmediaplayer_util.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 MEDIA_BLINK_WEBMEDIAPLAYER_UTIL_H_ 5 #ifndef MEDIA_BLINK_WEBMEDIAPLAYER_UTIL_H_
6 #define MEDIA_BLINK_WEBMEDIAPLAYER_UTIL_H_ 6 #define MEDIA_BLINK_WEBMEDIAPLAYER_UTIL_H_
7 7
8 #include "base/time/time.h" 8 #include "base/time/time.h"
9 #include "media/base/audio_renderer_sink.h" 9 #include "media/base/audio_renderer_sink.h"
10 #include "media/base/eme_constants.h" 10 #include "media/base/eme_constants.h"
(...skipping 25 matching lines...) Expand all
36 void MEDIA_BLINK_EXPORT RecordOriginOfHLSPlayback(const GURL& origin_url); 36 void MEDIA_BLINK_EXPORT RecordOriginOfHLSPlayback(const GURL& origin_url);
37 37
38 // TODO(ddorwin): Move this function to an EME-specific file. 38 // TODO(ddorwin): Move this function to an EME-specific file.
39 // We may also want to move the next one and pass Blink types to WMPI. 39 // We may also want to move the next one and pass Blink types to WMPI.
40 EmeInitDataType MEDIA_BLINK_EXPORT 40 EmeInitDataType MEDIA_BLINK_EXPORT
41 ConvertToEmeInitDataType(blink::WebEncryptedMediaInitDataType init_data_type); 41 ConvertToEmeInitDataType(blink::WebEncryptedMediaInitDataType init_data_type);
42 42
43 blink::WebEncryptedMediaInitDataType MEDIA_BLINK_EXPORT 43 blink::WebEncryptedMediaInitDataType MEDIA_BLINK_EXPORT
44 ConvertToWebInitDataType(EmeInitDataType init_data_type); 44 ConvertToWebInitDataType(EmeInitDataType init_data_type);
45 45
46 // Wraps a blink::WebSetSinkIdCallbacks into a media::SwitchOutputDeviceCB 46 // Wraps a blink::WebSetSinkIdCallbacks into a media::OutputDeviceStatusCB
47 // and binds it to the current thread 47 // and binds it to the current thread
48 SwitchOutputDeviceCB MEDIA_BLINK_EXPORT 48 OutputDeviceStatusCB MEDIA_BLINK_EXPORT
49 ConvertToSwitchOutputDeviceCB(blink::WebSetSinkIdCallbacks* web_callbacks); 49 ConvertToOutputDeviceStatusCB(blink::WebSetSinkIdCallbacks* web_callbacks);
50 50
51 } // namespace media 51 } // namespace media
52 52
53 #endif // MEDIA_BLINK_WEBMEDIAPLAYER_UTIL_H_ 53 #endif // MEDIA_BLINK_WEBMEDIAPLAYER_UTIL_H_
OLDNEW
« no previous file with comments | « media/blink/webmediaplayer_params.cc ('k') | media/blink/webmediaplayer_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698