Make the code more generic for different compiler settings#140
Make the code more generic for different compiler settings#140vasn1k wants to merge 10 commits intonvpro-samples:mainfrom
Conversation
|
can it be related and merged with KhronosGroup/Vulkan-Video-Samples#7 ? |
I didn't see too much overlap in the changes, so I think they should get merged in parallel. I don't expect merge conflicts. |
vasn1k
force-pushed
the
GenericComp
branch
5 times, most recently
from
fbdb564 to
91f0b03
Compare
zlatinski
left a comment
zlatinski
left a comment
There was a problem hiding this comment.
Thank you, Vassili, for the changes! I would like you to make some changes to your patch, please.
zlatinski
left a comment
zlatinski
left a comment
There was a problem hiding this comment.
Thank you, Vassili! Please look at my below comments. I still need to review your Vulkan chain changes.
vasn1k
force-pushed
the
GenericComp
branch
2 times, most recently
from
99f7625 to
c709593
Compare
vasn1k
force-pushed
the
GenericComp
branch
3 times, most recently
from
3a0d1a0 to
ab86c2b
Compare
Signed-off-by: Vassili Nikolaev (NVIDIA) <vnikolaev@nvidia.com>
Signed-off-by: Vassili Nikolaev (NVIDIA) <vnikolaev@nvidia.com>
Signed-off-by: Vassili Nikolaev (NVIDIA) <vnikolaev@nvidia.com>
Signed-off-by: Vassili Nikolaev (NVIDIA) <vnikolaev@nvidia.com>
Signed-off-by: Vassili Nikolaev (NVIDIA) <vnikolaev@nvidia.com>
Signed-off-by: Vassili Nikolaev (NVIDIA) <vnikolaev@nvidia.com>
Signed-off-by: Vassili Nikolaev (NVIDIA) <vnikolaev@nvidia.com>
vasn1k
force-pushed
the
GenericComp
branch
2 times, most recently
from
beb362d to
b97229f
Compare
Signed-off-by: Vassili Nikolaev (NVIDIA) <vnikolaev@nvidia.com>
Signed-off-by: Vassili Nikolaev (NVIDIA) <vnikolaev@nvidia.com>
Signed-off-by: Vassili Nikolaev (NVIDIA) <vnikolaev@nvidia.com>
|
|
||
| virtual ~ElementaryStream() { | ||
| #ifdef USE_SIMPLE_MALLOC | ||
| if (m_videoCodecType == VK_VIDEO_CODEC_OPERATION_DECODE_AV1_BIT_KHR) { |
| if (fileName != nullptr) { | ||
| m_outputFile = fopen(fileName, "wb"); | ||
| if (m_outputFile) { | ||
| #if !defined(REDUCE_VK_VIDEO_STDOUT_SPEW) |
There was a problem hiding this comment.
Please just commend this line out. Now we also have a logger in the Khronos repository, and I would rather not have so many ways to disable logging.
There was a problem hiding this comment.
I didn't want to comment that line out because it would affect how the sample app works currently. My goal is to make these changes not impact the apps logic or output at all.
| const bool gfxRendererIsEnabled = (m_videoRenderer != nullptr); | ||
| m_frameCount++; | ||
|
|
||
| #if !defined(REDUCE_VK_VIDEO_STDOUT_SPEW) |
There was a problem hiding this comment.
For all these locations, please add a local runtime config like m_printInfo
There was a problem hiding this comment.
If changes are incoming that remove the need for this change, then lets not impact the runtime.
| [argv](const char **, const ProgramArgs &a) { | ||
| int rtn = showHelp(argv, a); | ||
| exit(EXIT_SUCCESS); | ||
| safe_exit(EXIT_SUCCESS); |
There was a problem hiding this comment.
I still see the original code here. Where is the change to a return value? Am I looking at the fixes here or the original change?
| [argv](const char **, const ProgramArgs &a) { | ||
| int rtn = showHelp(argv, a); | ||
| safe_exit(EXIT_SUCCESS); | ||
| SAFE_EXIT(EXIT_SUCCESS, "Help requested - exiting successfully"); |
There was a problem hiding this comment.
Oho, this is a separate change with the fixes. I thought you'd fixed the original commit. Let me look again, please.
4 participants
This fixes some common compiler issues seen with the sample application when used outside of the cmake build environment with more strict settings.