Ladybird/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-06-08 05:27:14 +09:00
Code Activity

LibMedia: Mark ffmpeg as required, and reorganize CMakeLists

Browse source 
Now it should be clearer looking at the build scripts what options
are available for building LibMedia, and what packages are required.
This commit is contained in:
Andrew Kaster 2024-10-02 12:40:19 -06:00 • committed by Tim Flynn
parent 768d814ffd
commit ebaba7fb7b
Notes: github-actions[bot] 2024-10-02 20:04:30 +00:00
4 changed files with 20 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Meta/CMake/ffmpeg.cmake
View file

@ -1,11 +1,6 @@
include_guard() include_guard()
find_package(PkgConfig REQUIRED) find_package(PkgConfig REQUIRED)
pkg_check_modules(AVCODEC IMPORTED_TARGET libavcodec) pkg_check_modules(AVCODEC REQUIRED IMPORTED_TARGET libavcodec)
pkg_check_modules(AVFORMAT IMPORTED_TARGET libavformat) pkg_check_modules(AVFORMAT REQUIRED IMPORTED_TARGET libavformat)
pkg_check_modules(AVUTIL IMPORTED_TARGET libavutil) pkg_check_modules(AVUTIL REQUIRED IMPORTED_TARGET libavutil)
if (AVCODEC_FOUND AND AVFORMAT_FOUND AND AVUTIL_FOUND)
set(HAS_FFMPEG ON CACHE BOOL "" FORCE)
add_compile_definitions(USE_FFMPEG=1)
endif()

1
Meta/gn/build/libs/ffmpeg/BUILD.gn
View file

@ -27,7 +27,6 @@ config("ffmpeg_config") {
"avformat", "avformat",
"avutil", "avutil",
] ]
defines = [ "USE_FFMPEG" ]
} }
group("ffmpeg") { group("ffmpeg") {

2
Userland/Libraries/LibMedia/Audio/Loader.cpp
View file

@ -28,9 +28,7 @@ struct LoaderPluginInitializer {
}; };
static constexpr LoaderPluginInitializer s_initializers[] = { static constexpr LoaderPluginInitializer s_initializers[] = {
#ifdef USE_FFMPEG
{ FFmpegLoaderPlugin::sniff, FFmpegLoaderPlugin::create }, { FFmpegLoaderPlugin::sniff, FFmpegLoaderPlugin::create },
#endif
}; };
ErrorOr<NonnullRefPtr<Loader>, LoaderError> Loader::create(StringView path) ErrorOr<NonnullRefPtr<Loader>, LoaderError> Loader::create(StringView path)

40
Userland/Libraries/LibMedia/CMakeLists.txt
View file

@ -13,43 +13,37 @@ set(SOURCES
VideoFrame.cpp VideoFrame.cpp
) )
if (HAVE_PULSEAUDIO)
list(APPEND SOURCES
Audio/PlaybackStreamPulseAudio.cpp
Audio/PulseAudioWrappers.cpp
)
endif()
if (HAS_FFMPEG)
list(APPEND SOURCES
Audio/FFmpegLoader.cpp
FFmpeg/FFmpegVideoDecoder.cpp
)
else()
list(APPEND SOURCES FFmpeg/FFmpegVideoDecoderStub.cpp)
endif()
serenity_lib(LibMedia media) serenity_lib(LibMedia media)
target_link_libraries(LibMedia PRIVATE LibCore LibCrypto LibRIFF LibIPC LibGfx LibThreading LibUnicode) target_link_libraries(LibMedia PRIVATE LibCore LibCrypto LibRIFF LibIPC LibGfx LibThreading LibUnicode)
if (HAS_FFMPEG) if (NOT ANDROID)
target_sources(LibMedia PRIVATE
Audio/FFmpegLoader.cpp
FFmpeg/FFmpegVideoDecoder.cpp
)
target_link_libraries(LibMedia PRIVATE PkgConfig::AVCODEC PkgConfig::AVFORMAT PkgConfig::AVUTIL) target_link_libraries(LibMedia PRIVATE PkgConfig::AVCODEC PkgConfig::AVFORMAT PkgConfig::AVUTIL)
else()
# FIXME: Need to figure out how to build or replace ffmpeg libs on Android
target_sources(LibMedia PRIVATE FFmpeg/FFmpegVideoDecoderStub.cpp)
endif() endif()
# Audio backend -- how we output audio to the speakers
if (HAVE_PULSEAUDIO) if (HAVE_PULSEAUDIO)
target_sources(LibMedia PRIVATE
Audio/PlaybackStreamPulseAudio.cpp
Audio/PulseAudioWrappers.cpp
)
target_link_libraries(LibMedia PRIVATE pulse) target_link_libraries(LibMedia PRIVATE pulse)
target_compile_definitions(LibMedia PRIVATE HAVE_PULSEAUDIO=1) target_compile_definitions(LibMedia PRIVATE HAVE_PULSEAUDIO=1)
endif() elseif (APPLE AND NOT IOS)
if (APPLE AND NOT IOS)
target_sources(LibMedia PRIVATE Audio/PlaybackStreamAudioUnit.cpp) target_sources(LibMedia PRIVATE Audio/PlaybackStreamAudioUnit.cpp)
find_library(AUDIO_UNIT AudioUnit REQUIRED) find_library(AUDIO_UNIT AudioUnit REQUIRED)
target_link_libraries(LibMedia PRIVATE ${AUDIO_UNIT}) target_link_libraries(LibMedia PRIVATE ${AUDIO_UNIT})
endif() elseif (ANDROID)
if (ANDROID)
target_sources(LibMedia PRIVATE Audio/PlaybackStreamOboe.cpp) target_sources(LibMedia PRIVATE Audio/PlaybackStreamOboe.cpp)
find_package(oboe REQUIRED CONFIG) find_package(oboe REQUIRED CONFIG)
target_link_libraries(LibMedia PRIVATE log oboe::oboe) target_link_libraries(LibMedia PRIVATE log oboe::oboe)
else()
message(WARNING "No audio backend available")
endif() endif()