Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(740)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/cast/video_sender/video_encoder_impl_unittest.cc

Issue 288103002: [Cast] EncodedAudioFrame+EncodedVideoFrame+reference_time --> EncodedFrame (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 7 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
« no previous file with comments | « media/cast/video_sender/video_encoder_impl.cc ('k') | media/cast/video_sender/video_sender.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cast/video_sender/video_encoder_impl_unittest.cc
diff --git a/media/cast/video_sender/video_encoder_impl_unittest.cc b/media/cast/video_sender/video_encoder_impl_unittest.cc
index 05772398f4c66803e283fab23aca0c3c583417a0..b1a5cb8cefc8d1d54c9a8a49d5ab7317cda0bcdf 100644
--- a/media/cast/video_sender/video_encoder_impl_unittest.cc
+++ b/media/cast/video_sender/video_encoder_impl_unittest.cc
@@ -26,24 +26,26 @@ class TestVideoEncoderCallback
public:
TestVideoEncoderCallback() {}
- void SetExpectedResult(bool expected_key_frame,
- uint8 expected_frame_id,
- uint8 expected_last_referenced_frame_id,
+ void SetExpectedResult(uint32 expected_frame_id,
+ uint32 expected_last_referenced_frame_id,
const base::TimeTicks& expected_capture_time) {
- expected_key_frame_ = expected_key_frame;
expected_frame_id_ = expected_frame_id;
expected_last_referenced_frame_id_ = expected_last_referenced_frame_id;
expected_capture_time_ = expected_capture_time;
}
void DeliverEncodedVideoFrame(
- scoped_ptr<transport::EncodedVideoFrame> encoded_frame,
- const base::TimeTicks& capture_time) {
- EXPECT_EQ(expected_key_frame_, encoded_frame->key_frame);
+ scoped_ptr<transport::EncodedFrame> encoded_frame) {
+ if (expected_frame_id_ == expected_last_referenced_frame_id_) {
+ EXPECT_EQ(transport::EncodedFrame::KEY, encoded_frame->dependency);
+ } else {
+ EXPECT_EQ(transport::EncodedFrame::DEPENDENT,
+ encoded_frame->dependency);
+ }
EXPECT_EQ(expected_frame_id_, encoded_frame->frame_id);
EXPECT_EQ(expected_last_referenced_frame_id_,
- encoded_frame->last_referenced_frame_id);
- EXPECT_EQ(expected_capture_time_, capture_time);
+ encoded_frame->referenced_frame_id);
+ EXPECT_EQ(expected_capture_time_, encoded_frame->reference_time);
}
protected:
@@ -52,9 +54,8 @@ class TestVideoEncoderCallback
private:
friend class base::RefCountedThreadSafe<TestVideoEncoderCallback>;
- bool expected_key_frame_;
- uint8 expected_frame_id_;
- uint8 expected_last_referenced_frame_id_;
+ uint32 expected_frame_id_;
+ uint32 expected_last_referenced_frame_id_;
base::TimeTicks expected_capture_time_;
DISALLOW_COPY_AND_ASSIGN(TestVideoEncoderCallback);
@@ -128,21 +129,21 @@ TEST_F(VideoEncoderImplTest, EncodePattern30fpsRunningOutOfAck) {
base::TimeTicks capture_time;
capture_time += base::TimeDelta::FromMilliseconds(33);
- test_video_encoder_callback_->SetExpectedResult(true, 0, 0, capture_time);
+ test_video_encoder_callback_->SetExpectedResult(0, 0, capture_time);
EXPECT_TRUE(video_encoder_->EncodeVideoFrame(
video_frame_, capture_time, frame_encoded_callback));
task_runner_->RunTasks();
capture_time += base::TimeDelta::FromMilliseconds(33);
video_encoder_->LatestFrameIdToReference(0);
- test_video_encoder_callback_->SetExpectedResult(false, 1, 0, capture_time);
+ test_video_encoder_callback_->SetExpectedResult(1, 0, capture_time);
EXPECT_TRUE(video_encoder_->EncodeVideoFrame(
video_frame_, capture_time, frame_encoded_callback));
task_runner_->RunTasks();
capture_time += base::TimeDelta::FromMilliseconds(33);
video_encoder_->LatestFrameIdToReference(1);
- test_video_encoder_callback_->SetExpectedResult(false, 2, 1, capture_time);
+ test_video_encoder_callback_->SetExpectedResult(2, 1, capture_time);
EXPECT_TRUE(video_encoder_->EncodeVideoFrame(
video_frame_, capture_time, frame_encoded_callback));
task_runner_->RunTasks();
@@ -151,7 +152,7 @@ TEST_F(VideoEncoderImplTest, EncodePattern30fpsRunningOutOfAck) {
for (int i = 3; i < 6; ++i) {
capture_time += base::TimeDelta::FromMilliseconds(33);
- test_video_encoder_callback_->SetExpectedResult(false, i, 2, capture_time);
+ test_video_encoder_callback_->SetExpectedResult(i, 2, capture_time);
EXPECT_TRUE(video_encoder_->EncodeVideoFrame(
video_frame_, capture_time, frame_encoded_callback));
task_runner_->RunTasks();
@@ -170,21 +171,21 @@ TEST_F(VideoEncoderImplTest, DISABLED_EncodePattern60fpsRunningOutOfAck) {
test_video_encoder_callback_.get());
capture_time += base::TimeDelta::FromMilliseconds(33);
- test_video_encoder_callback_->SetExpectedResult(true, 0, 0, capture_time);
+ test_video_encoder_callback_->SetExpectedResult(0, 0, capture_time);
EXPECT_TRUE(video_encoder_->EncodeVideoFrame(
video_frame_, capture_time, frame_encoded_callback));
task_runner_->RunTasks();
video_encoder_->LatestFrameIdToReference(0);
capture_time += base::TimeDelta::FromMilliseconds(33);
- test_video_encoder_callback_->SetExpectedResult(false, 1, 0, capture_time);
+ test_video_encoder_callback_->SetExpectedResult(1, 0, capture_time);
EXPECT_TRUE(video_encoder_->EncodeVideoFrame(
video_frame_, capture_time, frame_encoded_callback));
task_runner_->RunTasks();
video_encoder_->LatestFrameIdToReference(1);
capture_time += base::TimeDelta::FromMilliseconds(33);
- test_video_encoder_callback_->SetExpectedResult(false, 2, 0, capture_time);
+ test_video_encoder_callback_->SetExpectedResult(2, 0, capture_time);
EXPECT_TRUE(video_encoder_->EncodeVideoFrame(
video_frame_, capture_time, frame_encoded_callback));
task_runner_->RunTasks();
@@ -193,7 +194,7 @@ TEST_F(VideoEncoderImplTest, DISABLED_EncodePattern60fpsRunningOutOfAck) {
for (int i = 3; i < 9; ++i) {
capture_time += base::TimeDelta::FromMilliseconds(33);
- test_video_encoder_callback_->SetExpectedResult(false, i, 2, capture_time);
+ test_video_encoder_callback_->SetExpectedResult(i, 2, capture_time);
EXPECT_TRUE(video_encoder_->EncodeVideoFrame(
video_frame_, capture_time, frame_encoded_callback));
task_runner_->RunTasks();
@@ -212,35 +213,35 @@ TEST_F(VideoEncoderImplTest,
test_video_encoder_callback_.get());
capture_time += base::TimeDelta::FromMilliseconds(33);
- test_video_encoder_callback_->SetExpectedResult(true, 0, 0, capture_time);
+ test_video_encoder_callback_->SetExpectedResult(0, 0, capture_time);
EXPECT_TRUE(video_encoder_->EncodeVideoFrame(
video_frame_, capture_time, frame_encoded_callback));
task_runner_->RunTasks();
video_encoder_->LatestFrameIdToReference(0);
capture_time += base::TimeDelta::FromMilliseconds(33);
- test_video_encoder_callback_->SetExpectedResult(false, 1, 0, capture_time);
+ test_video_encoder_callback_->SetExpectedResult(1, 0, capture_time);
EXPECT_TRUE(video_encoder_->EncodeVideoFrame(
video_frame_, capture_time, frame_encoded_callback));
task_runner_->RunTasks();
video_encoder_->LatestFrameIdToReference(1);
capture_time += base::TimeDelta::FromMilliseconds(33);
- test_video_encoder_callback_->SetExpectedResult(false, 2, 0, capture_time);
+ test_video_encoder_callback_->SetExpectedResult(2, 0, capture_time);
EXPECT_TRUE(video_encoder_->EncodeVideoFrame(
video_frame_, capture_time, frame_encoded_callback));
task_runner_->RunTasks();
video_encoder_->LatestFrameIdToReference(2);
capture_time += base::TimeDelta::FromMilliseconds(33);
- test_video_encoder_callback_->SetExpectedResult(false, 3, 0, capture_time);
+ test_video_encoder_callback_->SetExpectedResult(3, 0, capture_time);
EXPECT_TRUE(video_encoder_->EncodeVideoFrame(
video_frame_, capture_time, frame_encoded_callback));
task_runner_->RunTasks();
video_encoder_->LatestFrameIdToReference(3);
capture_time += base::TimeDelta::FromMilliseconds(33);
- test_video_encoder_callback_->SetExpectedResult(false, 4, 0, capture_time);
+ test_video_encoder_callback_->SetExpectedResult(4, 0, capture_time);
EXPECT_TRUE(video_encoder_->EncodeVideoFrame(
video_frame_, capture_time, frame_encoded_callback));
task_runner_->RunTasks();
@@ -248,7 +249,7 @@ TEST_F(VideoEncoderImplTest,
video_encoder_->LatestFrameIdToReference(4);
for (int i = 5; i < 17; ++i) {
- test_video_encoder_callback_->SetExpectedResult(false, i, 4, capture_time);
+ test_video_encoder_callback_->SetExpectedResult(i, 4, capture_time);
EXPECT_TRUE(video_encoder_->EncodeVideoFrame(
video_frame_, capture_time, frame_encoded_callback));
task_runner_->RunTasks();
« no previous file with comments | « media/cast/video_sender/video_encoder_impl.cc ('k') | media/cast/video_sender/video_sender.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698