Changeset 207891 in webkit


Ignore:
Timestamp:
Oct 26, 2016 1:48:19 AM (8 years ago)
Author:
eocanha@igalia.com
Message:

[cmake][GStreamer][MSE][EME] Build MSE and EME code after refactoring
​https://bugs.webkit.org/show_bug.cgi?id=162928

Reviewed by Xabier Rodriguez-Calvar.

.:

Consolidate all the source file tree changes after refactoring.

This patch is co-authored with Philippe Normand <​philn@igalia.com> (EME support).

  • Source/cmake/FindLibGcrypt.cmake: Added.
  • Source/cmake/OptionsGTK.cmake:

Source/WebCore:

Consolidate all the source file tree changes after refactoring.

This patch is co-authored with Philippe Normand <​philn@igalia.com> (EME support).

  • platform/GStreamer.cmake:

Tools:

Explicitly enable MSE and EME on WebKitGTK+ buildbots.

This patch is co-authored with Philippe Normand <​philn@igalia.com> (EME support).

  • Scripts/webkitperl/FeatureList.pm:
Location:
trunk
Files:
1 added
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r207872 r207891  
     12016-10-26  Enrique Ocaña González  <eocanha@igalia.com>
     2
     3        [cmake][GStreamer][MSE][EME] Build MSE and EME code after refactoring
     4        https://bugs.webkit.org/show_bug.cgi?id=162928
     5
     6        Reviewed by Xabier Rodriguez-Calvar.
     7
     8        Consolidate all the source file tree changes after refactoring.
     9
     10        This patch is co-authored with Philippe Normand <philn@igalia.com> (EME support).
     11
     12        * Source/cmake/FindLibGcrypt.cmake: Added.
     13        * Source/cmake/OptionsGTK.cmake:
     14
    1152016-10-26  Enrique Ocaña González  <eocanha@igalia.com>
    216

  • trunk/Source/WebCore/ChangeLog

    r207890 r207891  
     12016-10-26  Enrique Ocaña González  <eocanha@igalia.com>
     2
     3        [cmake][GStreamer][MSE][EME] Build MSE and EME code after refactoring
     4        https://bugs.webkit.org/show_bug.cgi?id=162928
     5
     6        Reviewed by Xabier Rodriguez-Calvar.
     7
     8        Consolidate all the source file tree changes after refactoring.
     9
     10        This patch is co-authored with Philippe Normand <philn@igalia.com> (EME support).
     11
     12        * platform/GStreamer.cmake:
     13
    1142016-10-26  Enrique Ocaña González  <eocanha@igalia.com>
    215

  • trunk/Source/WebCore/platform/GStreamer.cmake

    r207665 r207891  
    2424    list(APPEND WebCore_INCLUDE_DIRECTORIES
    2525        "${WEBCORE_DIR}/platform/graphics/gstreamer"
     26        "${WEBCORE_DIR}/platform/graphics/gstreamer/mse"
     27        "${WEBCORE_DIR}/platform/graphics/gstreamer/eme"
    2628    )
    2729
    … …  
    3335        platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
    3436        platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp
    35         platform/graphics/gstreamer/MediaSourceGStreamer.cpp
    36         platform/graphics/gstreamer/SourceBufferPrivateGStreamer.cpp
    3737        platform/graphics/gstreamer/TextCombinerGStreamer.cpp
    3838        platform/graphics/gstreamer/TextSinkGStreamer.cpp
    … …  
    4040        platform/graphics/gstreamer/VideoSinkGStreamer.cpp
    4141        platform/graphics/gstreamer/VideoTrackPrivateGStreamer.cpp
    42         platform/graphics/gstreamer/WebKitMediaSourceGStreamer.cpp
    4342        platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
     43
     44        platform/graphics/gstreamer/eme/WebKitClearKeyDecryptorGStreamer.cpp
     45        platform/graphics/gstreamer/eme/WebKitCommonEncryptionDecryptorGStreamer.cpp
     46
     47        platform/graphics/gstreamer/mse/AppendPipeline.cpp
     48        platform/graphics/gstreamer/mse/GStreamerMediaDescription.cpp
     49        platform/graphics/gstreamer/mse/GStreamerMediaSample.cpp
     50        platform/graphics/gstreamer/mse/MediaPlayerPrivateGStreamerMSE.cpp
     51        platform/graphics/gstreamer/mse/MediaSourceClientGStreamerMSE.cpp
     52        platform/graphics/gstreamer/mse/MediaSourceGStreamer.cpp
     53        platform/graphics/gstreamer/mse/PlaybackPipeline.cpp
     54        platform/graphics/gstreamer/mse/SourceBufferPrivateGStreamer.cpp
     55        platform/graphics/gstreamer/mse/WebKitMediaSourceGStreamer.cpp
    4456    )
    4557
    … …  
    118130    )
    119131endif ()
     132
     133if (ENABLE_LEGACY_ENCRYPTED_MEDIA)
     134    list(APPEND WebCore_INCLUDE_DIRECTORIES
     135        ${LIBGCRYPT_INCLUDE_DIRS}
     136    )
     137    list(APPEND WebCore_LIBRARIES
     138        ${LIBGCRYPT_LIBRARIES} -lgpg-error
     139    )
     140endif ()

  • trunk/Source/cmake/OptionsGTK.cmake

    r207872 r207891  
    271271endif ()
    272272
     273if (ENABLE_LEGACY_ENCRYPTED_MEDIA)
     274    find_package(LibGcrypt REQUIRED)
     275endif ()
     276
    273277SET_AND_EXPOSE_TO_BUILD(USE_TEXTURE_MAPPER TRUE)
    274278

  • trunk/Tools/ChangeLog

    r207835 r207891  
     12016-10-26  Enrique Ocaña González  <eocanha@igalia.com>
     2
     3        [cmake][GStreamer][MSE][EME] Build MSE and EME code after refactoring
     4        https://bugs.webkit.org/show_bug.cgi?id=162928
     5
     6        Reviewed by Xabier Rodriguez-Calvar.
     7
     8        Explicitly enable MSE and EME on WebKitGTK+ buildbots.
     9
     10        This patch is co-authored with Philippe Normand <philn@igalia.com> (EME support).
     11
     12        * Scripts/webkitperl/FeatureList.pm:
     13
    1142016-10-25  Antoine Quint  <graouts@apple.com>
    215

  • trunk/Tools/Scripts/webkitperl/FeatureList.pm

    r207762 r207891  
    8181    $domIterator,
    8282    $downloadAttributeSupport,
     83    $encryptedMediaSupport,
    8384    $fetchAPISupport,
    8485    $fontLoadEventsSupport,
    … …  
    103104    $intlSupport,
    104105    $jitSupport,
     106    $legacyEncryptedMediaSupport,
    105107    $legacyNotificationsSupport,
    106108    $legacyVendorPrefixSupport,
    … …  
    252254      define => "ENABLE_DOWNLOAD_ATTRIBUTE", default => (isEfl() || isGtk()), value => \$downloadAttributeSupport },
    253255
    254     { option => "encrypted-media", desc => "Toggle EME support",
    255       define => "ENABLE_ENCRYPTED_MEDIA", default => 0, value => \$fetchAPISupport },
     256    { option => "encrypted-media", desc => "Toggle EME V3 support",
     257      define => "ENABLE_ENCRYPTED_MEDIA", default => 0, value => \$encryptedMediaSupport },
    256258
    257259    { option => "fetch-api", desc => "Toggle Fetch API support",
    … …  
    318320    { option => "jit", desc => "Enable just-in-time JavaScript support",
    319321      define => "ENABLE_JIT", default => 1, value => \$jitSupport },
     322
     323    { option => "legacy-encrypted-media", desc => "Toggle Legacy EME V2 support",
     324      define => "ENABLE_LEGACY_ENCRYPTED_MEDIA", default => isGtk(), value => \$legacyEncryptedMediaSupport },
    320325
    321326    { option => "legacy-notifications", desc => "Toggle Legacy Notifications support",
Note: See TracChangeset for help on using the changeset viewer.