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
This commit is contained in:
foreman committed
1 parent
9423b93fb2
commit
d0b51ccdbf
20 files changed
+1
-836
No files matched your search
@@ -1202,129 +1202,6 @@ private:
|
||||
State state_; //!< State of the issued command
|
||||
};
|
||||
|
||||
#if cl_amd_open_video
|
||||
class RunVideoProgramCommand: public OneMemoryArgCommand
|
||||
{
|
||||
private:
|
||||
//! Store pointer to video data structure
|
||||
void* videoData_;
|
||||
|
||||
public:
|
||||
//! Construct a new AcquireExtObjectsCommand
|
||||
RunVideoProgramCommand(
|
||||
HostQueue& queue,
|
||||
const EventWaitList& eventWaitList,
|
||||
void* videoData,
|
||||
Memory& memory,
|
||||
cl_command_type cmdType)
|
||||
: OneMemoryArgCommand(queue, cmdType, eventWaitList, memory)
|
||||
, videoData_(NULL)
|
||||
{
|
||||
unsigned int size = *static_cast<unsigned int*>(videoData);
|
||||
videoData_ = static_cast<void*>(new char[size]);
|
||||
if (videoData_) {
|
||||
memcpy(videoData_, videoData, size);
|
||||
}
|
||||
}
|
||||
virtual ~RunVideoProgramCommand()
|
||||
{
|
||||
if (videoData_) delete[] static_cast<char*>(videoData_);
|
||||
}
|
||||
|
||||
virtual void submit(device::VirtualDevice& device) {
|
||||
device.submitRunVideoProgram(*this);
|
||||
}
|
||||
|
||||
// Accessor methods
|
||||
void* videoData() const { return videoData_; }
|
||||
|
||||
//! Read the memory object
|
||||
Memory& memory() const { return *memory_; }
|
||||
};
|
||||
|
||||
class SetVideoSessionCommand: public Command
|
||||
{
|
||||
public:
|
||||
enum Operation {
|
||||
CloseSession,
|
||||
ConfigTypePictureControl,
|
||||
ConfigTypeRateControl,
|
||||
ConfigTypeMotionEstimation,
|
||||
ConfigTypeRDO,
|
||||
SendEncodeConfig,
|
||||
GetDeviceCapVCE,
|
||||
EncodeQueryTaskDescription,
|
||||
ReleaseOutputResource
|
||||
};
|
||||
|
||||
//! Construct a new SetVideoSessionCommand
|
||||
SetVideoSessionCommand(
|
||||
HostQueue& queue,
|
||||
const EventWaitList& eventWaitList,
|
||||
Operation oper,
|
||||
void* paramValue = 0
|
||||
)
|
||||
: Command(queue, 0, eventWaitList)
|
||||
, oper_(oper)
|
||||
, paramValue_(paramValue)
|
||||
, numBuffers_(0)
|
||||
, paramValue2_(NULL)
|
||||
{
|
||||
}
|
||||
|
||||
//! Construct a new SetVideoSessionCommand
|
||||
SetVideoSessionCommand(
|
||||
HostQueue& queue,
|
||||
const EventWaitList& eventWaitList,
|
||||
Operation oper,
|
||||
void* paramValue,
|
||||
uint numBuffers
|
||||
)
|
||||
: Command(queue, 0, eventWaitList)
|
||||
, oper_(oper)
|
||||
, paramValue_(paramValue)
|
||||
, numBuffers_(numBuffers)
|
||||
, paramValue2_(NULL)
|
||||
{
|
||||
}
|
||||
//! Construct a new SetVideoSessionCommand
|
||||
SetVideoSessionCommand(
|
||||
HostQueue& queue,
|
||||
const EventWaitList& eventWaitList,
|
||||
Operation oper,
|
||||
uint numBuffers,
|
||||
void* paramValue,
|
||||
uint* paramValue2
|
||||
)
|
||||
: Command(queue, 0, eventWaitList)
|
||||
, oper_(oper)
|
||||
, paramValue_(paramValue)
|
||||
, numBuffers_(numBuffers)
|
||||
, paramValue2_(paramValue2)
|
||||
{
|
||||
}
|
||||
virtual ~SetVideoSessionCommand()
|
||||
{
|
||||
}
|
||||
|
||||
virtual void submit(device::VirtualDevice& device) {
|
||||
device.submitSetVideoSession(*this);
|
||||
}
|
||||
|
||||
// Accessor methods
|
||||
Operation operation() const { return oper_; }
|
||||
void* paramValue() const { return paramValue_; }
|
||||
uint* paramValue2() const { return paramValue2_; }
|
||||
uint numBuffers() const { return numBuffers_; }
|
||||
|
||||
private:
|
||||
Operation oper_; //!< Video session operation
|
||||
void* paramValue_; //!< Store pointer to parameter data
|
||||
uint numBuffers_; //!<
|
||||
uint* paramValue2_; //!< Store pointer to parameter data
|
||||
};
|
||||
#endif // cl_amd_open_video
|
||||
|
||||
class SignalCommand:public OneMemoryArgCommand
|
||||
{
|
||||
|
||||
|
||||
@@ -19,15 +19,9 @@ namespace amd {
|
||||
|
||||
HostQueue::HostQueue(
|
||||
Context& context, Device& device, cl_command_queue_properties properties, uint queueRTCUs
|
||||
#if cl_amd_open_video
|
||||
, void* calVideoProperties
|
||||
#endif // cl_amd_open_video
|
||||
)
|
||||
: CommandQueue(context, device, properties, device.info().queueProperties_
|
||||
| CL_QUEUE_COMMAND_INTERCEPT_ENABLE_AMD, queueRTCUs)
|
||||
#if cl_amd_open_video
|
||||
, calVideoProperties_(calVideoProperties)
|
||||
#endif // cl_amd_open_video
|
||||
{
|
||||
if (thread_.state() >= Thread::INITIALIZED) {
|
||||
ScopedLock sl(queueLock_);
|
||||
|
||||
@@ -169,10 +169,6 @@ private:
|
||||
protected:
|
||||
virtual bool terminate();
|
||||
|
||||
#if cl_amd_open_video
|
||||
void* calVideoProperties_;
|
||||
#endif // cl_amd_open_video
|
||||
|
||||
public:
|
||||
/*! \brief Construct a new host queue.
|
||||
*
|
||||
@@ -184,9 +180,6 @@ public:
|
||||
Device& device,
|
||||
cl_command_queue_properties properties,
|
||||
uint queueRTCUs = 0
|
||||
#if cl_amd_open_video
|
||||
, void* calVideoProperties = NULL
|
||||
#endif // cl_amd_open_video
|
||||
);
|
||||
|
||||
//! Returns TRUE if this command queue can accept commands.
|
||||
|
||||
@@ -22,7 +22,6 @@
|
||||
F(cl_sampler, Sampler) \
|
||||
F(cl_counter_amd, Counter) \
|
||||
F(cl_perfcounter_amd, PerfCounter) \
|
||||
F(cl_video_session_amd, VideoSession) \
|
||||
F(cl_threadtrace_amd, ThreadTrace)
|
||||
|
||||
// Forward declare ::cl_* types and amd::Class types
|
||||
@@ -184,8 +183,7 @@ public:
|
||||
ObjectTypeProgram = 7,
|
||||
ObjectTypeQueue = 8,
|
||||
ObjectTypeSampler = 9,
|
||||
ObjectTypeThreadTrace = 10,
|
||||
ObjectTypeVideoSession= 11
|
||||
ObjectTypeThreadTrace = 10
|
||||
};
|
||||
|
||||
ObjectMetadata& metadata() { return metadata_; }
|
||||
|
||||
@@ -1,79 +0,0 @@
|
||||
//
|
||||
// Copyright (c) 2010 Advanced Micro Devices, Inc. All rights reserved.
|
||||
//
|
||||
|
||||
#ifndef VIDEO_SESSION_HPP_
|
||||
#define VIDEO_SESSION_HPP_
|
||||
|
||||
#include "top.hpp"
|
||||
#include "platform/object.hpp"
|
||||
#include "device/device.hpp"
|
||||
#include "platform/commandqueue.hpp"
|
||||
|
||||
#if cl_amd_open_video
|
||||
|
||||
namespace amd
|
||||
{
|
||||
//! VideoSession class
|
||||
class VideoSession : public RuntimeObject
|
||||
{
|
||||
private:
|
||||
Context& context_; //!< OpenCL context
|
||||
Device& device_; //!< OpenCL device
|
||||
HostQueue* queue_; //!< Open CL video command queue
|
||||
cl_bitfield& video_session_flags_; //!< Creation flags
|
||||
cl_video_config_type_amd type_; //!< config buffer type
|
||||
cl_uint size_; //!< config buffer size
|
||||
void* buffer_; //!< pointer to config buffer
|
||||
|
||||
public:
|
||||
VideoSession(
|
||||
Context& context, //!< OpenCL context
|
||||
Device& device, //!< OpenCL device
|
||||
HostQueue* queue, //!< OpenCL command queue
|
||||
cl_bitfield flags, //!< Video Session flags
|
||||
cl_video_config_type_amd type, //!< config buffer type
|
||||
cl_uint size, //!< config buffer size
|
||||
void* buffer //!< pointer to config buffer
|
||||
)
|
||||
: context_(context)
|
||||
, device_(device)
|
||||
, queue_(queue)
|
||||
, video_session_flags_(flags)
|
||||
, type_(type)
|
||||
, size_(size)
|
||||
, buffer_(NULL)
|
||||
{
|
||||
if (size > 0 && buffer) {
|
||||
buffer_ = new char[size];
|
||||
memcpy(buffer_, buffer, size);
|
||||
}
|
||||
}
|
||||
|
||||
virtual ~VideoSession()
|
||||
{
|
||||
if (queue_) {
|
||||
queue_->release();
|
||||
}
|
||||
if (buffer_) {
|
||||
delete[] static_cast<char*>(buffer_);
|
||||
}
|
||||
}
|
||||
|
||||
//! Accessor functions
|
||||
Context& context() const { return context_; }
|
||||
Device& device() const { return device_; }
|
||||
HostQueue& queue() const { return *queue_; }
|
||||
cl_bitfield& flags() const { return video_session_flags_; }
|
||||
cl_video_config_type_amd type() const { return type_; }
|
||||
void * configbuffer() const {return buffer_;}
|
||||
|
||||
//! RTTI internal implementation
|
||||
virtual ObjectType objectType() const {return ObjectTypeVideoSession;}
|
||||
};
|
||||
|
||||
} // namespace amd
|
||||
|
||||
#endif // cl_amd_open_video
|
||||
|
||||
#endif /*VIDEO_SESSION_HPP_*/
|
||||
Reference in new issue
Block a user