Skip to content

Commit d415221

Browse files
dabrain34dabrain34
committed
NvVideoParser: fix data conversion warnings
1 parent f1f76b8 commit d415221

15 files changed

+544
-544
lines changed

‎vk_video_decoder/include/vkvideo_parser/VulkanVideoParserIf.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -226,9 +226,9 @@ typedef struct VkParserHevcPictureData {
226226
uint8_t seq_parameter_set_id; // SPS ID
227227
uint8_t vps_video_parameter_set_id; // VPS ID
228228

229-
uint8_t IrapPicFlag;
230-
uint8_t IdrPicFlag;
231-
uint8_t short_term_ref_pic_set_sps_flag;
229+
uint32_t IrapPicFlag : 1;
230+
uint32_t IdrPicFlag : 1;
231+
uint32_t short_term_ref_pic_set_sps_flag : 1;
232232

233233
// RefPicSets
234234
int32_t NumBitsForShortTermRPSInSlice;
@@ -440,7 +440,7 @@ typedef struct VkParserSequenceInfo {
440440
VkVideoCodecOperationFlagBitsKHR eCodec; // Compression Standard
441441
bool isSVC; // h.264 SVC
442442
FrameRate frameRate; // Frame Rate stored in the bitstream
443-
int32_t bProgSeq; // Progressive Sequence
443+
bool bProgSeq; // Progressive Sequence
444444
int32_t nDisplayWidth; // Displayed Horizontal Size
445445
int32_t nDisplayHeight; // Displayed Vertical Size
446446
int32_t nCodedWidth; // Coded Picture Width
@@ -453,7 +453,7 @@ typedef struct VkParserSequenceInfo {
453453
uint8_t uVideoFullRange; // 0=16-235, 1=0-255
454454
int32_t lBitrate; // Video bitrate (bps)
455455
int32_t lDARWidth,
456-
lDARHeight; // Display Aspect Ratio = lDARWidth : lDARHeight
456+
lDARHeight; // Display Aspect Ratio = lDARWidth : lDARHeight
457457
int32_t lVideoFormat; // Video Format (VideoFormatXXX)
458458
int32_t lColorPrimaries; // Colour Primaries (ColorPrimariesXXX)
459459
int32_t lTransferCharacteristics; // Transfer Characteristics

‎vk_video_decoder/libs/NvVideoParser/include/VulkanAV1Decoder.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ class VulkanAV1Decoder : public VulkanVideoDecoder {
383383
size_t le(int n) {
384384
size_t t = 0;
385385
for (int i = 0; i < n; i++) {
386-
uint8_t byte = u(8);
386+
uint8_t byte = (uint8_t)u(8);
387387
t += (byte << (i * 8));
388388
}
389389
return t;

‎vk_video_decoder/libs/NvVideoParser/include/VulkanH264Decoder.h‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include "VulkanH26xDecoder.h"
2323
#include "nvVulkanh264ScalingList.h"
2424

25-
#define VK_H264_SPS_VUI_FIELD(pStdVui, nvSpsIn, name) pStdVui->name = nvSpsIn->vui.name
25+
#define VK_H264_SPS_VUI_FIELD(pStdVui, nvSpsIn, name) pStdVui->name = (uint8_t)(nvSpsIn->vui.name)
2626
#define SET_VK_H264_SPS_VUI_FIELD(pStdVui, name, value) pStdVui->name = value
2727
#define VK_H264_SPS_VUI_FLAG(pStdVui, nvSpsIn, name) pStdVui->flags.name = nvSpsIn->vui.name
2828

@@ -76,19 +76,19 @@ struct vui_parameters_s
7676

7777
struct seq_parameter_set_svc_extension_s
7878
{
79-
int inter_layer_deblocking_filter_control_present_flag;
80-
int extended_spatial_scalability_idc;
81-
int chroma_phase_x_plus1_flag;
82-
int chroma_phase_y_plus1;
83-
int seq_ref_layer_chroma_phase_x_plus1_flag;
84-
int seq_ref_layer_chroma_phase_y_plus1;
85-
int seq_scaled_ref_layer_left_offset;
86-
int seq_scaled_ref_layer_top_offset;
87-
int seq_scaled_ref_layer_right_offset;
88-
int seq_scaled_ref_layer_bottom_offset;
89-
int seq_tcoeff_level_prediction_flag;
90-
int adaptive_tcoeff_level_prediction_flag;
91-
int slice_header_restriction_flag;
79+
uint32_t inter_layer_deblocking_filter_control_present_flag;
80+
uint32_t extended_spatial_scalability_idc;
81+
uint32_t chroma_phase_x_plus1_flag;
82+
uint32_t chroma_phase_y_plus1;
83+
uint32_t seq_ref_layer_chroma_phase_x_plus1_flag;
84+
uint32_t seq_ref_layer_chroma_phase_y_plus1;
85+
uint32_t seq_scaled_ref_layer_left_offset;
86+
uint32_t seq_scaled_ref_layer_top_offset;
87+
uint32_t seq_scaled_ref_layer_right_offset;
88+
uint32_t seq_scaled_ref_layer_bottom_offset;
89+
uint32_t seq_tcoeff_level_prediction_flag;
90+
uint32_t adaptive_tcoeff_level_prediction_flag;
91+
uint32_t slice_header_restriction_flag;
9292
};
9393

9494
struct seq_parameter_set_s : public StdVideoPictureParametersSet, public StdVideoH264SequenceParameterSet
@@ -233,8 +233,8 @@ struct seq_parameter_set_s : public StdVideoPictureParametersSet, public StdVide
233233

234234
// StdVideoH264HrdParameters hrd_parameters);
235235
pStdHrdParameters->cpb_cnt_minus1 = pSps->vui.nal_hrd.cpb_cnt_minus1;
236-
pStdHrdParameters->bit_rate_scale = pSps->vui.nal_hrd.bit_rate;
237-
pStdHrdParameters->cpb_size_scale = pSps->vui.nal_hrd.cbp_size;
236+
pStdHrdParameters->bit_rate_scale = (uint8_t)(pSps->vui.nal_hrd.bit_rate);
237+
pStdHrdParameters->cpb_size_scale =(uint8_t)(pSps->vui.nal_hrd.cbp_size);
238238
// stdVui.pHrdParameters->bit_rate_value_minus1[32];
239239
// stdVui.pHrdParameters->cpb_size_value_minus1[32];
240240
// stdVui.pHrdParameters->cbr_flag[32];
@@ -544,7 +544,7 @@ struct slice_header_s
544544
int first_mb_in_slice;
545545
int slice_type_raw;
546546
int slice_type;
547-
int pic_parameter_set_id;
547+
uint8_t pic_parameter_set_id;
548548
int colour_plane_id;
549549
int frame_num;
550550
int idr_pic_id;

‎vk_video_decoder/libs/NvVideoParser/include/VulkanH265Decoder.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -563,14 +563,14 @@ struct hevc_video_param_s : public StdVideoPictureParametersSet, public StdVideo
563563
uint8_t layer_id_included_flag[MAX_VPS_LAYER_SETS][MAX_NUM_LAYER_IDS];
564564
uint32_t num_layers_in_id_list[MAX_VPS_LAYER_SETS];
565565
uint8_t layer_set_layer_id_list[MAX_VPS_LAYER_SETS][MAX_NUM_LAYER_IDS];
566-
uint32_t vps_num_hrd_parameters;
566+
uint32_t vps_num_hrd_parameters;
567567
// hrdParameters_t hrdParameters[MAX_VPS_LAYER_SETS]; // CMOD variable
568568
uint32_t hrd_layer_set_idx[MAX_VPS_LAYER_SETS];
569569
uint8_t cprms_present_flag[MAX_VPS_LAYER_SETS];
570570

571571
/* VPS Extension */
572572
uint8_t scalability_mask_flag[MAX_NUM_SCALABILITY_TYPES];
573-
uint32_t numScalabilityTypes;
573+
uint32_t numScalabilityTypes;
574574
uint8_t dimension_id_len[MAX_NUM_SCALABILITY_TYPES];
575575

576576
uint8_t layer_id_in_nuh[MAX_NUM_LAYER_IDS];
@@ -651,10 +651,10 @@ typedef struct _hevc_slice_header_s
651651
uint32_t slice_segment_address;
652652

653653
uint8_t colour_plane_id;
654-
uint8_t short_term_ref_pic_set_sps_flag;
654+
uint32_t short_term_ref_pic_set_sps_flag : 1;
655655
uint8_t short_term_ref_pic_set_idx;
656656
uint8_t num_long_term_sps;
657-
657+
658658
uint16_t pic_order_cnt_lsb;
659659
uint8_t num_long_term_pics;
660660
uint8_t reserved1;

‎vk_video_decoder/libs/NvVideoParser/include/nvVulkanh264ScalingList.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ enum NvScalingListTypeH264 {
3434

3535
struct NvScalingListH264
3636
{
37-
int32_t scaling_matrix_present_flag:1;
38-
uint8_t scaling_list_type[8]; // scaling_list_type_e
39-
uint8_t ScalingList4x4[6][16];
40-
uint8_t ScalingList8x8[2][64];
37+
uint32_t scaling_matrix_present_flag:1;
38+
uint8_t scaling_list_type[8]; // scaling_list_type_e
39+
uint8_t ScalingList4x4[6][16];
40+
uint8_t ScalingList8x8[2][64];
4141
};
4242

4343
NVPARSER_EXPORT

‎vk_video_decoder/libs/NvVideoParser/src/NextStartCodeAVX2.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ size_t VulkanVideoDecoder::next_start_code<SIMD_ISA::AVX2>(const uint8_t *pdatai
1919
{
2020
const __m256i v1 = _mm256_set1_epi8(1);
2121
__m256i vdata = _mm256_loadu_si256((const __m256i*)pdatain);
22-
__m256i vBfr = _mm256_set1_epi16(((m_BitBfr << 8) & 0xFF00) | ((m_BitBfr >> 8) & 0xFF));
22+
__m256i vBfr = _mm256_set1_epi16((((int16_t)m_BitBfr << 8) & 0xFF00) | (((short)m_BitBfr >> 8) & 0xFF));
2323
__m256i vdata_alignr16b_init = _mm256_permute2f128_si256(vBfr, vdata, 1 | (2<<4));
2424
__m256i vdata_prev1 = _mm256_alignr_epi8(vdata, vdata_alignr16b_init, 15);
2525
__m256i vdata_prev2 = _mm256_alignr_epi8(vdata, vdata_alignr16b_init, 14);

‎vk_video_decoder/libs/NvVideoParser/src/NextStartCodeAVX512.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ size_t VulkanVideoDecoder::next_start_code<SIMD_ISA::AVX512>(const uint8_t *pdat
2020
const __m512i v1 = _mm512_set1_epi8(1);
2121
const __m512i v254 = _mm512_set1_epi8(-2);
2222
__m512i vdata = _mm512_loadu_si512((const void*)pdatain);
23-
__m512i vBfr = _mm512_set1_epi16(((m_BitBfr << 8) & 0xFF00) | ((m_BitBfr >> 8) & 0xFF));
23+
__m512i vBfr = _mm512_set1_epi16((((int16_t)m_BitBfr << 8) & 0xFF00) | (((short)m_BitBfr >> 8) & 0xFF));
2424
__m512i vdata_alignr48b_init = _mm512_alignr_epi32(vdata, vBfr, 12);
2525
__m512i vdata_prev1 = _mm512_alignr_epi8(vdata, vdata_alignr48b_init, 15);
2626
__m512i vdata_prev2 = _mm512_alignr_epi8(vdata, vdata_alignr48b_init, 14);

‎vk_video_decoder/libs/NvVideoParser/src/NextStartCodeSSSE3.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ size_t VulkanVideoDecoder::next_start_code<SIMD_ISA::SSSE3>(const uint8_t *pdata
1919
{
2020
const __m128i v1 = _mm_set1_epi8(1);
2121
__m128i vdata = _mm_loadu_si128((const __m128i*)pdatain);
22-
__m128i vBfr = _mm_set1_epi16(((m_BitBfr << 8) & 0xFF00) | ((m_BitBfr >> 8) & 0xFF));
22+
__m128i vBfr = _mm_set1_epi16((((int16_t)m_BitBfr << 8) & 0xFF00) | (((short)m_BitBfr >> 8) & 0xFF));
2323
__m128i vdata_prev1 = _mm_alignr_epi8(vdata, vBfr, 15);
2424
__m128i vdata_prev2 = _mm_alignr_epi8(vdata, vBfr, 14);
2525
for ( ; i < datasize32 - 32; i += 32)

0 commit comments

Comments
 (0)