Index: webrtc/modules/video_coding/h264_sps_pps_tracker.cc |
diff --git a/webrtc/modules/video_coding/h264_sps_pps_tracker.cc b/webrtc/modules/video_coding/h264_sps_pps_tracker.cc |
index 5dfdb49146a5f6874feef864074a8ffa72854166..e13c9f4364b4ca0b4fb6ff6ebbefbae38fca7d57 100644 |
--- a/webrtc/modules/video_coding/h264_sps_pps_tracker.cc |
+++ b/webrtc/modules/video_coding/h264_sps_pps_tracker.cc |
@@ -182,41 +182,15 @@ |
return kInsert; |
} |
-void H264SpsPpsTracker::InsertSpsPpsNalus(const std::vector<uint8_t>& sps, |
- const std::vector<uint8_t>& pps) { |
- constexpr size_t kNaluHeaderOffset = 1; |
- if (sps.size() < kNaluHeaderOffset) { |
- LOG(LS_WARNING) << "SPS size " << sps.size() << " is smaller than " |
- << kNaluHeaderOffset; |
- return; |
- } |
- if ((sps[0] & 0x1f) != H264::NaluType::kSps) { |
- LOG(LS_WARNING) << "SPS Nalu header missing"; |
- return; |
- } |
- if (pps.size() < kNaluHeaderOffset) { |
- LOG(LS_WARNING) << "PPS size " << pps.size() << " is smaller than " |
- << kNaluHeaderOffset; |
- return; |
- } |
- if ((pps[0] & 0x1f) != H264::NaluType::kPps) { |
- LOG(LS_WARNING) << "SPS Nalu header missing"; |
- return; |
- } |
- rtc::Optional<SpsParser::SpsState> parsed_sps = SpsParser::ParseSps( |
- sps.data() + kNaluHeaderOffset, sps.size() - kNaluHeaderOffset); |
- rtc::Optional<PpsParser::PpsState> parsed_pps = PpsParser::ParsePps( |
- pps.data() + kNaluHeaderOffset, pps.size() - kNaluHeaderOffset); |
- |
- if (!parsed_sps) { |
- LOG(LS_WARNING) << "Failed to parse SPS."; |
- } |
- |
- if (!parsed_pps) { |
- LOG(LS_WARNING) << "Failed to parse PPS."; |
- } |
+void H264SpsPpsTracker::InsertSpsPps(const std::vector<uint8_t>& sps, |
+ const std::vector<uint8_t>& pps) { |
+ rtc::Optional<SpsParser::SpsState> parsed_sps = |
+ SpsParser::ParseSps(sps.data(), sps.size()); |
+ rtc::Optional<PpsParser::PpsState> parsed_pps = |
+ PpsParser::ParsePps(pps.data(), pps.size()); |
if (!parsed_pps || !parsed_sps) { |
+ LOG(LS_WARNING) << "Failed to parse SPS or PPS parameters."; |
return; |
} |
@@ -234,10 +208,6 @@ |
memcpy(pps_data, pps.data(), pps_info.size); |
pps_info.data.reset(pps_data); |
pps_data_[parsed_pps->id] = std::move(pps_info); |
- |
- LOG(LS_INFO) << "Inserted SPS id " << parsed_sps->id << " and PPS id " |
- << parsed_pps->id << " (referencing SPS " << parsed_pps->sps_id |
- << ")"; |
} |
} // namespace video_coding |