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

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

Issue 1712903002: Remove prefixed EME. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix layout tests. Created 4 years, 10 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 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 16 matching lines...) Expand all
27 27
28 // Report various metrics to UMA and RAPPOR. 28 // Report various metrics to UMA and RAPPOR.
29 void MEDIA_BLINK_EXPORT ReportMetrics(blink::WebMediaPlayer::LoadType load_type, 29 void MEDIA_BLINK_EXPORT ReportMetrics(blink::WebMediaPlayer::LoadType load_type,
30 const GURL& url, 30 const GURL& url,
31 const GURL& origin_url); 31 const GURL& origin_url);
32 32
33 // Record a RAPPOR metric for the origin of an HLS playback. 33 // Record a RAPPOR metric for the origin of an HLS playback.
34 void MEDIA_BLINK_EXPORT RecordOriginOfHLSPlayback(const GURL& origin_url); 34 void MEDIA_BLINK_EXPORT RecordOriginOfHLSPlayback(const GURL& origin_url);
35 35
36 // Convert Initialization Data Types. 36 // Convert Initialization Data Types.
37 // TODO(ddorwin): Move the first to an EME-specific file.
38 // We may also want to move the second and pass Blink types to WMPI.
37 EmeInitDataType MEDIA_BLINK_EXPORT 39 EmeInitDataType MEDIA_BLINK_EXPORT
38 ConvertToEmeInitDataType(blink::WebEncryptedMediaInitDataType init_data_type); 40 ConvertToEmeInitDataType(blink::WebEncryptedMediaInitDataType init_data_type);
xhwang 2016/02/19 23:39:14 Add an empty line? It's kinda hard to read.
ddorwin 2016/02/20 01:04:46 Done.
39 blink::WebEncryptedMediaInitDataType MEDIA_BLINK_EXPORT 41 blink::WebEncryptedMediaInitDataType MEDIA_BLINK_EXPORT
40 ConvertToWebInitDataType(EmeInitDataType init_data_type); 42 ConvertToWebInitDataType(EmeInitDataType init_data_type);
41 43
42 // Wraps a blink::WebSetSinkIdCallbacks into a media::SwitchOutputDeviceCB 44 // Wraps a blink::WebSetSinkIdCallbacks into a media::SwitchOutputDeviceCB
43 // and binds it to the current thread 45 // and binds it to the current thread
44 SwitchOutputDeviceCB MEDIA_BLINK_EXPORT 46 SwitchOutputDeviceCB MEDIA_BLINK_EXPORT
45 ConvertToSwitchOutputDeviceCB(blink::WebSetSinkIdCallbacks* web_callbacks); 47 ConvertToSwitchOutputDeviceCB(blink::WebSetSinkIdCallbacks* web_callbacks);
46 48
47 } // namespace media 49 } // namespace media
48 50
49 #endif // MEDIA_BLINK_WEBMEDIAPLAYER_UTIL_H_ 51 #endif // MEDIA_BLINK_WEBMEDIAPLAYER_UTIL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698