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

Side by Side Diff: third_party/WebKit/Source/modules/media_capabilities/MediaCapabilities.cpp

Issue 2805553004: Wire up MediaCapabilities is_supported to MimeUtil (Closed)
Patch Set: Remove test for theora - not supported on android Created 3 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 2017 The Chromium Authors. All rights reserved. 1 // Copyright 2017 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 "modules/media_capabilities/MediaCapabilities.h" 5 #include "modules/media_capabilities/MediaCapabilities.h"
6 6
7 #include "bindings/core/v8/CallbackPromiseAdapter.h" 7 #include "bindings/core/v8/CallbackPromiseAdapter.h"
8 #include "bindings/core/v8/ScriptPromise.h" 8 #include "bindings/core/v8/ScriptPromise.h"
9 #include "bindings/core/v8/ScriptPromiseResolver.h" 9 #include "bindings/core/v8/ScriptPromiseResolver.h"
10 #include "bindings/core/v8/ScriptState.h" 10 #include "bindings/core/v8/ScriptState.h"
11 #include "core/dom/DOMException.h" 11 #include "core/dom/DOMException.h"
12 #include "modules/media_capabilities/MediaCapabilitiesInfo.h" 12 #include "modules/media_capabilities/MediaCapabilitiesInfo.h"
13 #include "modules/media_capabilities/MediaConfiguration.h" 13 #include "modules/media_capabilities/MediaConfiguration.h"
14 #include "modules/media_capabilities/MediaDecodingConfiguration.h" 14 #include "modules/media_capabilities/MediaDecodingConfiguration.h"
15 #include "modules/media_capabilities/MediaEncodingConfiguration.h" 15 #include "modules/media_capabilities/MediaEncodingConfiguration.h"
16 #include "platform/network/ParsedContentType.h"
16 #include "public/platform/Platform.h" 17 #include "public/platform/Platform.h"
17 #include "public/platform/WebMediaRecorderHandler.h" 18 #include "public/platform/WebMediaRecorderHandler.h"
18 #include "public/platform/modules/media_capabilities/WebMediaCapabilitiesClient. h" 19 #include "public/platform/modules/media_capabilities/WebMediaCapabilitiesClient. h"
19 #include "public/platform/modules/media_capabilities/WebMediaCapabilitiesInfo.h" 20 #include "public/platform/modules/media_capabilities/WebMediaCapabilitiesInfo.h"
20 #include "public/platform/modules/media_capabilities/WebMediaConfiguration.h" 21 #include "public/platform/modules/media_capabilities/WebMediaConfiguration.h"
21 22
22 namespace blink { 23 namespace blink {
23 24
24 namespace { 25 namespace {
25 26
26 WebAudioConfiguration ToWebAudioConfiguration( 27 WebAudioConfiguration ToWebAudioConfiguration(
27 const AudioConfiguration& configuration) { 28 const AudioConfiguration& configuration) {
28 WebAudioConfiguration web_configuration; 29 WebAudioConfiguration web_configuration;
29 30
30 // |contentType| is mandatory. 31 // |contentType| is mandatory.
31 DCHECK(configuration.hasContentType()); 32 DCHECK(configuration.hasContentType());
32 web_configuration.content_type = configuration.contentType(); 33 ParsedContentType parsed_content_type(configuration.contentType(),
34 ParsedContentType::Mode::kStrict);
35
36 // TODO(chcunningham): Throw TypeError for invalid input.
37 // DCHECK(parsed_content_type.IsValid());
38
39 DEFINE_STATIC_LOCAL(const String, codecs, ("codecs"));
40 web_configuration.mime_type = parsed_content_type.MimeType().LowerASCII();
41 web_configuration.codec = parsed_content_type.ParameterValueForName(codecs);
33 42
34 // |channels| is optional and will be set to a null WebString if not present. 43 // |channels| is optional and will be set to a null WebString if not present.
35 web_configuration.channels = configuration.hasChannels() 44 web_configuration.channels = configuration.hasChannels()
36 ? WebString(configuration.channels()) 45 ? WebString(configuration.channels())
37 : WebString(); 46 : WebString();
38 47
39 if (configuration.hasBitrate()) 48 if (configuration.hasBitrate())
40 web_configuration.bitrate = configuration.bitrate(); 49 web_configuration.bitrate = configuration.bitrate();
41 50
42 if (configuration.hasSamplerate()) 51 if (configuration.hasSamplerate())
43 web_configuration.samplerate = configuration.samplerate(); 52 web_configuration.samplerate = configuration.samplerate();
44 53
45 return web_configuration; 54 return web_configuration;
46 } 55 }
47 56
48 WebVideoConfiguration ToWebVideoConfiguration( 57 WebVideoConfiguration ToWebVideoConfiguration(
49 const VideoConfiguration& configuration) { 58 const VideoConfiguration& configuration) {
50 WebVideoConfiguration web_configuration; 59 WebVideoConfiguration web_configuration;
51 60
52 // All the properties are mandatory. 61 // All the properties are mandatory.
53 DCHECK(configuration.hasContentType()); 62 DCHECK(configuration.hasContentType());
54 web_configuration.content_type = configuration.contentType(); 63 ParsedContentType parsed_content_type(configuration.contentType(),
64 ParsedContentType::Mode::kStrict);
65
66 // TODO(chcunningham): Throw TypeError for invalid input.
67 // DCHECK(parsed_content_type.IsValid());
68
69 DEFINE_STATIC_LOCAL(const String, codecs, ("codecs"));
70 web_configuration.mime_type = parsed_content_type.MimeType().LowerASCII();
71 web_configuration.codec = parsed_content_type.ParameterValueForName(codecs);
55 72
56 DCHECK(configuration.hasWidth()); 73 DCHECK(configuration.hasWidth());
57 web_configuration.width = configuration.width(); 74 web_configuration.width = configuration.width();
58 75
59 DCHECK(configuration.hasHeight()); 76 DCHECK(configuration.hasHeight());
60 web_configuration.height = configuration.height(); 77 web_configuration.height = configuration.height();
61 78
62 DCHECK(configuration.hasBitrate()); 79 DCHECK(configuration.hasBitrate());
63 web_configuration.bitrate = configuration.bitrate(); 80 web_configuration.bitrate = configuration.bitrate();
64 81
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 handler->EncodingInfo( 149 handler->EncodingInfo(
133 ToWebMediaConfiguration(configuration), 150 ToWebMediaConfiguration(configuration),
134 WTF::MakeUnique<CallbackPromiseAdapter<MediaCapabilitiesInfo, void>>( 151 WTF::MakeUnique<CallbackPromiseAdapter<MediaCapabilitiesInfo, void>>(
135 resolver)); 152 resolver));
136 return promise; 153 return promise;
137 } 154 }
138 155
139 DEFINE_TRACE(MediaCapabilities) {} 156 DEFINE_TRACE(MediaCapabilities) {}
140 157
141 } // namespace blink 158 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698