Bug 162918 – [GStreamer][EME] ClearKey decryption support

• Status: RESOLVED
• Resolution: FIXED
• Component: Platform

[Enrique Ocaña]

Add ClearKey encryption subclass.

[Enrique Ocaña]

Created attachment 290613 [details]
Patch

[Enrique Ocaña]

Comment on attachment 290613 [details]
Patch

Wait until all the patches in 157314 are ready.

[Enrique Ocaña]

The style failures are on purpose, because of gobject macro machinery requirements.

[WebKit Commit Bot]

Attachment 290613 [details] did not pass style-queue:


ERROR: Source/WebCore/platform/graphics/gstreamer/eme/WebKitClearKeyDecryptorGStreamer.h:41:  webkit_media_clear_key_decrypt_get_type is incorrectly named. Don't use underscores in your identifier names.  [readability/naming/underscores] [4]
ERROR: Source/WebCore/platform/graphics/gstreamer/eme/WebKitClearKeyDecryptorGStreamer.cpp:66:  webkit_media_clear_key_decrypt_class_init is incorrectly named. Don't use underscores in your identifier names.  [readability/naming/underscores] [4]
ERROR: Source/WebCore/platform/graphics/gstreamer/eme/WebKitClearKeyDecryptorGStreamer.cpp:96:  webkit_media_clear_key_decrypt_init is incorrectly named. Don't use underscores in your identifier names.  [readability/naming/underscores] [4]
Total errors found: 3 in 3 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[Xabier Rodríguez Calvar]

Comment on attachment 290613 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=290613&action=review

> Source/WebCore/platform/graphics/gstreamer/eme/WebKitClearKeyDecryptorGStreamer.cpp:70
> +    WebKitMediaCommonEncryptionDecryptClass* cencClass = WEBKIT_MEDIA_CENC_DECRYPT_CLASS(klass);
> +    GstElementClass* elementClass = GST_ELEMENT_CLASS(klass);
> +    GObjectClass* gobjectClass = G_OBJECT_CLASS(klass);

You can move this to the latest place before they are used.

> Source/WebCore/platform/graphics/gstreamer/eme/WebKitClearKeyDecryptorGStreamer.cpp:188
> +    WebKitMediaClearKeyDecryptPrivate* priv = WEBKIT_MEDIA_CK_DECRYPT_GET_PRIVATE(WEBKIT_MEDIA_CK_DECRYPT(self));
> +    GstMapInfo map, ivMap, subSamplesMap;
> +    unsigned position = 0;
> +    unsigned sampleIndex = 0;
> +    uint8_t ctr[CLEARKEY_SIZE];
> +    GstByteReader* reader = nullptr;
> +    gboolean bufferMapped, subsamplesBufferMapped;
> +    gcry_error_t error;

Move these to the latest place where they are first used. reader should be GRefPtr

[Enrique Ocaña]

Created attachment 291771 [details]
Patch

[WebKit Commit Bot]

Attachment 291771 [details] did not pass style-queue:


ERROR: Source/WebCore/platform/graphics/gstreamer/eme/WebKitClearKeyDecryptorGStreamer.h:40:  webkit_media_clear_key_decrypt_get_type is incorrectly named. Don't use underscores in your identifier names.  [readability/naming/underscores] [4]
ERROR: Source/WebCore/platform/graphics/gstreamer/eme/WebKitClearKeyDecryptorGStreamer.cpp:66:  webkit_media_clear_key_decrypt_class_init is incorrectly named. Don't use underscores in your identifier names.  [readability/naming/underscores] [4]
ERROR: Source/WebCore/platform/graphics/gstreamer/eme/WebKitClearKeyDecryptorGStreamer.cpp:95:  webkit_media_clear_key_decrypt_init is incorrectly named. Don't use underscores in your identifier names.  [readability/naming/underscores] [4]
Total errors found: 3 in 3 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[Enrique Ocaña]

Created attachment 292901 [details]
Patch

[WebKit Commit Bot]

Attachment 292901 [details] did not pass style-queue:


ERROR: Source/WebCore/platform/graphics/gstreamer/eme/WebKitClearKeyDecryptorGStreamer.h:40:  webkit_media_clear_key_decrypt_get_type is incorrectly named. Don't use underscores in your identifier names.  [readability/naming/underscores] [4]
ERROR: Source/WebCore/platform/graphics/gstreamer/eme/WebKitClearKeyDecryptorGStreamer.cpp:66:  webkit_media_clear_key_decrypt_class_init is incorrectly named. Don't use underscores in your identifier names.  [readability/naming/underscores] [4]
ERROR: Source/WebCore/platform/graphics/gstreamer/eme/WebKitClearKeyDecryptorGStreamer.cpp:95:  webkit_media_clear_key_decrypt_init is incorrectly named. Don't use underscores in your identifier names.  [readability/naming/underscores] [4]
Total errors found: 3 in 3 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[Enrique Ocaña]

Comment on attachment 292901 [details]
Patch

Clearing flags on attachment: 292901

Committed r207888: <http://trac.webkit.org/changeset/207888>

[Enrique Ocaña]

All reviewed patches have been landed.  Closing bug.