Skip to content
This repository was archived by the owner on Oct 8, 2024. It is now read-only.

Force Vpp composition when video count more than plane count - #524

Merged
js0701 merged 5 commits into
intel:masterfrom
js0701:master2
Jan 28, 2019
Merged

Force Vpp composition when video count more than plane count#524
js0701 merged 5 commits into
intel:masterfrom
js0701:master2

Conversation

@js0701

@js0701 js0701 commented Jan 18, 2019

Copy link
Copy Markdown
Contributor

This scenario is true when ACRN only assign 1 plane to Andriod
Then VPP should be used for composition due to 2 reasons
1: If video is protected, 3D patch can't not deal with it
2: Some video effect still wanted on the video layer

Change-Id: I892fef1f13cd4e2b7665b2d5edb7c0203faf118a
Tracked-On: None
Tests: Android UI normal
Signed-off-by: Lin Johnson johnson.lin@intel.com

@js0701

js0701 commented Jan 18, 2019

Copy link
Copy Markdown
Contributor Author

Do not merge

@js0701

js0701 commented Jan 18, 2019

Copy link
Copy Markdown
Contributor Author

@harishkrupo
This may be related with you PR #467

@js0701

js0701 commented Jan 18, 2019

Copy link
Copy Markdown
Contributor Author

@Shao-Feng
We may need to integrate this PR and @harishkrupo 's PR 467 to enable VPP composition for multiple layers.

@harishkrupo

harishkrupo commented Jan 18, 2019

Copy link
Copy Markdown
Contributor

@js0701 @Shao-Feng
Yes, you will require patches from #467, specifically aa03dd7.
Looks like your patch handles the decision making, so you might require something similar to this for state changes: 60e6009

@sysopenci sysopenci left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Autobuild started from pull-request-changes on this PR.

FAILURE: CheckBug Bad comments/Bugs

For more information, see: /absp/builders/celadon-autobuild/builds/191

@js0701

js0701 commented Jan 23, 2019

Copy link
Copy Markdown
Contributor Author

@harishkrupo I rebased and use your commit in PR467 in here
We will push after debug and validations

@sysopenci sysopenci left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Autobuild started from pull-request-changes on this PR.

FAILURE: CheckBug Bad comments/Bugs

For more information, see: /absp/builders/celadon-autobuild/builds/207

@harishkrupo

Copy link
Copy Markdown
Contributor

@harishkrupo I rebased and use your commit in PR467 in here
We will push after debug and validations

Sure. Thanks :)

In cases where we fail to dedicate a separate plane for protected
content, say we have only one HW plane, the layers must be
composed using VAAPI as Mesa doesn't support composition of protected
content.

Jira: None
Test: When we have only one plane for display, all the contents are properly
      rendered.

Change-Id: I56da9b478a614d4f8c6746d8995ae7f3146b26ac
Signed-off-by: Harish Krupo <harish.krupo.kps@intel.com>
Signed-off-by: Johnson Lin  <johnson.lin@intel.com>
Conflicts:
	common/compositor/va/varenderer.cpp
@js0701

js0701 commented Jan 25, 2019

Copy link
Copy Markdown
Contributor Author

@Shao-Feng @harishkrupo
Please review
If no problem, please approve. THX

js0701 and others added 4 commits January 25, 2019 13:59
This scenario is true when ACRN only assign 1 plane to Andriod
Then VPP should be used for composition due to 2 reasons
1: If video is protected, 3D patch can't not deal with it
2: Some video effect still wanted on the video layer

Change-Id: I892fef1f13cd4e2b7665b2d5edb7c0203faf118a
Tracked-On: None
Tests: Android UI normal
Signed-off-by: Lin Johnson <johnson.lin@intel.com>
For the multiple layer case, we need to use UI formats
to prevent any artifacts

Change-Id: I9d5d1f87b9d432f6a1a80d3eac05a6e3e580f5dd
Tracked-On: None
Tests: Android UI be compositioned well
Signed-off-by: Lin Johnson <johnson.lin@intel.com>
1) overlay plane not universal can't be count as avail planes for video
2) VPP can't deal with solid color(no input buffer), drop solid color layer
   for temp solution
3) Video Planes don't have to only contain 1 layer(ResetLayers)

Change-Id: Ie2b285598ea77bd1038b1dfe5d630cf7bf1aa816
Tracked-On: None
Tests: Android video playback with UI composited by VPP path
Signed-off-by: Lin Johnson <johnson.lin@intel.com>
WA for VPP linux compiling error

Change-Id: Ibf5363ac15abdbdf2705363ea7d7913ab26d231a
Tracked-On: None
Signed-off-by: Shaofeng Tang <shaofeng.tang@intel.com>
@Shao-Feng

Copy link
Copy Markdown
Contributor

Look Good to me

@harishkrupo harishkrupo left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM

@js0701
js0701 merged commit 0e5d832 into intel:master Jan 28, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants