Permalink
Browse files

Drop LEGACY_ENCRYPTED_MEDIA code.

  • Loading branch information...
zdobersek committed Nov 20, 2017
1 parent c0aadeb commit db8ce0bada6e3a2a3508e371dc248dbfec854e41
Showing with 40 additions and 1,603 deletions.
  1. +2 −1 Source/WebCore/Modules/encryptedmedia/legacy/LegacyCDM.cpp
  2. +1 −1 Source/WebCore/Modules/encryptedmedia/legacy/LegacyCDMPrivateClearKey.cpp
  3. +1 −1 Source/WebCore/Modules/encryptedmedia/legacy/LegacyCDMPrivateMediaPlayer.cpp
  4. +1 −1 Source/WebCore/Modules/encryptedmedia/legacy/WebKitMediaKeySession.h
  5. +1 −1 Source/WebCore/Modules/encryptedmedia/legacy/WebKitMediaKeys.h
  6. +1 −1 Source/WebCore/dom/Element.idl
  7. +1 −2 Source/WebCore/html/HTMLMediaElement.cpp
  8. +1 −1 Source/WebCore/html/HTMLMediaElement.h
  9. +0 −4 Source/WebCore/html/HTMLMediaElement.idl
  10. +0 −39 Source/WebCore/platform/GStreamer.cmake
  11. +0 −86 Source/WebCore/platform/graphics/CDMSession.h
  12. +0 −2 Source/WebCore/platform/graphics/MediaPlayer.h
  13. +1 −6 Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
  14. +1 −425 Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp
  15. +0 −43 Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h
  16. +0 −100 Source/WebCore/platform/graphics/gstreamer/eme/CDMPRSessionGStreamer.cpp
  17. +0 −70 Source/WebCore/platform/graphics/gstreamer/eme/CDMPRSessionGStreamer.h
  18. +0 −84 Source/WebCore/platform/graphics/gstreamer/eme/CDMPrivateOpenCDM.cpp
  19. +0 −67 Source/WebCore/platform/graphics/gstreamer/eme/CDMPrivateOpenCDM.h
  20. +0 −107 Source/WebCore/platform/graphics/gstreamer/eme/CDMSessionOpenCDM.cpp
  21. +0 −80 Source/WebCore/platform/graphics/gstreamer/eme/CDMSessionOpenCDM.h
  22. +2 −2 Source/WebCore/platform/graphics/gstreamer/eme/GStreamerEMEUtilities.cpp
  23. +2 −2 Source/WebCore/platform/graphics/gstreamer/eme/GStreamerEMEUtilities.h
  24. +0 −10 Source/WebCore/platform/graphics/gstreamer/eme/PlayreadySession.cpp
  25. +1 −21 Source/WebCore/platform/graphics/gstreamer/eme/WebKitClearKeyDecryptorGStreamer.cpp
  26. +1 −1 Source/WebCore/platform/graphics/gstreamer/eme/WebKitClearKeyDecryptorGStreamer.h
  27. +1 −1 Source/WebCore/platform/graphics/gstreamer/eme/WebKitCommonEncryptionDecryptorGStreamer.cpp
  28. +1 −1 Source/WebCore/platform/graphics/gstreamer/eme/WebKitCommonEncryptionDecryptorGStreamer.h
  29. +2 −2 Source/WebCore/platform/graphics/gstreamer/eme/WebKitOpenCDMDecryptorGStreamer.cpp
  30. +2 −2 Source/WebCore/platform/graphics/gstreamer/eme/WebKitOpenCDMDecryptorGStreamer.h
  31. +2 −2 Source/WebCore/platform/graphics/gstreamer/eme/WebKitOpenCDMPlayReadyDecryptorGStreamer.cpp
  32. +2 −2 Source/WebCore/platform/graphics/gstreamer/eme/WebKitOpenCDMPlayReadyDecryptorGStreamer.h
  33. +2 −2 Source/WebCore/platform/graphics/gstreamer/eme/WebKitOpenCDMWidevineDecryptorGStreamer.cpp
  34. +2 −2 Source/WebCore/platform/graphics/gstreamer/eme/WebKitOpenCDMWidevineDecryptorGStreamer.h
  35. +0 −222 Source/WebCore/platform/graphics/gstreamer/eme/WebKitPlayReadyDecryptorGStreamer.cpp
  36. +0 −62 Source/WebCore/platform/graphics/gstreamer/eme/WebKitPlayReadyDecryptorGStreamer.h
  37. +7 −64 Source/WebCore/platform/graphics/gstreamer/mse/AppendPipeline.cpp
  38. +2 −11 Source/WebCore/platform/graphics/gstreamer/mse/AppendPipeline.h
  39. +0 −53 Source/WebCore/platform/graphics/gstreamer/mse/MediaPlayerPrivateGStreamerMSE.cpp
  40. +0 −10 Source/WebCore/platform/graphics/gstreamer/mse/MediaPlayerPrivateGStreamerMSE.h
  41. +0 −9 Source/cmake/OptionsWPE.cmake
@@ -24,10 +24,11 @@
*/
#include "config.h"
#include "LegacyCDM.h"
#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
#include "LegacyCDM.h"
#include "LegacyCDMPrivateClearKey.h"
#include "LegacyCDMPrivateMediaPlayer.h"
#include "LegacyCDMSession.h"
@@ -28,9 +28,9 @@
#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
#include "ContentType.h"
#include "LegacyCDM.h"
#include "LegacyCDMSessionClearKey.h"
#include "ContentType.h"
#include "MediaPlayer.h"
namespace WebCore {
@@ -28,9 +28,9 @@
#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
#include "ContentType.h"
#include "LegacyCDM.h"
#include "LegacyCDMSession.h"
#include "ContentType.h"
#include "MediaPlayer.h"
#if PLATFORM(IOS)
@@ -28,10 +28,10 @@
#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
#include "ActiveDOMObject.h"
#include "LegacyCDMSession.h"
#include "EventTarget.h"
#include "ExceptionOr.h"
#include "GenericEventQueue.h"
#include "LegacyCDMSession.h"
#include "Timer.h"
#include <runtime/Uint8Array.h>
#include <wtf/Deque.h>
@@ -27,8 +27,8 @@
#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
#include "ExceptionOr.h"
#include "LegacyCDM.h"
#include "ExceptionOr.h"
#include <runtime/Uint8Array.h>
#include <wtf/Vector.h>
@@ -130,7 +130,7 @@
[NotEnumerable] attribute EventHandler onbeforeload;
// Non standard event handler (https://developer.apple.com/reference/webkitjs/element/1634205-onwebkitneedkey).
[NotEnumerable, Conditional=LEGACY_ENCRYPTED_MEDIA] attribute EventHandler onwebkitneedkey;
[NotEnumerable, Conditional=LEGACY_ENCRYPTED_MEDIA, EnabledAtRuntime=LegacyEncryptedMediaAPI] attribute EventHandler onwebkitneedkey;
// Non standard event handler (https://developer.apple.com/reference/webkitjs/element/1633943-onwebkitpresentationmodechanged).
[NotEnumerable, Conditional=VIDEO_PRESENTATION_MODE] attribute EventHandler onwebkitpresentationmodechanged;
@@ -1145,13 +1145,12 @@ HTMLMediaElement::NetworkState HTMLMediaElement::networkState() const
return m_networkState;
}
String HTMLMediaElement::canPlayType(const String& mimeType, const String& keySystem) const
String HTMLMediaElement::canPlayType(const String& mimeType) const
{
MediaEngineSupportParameters parameters;
ContentType contentType(mimeType);
parameters.type = contentType;
parameters.contentTypesRequiringHardwareSupport = mediaContentTypesRequiringHardwareSupport();
UNUSED_PARAM(keySystem);
MediaPlayer::SupportsType support = MediaPlayer::supportsType(parameters, this);
String canPlay;
@@ -216,7 +216,7 @@ class HTMLMediaElement
Ref<TimeRanges> buffered() const override;
WEBCORE_EXPORT void load();
WEBCORE_EXPORT String canPlayType(const String& mimeType, const String& keySystem = String()) const;
WEBCORE_EXPORT String canPlayType(const String& mimeType) const;
// ready state
using HTMLMediaElementEnums::ReadyState;
@@ -59,11 +59,7 @@ typedef (
readonly attribute TimeRanges buffered;
void load();
#if defined(ENABLE_LEGACY_ENCRYPTED_MEDIA) && ENABLE_LEGACY_ENCRYPTED_MEDIA
DOMString canPlayType(DOMString type, optional DOMString? keySystem = null);
#else
DOMString canPlayType(DOMString type);
#endif
// ready state
const unsigned short HAVE_NOTHING = 0;
@@ -137,45 +137,6 @@ if (ENABLE_WEB_AUDIO)
)
endif ()
if (ENABLE_LEGACY_ENCRYPTED_MEDIA)
list(APPEND WebCore_INCLUDE_DIRECTORIES
${LIBGCRYPT_INCLUDE_DIRS}
)
list(APPEND WebCore_LIBRARIES
${LIBGCRYPT_LIBRARIES} -lgpg-error
)
if (ENABLE_PLAYREADY)
list(APPEND WebCore_LIBRARIES
${PLAYREADY_LIBRARIES}
)
list(APPEND WebCore_INCLUDE_DIRECTORIES
${PLAYREADY_INCLUDE_DIRS}
)
add_definitions(${PLAYREADY_CFLAGS_OTHER})
foreach(p ${PLAYREADY_INCLUDE_DIRS})
if (EXISTS "${p}/playready.cmake")
include("${p}/playready.cmake")
endif()
endforeach()
list(APPEND WebCore_SOURCES
platform/graphics/gstreamer/eme/CDMPRSessionGStreamer.cpp
platform/graphics/gstreamer/eme/PlayreadySession.cpp
platform/graphics/gstreamer/eme/WebKitPlayReadyDecryptorGStreamer.cpp
)
endif ()
if (ENABLE_OPENCDM)
list(APPEND WebCore_SOURCES
platform/graphics/gstreamer/eme/CDMPrivateOpenCDM.cpp
platform/graphics/gstreamer/eme/CDMSessionOpenCDM.cpp
platform/graphics/gstreamer/eme/WebKitOpenCDMDecryptorGStreamer.cpp
platform/graphics/gstreamer/eme/WebKitOpenCDMPlayReadyDecryptorGStreamer.cpp
platform/graphics/gstreamer/eme/WebKitOpenCDMWidevineDecryptorGStreamer.cpp
)
endif ()
endif ()
if (ENABLE_ENCRYPTED_MEDIA)
list(APPEND WebCore_INCLUDE_DIRECTORIES
"${WEBCORE_DIR}/platform/encryptedmedia/clearkey"

This file was deleted.

Oops, something went wrong.
@@ -390,9 +390,7 @@ class MediaPlayer : public MediaPlayerEnums, public RefCounted<MediaPlayer> {
// Represents synchronous exceptions that can be thrown from the Encrypted Media methods.
// This is different from the asynchronous MediaKeyError.
enum MediaKeyException { NoError, InvalidPlayerState, KeySystemNotSupported };
#endif
#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
std::unique_ptr<CDMSession> createSession(const String& keySystem, CDMSessionClient*);
void setCDMSession(CDMSession*);
void keyAdded();
@@ -1163,17 +1163,12 @@ void MediaPlayerPrivateGStreamer::handleMessage(GstMessage* message)
m_buffering = false;
updateStates();
}
#if ENABLE(LEGACY_ENCRYPTED_MEDIA) || ENABLE(ENCRYPTED_MEDIA)
#if ENABLE(ENCRYPTED_MEDIA)
else if (gst_structure_has_name(structure, "drm-key-needed")) {
GST_DEBUG("drm-key-needed message from %s", GST_MESSAGE_SRC_NAME(message));
GRefPtr<GstEvent> event;
gst_structure_get(structure, "event", GST_TYPE_EVENT, &event.outPtr(), nullptr);
#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
handleProtectionEvent(event.get(), GST_ELEMENT(message->src));
#endif
#if ENABLE(ENCRYPTED_MEDIA)
handleProtectionEvent(event.get());
#endif
}
#endif
}
Oops, something went wrong.

0 comments on commit db8ce0b

Please sign in to comment.