Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

VIDEO: Fix VPX build for various platforms #4807

Merged
merged 4 commits into from Mar 13, 2023
Merged

Conversation

lephilousophe
Copy link
Member

AppleTV and iOS need the libvpx.a file to be added to their build flags like other libraries.

MKV decoder needs proper support for Tremor. This is copied from Theora decoder.

libvpx can be built statically. In this case additional libraries may be needed (like pthread for multithreaded decoding).
Without this, it fails to build on platforms like Vita.

Finally, patch MKV parser to make it use our own objects instead of STL ones. This makes the code compile under MacOS i386 toolchain.
As the C++ headers are replaced by our own (which include C versions of them), LLONG_MAX needs to be redefined on some platforms (newlib based ones) and isnan can't be defined as a function as it may be a macro.

Without this PR, new toolchains which have libvpx can't be deployed.

@lephilousophe lephilousophe requested a review from sev- March 12, 2023 16:49
configure Outdated Show resolved Hide resolved
@@ -5309,7 +5296,7 @@ long VideoTrack::Parse(Segment* pSegment, const Info& info,
long long stereo_mode = 0;

double rate = 0.0;
std::unique_ptr<char[]> colour_space_ptr;
Common::ScopedPtr<char, Common::ArrayDeleter<char>> colour_space_ptr;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

STL, makes me wonder who reviewed this in first place...

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@aquadran That was me, and moreover, I did add it in the first place...

@sev-
Copy link
Member

sev- commented Mar 13, 2023

Thank you!

@sev- sev- merged commit aae7031 into scummvm:master Mar 13, 2023
8 checks passed
@lephilousophe lephilousophe deleted the fix-vpx branch March 14, 2023 09:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants