AI/rocm-systems
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

P4 to Git Change 1161664 by rili@rili_opencl_stg on 2015/06/15 18:01:53

Browse Source 
EPR #421679 - remove all source code related to open video

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/opencl/OpenVideo/Makefile#3 delete
... //depot/stg/opencl/drivers/opencl/api/opencl/OpenVideo/OVDecode.cpp#15 delete
... //depot/stg/opencl/drivers/opencl/api/opencl/OpenVideo/OVDecode.def#5 delete
... //depot/stg/opencl/drivers/opencl/api/opencl/OpenVideo/OVDecode.h#7 delete
... //depot/stg/opencl/drivers/opencl/api/opencl/OpenVideo/OVDecode.rc#2 delete
... //depot/stg/opencl/drivers/opencl/api/opencl/OpenVideo/OVDecodeTypes.h#6 delete
... //depot/stg/opencl/drivers/opencl/api/opencl/OpenVideo/OVEncode.cpp#37 delete
... //depot/stg/opencl/drivers/opencl/api/opencl/OpenVideo/OVEncode.h#11 delete
... //depot/stg/opencl/drivers/opencl/api/opencl/OpenVideo/OVEncodeTypes.h#16 delete
... //depot/stg/opencl/drivers/opencl/api/opencl/OpenVideo/OpenVideo.cpp#6 delete
... //depot/stg/opencl/drivers/opencl/api/opencl/OpenVideo/OpenVideo.def#3 delete
... //depot/stg/opencl/drivers/opencl/api/opencl/OpenVideo/OpenVideo.h#5 delete
... //depot/stg/opencl/drivers/opencl/api/opencl/OpenVideo/OpenVideo.rc#3 delete
... //depot/stg/opencl/drivers/opencl/api/opencl/OpenVideo/OpenVideo.sln#5 delete
... //depot/stg/opencl/drivers/opencl/api/opencl/OpenVideo/OpenVideo.vcxproj#11 delete
... //depot/stg/opencl/drivers/opencl/api/opencl/OpenVideo/OpenVideo.vcxproj.filters#3 delete
... //depot/stg/opencl/drivers/opencl/api/opencl/OpenVideo/OpenVideo_2008.sln#2 delete
... //depot/stg/opencl/drivers/opencl/api/opencl/OpenVideo/OpenVideo_2008.vcproj#2 delete
... //depot/stg/opencl/drivers/opencl/api/opencl/OpenVideo/atiumdva.cap#2 delete
... //depot/stg/opencl/drivers/opencl/api/opencl/OpenVideo/build.bat#2 delete
... //depot/stg/opencl/drivers/opencl/api/opencl/OpenVideo/build/Makefile#6 delete
... //depot/stg/opencl/drivers/opencl/api/opencl/OpenVideo/build/Makefile.ov#18 delete
... //depot/stg/opencl/drivers/opencl/api/opencl/OpenVideo/build/Makefile.ovd#27 delete
... //depot/stg/opencl/drivers/opencl/api/opencl/OpenVideo/buildOV/Makefile#5 delete
... //depot/stg/opencl/drivers/opencl/api/opencl/OpenVideo/res/OpenVideo.rc2#2 delete
... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/build/Makefile.api#113 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_common.hpp#17 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_context.cpp#43 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_device.cpp#59 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_open_video.cpp#35 delete
... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_open_video_amd.h#20 delete
... //depot/stg/opencl/drivers/opencl/runtime/device/cpu/cpudevice.cpp#273 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/cpu/cpudevice.hpp#91 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/cpu/cpuvirtual.cpp#24 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/cpu/cpuvirtual.hpp#12 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/device.hpp#247 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudevice.cpp#512 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudevice.hpp#145 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpusettings.cpp#311 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpusettings.hpp#91 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuvirtual.cpp#366 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuvirtual.hpp#130 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/GSLContext.cpp#73 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/GSLContext.h#45 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/hsa/hsadevice.cpp#92 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/hsa/hsadevice.hpp#49 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/hsa/hsavirtual.hpp#28 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/hsa_foundation/hsadevice.cpp#34 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/hsa_foundation/hsadevice.hpp#15 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/hsa_foundation/hsavirtual.hpp#20 edit
... //depot/stg/opencl/drivers/opencl/runtime/platform/command.hpp#78 edit
... //depot/stg/opencl/drivers/opencl/runtime/platform/commandqueue.cpp#21 edit
... //depot/stg/opencl/drivers/opencl/runtime/platform/commandqueue.hpp#16 edit
... //depot/stg/opencl/drivers/opencl/runtime/platform/object.hpp#15 edit
... //depot/stg/opencl/drivers/opencl/runtime/platform/video_session.hpp#13 delete
... //depot/stg/opencl/drivers/opencl/runtime/top.hpp#22 edit
... //depot/stg/opencl/drivers/opencl/runtime/utils/flags.hpp#235 edit
This commit is contained in:
foreman
2015-06-15 18:09:54 -04:00
parent 9423b93fb2
commit d0b51ccdbf
20 changed files with 1 additions and 836 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rocclr/runtime/device/gpu/gpuvirtual.cpp
-206
View File
@@ -212,7 +212,6 @@ VirtualGPU::gslOpen(uint nEngines, gslEngineDescriptor *engines)
void
VirtualGPU::gslDestroy()
{
closeVideoSession();
close(dev().getNative());
}
@@ -421,9 +420,6 @@ VirtualGPU::VirtualGPU(
bool
VirtualGPU::create(
bool profiling
#if cl_amd_open_video
, void* calVideoProperties
#endif // cl_amd_open_video
, uint deviceQueueSize
)
{
@@ -440,56 +436,6 @@ VirtualGPU::create(
// Virtual GPU will have profiling enabled
state_.profiling_ = profiling;
#if cl_amd_open_video
if(calVideoProperties) {
cl_video_encode_desc_amd* ptr_ovSessionProperties =
reinterpret_cast<cl_video_encode_desc_amd *>(calVideoProperties);
CALvideoProperties* ptr_calVideoProperties =
reinterpret_cast<CALvideoProperties *>(ptr_ovSessionProperties->calVideoProperties);
switch (ptr_calVideoProperties->VideoEngine_name) {
case CAL_CONTEXT_VIDEO:
engineMask = dev().engines().getMask(GSL_ENGINEID_UVD);
num = dev().engines().getRequested(engineMask, engines);
// Open GSL context
if ((num == 0) || !gslOpen(num, engines)) {
return false;
}
openVideoSession(*ptr_calVideoProperties);
break;
case CAL_CONTEXT_VIDEO_VCE:
engineMask = dev().engines().getMask(GSL_ENGINEID_VCE);
num = dev().engines().getRequested(engineMask, engines);
// Open GSL context
if ((num == 0) || !gslOpen(num, engines)) {
return false;
}
break;
default:
assert(false && "Unknown video engine!");
break;
}
if (ptr_calVideoProperties->VideoEngine_name == CAL_CONTEXT_VIDEO_VCE) {
CALEncodeCreateVCE encodeVCE;
createVCE(&encodeVCE, 0);
CAL_VID_PROFILE_LEVEL encode_profile_level;
encode_profile_level.profile = ptr_ovSessionProperties->attrib.profile;
encode_profile_level.level = ptr_ovSessionProperties->attrib.level;
createEncodeSession(
0,
(CALencodeMode)ptr_ovSessionProperties->encodeMode,//CAL_VID_encode_AVC_FULL
encode_profile_level,
(CAL_VID_PICTURE_FORMAT)ptr_ovSessionProperties->attrib.format, //CAL_VID_PICTURE_NV12
ptr_ovSessionProperties->image_width,
ptr_ovSessionProperties->image_height,
ptr_ovSessionProperties->frameRateNumerator,
ptr_ovSessionProperties->frameRateDenominator,
(CAL_VID_ENCODE_JOB_PRIORITY)ptr_ovSessionProperties->priority); //CAL_VID_ENCODE_JOB_PRIORITY_LEVEL1
}
}
else
#endif // !cl_amd_open_video
{
if (dev().engines().numComputeRings()) {
uint idx = index() % dev().engines().numComputeRings();
@@ -2621,158 +2567,6 @@ VirtualGPU::submitReleaseExtObjects(amd::ReleaseExtObjectsCommand& vcmd)
profilingEnd(vcmd);
}
#if cl_amd_open_video
void
VirtualGPU::submitRunVideoProgram(amd::RunVideoProgramCommand& vcmd)
{
// Make sure VirtualGPU has an exclusive access to the resources
amd::ScopedLock lock(execution());
profilingBegin(vcmd);
switch(vcmd.type()) {
case CL_COMMAND_VIDEO_DECODE_AMD: {
CALprogramVideoDecode calVideoData;
cl_video_decode_data_amd* clVideoData =
static_cast<cl_video_decode_data_amd*>(vcmd.videoData());
//Convert cl_video_program_type_amd to CALvideoType
calVideoData.videoType.type = CAL_VIDEO_DECODE;
calVideoData.videoType.size = sizeof(CALprogramVideoDecode);
// Copy video data from CL to CAL structure
calVideoData.videoType.flags = clVideoData->video_type.flags;
calVideoData.picture_parameter_1 = clVideoData->picture_parameter_1;
calVideoData.picture_parameter_2 = clVideoData->picture_parameter_2;
calVideoData.picture_parameter_2_size = clVideoData->picture_parameter_2_size;
calVideoData.bitstream_data = clVideoData->bitstream_data;
calVideoData.bitstream_data_size = clVideoData->bitstream_data_size;
calVideoData.slice_data_control = clVideoData->slice_data_control;
calVideoData.slice_data_size = clVideoData->slice_data_control_size;
gpu::Memory* gpuMem = dev().getGpuMemory(&vcmd.memory());
GpuEvent event;
if (!runProgramVideoDecode(event, gpuMem->gslResource(),
reinterpret_cast<CALprogramVideoDecode&>(calVideoData))) {
vcmd.setStatus(CL_INVALID_OPERATION);
return;
}
// Mark source and destination as busy
gpuMem->setBusy(*this, event);
// Update the global GPU event and flush the DMA buffer,
// so runtime can synchronize UVD and SDMA engines
// @todo - do we need to flush here?
setGpuEvent(event, true);
}
break;
case CL_COMMAND_VIDEO_ENCODE_AMD: {
cl_video_encode_data_amd* clVideoData =
static_cast<cl_video_encode_data_amd*>(vcmd.videoData());
CAL_VID_ENCODE_PARAMETERS_H264 *ppicture_parameter =
reinterpret_cast<CAL_VID_ENCODE_PARAMETERS_H264*>(clVideoData->pictureParam2);
uint num_of_encode_task_input_buffer =
(uint)(clVideoData->pictureParam1Size);
CAL_VID_BUFFER_DESCRIPTION *encode_task_input_buffer_list =
reinterpret_cast<CAL_VID_BUFFER_DESCRIPTION *>(clVideoData->pictureParam1);
CAL_VID_BUFFER_DESCRIPTION *encode_task_input_buffer_listbackup =
new CAL_VID_BUFFER_DESCRIPTION [num_of_encode_task_input_buffer];
if (encode_task_input_buffer_listbackup == NULL) {
LogError("calCtxRunProgramVideo unable to allocate memory");
vcmd.setStatus(CL_OUT_OF_RESOURCES);
return;
}
// Entropy mode
cl_mem buffer_surface;
gpu::Memory* gpuMem;
// Convert cl_mem object to gslMemObject object
for (uint i = 0; i < num_of_encode_task_input_buffer; i++) {
encode_task_input_buffer_listbackup[i] = encode_task_input_buffer_list[i];
buffer_surface = (cl_mem)encode_task_input_buffer_list[i].buffer.pPicture;
gpuMem = dev().getGpuMemory(as_amd(buffer_surface));
encode_task_input_buffer_listbackup[i].buffer.pPicture = gpuMem->gslResource();
}
gpuMem = dev().getGpuMemory(&(vcmd.memory()));
// Encode the picture - call QueryTask to get the results...
GpuEvent event;
EncodeePicture(event, num_of_encode_task_input_buffer,
encode_task_input_buffer_listbackup, ppicture_parameter,
&(clVideoData->uiTaskID),
gpuMem->gslResource(), 0);
// Mark source and destination as busy
gpuMem->setBusy(*this, event);
// Update the global GPU event and flush the DMA buffer,
// so runtime can synchronize VCE and SDMA engines
// @todo - do we need to flush here?
setGpuEvent(event, true);
delete[] encode_task_input_buffer_listbackup;
}
break;
default:
vcmd.setStatus(CL_INVALID_VIDEO_CONFIG_TYPE_AMD);
LogError("Invalid video command type");
return;
}
profilingEnd(vcmd);
}
void
VirtualGPU::submitSetVideoSession(amd::SetVideoSessionCommand& cmd)
{
switch (cmd.operation()) {
case amd::SetVideoSessionCommand::CloseSession:
closeVideoEncodeSession(0);
destroyVCE(0);
break;
case amd::SetVideoSessionCommand::ConfigTypePictureControl:
getPictureConfig(
(CALEncodeGetPictureControlConfig*)(cmd.paramValue()), 0);
break;
case amd::SetVideoSessionCommand::ConfigTypeRateControl:
getRateControlConfig(
(CALEncodeGetRateControlConfig*)(cmd.paramValue()), 0);
break;
case amd::SetVideoSessionCommand::ConfigTypeMotionEstimation:
getMotionEstimationConfig(
(CALEncodeGetMotionEstimationConfig*)(cmd.paramValue()), 0);
break;
case amd::SetVideoSessionCommand::ConfigTypeRDO:
getRDOConfig(
(CALEncodeGetRDOControlConfig*)(cmd.paramValue()), 0);
break;
case amd::SetVideoSessionCommand::SendEncodeConfig:
SendConfig(
cmd.numBuffers(), (CAL_VID_CONFIG*)(cmd.paramValue()), 0);
break;
case amd::SetVideoSessionCommand::GetDeviceCapVCE: {
CALEncodeGetDeviceCAP EncodeCAP;
EncodeCAP.num_of_encode_cap = 1;
EncodeCAP.encode_caps = (CAL_VID_ENCODE_CAPS *)(cmd.paramValue());
getDeviceCAPVCE(0, cmd.numBuffers(), &EncodeCAP, 0);
}
break;
case amd::SetVideoSessionCommand::EncodeQueryTaskDescription:
QueryTaskDescription(
cmd.numBuffers(), cmd.paramValue2(),
(CAL_VID_OUTPUT_DESCRIPTION *)cmd.paramValue(), 0);
break;
case amd::SetVideoSessionCommand::ReleaseOutputResource:
ReleaseOutputResource(cmd.numBuffers(), 0);
break;
default:
break;
}
}
#endif // cl_amd_open_video
void
VirtualGPU::submitSignal(amd::SignalCommand & vcmd)
{