Skip to content
This repository was archived by the owner on Oct 25, 2024. It is now read-only.

Commit dfdd50f

Browse files
committed
Suppress warnings for msvc build (#71)
1 parent fbc5355 commit dfdd50f

File tree

2 files changed

+6
-25
lines changed

2 files changed

+6
-25
lines changed

api/video_codecs/video_decoder_software_fallback_wrapper.cc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,12 @@ void VideoDecoderSoftwareFallbackWrapper::UpdateFallbackDecoderHistograms() {
181181
RTC_HISTOGRAM_COUNTS_100000(kFallbackHistogramsUmaPrefix + "H264",
182182
hw_decoded_frames_since_last_fallback_);
183183
break;
184+
#ifndef DISABLE_H265
185+
case kVideoCodecH265:
186+
RTC_HISTOGRAM_COUNTS_100000(kFallbackHistogramsUmaPrefix + "H265",
187+
hw_decoded_frames_since_last_fallback_);
188+
break;
189+
#endif
184190
case kVideoCodecMultiplex:
185191
RTC_HISTOGRAM_COUNTS_100000(kFallbackHistogramsUmaPrefix + "Multiplex",
186192
hw_decoded_frames_since_last_fallback_);

modules/rtp_rtcp/source/rtp_format_h265.cc

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,6 @@ static const size_t kHevcNalHeaderSize = 2;
6060
// H.265's FU is constructed of 2-byte payload header, and 1-byte FU header
6161
static const size_t kHevcFuHeaderSize = 1;
6262
static const size_t kHevcLengthFieldSize = 2;
63-
static const size_t kHevcApHeaderSize =
64-
kHevcNalHeaderSize + kHevcLengthFieldSize;
6563

6664
enum HevcNalHdrMasks {
6765
kHevcFBit = 0x80,
@@ -76,29 +74,6 @@ enum HevcNalHdrMasks {
7674
// Bit masks for FU headers.
7775
enum HevcFuDefs { kHevcSBit = 0x80, kHevcEBit = 0x40, kHevcFuTypeBit = 0x3F };
7876

79-
// TODO(pbos): Avoid parsing this here as well as inside the jitter buffer.
80-
bool ParseApStartOffsets(const uint8_t* nalu_ptr,
81-
size_t length_remaining,
82-
std::vector<size_t>* offsets) {
83-
size_t offset = 0;
84-
while (length_remaining > 0) {
85-
// Buffer doesn't contain room for additional nalu length.
86-
if (length_remaining < sizeof(uint16_t))
87-
return false;
88-
uint16_t nalu_size = ByteReader<uint16_t>::ReadBigEndian(nalu_ptr);
89-
nalu_ptr += sizeof(uint16_t);
90-
length_remaining -= sizeof(uint16_t);
91-
if (nalu_size > length_remaining)
92-
return false;
93-
nalu_ptr += nalu_size;
94-
length_remaining -= nalu_size;
95-
96-
offsets->push_back(offset + kHevcApHeaderSize);
97-
offset += kHevcLengthFieldSize + nalu_size;
98-
}
99-
return true;
100-
}
101-
10277
} // namespace
10378

10479
RtpPacketizerH265::RtpPacketizerH265(

0 commit comments

Comments
 (0)