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

Move the call to GetBitstream out of the RtpFrameObject ctor.

Browse Source 
Bug: webrtc:10979
Change-Id: I9159eb04d4a371e8ed8f932a989d6b884faa7be7
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/153661
Reviewed-by: Niels Moller <nisse@webrtc.org>
Commit-Queue: Philip Eliasson <philipel@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#29237}
This commit is contained in:
philipel
2019-09-19 11:22:22 +02:00
committed by Commit Bot
parent 14137a1064
commit 76161f7446
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
modules/video_coding/packet_buffer.cc
View File

@ -18,6 +18,7 @@
#include "absl/types/variant.h"
#include "api/video/encoded_frame.h"
#include "api/video/encoded_image.h"
#include "common_video/h264/h264_common.h"
#include "modules/rtp_rtcp/source/rtp_video_header.h"
#include "modules/video_coding/codecs/h264/include/h264_globals.h"
@ -436,10 +437,14 @@ std::vector<std::unique_ptr<RtpFrameObject>> PacketBuffer::FindFrames(
missing_packets_.erase(missing_packets_.begin(),
missing_packets_.upper_bound(seq_num));
found_frames.emplace_back(
new RtpFrameObject(this, start_seq_num, seq_num, frame_size,
max_nack_count, min_recv_time, max_recv_time,
RtpPacketInfos(std::move(packet_infos))));
auto frame = std::make_unique<RtpFrameObject>(
this, start_seq_num, seq_num, frame_size, max_nack_count,
min_recv_time, max_recv_time,
RtpPacketInfos(std::move(packet_infos)));
frame->SetEncodedData(EncodedImageBuffer::Create(frame_size));
GetBitstream(*frame, frame->data());
found_frames.emplace_back(std::move(frame));
ClearInterval(start_seq_num, seq_num);
}
++seq_num;
@ -447,6 +452,7 @@ std::vector<std::unique_ptr<RtpFrameObject>> PacketBuffer::FindFrames(
return found_frames;
}
// TODO(philipel): Update function to not accept an RtpFrameObject.
bool PacketBuffer::GetBitstream(const RtpFrameObject& frame,
uint8_t* destination) {
rtc::CritScope lock(&crit_);