P4 to Git Change 1161664 by rili@rili_opencl_stg on 2015/06/15 18:01:53
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
Bu işleme şunda yer alıyor:
@@ -44,7 +44,6 @@ CALGSLContext::CALGSLContext()
|
||||
|
||||
m_scratchBuffers = 0;
|
||||
|
||||
m_videoSession = 0;
|
||||
m_waitType = CAL_WAIT_LOW_CPU_UTILIZATION;
|
||||
}
|
||||
|
||||
@@ -434,8 +433,6 @@ CALGSLContext::runProgramVideoDecode(GpuEvent& event, gslMemObject mo, const CAL
|
||||
eventBegin(MainEngine);
|
||||
eventEnd(MainEngine, event);
|
||||
|
||||
gslVidDecode(&m_videocontext, m_videoSession, data);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -802,46 +799,6 @@ CALGSLContext::MakeBuffersResident(CALuint numObjects, gslMemObject* pMemObjects
|
||||
return res;
|
||||
}
|
||||
|
||||
bool
|
||||
CALGSLContext::openVideoSession(CALvideoProperties& properties)
|
||||
{
|
||||
gslVidSessionCreateData data;
|
||||
|
||||
assert(properties.size == sizeof(CALvideoProperties));
|
||||
|
||||
data.size = sizeof(gslVidSessionCreateData);
|
||||
data.type = (gslDecodeProfile) properties.profile;
|
||||
data.format = (gslDecodeFormat) properties.format;
|
||||
data.width = properties.width;
|
||||
data.height = properties.height;
|
||||
|
||||
m_videocontext.m_gsCtx = m_cs;
|
||||
m_videocontext.VideoEngine_name = static_cast<gslVidContextEnum>(properties.VideoEngine_name);
|
||||
m_videoSession = gslVidSessionCreate(&m_videocontext, data);
|
||||
|
||||
if (m_videoSession == NULL)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
CALGSLContext::closeVideoSession(void)
|
||||
{
|
||||
if (m_videoSession)
|
||||
{
|
||||
//! @note: GSL device isn't thread safe
|
||||
amd::ScopedLock k(dev()->gslDeviceOps());
|
||||
|
||||
m_videocontext.m_gsCtx = m_cs;
|
||||
m_videocontext.VideoEngine_name = GSL_VID_CONTEXT_VIDEO;
|
||||
gslVidSessionDestroy(&m_videocontext, m_videoSession);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
CALGSLContext::bindAtomicCounter(uint32 index, gslMemObject obj)
|
||||
{
|
||||
@@ -862,238 +819,6 @@ CALGSLContext::syncAtomicCounter(GpuEvent& event, uint32 index, bool read)
|
||||
eventEnd(MainEngine, event);
|
||||
}
|
||||
|
||||
void
|
||||
CALGSLContext::createVCE(CALEncodeCreateVCE* pEncodeVCE, CALuint flags)
|
||||
{
|
||||
gslVidEncodeCreateVCEData data;
|
||||
m_videocontext.m_gsCtx = m_cs;
|
||||
m_videocontext.VideoEngine_name = GSL_VID_CONTEXT_VIDEO_VCE;
|
||||
|
||||
gslVidEncodeCreateVCE(&m_videocontext, &data);
|
||||
|
||||
pEncodeVCE->VCEsession = reinterpret_cast<CALvoid *>(data.session);
|
||||
}
|
||||
|
||||
void
|
||||
CALGSLContext::destroyVCE(CALuint flags)
|
||||
{
|
||||
m_videocontext.m_gsCtx = m_cs;
|
||||
m_videocontext.VideoEngine_name = GSL_VID_CONTEXT_VIDEO_VCE;
|
||||
|
||||
gslVidEncodeDestroyVCE(&m_videocontext);
|
||||
}
|
||||
|
||||
void
|
||||
CALGSLContext::getDeviceInfoVCE(CALuint *num_device, CALEncodeGetDeviceInfo* pEncodeDeviceInfo, CALuint flags)
|
||||
{
|
||||
gslVidEncodeGetDeviceInfo(num_device, (gslVidEncodeGetDeviceInfoData *) pEncodeDeviceInfo);
|
||||
}
|
||||
|
||||
void
|
||||
CALGSLContext::getNumberOfModesVCE(CALEncodeGetNumberOfModes* pEncodeNumberOfModes, CALuint flags)
|
||||
{
|
||||
uint32 device_id =0;
|
||||
gslVidEncodeQueryNumberOfModesData data;
|
||||
|
||||
m_videocontext.m_gsCtx = m_cs;
|
||||
m_videocontext.VideoEngine_name = GSL_VID_CONTEXT_VIDEO_VCE;
|
||||
|
||||
gslVidEncodeGetNumberOfModes(&m_videocontext, device_id, &data);
|
||||
pEncodeNumberOfModes->num_of_encode_Mode = data.num_of_encode_Mode;
|
||||
}
|
||||
|
||||
void
|
||||
CALGSLContext::getModesVCE(CALuint device_id, CALuint NumEncodeModesToRetrieve, CALEncodeGetModes* pEncodeMode, CALuint flags)
|
||||
{
|
||||
gslVidEncodeGetModesData data;
|
||||
data.NumEncodeModesToRetrieve = NumEncodeModesToRetrieve ;
|
||||
data.pEncodeModes = (GSL_VID_ENCODE_MODE *)malloc(sizeof(GSL_VID_ENCODE_MODE)*NumEncodeModesToRetrieve);
|
||||
|
||||
m_videocontext.m_gsCtx = m_cs;
|
||||
m_videocontext.VideoEngine_name = GSL_VID_CONTEXT_VIDEO_VCE;
|
||||
|
||||
gslVidEncodeGetModes(&m_videocontext, device_id, &data);
|
||||
|
||||
// pEncodeMode = ( CALEncodeGetModes *) data.pEncodeModes;
|
||||
pEncodeMode->NumEncodeModesToRetrieve = data.NumEncodeModesToRetrieve;
|
||||
CALencodeMode *pEncodeModes = pEncodeMode->pEncodeModes;
|
||||
|
||||
for (CALuint mode_id = 0; mode_id < NumEncodeModesToRetrieve; mode_id++)
|
||||
{
|
||||
switch(data.pEncodeModes[mode_id])
|
||||
{
|
||||
case GSL_VID_encode_AVC_FULL:
|
||||
pEncodeModes[mode_id] = CAL_VID_encode_AVC_FULL;
|
||||
break;
|
||||
case GSL_VID_encode_AVC_ENTROPY:
|
||||
pEncodeModes[mode_id] = CAL_VID_encode_AVC_ENTROPY;
|
||||
break;
|
||||
default:
|
||||
pEncodeModes[mode_id] = CAL_VID_encode_MODE_NONE;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
free(data.pEncodeModes);
|
||||
}
|
||||
void
|
||||
CALGSLContext::getDeviceCAPVCE(CALuint device_id,
|
||||
CALuint encode_cap_total_size,
|
||||
CALEncodeGetDeviceCAP *pEncodeCAP,
|
||||
CALuint flags)
|
||||
{
|
||||
gslVidEncodeGetDeviceCAPData *data = (gslVidEncodeGetDeviceCAPData *) pEncodeCAP;
|
||||
|
||||
m_videocontext.m_gsCtx = m_cs;
|
||||
m_videocontext.VideoEngine_name = GSL_VID_CONTEXT_VIDEO_VCE;
|
||||
|
||||
data->num_of_encode_cap = encode_cap_total_size;
|
||||
|
||||
gslVidEncodeGetDeviceCAP(device_id, encode_cap_total_size, data);
|
||||
}
|
||||
|
||||
void
|
||||
CALGSLContext::createEncodeSession(CALuint device_id,
|
||||
CALencodeMode encode_mode,
|
||||
CAL_VID_PROFILE_LEVEL encode_profile_level,
|
||||
CAL_VID_PICTURE_FORMAT encode_formatm,
|
||||
CALuint encode_width,
|
||||
CALuint encode_height,
|
||||
CALuint frameRateNum,
|
||||
CALuint frameRateDenom,
|
||||
CAL_VID_ENCODE_JOB_PRIORITY encode_priority_level)
|
||||
{
|
||||
gslVidEncodeSessionCreateData data;
|
||||
|
||||
data.encode_mode = (GSL_VID_ENCODE_MODE)encode_mode;
|
||||
data.encode_profile_level.profile = encode_profile_level.profile;
|
||||
data.encode_profile_level.level = encode_profile_level.level;
|
||||
data.encode_formatm = (GSL_VID_PICTURE_FORMAT)encode_formatm;
|
||||
data.encode_width = encode_width;
|
||||
data.encode_height = encode_height;
|
||||
data.frameRateNumerator = frameRateNum;
|
||||
data.frameRateDenominator = frameRateDenom;
|
||||
data.encode_priority_level = (GSL_VID_ENCODE_JOB_PRIORITY)encode_priority_level;
|
||||
|
||||
m_videocontext.m_gsCtx = m_cs;
|
||||
m_videocontext.VideoEngine_name = GSL_VID_CONTEXT_VIDEO_VCE;
|
||||
|
||||
m_EncodevideoSession = gslVidEncodeCreateSession(&m_videocontext, device_id, &data);
|
||||
}
|
||||
|
||||
void
|
||||
CALGSLContext::closeVideoEncodeSession(CALuint device_id)
|
||||
{
|
||||
m_videocontext.m_gsCtx = m_cs;
|
||||
m_videocontext.VideoEngine_name = GSL_VID_CONTEXT_VIDEO_VCE;
|
||||
|
||||
if (m_EncodevideoSession)
|
||||
{
|
||||
gslVidEncodeSessionDestroy(&m_videocontext, device_id, m_EncodevideoSession);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
CALGSLContext::setState(CALEncodeSetState EncodeState, CALuint flags)
|
||||
{
|
||||
m_videocontext.m_gsCtx = m_cs;
|
||||
m_videocontext.VideoEngine_name = GSL_VID_CONTEXT_VIDEO_VCE;
|
||||
gslVidEncodeSetState(&m_videocontext, m_EncodevideoSession, (GSL_VID_ENCODE_STATE) EncodeState.encode_states);
|
||||
}
|
||||
|
||||
void
|
||||
CALGSLContext::getPictureConfig(CALEncodeGetPictureControlConfig *pPictureControlConfig, CALuint flags)
|
||||
{
|
||||
m_videocontext.m_gsCtx = m_cs;
|
||||
m_videocontext.VideoEngine_name = GSL_VID_CONTEXT_VIDEO_VCE;
|
||||
|
||||
gslVidEncodeGetPictureControlConfig(&m_videocontext, m_EncodevideoSession, (GSL_VID_CONFIG_PICTURE_CONTROL *) pPictureControlConfig);
|
||||
}
|
||||
void
|
||||
CALGSLContext::getRateControlConfig(CALEncodeGetRateControlConfig *pRateControConfig, CALuint flags)
|
||||
{
|
||||
m_videocontext.m_gsCtx = m_cs;
|
||||
m_videocontext.VideoEngine_name = GSL_VID_CONTEXT_VIDEO_VCE;
|
||||
|
||||
gslVidEncodeGetRateControlConfig(&m_videocontext, m_EncodevideoSession, (GSL_VID_CONFIG_RATE_CONTROL *) pRateControConfig);
|
||||
}
|
||||
void
|
||||
CALGSLContext::getMotionEstimationConfig(CALEncodeGetMotionEstimationConfig *pMotionEstimationConfig, CALuint flags)
|
||||
{
|
||||
m_videocontext.m_gsCtx = m_cs;
|
||||
m_videocontext.VideoEngine_name = GSL_VID_CONTEXT_VIDEO_VCE;
|
||||
gslVidEncodeGetMotionEstimationConfig(&m_videocontext, m_EncodevideoSession, (GSL_VID_CONFIG_MOTION_ESTIMATION *) pMotionEstimationConfig);
|
||||
}
|
||||
|
||||
void
|
||||
CALGSLContext::getRDOConfig(CALEncodeGetRDOControlConfig *pRODConfig, CALuint flags)
|
||||
{
|
||||
m_videocontext.m_gsCtx = m_cs;
|
||||
m_videocontext.VideoEngine_name = GSL_VID_CONTEXT_VIDEO_VCE;
|
||||
|
||||
gslVidEncodeGetRDOControlConfig(&m_videocontext, m_EncodevideoSession, (GSL_VID_CONFIG_RDO *) pRODConfig);
|
||||
}
|
||||
|
||||
void
|
||||
CALGSLContext::SendConfig(CALuint num_of_config_buffers, CAL_VID_CONFIG *pConfigBuffers, CALuint flags)
|
||||
{
|
||||
m_videocontext.m_gsCtx = m_cs;
|
||||
m_videocontext.VideoEngine_name = GSL_VID_CONTEXT_VIDEO_VCE;
|
||||
|
||||
gslVidEncodeSendConfig(&m_videocontext, m_EncodevideoSession, num_of_config_buffers, (GSL_VID_CONFIG *)pConfigBuffers);
|
||||
}
|
||||
|
||||
void
|
||||
CALGSLContext::EncodeePicture(GpuEvent& event,
|
||||
CALuint num_of_encode_task_input_buffer,
|
||||
CAL_VID_BUFFER_DESCRIPTION *encode_task_input_buffer_list,
|
||||
void* picture_parameter,
|
||||
CALuint *pTaskID,
|
||||
gslMemObject input_NV12_surface,
|
||||
CALuint flags)
|
||||
{
|
||||
m_videocontext.m_gsCtx = m_cs;
|
||||
m_videocontext.VideoEngine_name = GSL_VID_CONTEXT_VIDEO_VCE;
|
||||
|
||||
eventBegin(MainEngine);
|
||||
eventEnd(MainEngine, event);
|
||||
|
||||
gslVidEncodeePicture(
|
||||
&m_videocontext,
|
||||
m_EncodevideoSession,
|
||||
num_of_encode_task_input_buffer,
|
||||
(GSL_VID_BUFFER_DESCRIPTION *)encode_task_input_buffer_list,
|
||||
picture_parameter,
|
||||
pTaskID,
|
||||
input_NV12_surface);
|
||||
}
|
||||
|
||||
void
|
||||
CALGSLContext::QueryTaskDescription(CALuint num_of_task_description_request,
|
||||
CALuint *num_of_task_description_return,
|
||||
CAL_VID_OUTPUT_DESCRIPTION *task_description_list,
|
||||
CALuint flags)
|
||||
{
|
||||
m_videocontext.m_gsCtx = m_cs;
|
||||
m_videocontext.VideoEngine_name = GSL_VID_CONTEXT_VIDEO_VCE;
|
||||
|
||||
gslVidEncodeeQueryTaskDescription(
|
||||
&m_videocontext,
|
||||
m_EncodevideoSession,
|
||||
num_of_task_description_request,
|
||||
num_of_task_description_return,
|
||||
(GSL_VID_OUTPUT_DESCRIPTION *)task_description_list);
|
||||
}
|
||||
void
|
||||
CALGSLContext::ReleaseOutputResource(CALuint taskID, CALuint flags)
|
||||
{
|
||||
m_videocontext.m_gsCtx = m_cs;
|
||||
m_videocontext.VideoEngine_name = GSL_VID_CONTEXT_VIDEO_VCE;
|
||||
|
||||
gslVidEncodeeReleaseOutputResource(&m_videocontext, m_EncodevideoSession, taskID);
|
||||
}
|
||||
|
||||
bool
|
||||
CALGSLContext::moduleLoad(CALimage image,
|
||||
gslProgramObject* func, gslMemObject* constants, CALUavMask* uavMask)
|
||||
|
||||
@@ -94,9 +94,6 @@ public:
|
||||
|
||||
void getFuncInfo(gslProgramObject func, gslProgramTarget target, CALfuncInfo* pInfo);
|
||||
|
||||
bool openVideoSession(CALvideoProperties& properties);
|
||||
void closeVideoSession(void);
|
||||
|
||||
void bindAtomicCounter(uint32 index, gslMemObject obj);
|
||||
void syncAtomicCounter(GpuEvent& event, uint32 index, bool read);
|
||||
|
||||
@@ -178,10 +175,6 @@ private:
|
||||
gslScratchBufferObject m_scratchBuffers;
|
||||
EventQueue m_eventQueue[AllEngines];
|
||||
bool m_allowDMA;
|
||||
|
||||
gslVidSession m_videoSession;
|
||||
gslVideoContext m_videocontext;
|
||||
gslVidSession m_EncodevideoSession;
|
||||
};
|
||||
|
||||
#endif // __GSLContext_h__
|
||||
|
||||
Yeni konuda referans
Bir kullanıcı engelle