intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-12-30 09:58:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

use image offsets from libva instead of Gmmlib

Browse Source 
Change-Id: I6f5fcfa1eb41e53abbc64e52ce38c81b7337e027
Signed-off-by: Jacek Danecki <jacek.danecki@intel.com>
This commit is contained in:
Jacek Danecki
2018-06-14 12:32:36 +02:00
committed by sys_ocldev
parent 4e802fdb93
commit 33ec97148d
4 changed files with 56 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
runtime/sharings/va/va_surface.cpp
View File

@@ -71,8 +71,6 @@ Image *VASurface::createSharedVaSurface(Context *context, VASharingFunctions *sh
imgSurfaceFormat = Image::getSurfaceFormatFromTable(flags, &imgFormat);
sharingFunctions->destroyImage(vaImage.image_id);
sharingFunctions->extGetSurfaceHandle(surface, &sharedHandle);
auto alloc = memoryManager->createGraphicsAllocationFromSharedHandle(sharedHandle, false, true);
@@ -88,7 +86,10 @@ Image *VASurface::createSharedVaSurface(Context *context, VASharingFunctions *sh
if (plane == 1) {
imgDesc.image_width /= 2;
imgDesc.image_height /= 2;
imgInfo.offset = vaImage.offsets[1];
imgInfo.yOffsetForUVPlane = static_cast<uint32_t>(imgInfo.offset / vaImage.pitches[0]);
}
sharingFunctions->destroyImage(vaImage.image_id);
auto vaSurface = new VASurface(sharingFunctions, imageId, plane, surface, context->getInteropUserSyncEnabled());

3
unit_tests/sharings/va/mock_va_sharing.cpp
View File

@@ -31,6 +31,7 @@ int vaGetLibFuncCalled = 0;
int vaExtGetSurfaceHandleCalled = 0;
osHandle acquiredVaHandle = 0;
VAImage mockVaImage = {};
uint16_t vaSharingFunctionsMockWidth, vaSharingFunctionsMockHeight;
void VASharingFunctionsMock::initMembers() {
vaDisplayIsValidPFN = mockVaDisplayIsValid;
@@ -50,5 +51,7 @@ void VASharingFunctionsMock::initMembers() {
mockVaImage = {};
acquiredVaHandle = 0;
vaSharingFunctionsMockWidth = 256u;
vaSharingFunctionsMockHeight = 256u;
}
} // namespace OCLRT

13
unit_tests/sharings/va/mock_va_sharing.h
View File

@@ -21,6 +21,7 @@
*/
#pragma once
#include "runtime/helpers/aligned_memory.h"
#include "runtime/sharings/va/va_sharing.h"
namespace OCLRT {
@@ -33,6 +34,7 @@ extern int vaGetLibFuncCalled;
extern int vaExtGetSurfaceHandleCalled;
extern osHandle acquiredVaHandle;
extern VAImage mockVaImage;
extern uint16_t vaSharingFunctionsMockWidth, vaSharingFunctionsMockHeight;
class VASharingFunctionsMock : public VASharingFunctions {
@@ -42,9 +44,16 @@ class VASharingFunctionsMock : public VASharingFunctions {
};
static VAStatus mockVaDeriveImage(VADisplay vaDisplay, VASurfaceID vaSurface, VAImage *vaImage) {
uint32_t pitch;
vaDeriveImageCalled++;
vaImage->height = 256u;
vaImage->width = 256u;
vaImage->height = vaSharingFunctionsMockHeight;
vaImage->width = vaSharingFunctionsMockWidth;
pitch = alignUp(vaSharingFunctionsMockWidth, 128);
vaImage->offsets[1] = alignUp(vaImage->height, 32) * pitch;
vaImage->offsets[2] = vaImage->offsets[1] + 1;
vaImage->pitches[0] = pitch;
vaImage->pitches[1] = pitch;
vaImage->pitches[2] = pitch;
mockVaImage.width = vaImage->width;
mockVaImage.height = vaImage->height;
return (VAStatus)0; // success

39
unit_tests/sharings/va/va_sharing_tests.cpp
View File

@@ -133,6 +133,45 @@ TEST_F(VaSharingTests, givenMockVaWhenVaSurfaceIsCreatedThenMemObjectHasVaHandle
delete vaSurface;
}
TEST_F(VaSharingTests, givenMockVaWhenVaSurfaceIsCreatedWithNotAlignedWidthAndHeightThenSurfaceOffsetsUseAlignedValues) {
// this will create OS specific memory Manager
//overrideCommandStreamReceiverCreation = true;
ASSERT_FALSE(overrideCommandStreamReceiverCreation);
vaSharingFunctionsMockWidth = 256 + 16;
vaSharingFunctionsMockHeight = 512 + 16;
auto vaSurface = VASurface::createSharedVaSurface(&context, &vaSharing->m_sharingFunctions,
CL_MEM_READ_WRITE, &vaSurfaceId, 1, &errCode);
EXPECT_NE(nullptr, vaSurface);
EXPECT_NE(nullptr, vaSurface->getGraphicsAllocation());
EXPECT_EQ(4096u, vaSurface->getGraphicsAllocation()->getUnderlyingBufferSize());
EXPECT_EQ(1u, vaSurface->getGraphicsAllocation()->peekSharedHandle());
EXPECT_EQ(4096u, vaSurface->getSize());
auto handler = vaSurface->peekSharingHandler();
ASSERT_NE(nullptr, handler);
auto vaHandler = static_cast<VASharing *>(handler);
EXPECT_EQ(vaHandler->peekFunctionsHandler(), &vaSharing->m_sharingFunctions);
EXPECT_EQ(1u, acquiredVaHandle);
EXPECT_EQ(1, vaDeriveImageCalled);
EXPECT_EQ(1, vaDestroyImageCalled);
EXPECT_EQ(1, vaExtGetSurfaceHandleCalled);
SurfaceOffsets surfaceOffsets;
uint16_t alignedWidth = alignUp(vaSharingFunctionsMockWidth, 128);
uint16_t alignedHeight = alignUp(vaSharingFunctionsMockHeight, 32);
uint64_t alignedOffset = alignedWidth * alignedHeight;
vaSurface->getSurfaceOffsets(surfaceOffsets);
EXPECT_EQ(alignedHeight, surfaceOffsets.yOffsetForUVplane);
EXPECT_EQ(alignedOffset, surfaceOffsets.offset);
delete vaSurface;
}
TEST_F(VaSharingTests, givenContextWhenClCreateFromVaApiMediaSurfaceIsCalledThenSurfaceIsReturned) {
sharedClMem = clCreateFromVA_APIMediaSurfaceINTEL(&context, CL_MEM_READ_WRITE, &vaSurfaceId, 0, &errCode);
ASSERT_EQ(CL_SUCCESS, errCode);