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

Clear Codec and AVC420 fixes #3648

Merged
merged 6 commits into from
Dec 15, 2016
Merged

Conversation

akallabeth
Copy link
Member

@akallabeth akallabeth commented Dec 7, 2016

Fixes #3642 #3527 #3279 et al

Tested with windows 8.1 and 10 as well as android

@akallabeth akallabeth changed the title Clear Codec and Clear Codec and AVC420 fixes Dec 7, 2016
@akallabeth
Copy link
Member Author

@mfleisz This may fix the issues you've encountered

@freerdp-bot
Copy link

Refer to this link for build results (access rights to CI server needed):
https://ci.freerdp.com//job/PullRequestTester/1612/

Copy link
Member

@mfleisz mfleisz left a comment

Choose a reason for hiding this comment

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

@akallabeth Just one comment - apart from that there is the "problem" with the API change.

glyphEntry->size = glyphEntry->count;
tmp = (UINT32*) realloc(glyphEntry->pixels, glyphEntry->size * 4);
tmp = realloc(glyphEntry->pixels, glyphEntry->size * bpp);
Copy link
Member

Choose a reason for hiding this comment

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

I think we miss a (BYTE*) cast here

Copy link
Member Author

Choose a reason for hiding this comment

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

@mfleisz You looked at the wrong end of the diff ;)

Copy link
Member

Choose a reason for hiding this comment

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

@akallabeth You are right - should not be necessary with PODs

@akallabeth
Copy link
Member Author

@mfleisz Refactored the changes, using an API compatible fix now.

@freerdp-bot
Copy link

Refer to this link for build results (access rights to CI server needed):
https://ci.freerdp.com//job/PullRequestTester/1615/

glyphEntry->size = glyphEntry->count;
tmp = (UINT32*) realloc(glyphEntry->pixels, glyphEntry->size * 4);
tmp = realloc(glyphEntry->pixels, glyphEntry->size * bpp);
Copy link
Member

Choose a reason for hiding this comment

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

@akallabeth You are right - should not be necessary with PODs

@mfleisz
Copy link
Member

mfleisz commented Dec 13, 2016

@freerdp-bot test

@freerdp-bot
Copy link

Refer to this link for build results (access rights to CI server needed):
https://ci.freerdp.com//job/PullRequestTester/1617/

@freerdp-bot
Copy link

Refer to this link for build results (access rights to CI server needed):
https://ci.freerdp.com//job/PullRequestTester/1618/

@@ -1011,6 +1011,8 @@ BOOL rfx_process_message(RFX_CONTEXT* context, const BYTE* data, UINT32 length,
BOOL ok = TRUE;
UINT16 expectedDataBlockType = WBT_FRAME_BEGIN;

region16_init(&updateRegion);
Copy link
Member

Choose a reason for hiding this comment

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

Wouldn't it be easier to just move the declaration of updateRegion into the for() loop and get rid of init/uninit here and in fail:?

Copy link
Member

Choose a reason for hiding this comment

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

@mfleisz good point.

@freerdp-bot
Copy link

Refer to this link for build results (access rights to CI server needed):
https://ci.freerdp.com//job/PullRequestTester/1619/

@bmiklautz
Copy link
Member

@freerdp-bot test.

@bmiklautz
Copy link
Member

@freerdp-bot test.

@freerdp-bot
Copy link

Refer to this link for build results (access rights to CI server needed):
https://ci.freerdp.com//job/PullRequestTester/1621/

@bmiklautz
Copy link
Member

@freerdp-bot test.

@freerdp-bot
Copy link

Refer to this link for build results (access rights to CI server needed):
https://ci.freerdp.com//job/PullRequestTester/1622/

@mfleisz
Copy link
Member

mfleisz commented Dec 15, 2016

@freerdp-bot test

@freerdp-bot
Copy link

Refer to this link for build results (access rights to CI server needed):
https://ci.freerdp.com//job/PullRequestTester/1625/

@mfleisz mfleisz merged commit 2b91654 into FreeRDP:master Dec 15, 2016
@akallabeth akallabeth deleted the clear_codec_fixed branch December 16, 2016 08:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants