webrtc/modules/video_coding/video_packet_buffer_unittest.cc - Issue 2199133004: PacketBuffer is now ref counted.

Unified Diff: webrtc/modules/video_coding/video_packet_buffer_unittest.cc

Issue 2199133004: PacketBuffer is now ref counted. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: #include <utility> for std::move Created 4 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: webrtc/modules/video_coding/video_packet_buffer_unittest.cc

diff --git a/webrtc/modules/video_coding/video_packet_buffer_unittest.cc b/webrtc/modules/video_coding/video_packet_buffer_unittest.cc

index ee9a853a246271164d8f95a6717446550c826f1e..f4ae5c750863e14778eff7c43344ee720a910178 100644

--- a/webrtc/modules/video_coding/video_packet_buffer_unittest.cc

+++ b/webrtc/modules/video_coding/video_packet_buffer_unittest.cc

@@ -9,7 +9,6 @@

#include <cstring>

-#include <limits>

#include <map>

#include <set>

#include <utility>

@@ -24,274 +23,83 @@ namespace webrtc {

namespace video_coding {

class TestPacketBuffer : public ::testing::Test,

- public OnCompleteFrameCallback {

+ public OnReceivedFrameCallback {

protected:

TestPacketBuffer()

- : rand_(0x8739211),

+ : rand_(0x7732213),

clock_(new SimulatedClock(0)),

- packet_buffer_(new PacketBuffer(clock_.get(),

- kStartSize,

- kMaxSize,

- this)),

- frames_from_callback_(FrameComp()),

- dummy_data_(new uint8_t[kDummyDataSize]()) {}

- uint16_t Rand() { return rand_.Rand(std::numeric_limits<uint16_t>::max()); }

- void OnCompleteFrame(std::unique_ptr<FrameObject> frame) override {

- uint16_t pid = frame->picture_id;

- uint16_t sidx = frame->spatial_layer;

- auto frame_it = frames_from_callback_.find(std::make_pair(pid, sidx));

- if (frame_it != frames_from_callback_.end()) {

- ADD_FAILURE() << "Already received frame with (pid:sidx): ("

- << pid << ":" << sidx << ")";

+ packet_buffer_(

+ PacketBuffer::Create(clock_.get(), kStartSize, kMaxSize, this)) {}

+ uint16_t Rand() { return rand_.Rand<uint16_t>(); }

+ void OnReceivedFrame(std::unique_ptr<RtpFrameObject> frame) override {

+ uint16_t first_seq_num = frame->first_seq_num();

+ if (frames_from_callback_.find(first_seq_num) !=

+ frames_from_callback_.end()) {

+ ADD_FAILURE() << "Already received frame with first sequence number "

+ << first_seq_num << ".";

return;

}

frames_from_callback_.insert(

- std::make_pair(std::make_pair(pid, sidx), std::move(frame)));

+ std::make_pair(frame->first_seq_num(), std::move(frame)));

}

- void TearDown() override {

- // All frame objects must be destroyed before the packet buffer since

- // a frame object will try to remove itself from the packet buffer

- // upon destruction.

- frames_from_callback_.clear();

- }

- // Short version of true and false.

- enum {

- kT = true,

- kF = false

- };

- // Insert a generic packet into the packet buffer.

- void InsertGeneric(uint16_t seq_num, // packet sequence number

- bool keyframe, // is keyframe

- bool first, // is first packet of frame

- bool last, // is last packet of frame

- int data_size = -1, // size of data

- uint8_t* data = nullptr) { // data pointer

- if (data_size == -1) {

- data_size = kDummyDataSize;

- data = dummy_data_.get();

- }

+ enum IsKeyFrame { kKeyFrame, kDeltaFrame };

+ enum IsFirst { kFirst, kNotFirst };

+ enum IsLast { kLast, kNotLast };

+ void InsertPacket(uint16_t seq_num, // packet sequence number

+ IsKeyFrame keyframe, // is keyframe

+ IsFirst first, // is first packet of frame

+ IsLast last, // is last packet of frame

+ int data_size = 0, // size of data

+ uint8_t* data = nullptr) { // data pointer

VCMPacket packet;

packet.codec = kVideoCodecGeneric;

packet.seqNum = seq_num;

packet.frameType = keyframe ? kVideoFrameKey : kVideoFrameDelta;

- packet.isFirstPacket = first;

- packet.markerBit = last;

- packet.sizeBytes = data_size;

- packet.dataPtr = data;

- EXPECT_TRUE(packet_buffer_->InsertPacket(packet));

- }

- // Insert a Vp8 packet into the packet buffer.

- void InsertVp8(uint16_t seq_num, // packet sequence number

- bool keyframe, // is keyframe

- bool first, // is first packet of frame

- bool last, // is last packet of frame

- bool sync = false, // is sync frame

- int32_t pid = kNoPictureId, // picture id

- uint8_t tid = kNoTemporalIdx, // temporal id

- int32_t tl0 = kNoTl0PicIdx, // tl0 pic index

- int data_size = -1, // size of data

- uint8_t* data = nullptr) { // data pointer

- if (data_size == -1) {

- data_size = kDummyDataSize;

- data = dummy_data_.get();

- }

- VCMPacket packet;

- packet.codec = kVideoCodecVP8;

- packet.seqNum = seq_num;

- packet.frameType = keyframe ? kVideoFrameKey : kVideoFrameDelta;

- packet.isFirstPacket = first;

- packet.markerBit = last;

- packet.sizeBytes = data_size;

- packet.dataPtr = data;

- packet.video_header.codecHeader.VP8.pictureId = pid % (1 << 15);

- packet.video_header.codecHeader.VP8.temporalIdx = tid;

- packet.video_header.codecHeader.VP8.tl0PicIdx = tl0;

- packet.video_header.codecHeader.VP8.layerSync = sync;

- EXPECT_TRUE(packet_buffer_->InsertPacket(packet));

- }

- // Insert a Vp9 packet into the packet buffer.

- void InsertVp9Gof(uint16_t seq_num, // packet sequence number

- bool keyframe, // is keyframe

- bool first, // is first packet of frame

- bool last, // is last packet of frame

- bool up = false, // frame is up-switch point

- int32_t pid = kNoPictureId, // picture id

- uint8_t sid = kNoSpatialIdx, // spatial id

- uint8_t tid = kNoTemporalIdx, // temporal id

- int32_t tl0 = kNoTl0PicIdx, // tl0 pic index

- GofInfoVP9* ss = nullptr, // scalability structure

- int data_size = -1, // size of data

- uint8_t* data = nullptr) { // data pointer

- if (data_size == -1) {

- data_size = kDummyDataSize;

- data = dummy_data_.get();

- }

- VCMPacket packet;

- packet.codec = kVideoCodecVP9;

- packet.seqNum = seq_num;

- packet.frameType = keyframe ? kVideoFrameKey : kVideoFrameDelta;

- packet.isFirstPacket = first;

- packet.markerBit = last;

+ packet.isFirstPacket = first == kFirst;

+ packet.markerBit = last == kLast;

packet.sizeBytes = data_size;

packet.dataPtr = data;

- packet.video_header.codecHeader.VP9.flexible_mode = false;

- packet.video_header.codecHeader.VP9.picture_id = pid % (1 << 15);

- packet.video_header.codecHeader.VP9.temporal_idx = tid;

- packet.video_header.codecHeader.VP9.spatial_idx = sid;

- packet.video_header.codecHeader.VP9.tl0_pic_idx = tl0;

- packet.video_header.codecHeader.VP9.temporal_up_switch = up;

- if (ss != nullptr) {

- packet.video_header.codecHeader.VP9.ss_data_available = true;

- packet.video_header.codecHeader.VP9.gof = *ss;

- }

EXPECT_TRUE(packet_buffer_->InsertPacket(packet));

}

- // Insert a Vp9 packet into the packet buffer.

- void InsertVp9Flex(

- uint16_t seq_num, // packet sequence number

- bool keyframe, // is keyframe

- bool first, // is first packet of frame

- bool last, // is last packet of frame

- bool inter, // depends on S-1 layer

- int32_t pid = kNoPictureId, // picture id

- uint8_t sid = kNoSpatialIdx, // spatial id

- uint8_t tid = kNoTemporalIdx, // temporal id

- int32_t tl0 = kNoTl0PicIdx, // tl0 pic index

- std::vector<uint8_t> refs = std::vector<uint8_t>(), // frame references

- int data_size = -1, // size of data

- uint8_t* data = nullptr) { // data pointer

- if (data_size == -1) {

- data_size = kDummyDataSize;

- data = dummy_data_.get();

- }

- VCMPacket packet;

- packet.codec = kVideoCodecVP9;

- packet.seqNum = seq_num;

- packet.frameType = keyframe ? kVideoFrameKey : kVideoFrameDelta;

- packet.isFirstPacket = first;

- packet.markerBit = last;

- packet.sizeBytes = data_size;

- packet.dataPtr = data;

- packet.video_header.codecHeader.VP9.inter_layer_predicted = inter;

- packet.video_header.codecHeader.VP9.flexible_mode = true;

- packet.video_header.codecHeader.VP9.picture_id = pid % (1 << 15);

- packet.video_header.codecHeader.VP9.temporal_idx = tid;

- packet.video_header.codecHeader.VP9.spatial_idx = sid;

- packet.video_header.codecHeader.VP9.tl0_pic_idx = tl0;

- packet.video_header.codecHeader.VP9.num_ref_pics = refs.size();

- for (size_t i = 0; i < refs.size(); ++i)

- packet.video_header.codecHeader.VP9.pid_diff[i] = refs[i];

- EXPECT_TRUE(packet_buffer_->InsertPacket(packet));

- }

- // Check if a frame with picture id |pid| and spatial index |sidx| has been

- // delivered from the packet buffer, and if so, if it has the references

- // specified by |refs|.

- template <typename... T>

- void CheckReferences(uint16_t pid, uint16_t sidx, T... refs) const {

- auto frame_it = frames_from_callback_.find(std::make_pair(pid, sidx));

- if (frame_it == frames_from_callback_.end()) {

- ADD_FAILURE() << "Could not find frame with (pid:sidx): ("

- << pid << ":" << sidx << ")";

- return;

- }

- std::set<uint16_t> actual_refs;

- for (uint8_t r = 0; r < frame_it->second->num_references; ++r) {

- actual_refs.insert(frame_it->second->references[r]);

- }

- std::set<uint16_t> expected_refs;

- RefsToSet(&expected_refs, refs...);

- ASSERT_EQ(expected_refs, actual_refs);

- }

- template <typename... T>

- void CheckReferencesGeneric(uint16_t pid, T... refs) const {

- CheckReferences(pid, 0, refs...);

- }

- template <typename... T>

- void CheckReferencesVp8(uint16_t pid, T... refs) const {

- CheckReferences(pid, 0, refs...);

+ void CheckFrame(uint16_t first_seq_num) {

+ auto frame_it = frames_from_callback_.find(first_seq_num);

+ ASSERT_FALSE(frame_it == frames_from_callback_.end())

+ << "Could not find frame with first sequence number " << first_seq_num

+ << ".";

}

- template <typename... T>

- void CheckReferencesVp9(uint16_t pid, uint8_t sidx, T... refs) const {

- CheckReferences(pid, sidx, refs...);

- }

- template <typename... T>

- void RefsToSet(std::set<uint16_t>* m, uint16_t ref, T... refs) const {

- m->insert(ref);

- RefsToSet(m, refs...);

- }

- void RefsToSet(std::set<uint16_t>* m) const {}

const int kStartSize = 16;

const int kMaxSize = 64;

- const int kDummyDataSize = 4;

Random rand_;

std::unique_ptr<Clock> clock_;

- std::unique_ptr<PacketBuffer> packet_buffer_;

- struct FrameComp {

- bool operator()(const std::pair<uint16_t, uint8_t> f1,

- const std::pair<uint16_t, uint8_t> f2) const {

- if (f1.first == f2.first)

- return f1.second < f2.second;

- return f1.first < f2.first;

- }

- };

- std::map<std::pair<uint16_t, uint8_t>,

- std::unique_ptr<FrameObject>,

- FrameComp> frames_from_callback_;

- std::unique_ptr<uint8_t[]> dummy_data_;

+ rtc::scoped_refptr<PacketBuffer> packet_buffer_;

+ std::map<uint16_t, std::unique_ptr<RtpFrameObject>> frames_from_callback_;

};

TEST_F(TestPacketBuffer, InsertOnePacket) {

- VCMPacket packet;

- packet.seqNum = Rand();

- EXPECT_TRUE(packet_buffer_->InsertPacket(packet));

+ uint16_t seq_num = Rand();

+ InsertPacket(seq_num, kKeyFrame, kFirst, kLast);

}

TEST_F(TestPacketBuffer, InsertMultiplePackets) {

- VCMPacket packet;

- packet.seqNum = Rand();

- EXPECT_TRUE(packet_buffer_->InsertPacket(packet));

- ++packet.seqNum;

- EXPECT_TRUE(packet_buffer_->InsertPacket(packet));

- ++packet.seqNum;

- EXPECT_TRUE(packet_buffer_->InsertPacket(packet));

+ uint16_t seq_num = Rand();

+ InsertPacket(seq_num, kKeyFrame, kFirst, kLast);

+ InsertPacket(seq_num + 1, kKeyFrame, kFirst, kLast);

+ InsertPacket(seq_num + 2, kKeyFrame, kFirst, kLast);

+ InsertPacket(seq_num + 3, kKeyFrame, kFirst, kLast);

}

TEST_F(TestPacketBuffer, InsertDuplicatePacket) {

- VCMPacket packet;

- packet.seqNum = Rand();

- EXPECT_TRUE(packet_buffer_->InsertPacket(packet));

- ++packet.seqNum;

- EXPECT_TRUE(packet_buffer_->InsertPacket(packet));

+ uint16_t seq_num = Rand();

+ InsertPacket(seq_num, kKeyFrame, kFirst, kLast);

}

TEST_F(TestPacketBuffer, NackCount) {

@@ -303,8 +111,6 @@ TEST_F(TestPacketBuffer, NackCount) {

packet.frameType = kVideoFrameKey;

packet.isFirstPacket = true;

packet.markerBit = false;

- packet.dataPtr = dummy_data_.get();

- packet.sizeBytes = kDummyDataSize;

packet.timesNacked = 0;

packet_buffer_->InsertPacket(packet);

@@ -325,20 +131,18 @@ TEST_F(TestPacketBuffer, NackCount) {

ASSERT_EQ(1UL, frames_from_callback_.size());

- FrameObject* frame = frames_from_callback_.begin()->second.get();

- RtpFrameObject* rtp_frame = static_cast<RtpFrameObject*>(frame);

- EXPECT_EQ(3, rtp_frame->times_nacked());

+ RtpFrameObject* frame = frames_from_callback_.begin()->second.get();

+ EXPECT_EQ(3, frame->times_nacked());

}

TEST_F(TestPacketBuffer, FrameSize) {

uint16_t seq_num = Rand();

uint8_t data[] = {1, 2, 3, 4, 5};

- // seq_num , kf, frst, lst, size, data

- InsertGeneric(seq_num , kT, kT , kF , 5 , data);

- InsertGeneric(seq_num + 1, kT, kF , kF , 5 , data);

- InsertGeneric(seq_num + 2, kT, kF , kF , 5 , data);

- InsertGeneric(seq_num + 3, kT, kF , kT , 5 , data);

+ InsertPacket(seq_num, kKeyFrame, kFirst, kNotLast, 5, data);

+ InsertPacket(seq_num + 1, kKeyFrame, kNotFirst, kNotLast, 5, data);

+ InsertPacket(seq_num + 2, kKeyFrame, kNotFirst, kNotLast, 5, data);

+ InsertPacket(seq_num + 3, kKeyFrame, kNotFirst, kLast, 5, data);

ASSERT_EQ(1UL, frames_from_callback_.size());

EXPECT_EQ(20UL, frames_from_callback_.begin()->second->size);

@@ -348,8 +152,7 @@ TEST_F(TestPacketBuffer, ExpandBuffer) {

uint16_t seq_num = Rand();

for (int i = 0; i < kStartSize + 1; ++i) {

- // seq_num , kf, frst, lst

- InsertGeneric(seq_num + i, kT, kT , kT);

+ InsertPacket(seq_num + i, kKeyFrame, kFirst, kLast);

}

@@ -357,58 +160,55 @@ TEST_F(TestPacketBuffer, ExpandBufferOverflow) {

uint16_t seq_num = Rand();

for (int i = 0; i < kMaxSize; ++i) {

- // seq_num , kf, frst, lst

- InsertGeneric(seq_num + i, kT, kT , kT);

+ InsertPacket(seq_num + i, kKeyFrame, kFirst, kLast);

}

VCMPacket packet;

packet.seqNum = seq_num + kMaxSize + 1;

- packet.sizeBytes = 1;

EXPECT_FALSE(packet_buffer_->InsertPacket(packet));

}

-TEST_F(TestPacketBuffer, GenericOnePacketOneFrame) {

- // seq_num, kf, frst, lst

- InsertGeneric(Rand() , kT, kT , kT);

+TEST_F(TestPacketBuffer, OnePacketOneFrame) {

+ uint16_t seq_num = Rand();

+ InsertPacket(seq_num, kKeyFrame, kFirst, kLast);

ASSERT_EQ(1UL, frames_from_callback_.size());

+ CheckFrame(seq_num);

}

-TEST_F(TestPacketBuffer, GenericTwoPacketsTwoFrames) {

+TEST_F(TestPacketBuffer, TwoPacketsTwoFrames) {

uint16_t seq_num = Rand();

- // seq_num , kf, frst, lst

- InsertGeneric(seq_num , kT, kT , kT);

- InsertGeneric(seq_num + 1, kT, kT , kT);

+ InsertPacket(seq_num, kKeyFrame, kFirst, kLast);

+ InsertPacket(seq_num + 1, kKeyFrame, kFirst, kLast);

EXPECT_EQ(2UL, frames_from_callback_.size());

+ CheckFrame(seq_num);

+ CheckFrame(seq_num + 1);

}

-TEST_F(TestPacketBuffer, GenericTwoPacketsOneFrames) {

+TEST_F(TestPacketBuffer, TwoPacketsOneFrames) {

uint16_t seq_num = Rand();

- // seq_num , kf, frst, lst

- InsertGeneric(seq_num , kT, kT , kF);

- InsertGeneric(seq_num + 1, kT, kF , kT);

+ InsertPacket(seq_num, kKeyFrame, kFirst, kNotLast);

+ InsertPacket(seq_num + 1, kKeyFrame, kNotFirst, kLast);

EXPECT_EQ(1UL, frames_from_callback_.size());

+ CheckFrame(seq_num);

}

-TEST_F(TestPacketBuffer, GenericThreePacketReorderingOneFrame) {

+TEST_F(TestPacketBuffer, ThreePacketReorderingOneFrame) {

uint16_t seq_num = Rand();

- // seq_num , kf, frst, lst

- InsertGeneric(seq_num , kT, kT , kF);

- InsertGeneric(seq_num + 2, kT, kF , kT);

- InsertGeneric(seq_num + 1, kT, kF , kF);

+ InsertPacket(seq_num, kKeyFrame, kFirst, kNotLast);

+ InsertPacket(seq_num + 2, kKeyFrame, kNotFirst, kLast);

+ InsertPacket(seq_num + 1, kKeyFrame, kNotFirst, kNotLast);

EXPECT_EQ(1UL, frames_from_callback_.size());

+ CheckFrame(seq_num);

}

TEST_F(TestPacketBuffer, DiscardOldPacket) {

- uint16_t seq_num = Rand();

VCMPacket packet;

- packet.dataPtr = dummy_data_.get();

- packet.sizeBytes = kDummyDataSize;

packet.seqNum = Rand();

EXPECT_TRUE(packet_buffer_->InsertPacket(packet));

packet.seqNum += 2;

@@ -421,15 +221,13 @@ TEST_F(TestPacketBuffer, DiscardOldPacket) {

++packet.seqNum;

EXPECT_FALSE(packet_buffer_->InsertPacket(packet));

- packet_buffer_->ClearTo(seq_num + 1);

+ packet_buffer_->ClearTo(packet.seqNum + 1);

EXPECT_TRUE(packet_buffer_->InsertPacket(packet));

}

TEST_F(TestPacketBuffer, DiscardMultipleOldPackets) {

uint16_t seq_num = Rand();

VCMPacket packet;

- packet.dataPtr = dummy_data_.get();

- packet.sizeBytes = kDummyDataSize;

packet.seqNum = seq_num;

EXPECT_TRUE(packet_buffer_->InsertPacket(packet));

packet.seqNum += 2;

@@ -451,36 +249,34 @@ TEST_F(TestPacketBuffer, DiscardMultipleOldPackets) {

}

-TEST_F(TestPacketBuffer, GenericFrames) {

+TEST_F(TestPacketBuffer, Frames) {

uint16_t seq_num = Rand();

- // seq_num , keyf , first, last

- InsertGeneric(seq_num , true , true , true);

- InsertGeneric(seq_num + 1, false, true , true);

- InsertGeneric(seq_num + 2, false, true , true);

- InsertGeneric(seq_num + 3, false, true , true);

+ InsertPacket(seq_num, kKeyFrame, kFirst, kLast);

+ InsertPacket(seq_num + 1, kDeltaFrame, kFirst, kLast);

+ InsertPacket(seq_num + 2, kDeltaFrame, kFirst, kLast);

+ InsertPacket(seq_num + 3, kDeltaFrame, kFirst, kLast);

ASSERT_EQ(4UL, frames_from_callback_.size());

- CheckReferencesGeneric(seq_num);

- CheckReferencesGeneric(seq_num + 1, seq_num);

- CheckReferencesGeneric(seq_num + 2, seq_num + 1);

- CheckReferencesGeneric(seq_num + 3, seq_num + 2);

+ CheckFrame(seq_num);

+ CheckFrame(seq_num + 1);

+ CheckFrame(seq_num + 2);

+ CheckFrame(seq_num + 3);

}

-TEST_F(TestPacketBuffer, GenericFramesReordered) {

+TEST_F(TestPacketBuffer, FramesReordered) {

uint16_t seq_num = Rand();

- // seq_num , keyf , first, last

- InsertGeneric(seq_num + 1, false, true , true);

- InsertGeneric(seq_num , true , true , true);

- InsertGeneric(seq_num + 3, false, true , true);

- InsertGeneric(seq_num + 2, false, true , true);

+ InsertPacket(seq_num + 1, kDeltaFrame, kFirst, kLast);

+ InsertPacket(seq_num, kKeyFrame, kFirst, kLast);

+ InsertPacket(seq_num + 3, kDeltaFrame, kFirst, kLast);

+ InsertPacket(seq_num + 2, kDeltaFrame, kFirst, kLast);

ASSERT_EQ(4UL, frames_from_callback_.size());

- CheckReferencesGeneric(seq_num);

- CheckReferencesGeneric(seq_num + 1, seq_num);

- CheckReferencesGeneric(seq_num + 2, seq_num + 1);

- CheckReferencesGeneric(seq_num + 3, seq_num + 2);

+ CheckFrame(seq_num);

+ CheckFrame(seq_num + 1);

+ CheckFrame(seq_num + 2);

+ CheckFrame(seq_num + 3);

}

TEST_F(TestPacketBuffer, GetBitstreamFromFrame) {

@@ -495,63 +291,62 @@ TEST_F(TestPacketBuffer, GetBitstreamFromFrame) {

uint16_t seq_num = Rand();

- // seq_num , kf, frst, lst, data_size , data

- InsertGeneric(seq_num , kT, kT , kF , sizeof(many) , many);

- InsertGeneric(seq_num + 1, kF, kF , kF , sizeof(bitstream), bitstream);

- InsertGeneric(seq_num + 2, kF, kF , kF , sizeof(such) , such);

- InsertGeneric(seq_num + 3, kF, kF , kT , sizeof(data) , data);

+ InsertPacket(seq_num, kKeyFrame, kFirst, kNotLast, sizeof(many), many);

+ InsertPacket(seq_num + 1, kDeltaFrame, kNotFirst, kNotLast, sizeof(bitstream),

+ bitstream);

+ InsertPacket(seq_num + 2, kDeltaFrame, kNotFirst, kNotLast, sizeof(such),

+ such);

+ InsertPacket(seq_num + 3, kDeltaFrame, kNotFirst, kLast, sizeof(data), data);

ASSERT_EQ(1UL, frames_from_callback_.size());

- CheckReferencesVp8(seq_num + 3);

- EXPECT_TRUE(frames_from_callback_[std::make_pair(seq_num + 3, 0)]->

- GetBitstream(result));

+ CheckFrame(seq_num);

+ EXPECT_TRUE(frames_from_callback_[seq_num]->GetBitstream(result));

EXPECT_EQ(memcmp(result, "many bitstream, such data", sizeof(result)), 0);

}

TEST_F(TestPacketBuffer, FreeSlotsOnFrameDestruction) {

uint16_t seq_num = Rand();

- // seq_num , kf, frst, lst

- InsertGeneric(seq_num , kT, kT , kF);

- InsertGeneric(seq_num + 1, kF, kF , kF);

- InsertGeneric(seq_num + 2, kF, kF , kT);

+ InsertPacket(seq_num, kKeyFrame, kFirst, kNotLast);

+ InsertPacket(seq_num + 1, kDeltaFrame, kNotFirst, kNotLast);

+ InsertPacket(seq_num + 2, kDeltaFrame, kNotFirst, kLast);

EXPECT_EQ(1UL, frames_from_callback_.size());

+ CheckFrame(seq_num);

frames_from_callback_.clear();

- // seq_num , kf, frst, lst

- InsertGeneric(seq_num , kT, kT , kF);

- InsertGeneric(seq_num + 1, kF, kF , kF);

- InsertGeneric(seq_num + 2, kF, kF , kT);

+ // Insert frame that fills the whole buffer.

+ InsertPacket(seq_num + 3, kKeyFrame, kFirst, kNotLast);

+ for (int i = 0; i < kMaxSize - 2; ++i)

+ InsertPacket(seq_num + i + 4, kDeltaFrame, kNotFirst, kNotLast);

+ InsertPacket(seq_num + kMaxSize + 2, kKeyFrame, kNotFirst, kLast);

EXPECT_EQ(1UL, frames_from_callback_.size());

+ CheckFrame(seq_num + 3);

}

TEST_F(TestPacketBuffer, Clear) {

uint16_t seq_num = Rand();

- // seq_num , kf, frst, lst

- InsertGeneric(seq_num , kT, kT , kF);

- InsertGeneric(seq_num + 1, kF, kF , kF);

- InsertGeneric(seq_num + 2, kF, kF , kT);

+ InsertPacket(seq_num, kKeyFrame, kFirst, kNotLast);

+ InsertPacket(seq_num + 1, kDeltaFrame, kNotFirst, kNotLast);

+ InsertPacket(seq_num + 2, kDeltaFrame, kNotFirst, kLast);

EXPECT_EQ(1UL, frames_from_callback_.size());

+ CheckFrame(seq_num);

packet_buffer_->Clear();

- // seq_num , kf, frst, lst

- InsertGeneric(seq_num + kStartSize , kT, kT , kF);

- InsertGeneric(seq_num + kStartSize + 1, kF, kF , kF);

- InsertGeneric(seq_num + kStartSize + 2, kF, kF , kT);

+ InsertPacket(seq_num + kStartSize, kKeyFrame, kFirst, kNotLast);

+ InsertPacket(seq_num + kStartSize + 1, kDeltaFrame, kNotFirst, kNotLast);

+ InsertPacket(seq_num + kStartSize + 2, kDeltaFrame, kNotFirst, kLast);

EXPECT_EQ(2UL, frames_from_callback_.size());

+ CheckFrame(seq_num + kStartSize);

}

TEST_F(TestPacketBuffer, InvalidateFrameByClearing) {

VCMPacket packet;

- packet.dataPtr = dummy_data_.get();

- packet.sizeBytes = kDummyDataSize;

- packet.codec = kVideoCodecGeneric;

packet.frameType = kVideoFrameKey;

- packet.isFirstPacket = kT;

- packet.markerBit = kT;

+ packet.isFirstPacket = true;

+ packet.markerBit = true;

packet.seqNum = Rand();

EXPECT_TRUE(packet_buffer_->InsertPacket(packet));

ASSERT_EQ(1UL, frames_from_callback_.size());

@@ -560,1051 +355,5 @@ TEST_F(TestPacketBuffer, InvalidateFrameByClearing) {

EXPECT_FALSE(frames_from_callback_.begin()->second->GetBitstream(nullptr));

}

-TEST_F(TestPacketBuffer, PaddingPackets) {

- uint16_t seq_num = Rand();

- // seq_num , kf, frst, lst

- InsertGeneric(seq_num , kT, kT , kT);

- InsertGeneric(seq_num + 1, kF, kF , kF, 0, nullptr);

- InsertGeneric(seq_num + 3, kF, kT , kT);

- EXPECT_EQ(1UL, frames_from_callback_.size());

- InsertGeneric(seq_num + 2, kF, kF , kF, 0, nullptr);

- EXPECT_EQ(2UL, frames_from_callback_.size());

-TEST_F(TestPacketBuffer, PaddingPacketsReordered) {

- uint16_t seq_num = Rand();

- // seq_num , kf, frst, lst

- InsertGeneric(seq_num , kT, kT , kT);

- InsertGeneric(seq_num + 1, kF, kF , kF, 0, nullptr);

- InsertGeneric(seq_num + 2, kF, kT , kF);

- InsertGeneric(seq_num + 4, kF, kF , kF, 0, nullptr);

- InsertGeneric(seq_num + 3, kF, kF , kT);

- EXPECT_EQ(2UL, frames_from_callback_.size());

- CheckReferencesGeneric(seq_num);

- CheckReferencesGeneric(seq_num + 3, seq_num);

-TEST_F(TestPacketBuffer, PaddingPacketsReorderedMultipleKeyframes) {

- uint16_t seq_num = Rand();

- // seq_num , kf, frst, lst

- InsertGeneric(seq_num , kT, kT , kT);

- InsertGeneric(seq_num + 2, kF, kT , kF);

- InsertGeneric(seq_num + 1, kF, kF , kF, 0, nullptr);

- InsertGeneric(seq_num + 4, kF, kF , kF, 0, nullptr);

- InsertGeneric(seq_num + 5, kT, kT , kT);

- InsertGeneric(seq_num + 3, kF, kF , kT);

- InsertGeneric(seq_num + 6, kF, kF , kF, 0, nullptr);

- InsertGeneric(seq_num + 9, kF, kF , kF, 0, nullptr);

- InsertGeneric(seq_num + 8, kF, kF , kT);

- InsertGeneric(seq_num + 7, kF, kT , kF);

- EXPECT_EQ(4UL, frames_from_callback_.size());

-TEST_F(TestPacketBuffer, Vp8NoPictureId) {

- uint16_t seq_num = Rand();

- // seq_num , kf, frst, lst

- InsertVp8(seq_num , kT, kT , kF);

- InsertVp8(seq_num + 1 , kF, kF , kF);

- InsertVp8(seq_num + 2 , kF, kF , kT);

- ASSERT_EQ(1UL, frames_from_callback_.size());

- InsertVp8(seq_num + 3 , kF, kT , kF);

- InsertVp8(seq_num + 4 , kF, kF , kT);

- ASSERT_EQ(2UL, frames_from_callback_.size());

- InsertVp8(seq_num + 5 , kF, kT , kF);

- InsertVp8(seq_num + 6 , kF, kF , kF);

- InsertVp8(seq_num + 7 , kF, kF , kF);

- InsertVp8(seq_num + 8 , kF, kF , kT);

- ASSERT_EQ(3UL, frames_from_callback_.size());

- InsertVp8(seq_num + 9 , kF, kT , kT);

- ASSERT_EQ(4UL, frames_from_callback_.size());

- InsertVp8(seq_num + 10, kF, kT , kF);

- InsertVp8(seq_num + 11, kF, kF , kT);

- ASSERT_EQ(5UL, frames_from_callback_.size());

- InsertVp8(seq_num + 12, kT, kT , kT);

- ASSERT_EQ(6UL, frames_from_callback_.size());

- InsertVp8(seq_num + 13, kF, kT , kF);

- InsertVp8(seq_num + 14, kF, kF , kF);

- InsertVp8(seq_num + 15, kF, kF , kF);

- InsertVp8(seq_num + 16, kF, kF , kF);

- InsertVp8(seq_num + 17, kF, kF , kT);

- ASSERT_EQ(7UL, frames_from_callback_.size());

- InsertVp8(seq_num + 18, kF, kT , kT);

- ASSERT_EQ(8UL, frames_from_callback_.size());

- InsertVp8(seq_num + 19, kF, kT , kF);

- InsertVp8(seq_num + 20, kF, kF , kT);

- ASSERT_EQ(9UL, frames_from_callback_.size());

- InsertVp8(seq_num + 21, kF, kT , kT);

- ASSERT_EQ(10UL, frames_from_callback_.size());

- CheckReferencesVp8(seq_num + 2);

- CheckReferencesVp8(seq_num + 4, seq_num + 2);

- CheckReferencesVp8(seq_num + 8, seq_num + 4);

- CheckReferencesVp8(seq_num + 9, seq_num + 8);

- CheckReferencesVp8(seq_num + 11, seq_num + 9);

- CheckReferencesVp8(seq_num + 12);

- CheckReferencesVp8(seq_num + 17, seq_num + 12);

- CheckReferencesVp8(seq_num + 18, seq_num + 17);

- CheckReferencesVp8(seq_num + 20, seq_num + 18);

- CheckReferencesVp8(seq_num + 21, seq_num + 20);

-TEST_F(TestPacketBuffer, Vp8NoPictureIdReordered) {

- uint16_t seq_num = 0xfffa;

- // seq_num , kf, frst, lst

- InsertVp8(seq_num + 1 , kF, kF , kF);

- InsertVp8(seq_num , kT, kT , kF);

- InsertVp8(seq_num + 2 , kF, kF , kT);

- InsertVp8(seq_num + 4 , kF, kF , kT);

- InsertVp8(seq_num + 6 , kF, kF , kF);

- InsertVp8(seq_num + 3 , kF, kT , kF);

- InsertVp8(seq_num + 7 , kF, kF , kF);

- InsertVp8(seq_num + 5 , kF, kT , kF);

- InsertVp8(seq_num + 9 , kF, kT , kT);

- InsertVp8(seq_num + 10, kF, kT , kF);

- InsertVp8(seq_num + 8 , kF, kF , kT);

- InsertVp8(seq_num + 13, kF, kT , kF);

- InsertVp8(seq_num + 14, kF, kF , kF);

- InsertVp8(seq_num + 12, kT, kT , kT);

- InsertVp8(seq_num + 11, kF, kF , kT);

- InsertVp8(seq_num + 16, kF, kF , kF);

- InsertVp8(seq_num + 19, kF, kT , kF);

- InsertVp8(seq_num + 15, kF, kF , kF);

- InsertVp8(seq_num + 17, kF, kF , kT);

- InsertVp8(seq_num + 20, kF, kF , kT);

- InsertVp8(seq_num + 21, kF, kT , kT);

- InsertVp8(seq_num + 18, kF, kT , kT);

- ASSERT_EQ(10UL, frames_from_callback_.size());

- CheckReferencesVp8(seq_num + 2);

- CheckReferencesVp8(seq_num + 4, seq_num + 2);

- CheckReferencesVp8(seq_num + 8, seq_num + 4);

- CheckReferencesVp8(seq_num + 9, seq_num + 8);

- CheckReferencesVp8(seq_num + 11, seq_num + 9);

- CheckReferencesVp8(seq_num + 12);

- CheckReferencesVp8(seq_num + 17, seq_num + 12);

- CheckReferencesVp8(seq_num + 18, seq_num + 17);

- CheckReferencesVp8(seq_num + 20, seq_num + 18);

- CheckReferencesVp8(seq_num + 21, seq_num + 20);

-TEST_F(TestPacketBuffer, Vp8KeyFrameReferences) {

- uint16_t pid = Rand();

- // seq_num, kf, frst, lst, sync, pid, tid, tl0

- InsertVp8(Rand() , kT, kT , kT , kF , pid, 0 , 0);

- ASSERT_EQ(1UL, frames_from_callback_.size());

- CheckReferencesVp8(pid);

-// Test with 1 temporal layer.

-TEST_F(TestPacketBuffer, Vp8TemporalLayers_0) {

- uint16_t pid = Rand();

- uint16_t seq_num = Rand();

- // seq_num , kf, frst, lst, sync, pid , tid, tl0

- InsertVp8(seq_num , kT, kT , kT , kF , pid , 0 , 1);

- InsertVp8(seq_num + 1, kF, kT , kT , kF , pid + 1, 0 , 2);

- InsertVp8(seq_num + 2, kF, kT , kT , kF , pid + 2, 0 , 3);

- InsertVp8(seq_num + 3, kF, kT , kT , kF , pid + 3, 0 , 4);

- ASSERT_EQ(4UL, frames_from_callback_.size());

- CheckReferencesVp8(pid);

- CheckReferencesVp8(pid + 1, pid);

- CheckReferencesVp8(pid + 2, pid + 1);

- CheckReferencesVp8(pid + 3, pid + 2);

-// Test with 1 temporal layer.

-TEST_F(TestPacketBuffer, Vp8TemporalLayersReordering_0) {

- uint16_t pid = Rand();

- uint16_t seq_num = Rand();

- // seq_num , kf, frst, lst, sync, pid , tid, tl0

- InsertVp8(seq_num , kT, kT , kT , kF , pid , 0 , 1);

- InsertVp8(seq_num + 1, kF, kT , kT , kF , pid + 1, 0 , 2);

- InsertVp8(seq_num + 3, kF, kT , kT , kF , pid + 3, 0 , 4);

- InsertVp8(seq_num + 2, kF, kT , kT , kF , pid + 2, 0 , 3);

- InsertVp8(seq_num + 5, kF, kT , kT , kF , pid + 5, 0 , 6);

- InsertVp8(seq_num + 6, kF, kT , kT , kF , pid + 6, 0 , 7);

- InsertVp8(seq_num + 4, kF, kT , kT , kF , pid + 4, 0 , 5);

- ASSERT_EQ(7UL, frames_from_callback_.size());

- CheckReferencesVp8(pid);

- CheckReferencesVp8(pid + 1, pid);

- CheckReferencesVp8(pid + 2, pid + 1);

- CheckReferencesVp8(pid + 3, pid + 2);

- CheckReferencesVp8(pid + 4, pid + 3);

- CheckReferencesVp8(pid + 5, pid + 4);

- CheckReferencesVp8(pid + 6, pid + 5);

-// Test with 2 temporal layers in a 01 pattern.

-TEST_F(TestPacketBuffer, Vp8TemporalLayers_01) {

- uint16_t pid = Rand();

- uint16_t seq_num = Rand();

- // seq_num , kf, frst, lst, sync, pid , tid, tl0

- InsertVp8(seq_num , kT, kT , kT , kF , pid , 0, 255);

- InsertVp8(seq_num + 1, kF, kT , kT , kT , pid + 1, 1, 255);

- InsertVp8(seq_num + 2, kF, kT , kT , kF , pid + 2, 0, 0);

- InsertVp8(seq_num + 3, kF, kT , kT , kF , pid + 3, 1, 0);

- ASSERT_EQ(4UL, frames_from_callback_.size());

- CheckReferencesVp8(pid);

- CheckReferencesVp8(pid + 1, pid);

- CheckReferencesVp8(pid + 2, pid);

- CheckReferencesVp8(pid + 3, pid + 1, pid + 2);

-// Test with 2 temporal layers in a 01 pattern.

-TEST_F(TestPacketBuffer, Vp8TemporalLayersReordering_01) {

- uint16_t pid = Rand();

- uint16_t seq_num = Rand();

- // seq_num , kf, frst, lst, sync, pid , tid, tl0

- InsertVp8(seq_num + 1, kF, kT , kT , kT , pid + 1, 1 , 255);

- InsertVp8(seq_num , kT, kT , kT , kF , pid , 0 , 255);

- InsertVp8(seq_num + 3, kF, kT , kT , kF , pid + 3, 1 , 0);

- InsertVp8(seq_num + 5, kF, kT , kT , kF , pid + 5, 1 , 1);

- InsertVp8(seq_num + 2, kF, kT , kT , kF , pid + 2, 0 , 0);

- InsertVp8(seq_num + 4, kF, kT , kT , kF , pid + 4, 0 , 1);

- InsertVp8(seq_num + 6, kF, kT , kT , kF , pid + 6, 0 , 2);

- InsertVp8(seq_num + 7, kF, kT , kT , kF , pid + 7, 1 , 2);

- ASSERT_EQ(8UL, frames_from_callback_.size());

- CheckReferencesVp8(pid);

- CheckReferencesVp8(pid + 1, pid);

- CheckReferencesVp8(pid + 2, pid);

- CheckReferencesVp8(pid + 3, pid + 1, pid + 2);

- CheckReferencesVp8(pid + 4, pid + 2);

- CheckReferencesVp8(pid + 5, pid + 3, pid + 4);

- CheckReferencesVp8(pid + 6, pid + 4);

- CheckReferencesVp8(pid + 7, pid + 5, pid + 6);

-// Test with 3 temporal layers in a 0212 pattern.

-TEST_F(TestPacketBuffer, Vp8TemporalLayers_0212) {

- uint16_t pid = Rand();

- uint16_t seq_num = Rand();

- // seq_num , kf, frst, lst, sync, pid , tid, tl0

- InsertVp8(seq_num , kT, kT , kT , kF , pid , 0 , 55);

- InsertVp8(seq_num + 1 , kF, kT , kT , kT , pid + 1 , 2 , 55);

- InsertVp8(seq_num + 2 , kF, kT , kT , kT , pid + 2 , 1 , 55);

- InsertVp8(seq_num + 3 , kF, kT , kT , kF , pid + 3 , 2 , 55);

- InsertVp8(seq_num + 4 , kF, kT , kT , kF , pid + 4 , 0 , 56);

- InsertVp8(seq_num + 5 , kF, kT , kT , kF , pid + 5 , 2 , 56);

- InsertVp8(seq_num + 6 , kF, kT , kT , kF , pid + 6 , 1 , 56);

- InsertVp8(seq_num + 7 , kF, kT , kT , kF , pid + 7 , 2 , 56);

- InsertVp8(seq_num + 8 , kF, kT , kT , kF , pid + 8 , 0 , 57);

- InsertVp8(seq_num + 9 , kF, kT , kT , kT , pid + 9 , 2 , 57);

- InsertVp8(seq_num + 10, kF, kT , kT , kT , pid + 10, 1 , 57);

- InsertVp8(seq_num + 11, kF, kT , kT , kF , pid + 11, 2 , 57);

- ASSERT_EQ(12UL, frames_from_callback_.size());

- CheckReferencesVp8(pid);

- CheckReferencesVp8(pid + 1 , pid);

- CheckReferencesVp8(pid + 2 , pid);

- CheckReferencesVp8(pid + 3 , pid, pid + 1, pid + 2);

- CheckReferencesVp8(pid + 4 , pid);

- CheckReferencesVp8(pid + 5 , pid + 2, pid + 3, pid + 4);

- CheckReferencesVp8(pid + 6 , pid + 2, pid + 4);

- CheckReferencesVp8(pid + 7 , pid + 4, pid + 5, pid + 6);

- CheckReferencesVp8(pid + 8 , pid + 4);

- CheckReferencesVp8(pid + 9 , pid + 8);

- CheckReferencesVp8(pid + 10, pid + 8);

- CheckReferencesVp8(pid + 11, pid + 8, pid + 9, pid + 10);

-// Test with 3 temporal layers in a 0212 pattern.

-TEST_F(TestPacketBuffer, Vp8TemporalLayersReordering_0212) {

- uint16_t pid = 126;