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

video_coding::PacketBuffer now group all H264 packets with the same timestamp into the same frame.

Browse Source 
Since we can't know when a H264 frame really starts we instead group all packets together by timestamp when a frame seems to be complete (only in the case of H264).

BUG=webrtc:5514

Review-Url: https://codereview.webrtc.org/2675693002
Cr-Commit-Position: refs/heads/master@{#16419}
This commit is contained in:
philipel
2017-02-02 08:51:29 -08:00
committed by Commit bot
parent 1dffc62843
commit 8c61924b56
1 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
webrtc/modules/video_coding/packet_buffer.cc
View File

@ -211,17 +211,38 @@ std::vector<std::unique_ptr<RtpFrameObject>> PacketBuffer::FindFrames(
// Find the start index by searching backward until the packet with
// the |frame_begin| flag is set.
int start_index = index;
bool is_h264 = data_buffer_[start_index].codec == kVideoCodecH264;
int64_t frame_timestamp = data_buffer_[start_index].timestamp;
while (true) {
frame_size += data_buffer_[start_index].sizeBytes;
max_nack_count =
std::max(max_nack_count, data_buffer_[start_index].timesNacked);
sequence_buffer_[start_index].frame_created = true;
if (sequence_buffer_[start_index].frame_begin)
if (!is_h264 && sequence_buffer_[start_index].frame_begin)
break;
start_index = start_index > 0 ? start_index - 1 : size_ - 1;
start_seq_num--;
// In the case of H264 we don't have a frame_begin bit (yes,
// |frame_begin| might be set to true but that is a lie). So instead
// we traverese backwards as long as we have a previous packet and
// the timestamp of that packet is the same as this one. This may cause
// the PacketBuffer to hand out incomplete frames.
// See: https://bugs.chromium.org/p/webrtc/issues/detail?id=7106
//
// Since we ignore the |frame_begin| flag of the inserted packets
// we check that |start_index != static_cast<int>(index)| to make sure
// that we don't get stuck in a loop if the packet buffer is filled
// with packets of the same timestamp.
if (is_h264 && start_index != static_cast<int>(index) &&
(!sequence_buffer_[start_index].used ||
data_buffer_[start_index].timestamp != frame_timestamp)) {
break;
}
--start_seq_num;
}
found_frames.emplace_back(