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

VideoPlayer: move supported deinterlacing methods into ProcessInfo #10323

Merged
merged 2 commits into from Aug 23, 2016

Conversation

@FernetMenta
Copy link
Member

commented Aug 22, 2016

fixes missing deinterlacing methods for sw decoding

@fritsch /cc

{
CSingleLock lock(m_videoCodecSection);

for (auto &deint : m_deintMethods)

This comment has been minimized.

Copy link
@fritsch

fritsch Aug 22, 2016

Member

std::find ?

This comment has been minimized.

Copy link
@FernetMenta

FernetMenta Aug 22, 2016

Author Member

yes but internet is not always good here

@fritsch

This comment has been minimized.

Copy link
Member

commented Aug 22, 2016

Cool thx much. I will close mine.

jenkins build this please

@@ -57,6 +59,7 @@ class CProcessInfo
int GetAudioSampleRate();
void SetAudioBitsPerSample(int bitsPerSample);
int GetAudioBitsPerSampe();

This comment has been minimized.

Copy link
@fritsch

fritsch Aug 22, 2016

Member

Ouh - if you just touch that file GetAudioBitsPerSample <- the L is missing.

This comment has been minimized.

Copy link
@FernetMenta

FernetMenta Aug 22, 2016

Author Member

:)

@fritsch

This comment has been minimized.

Copy link
Member

commented Aug 23, 2016

Can you squash the first commit into yours? (No need to keep my authorship) - then we can get jenkins build and can finally merge?

@FernetMenta FernetMenta force-pushed the FernetMenta:deint branch from 44fff6c to 29237ce Aug 23, 2016
@FernetMenta

This comment has been minimized.

Copy link
Member Author

commented Aug 23, 2016

jenkins build this please

{
CSingleLock lock(m_videoCodecSection);

auto it = std::find(m_deintMethods.begin(), m_deintMethods.end(), method);

This comment has been minimized.

Copy link
@Jalle19

Jalle19 Aug 23, 2016

Member

Could be just "return std::find() != end()"

This comment has been minimized.

Copy link
@fritsch

fritsch Aug 23, 2016

Member

I had debugging in mind. But yes.

This comment has been minimized.

Copy link
@FernetMenta

FernetMenta Aug 23, 2016

Author Member

never ever put multiple statements on a single line.

@fritsch

This comment has been minimized.

Copy link
Member

commented Aug 23, 2016

jenkins is fine - let's fix that bug.

@fritsch fritsch merged commit 903d13f into xbmc:master Aug 23, 2016
3 checks passed
3 checks passed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
jenkins.kodi.tv You did a great job. Have a cookie.
Details
@fritsch

This comment has been minimized.

Copy link
Member

commented Aug 24, 2016

That patches out too much. We now have removed the selection dialog for selecting any deinterlacer :-)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.