zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert of Use sps and pps to determine decodability of H.264 frames. (patchset #4 id:60001 of https://codereview.webrtc.org/2341713002/ )

Browse Source 
Reason for revert:
Broke browser_tests, e.g., WebRtcVideoQualityBrowserTests/WebRtcVideoQualityBrowserTest.MANUAL_TestVideoQualityH264

Original issue's description:
> Use sps and pps to determine decodability of H.264 frames.
>
> NOPRESUBMIT=true
> BUG=webrtc:6208
> R=philipel@webrtc.org
>
> Committed: https://crrev.com/17b02633666f2f5d7e78767ad5674c728d639c26
> Cr-Commit-Position: refs/heads/master@{#14458}

TBR=philipel@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=webrtc:6208

Review-Url: https://codereview.webrtc.org/2381233004
Cr-Commit-Position: refs/heads/master@{#14460}
This commit is contained in:
stefan
2016-09-30 09:06:36 -07:00
committed by Commit bot
parent 61050f67ef
commit 3cdfcd88a1
9 changed files with 17 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
webrtc/modules/video_coding/decoding_state.cc
View File

@ -10,8 +10,6 @@
#include "webrtc/modules/video_coding/decoding_state.h"
#include "webrtc/base/logging.h"
#include "webrtc/common_video/h264/h264_common.h"
#include "webrtc/modules/include/module_common_types.h"
#include "webrtc/modules/video_coding/frame_buffer.h"
#include "webrtc/modules/video_coding/jitter_buffer_common.h"
@ -42,8 +40,6 @@ void VCMDecodingState::Reset() {
full_sync_ = true;
in_initial_state_ = true;
memset(frame_decoded_, 0, sizeof(frame_decoded_));
received_sps_.clear();
received_pps_.clear();
}
uint32_t VCMDecodingState::time_stamp() const {
@ -78,24 +74,6 @@ void VCMDecodingState::SetState(const VCMFrameBuffer* frame) {
temporal_id_ = frame->TemporalId();
tl0_pic_id_ = frame->Tl0PicId();
for (const NaluInfo& nalu : frame->GetNaluInfos()) {
if (nalu.type == H264::NaluType::kPps) {
if (nalu.pps_id < 0) {
LOG(LS_WARNING) << "Received pps without pps id.";
} else if (nalu.sps_id < 0) {
LOG(LS_WARNING) << "Received pps without sps id.";
} else {
received_pps_[nalu.pps_id] = nalu.sps_id;
}
} else if (nalu.type == H264::NaluType::kSps) {
if (nalu.sps_id < 0) {
LOG(LS_WARNING) << "Received sps without sps id.";
} else {
received_sps_.insert(nalu.sps_id);
}
}
}
if (UsingFlexibleMode(frame)) {
uint16_t frame_index = picture_id_ % kFrameDecodedLength;
if (in_initial_state_) {
@ -128,8 +106,6 @@ void VCMDecodingState::CopyFrom(const VCMDecodingState& state) {
in_initial_state_ = state.in_initial_state_;
frame_decoded_cleared_to_ = state.frame_decoded_cleared_to_;
memcpy(frame_decoded_, state.frame_decoded_, sizeof(frame_decoded_));
received_sps_ = state.received_sps_;
received_pps_ = state.received_pps_;
}
bool VCMDecodingState::UpdateEmptyFrame(const VCMFrameBuffer* frame) {
@ -207,10 +183,8 @@ bool VCMDecodingState::ContinuousFrame(const VCMFrameBuffer* frame) const {
// A key frame is always considered continuous as it doesn't refer to any
// frames and therefore won't introduce any errors even if prior frames are
// missing.
if (frame->FrameType() == kVideoFrameKey &&
HaveSpsAndPps(frame->GetNaluInfos())) {
if (frame->FrameType() == kVideoFrameKey)
return true;
}
// When in the initial state we always require a key frame to start decoding.
if (in_initial_state_)
return false;
@ -231,8 +205,7 @@ bool VCMDecodingState::ContinuousFrame(const VCMFrameBuffer* frame) const {
return ContinuousPictureId(frame->PictureId());
}
} else {
return ContinuousSeqNum(static_cast<uint16_t>(frame->GetLowSeqNum())) &&
HaveSpsAndPps(frame->GetNaluInfos());
return ContinuousSeqNum(static_cast<uint16_t>(frame->GetLowSeqNum()));
}
}
@ -309,48 +282,4 @@ bool VCMDecodingState::AheadOfFramesDecodedClearedTo(uint16_t index) const {
return diff > kFrameDecodedLength / 2;
}
bool VCMDecodingState::HaveSpsAndPps(const std::vector<NaluInfo>& nalus) const {
std::set<int> new_sps;
std::map<int, int> new_pps;
for (const NaluInfo& nalu : nalus) {
switch (nalu.type) {
case H264::NaluType::kPps:
if (nalu.pps_id < 0) {
LOG(LS_WARNING) << "Received pps without pps id.";
} else if (nalu.sps_id < 0) {
LOG(LS_WARNING) << "Received pps without sps id.";
} else {
new_pps[nalu.pps_id] = nalu.sps_id;
}
break;
case H264::NaluType::kSps:
if (nalu.sps_id < 0) {
LOG(LS_WARNING) << "Received sps without sps id.";
} else {
new_sps.insert(nalu.sps_id);
}
break;
default: {
int sps_needed = -1;
auto pps_it = new_pps.find(nalu.pps_id);
if (pps_it != new_pps.end()) {
sps_needed = pps_it->second;
} else {
auto pps_it2 = received_pps_.find(nalu.pps_id);
if (pps_it2 == received_pps_.end()) {
return false;
}
sps_needed = pps_it2->second;
}
if (new_sps.find(sps_needed) == new_sps.end() &&
received_sps_.find(sps_needed) == received_sps_.end()) {
return false;
}
break;
}
}
}
return true;
}
} // namespace webrtc