Fix EXTENDED_MEDIA_MODE build and runtime failures #900
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The GStreamer include directories were not properly set up in the CMake files for appMain and the Media Manager component, this commit fixes this.
media_manager_impl.cc tries to make an A2DPSourcePlayerAdapter using the protocol handler before it is set, causing the program to SEGFAULT. This commit moves this creation to the PlayA2DPSource method and adds an explicit check to make sure that the protocol handler is set beforehand.
jacobkeeler
changed the title
|
Should fix #890 |
Current coverage is 68.47% (diff: 100%)@@ master #900 diff @@
==========================================
Files 313 313
Lines 22431 22431
Methods 0 0
Messages 0 0
Branches 0 0
==========================================
Hits 15359 15359
Misses 7072 7072
Partials 0 0
|
|
@jacobkeeler Reviewed |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The build for SDL Core currently fails if EXTENDED_MEDIA_MODE=ON, this is partially due to a mistake made in a large CMake refactoring commit which removes the GStreamer include directories (here).
In addition, the GStreamer config directory is not included in the build, which is used by some of the headers in the gst directory which are included in the Media Manager. Unfortunately, FindGStreamer-1.0.cmake cannot find the config directory automatically, so the GSTREAMER_DIR environment variable still needs to be set manually for these changes to work (for Ubuntu 16.04 64-bit, this path should be /usr/lib/x86_64-linux-gnu/gstreamer-1.0):
Finally, once Core is built with this feature, a SEGFAULT occurs in media_manager_impl.cc due to the code attempting to access a member of protocol_handler_ before it is set.
PR Changes