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

Use AV1 packetizer/depacketizer for AV1 bitstreams

Browse Source 
Bug: webrtc:11042
Change-Id: Ibf45a99d8016dccbe109d946ac967efa927312e4
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/161011
Reviewed-by: Philip Eliasson <philipel@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#29953}
This commit is contained in:
Danil Chapovalov
2019-11-28 16:50:02 +01:00
committed by Commit Bot
parent 9dc209a23a
commit 0682ca9a83
5 changed files with 109 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
modules/video_coding/packet_buffer.cc
View File

@ -22,7 +22,9 @@
#include "api/array_view.h"
#include "api/rtp_packet_info.h"
#include "api/video/encoded_frame.h"
#include "api/video/video_frame_type.h"
#include "common_video/h264/h264_common.h"
#include "modules/rtp_rtcp/source/rtp_depacketizer_av1.h"
#include "modules/rtp_rtcp/source/rtp_header_extensions.h"
#include "modules/rtp_rtcp/source/rtp_packet_received.h"
#include "modules/rtp_rtcp/source/rtp_video_header.h"
@ -398,7 +400,12 @@ std::vector<std::unique_ptr<RtpFrameObject>> PacketBuffer::FindFrames(
}
}
found_frames.push_back(AssembleFrame(start_seq_num, seq_num));
if (auto frame = AssembleFrame(start_seq_num, seq_num)) {
found_frames.push_back(std::move(frame));
} else {
RTC_LOG(LS_ERROR) << "Failed to assemble frame from packets "
<< start_seq_num << "-" << seq_num;
}
missing_packets_.erase(missing_packets_.begin(),
missing_packets_.upper_bound(seq_num));
@ -437,16 +444,25 @@ std::unique_ptr<RtpFrameObject> PacketBuffer::AssembleFrame(
packet_infos.push_back(packet.packet_info);
}
auto bitstream = EncodedImageBuffer::Create(frame_size);
uint8_t* write_at = bitstream->data();
for (rtc::ArrayView<const uint8_t> payload : payloads) {
memcpy(write_at, payload.data(), payload.size());
write_at += payload.size();
}
RTC_DCHECK_EQ(write_at - bitstream->data(), bitstream->size());
const Packet& first_packet = GetPacket(first_seq_num);
rtc::scoped_refptr<EncodedImageBuffer> bitstream;
// TODO(danilchap): Hide codec-specific code paths behind an interface.
if (first_packet.codec() == VideoCodecType::kVideoCodecAV1) {
bitstream = RtpDepacketizerAv1::AssembleFrame(payloads);
if (!bitstream) {
// Failed to assemble a frame. Discard and continue.
return nullptr;
}
} else {
bitstream = EncodedImageBuffer::Create(frame_size);
uint8_t* write_at = bitstream->data();
for (rtc::ArrayView<const uint8_t> payload : payloads) {
memcpy(write_at, payload.data(), payload.size());
write_at += payload.size();
}
RTC_DCHECK_EQ(write_at - bitstream->data(), bitstream->size());
}
const Packet& last_packet = GetPacket(last_seq_num);
return std::make_unique<RtpFrameObject>(
first_seq_num, //