Implement MediaKeys.getMetrics() #4837
Conversation
sideb0ard
force-pushed
the
getMetrics
branch
2 times, most recently
from
3968bb9 to
7298bc4
Compare
| static_idl_files_in_modules += get_path_info( | ||
| [ "//third_party/blink/renderer/modules/mediasource/source_buffer_write_head.idl" ], | ||
| "abspath") | ||
|
|
||
| # MediaKeys |
There was a problem hiding this comment.
nit: You could combine these two into a single addition to static_idl_files_in_modules but leave the comments.
|
LGTM, though you may need to move the idl/implementation somewhere else depending on what Holden/Andrew think |
| "media_keys_get_metrics.cc", | ||
| "media_keys_get_metrics.h", | ||
| ] | ||
| deps += [ "//starboard($starboard_toolchain)" ] |
There was a problem hiding this comment.
Use //starboard:starboard_group
| auto* cdm_context = cdm_context_ref->GetCdmContext(); | ||
| DCHECK(cdm_context); | ||
|
|
||
| auto sbdrm = cdm_context->GetSbDrmSystem(); |
|
|
||
| int metrics_size = -1; | ||
| const void* metrics = SbDrmGetMetrics(sbdrm, &metrics_size); | ||
| DCHECK(metrics_size > 0); |
There was a problem hiding this comment.
nit: DCHECK_GT(metrics_size, 0);
| SecureContext, | ||
| ImplementedAs=MediaKeysGetMetrics | ||
| ] partial interface MediaKeys { | ||
| [RaisesException] Uint8Array getMetrics(); |
There was a problem hiding this comment.
Can this be a DOMString ? It would simplify the conversion.
| int metrics_size = -1; | ||
| const void* metrics = SbDrmGetMetrics(sbdrm, &metrics_size); | ||
| DCHECK(metrics_size > 0); | ||
| metrics_results.assign(static_cast<const char*>(metrics), metrics_size); |
There was a problem hiding this comment.
Can we make this function signature std::string ...::GetMetrics() { and then here just do return std::string(static_cast<const char*>(metrics), metrics_size); ?
| ActiveScriptWrappable, | ||
| SecureContext, | ||
| ImplementedAs=MediaKeysGetMetrics | ||
| ] partial interface MediaKeys { |
There was a problem hiding this comment.
Can we add an hmlt test file in or around https://source.chromium.org/chromium/chromium/src/+/main:third_party/blink/web_tests/media/encrypted-media/ ?
| @@ -54,6 +54,10 @@ class PLATFORM_EXPORT WebContentDecryptionModuleImpl | |||
| void GetStatusForPolicy(const WebString& min_hdcp_version_string, | |||
| WebContentDecryptionModuleResult result) override; | |||
|
|
|||
| #if BUILDFLAG(USE_STARBOARD_MEDIA) | |||
| void GetMetrics(std::string &metrics_results) override; | |||
There was a problem hiding this comment.
Can we have a unit test for this? Not sure the mocking capabilities of SbDrmGetMetrics but the CdmAdapter might be a pickle, and perhaps is not injectable.
| class MediaKeysGetMetrics { | ||
| STATIC_ONLY(MediaKeysGetMetrics); | ||
|
|
||
| public: |
There was a problem hiding this comment.
nit: there's an extra leading space here
There was a problem hiding this comment.
Consider moving this to a cobalt-specific dir as is being done in #4851
| namespace blink { | ||
|
|
||
| // static | ||
| NotShared<DOMUint8Array> MediaKeysGetMetrics::getMetrics(MediaKeys& media_keys, ExceptionState& exception_state) { |
There was a problem hiding this comment.
nit: wrap at 80 characters.
| @@ -53,6 +53,10 @@ class BLINK_PLATFORM_EXPORT WebContentDecryptionModule { | |||
|
|
|||
| virtual void GetStatusForPolicy(const WebString& min_hdcp_version, | |||
| WebContentDecryptionModuleResult) = 0; | |||
|
|
|||
| #if BUILDFLAG(USE_STARBOARD_MEDIA) | |||
| virtual void GetMetrics(std::string &metrics_results) {} | |||
There was a problem hiding this comment.
Consider turning this into pure virtual function if it doesn't break the build.
Also move the '&' to the left of the space, to be consistent to other functions. The same to other instances.
| const unsigned char* unsigned_buffer = | ||
| reinterpret_cast<const unsigned char*>(metrics.c_str()); | ||
|
|
||
| return NotShared<DOMUint8Array>(DOMUint8Array::Create(unsigned_buffer, metrics.size())); |
There was a problem hiding this comment.
We may want to make GetMetrics() return a boolean value, and raise an exception when metrics isn't ready. See https://github.com/youtube/cobalt/blob/25.lts.1%2B/cobalt/dom/eme/media_keys.cc#L120 for more details.
b/381298846
Extend MediaKeys API with getMetrics.
This fixes the YTS EME getMetrics test failure, which is one of the golden ATV tests, required for fishfood.