Skip to content

common: remove unused variable #102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
dabrain34 wants to merge 1 commit into from
Closed

common: remove unused variable #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions common/libs/VkCodecUtils/VulkanFilterYuvCompute.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ VkResult VulkanFilterYuvCompute::Create(const VulkanDeviceContext* vkDevCtx,
VkFormat inputFormat,
VkFormat outputFormat,
const VkSamplerYcbcrConversionCreateInfo* pYcbcrConversionCreateInfo,
const YcbcrPrimariesConstants* pYcbcrPrimariesConstants,
const VkSamplerCreateInfo* pSamplerCreateInfo,
VkSharedBaseObj<VulkanFilter>& vulkanFilter)
{
Expand All @@ -38,8 +37,7 @@ VkResult VulkanFilterYuvCompute::Create(const VulkanDeviceContext* vkDevCtx,
flterType,
maxNumFrames,
inputFormat,
outputFormat,
pYcbcrPrimariesConstants));
outputFormat));

if (!yCbCrVulkanFilter) {
return VK_ERROR_OUT_OF_HOST_MEMORY;
Expand Down
8 changes: 1 addition & 7 deletions common/libs/VkCodecUtils/VulkanFilterYuvCompute.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ class VulkanFilterYuvCompute : public VulkanFilter
VkFormat inputFormat,
VkFormat outputFormat,
const VkSamplerYcbcrConversionCreateInfo* pYcbcrConversionCreateInfo,
const YcbcrPrimariesConstants* pYcbcrPrimariesConstants,
const VkSamplerCreateInfo* pSamplerCreateInfo,
VkSharedBaseObj<VulkanFilter>& vulkanFilter);

Expand All @@ -51,18 +50,14 @@ class VulkanFilterYuvCompute : public VulkanFilter
FilterType filterType,
uint32_t maxNumFrames,
VkFormat inputFormat,
VkFormat outputFormat,
const YcbcrPrimariesConstants* pYcbcrPrimariesConstants)
VkFormat outputFormat)
: VulkanFilter(vkDevCtx, queueFamilyIndex, queueIndex)
, m_filterType(filterType)
, m_inputFormat(inputFormat)
, m_outputFormat(outputFormat)
, m_workgroupSizeX(16)
, m_workgroupSizeY(16)
, m_maxNumFrames(maxNumFrames)
, m_ycbcrPrimariesConstants (pYcbcrPrimariesConstants ?
*pYcbcrPrimariesConstants :
YcbcrPrimariesConstants{0.0, 0.0})
, m_inputImageAspects( VK_IMAGE_ASPECT_COLOR_BIT |
VK_IMAGE_ASPECT_PLANE_0_BIT |
VK_IMAGE_ASPECT_PLANE_1_BIT |
Expand Down Expand Up @@ -346,7 +341,6 @@ class VulkanFilterYuvCompute : public VulkanFilter
uint32_t m_workgroupSizeX; // usually 16
uint32_t m_workgroupSizeY; // usually 16
uint32_t m_maxNumFrames;
const YcbcrPrimariesConstants m_ycbcrPrimariesConstants;
VulkanSamplerYcbcrConversion m_samplerYcbcrConversion;
VulkanDescriptorSetLayout m_descriptorSetLayout;
VulkanComputePipeline m_computePipeline;
Expand Down
3 changes: 0 additions & 3 deletions vk_video_decoder/libs/VkVideoDecoder/VkVideoDecoder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,8 +280,6 @@ int32_t VkVideoDecoder::StartVideoSequence(VkParserDetectedVideoFormat* pVideoFo
pVideoFormat->video_signal_description.video_full_range_flag);
const VkSamplerYcbcrModelConversion ycbcrModelConversion = VkVideoCoreProfile::CodecColorPrimariesToYCbCrModel(
pVideoFormat->video_signal_description.color_primaries);
const YcbcrPrimariesConstants ycbcrPrimariesConstants = VkVideoCoreProfile::CodecGetMatrixCoefficients(
pVideoFormat->video_signal_description.matrix_coefficients);

const VkFormat inputFormat = dpbImageFormat;
const VkFormat outputFormat = outImageFormat;
Expand Down Expand Up @@ -322,7 +320,6 @@ int32_t VkVideoDecoder::StartVideoSequence(VkParserDetectedVideoFormat* pVideoFo
inputFormat,
outputFormat,
&ycbcrConversionCreateInfo,
&ycbcrPrimariesConstants,
&samplerInfo,
m_yuvFilter);
if (result == VK_SUCCESS) {
Expand Down
2 changes: 0 additions & 2 deletions vk_video_encoder/libs/VkVideoEncoder/VkVideoEncoder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1178,7 +1178,6 @@ VkResult VkVideoEncoder::InitEncoder(VkSharedBaseObj<EncoderConfig>& encoderConf

const VkSamplerYcbcrRange ycbcrRange = VK_SAMPLER_YCBCR_RANGE_ITU_FULL; // FIXME
const VkSamplerYcbcrModelConversion ycbcrModelConversion = VK_SAMPLER_YCBCR_MODEL_CONVERSION_YCBCR_2020; // FIXME
const YcbcrPrimariesConstants ycbcrPrimariesConstants = GetYcbcrPrimariesConstants(YcbcrBtStandardBt2020); // FIXME

const VkSamplerYcbcrConversionCreateInfo ycbcrConversionCreateInfo {
VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_CREATE_INFO,
Expand Down Expand Up @@ -1216,7 +1215,6 @@ VkResult VkVideoEncoder::InitEncoder(VkSharedBaseObj<EncoderConfig>& encoderConf
m_imageInFormat, // in filter format (can be RGB)
m_imageInFormat, // out filter - same as input for now.
&ycbcrConversionCreateInfo,
&ycbcrPrimariesConstants,
&samplerInfo,
m_inputComputeFilter);
}
Expand Down
Loading