Skip to content

Commit da57a06

Browse files
committed
[what][style][h264] 编译警告处理
1 parent b1d2cea commit da57a06

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

H264SliceDecodingProcess.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -734,7 +734,7 @@ void H264SliceDecodingProcess::InitializationProcessForReferencePictureLists(H26
734734
{
735735
return left->LongTermPicNum < right->LongTermPicNum;
736736
});
737-
MPP_H264_SD_LOG("-- shortTermRefPicList(%ld) longTermRefList(%ld)", (uint32_t)shortTermRefPicList.size(), (uint32_t)longTermRefList.size());
737+
MPP_H264_SD_LOG("-- shortTermRefPicList(%d) longTermRefList(%d)", (uint32_t)shortTermRefPicList.size(), (uint32_t)longTermRefList.size());
738738
for (auto& shortTermPicture : shortTermRefPicList)
739739
{
740740
_RefPicList0.push_back(shortTermPicture);
@@ -804,7 +804,7 @@ void H264SliceDecodingProcess::InitializationProcessForReferencePictureLists(H26
804804
return left->LongTermPicNum < right->LongTermPicNum;
805805
});
806806
}
807-
MPP_H264_SD_LOG("-- RefPicList01(%ld) RefPicList02(%ld) RefPicList03(%ld)", (uint32_t)RefPicList01.size(), (uint32_t)RefPicList02.size(), (uint32_t)RefPicList03.size());
807+
MPP_H264_SD_LOG("-- RefPicList01(%d) RefPicList02(%d) RefPicList03(%d)", (uint32_t)RefPicList01.size(), (uint32_t)RefPicList02.size(), (uint32_t)RefPicList03.size());
808808
for (const auto& RefPic : RefPicList01)
809809
{
810810
_RefPicList0.push_back(RefPic);
@@ -869,7 +869,7 @@ void H264SliceDecodingProcess::InitializationProcessForReferencePictureLists(H26
869869
return left->LongTermPicNum > right->LongTermPicNum;
870870
});
871871
}
872-
MPP_H264_SD_LOG("-- RefPicList11(%ld) RefPicList12(%ld) RefPicList13(%ld)", (uint32_t)RefPicList11.size(), (uint32_t)RefPicList12.size(), (uint32_t)RefPicList13.size());
872+
MPP_H264_SD_LOG("-- RefPicList11(%d) RefPicList12(%d) RefPicList13(%d)", (uint32_t)RefPicList11.size(), (uint32_t)RefPicList12.size(), (uint32_t)RefPicList13.size());
873873
for (const auto& RefPic : RefPicList11)
874874
{
875875
_RefPicList1.push_back(RefPic);

H26xUltis.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,9 @@ void FillH265SpsContext(H265SpsSyntax::ptr sps)
121121
context->MinCbSizeY = 1 << context->MinCbLog2SizeY;
122122
context->CtbSizeY = 1 << context->CtbLog2SizeY;
123123
context->PicWidthInMinCbsY = sps->pic_width_in_luma_samples / context->MinCbSizeY;
124-
context->PicWidthInCtbsY = std::ceil(sps->pic_width_in_luma_samples / context->CtbSizeY);
124+
context->PicWidthInCtbsY = (uint32_t)std::ceil(sps->pic_width_in_luma_samples / context->CtbSizeY);
125125
context->PicHeightInMinCbsY = sps->pic_height_in_luma_samples / context->MinCbSizeY;
126-
context->PicHeightInCtbsY = std::ceil(sps-> pic_height_in_luma_samples / context->CtbSizeY);
126+
context->PicHeightInCtbsY = (uint32_t)std::ceil(sps-> pic_height_in_luma_samples / context->CtbSizeY);
127127
context->PicSizeInMinCbsY = context->PicWidthInMinCbsY * context->PicHeightInMinCbsY;
128128
context->PicSizeInCtbsY = context->PicWidthInCtbsY * context->PicHeightInCtbsY;
129129
context->PicWidthInSamplesC = sps->pic_width_in_luma_samples / SubWidthC;

main.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ size_t CacheFileH264ByteReader::Read(void* data, size_t bytes)
141141
else
142142
{
143143
_offset = _ifs.tellg();
144-
_ifs.readsome((char*)_buf, kBufSize);
144+
_ifs.read((char*)_buf, kBufSize);
145145
_cur = 0;
146146
_len = _ifs.gcount();
147147
if (_len == 0) /* eof */
@@ -161,7 +161,7 @@ bool CacheFileH264ByteReader::Seek(size_t offset)
161161
{
162162
_ifs.seekg(offset);
163163
_offset = _ifs.tellg();
164-
_ifs.readsome((char*)_buf, kBufSize);
164+
_ifs.read((char*)_buf, kBufSize);
165165
_cur = 0;
166166
_len = _ifs.gcount();
167167
return _offset == offset;
@@ -170,7 +170,7 @@ bool CacheFileH264ByteReader::Seek(size_t offset)
170170
{
171171
_ifs.seekg(offset);
172172
_offset = _ifs.tellg();
173-
_ifs.readsome((char*)_buf, kBufSize);
173+
_ifs.read((char*)_buf, kBufSize);
174174
_cur = 0;
175175
_len = _ifs.gcount();
176176
return _offset == offset;

0 commit comments

Comments
 (0)