| Index: media/muxers/webm_muxer_unittest.cc
|
| diff --git a/media/muxers/webm_muxer_unittest.cc b/media/muxers/webm_muxer_unittest.cc
|
| index 8dcceb88b2aaf29863be6da7fc8de7f9891ad473..3b34b3e125aa01b4f5f50d8c5881bbee774033a3 100644
|
| --- a/media/muxers/webm_muxer_unittest.cc
|
| +++ b/media/muxers/webm_muxer_unittest.cc
|
| @@ -111,8 +111,8 @@ TEST_P(WebmMuxerTest, OnEncodedVideoTwoFrames) {
|
| WithArgs<0>(Invoke(this, &WebmMuxerTest::SaveEncodedDataLen)));
|
| EXPECT_TRUE(webm_muxer_.OnEncodedVideo(
|
| WebmMuxer::VideoParameters(video_frame),
|
| - base::WrapUnique(new std::string(encoded_data)), base::TimeTicks::Now(),
|
| - false /* keyframe */));
|
| + base::WrapUnique(new std::string(encoded_data)), nullptr,
|
| + base::TimeTicks::Now(), false /* keyframe */));
|
|
|
| // First time around WriteCallback() is pinged a number of times to write the
|
| // Matroska header, but at the end it dumps |encoded_data|.
|
| @@ -127,7 +127,7 @@ TEST_P(WebmMuxerTest, OnEncodedVideoTwoFrames) {
|
| .WillRepeatedly(
|
| WithArgs<0>(Invoke(this, &WebmMuxerTest::SaveEncodedDataLen)));
|
| EXPECT_TRUE(webm_muxer_.OnEncodedVideo(
|
| - video_frame, base::WrapUnique(new std::string(encoded_data)),
|
| + video_frame, base::WrapUnique(new std::string(encoded_data)), nullptr,
|
| base::TimeTicks::Now(), false /* keyframe */));
|
|
|
| // The second time around the callbacks should include a SimpleBlock header,
|
| @@ -141,10 +141,10 @@ TEST_P(WebmMuxerTest, OnEncodedVideoTwoFrames) {
|
|
|
| // Force an error in libwebm and expect OnEncodedVideo to fail.
|
| webm_muxer_.ForceOneLibWebmErrorForTesting();
|
| - EXPECT_FALSE(
|
| - webm_muxer_.OnEncodedVideo(WebmMuxer::VideoParameters(video_frame),
|
| - base::MakeUnique<std::string>(encoded_data),
|
| - base::TimeTicks::Now(), true /* keyframe */));
|
| + EXPECT_FALSE(webm_muxer_.OnEncodedVideo(
|
| + WebmMuxer::VideoParameters(video_frame),
|
| + base::MakeUnique<std::string>(encoded_data), nullptr,
|
| + base::TimeTicks::Now(), true /* keyframe */));
|
| }
|
|
|
| TEST_P(WebmMuxerTest, OnEncodedAudioTwoFrames) {
|
| @@ -215,14 +215,14 @@ TEST_P(WebmMuxerTest, VideoIsStoredWhileWaitingForAudio) {
|
| const std::string encoded_video("thisisanencodedvideopacket");
|
| EXPECT_TRUE(webm_muxer_.OnEncodedVideo(
|
| WebmMuxer::VideoParameters(video_frame),
|
| - base::WrapUnique(new std::string(encoded_video)), base::TimeTicks::Now(),
|
| - true /* keyframe */));
|
| + base::WrapUnique(new std::string(encoded_video)), nullptr,
|
| + base::TimeTicks::Now(), true /* keyframe */));
|
| // A few encoded non key frames.
|
| const int kNumNonKeyFrames = 2;
|
| for (int i = 0; i < kNumNonKeyFrames; ++i) {
|
| EXPECT_TRUE(webm_muxer_.OnEncodedVideo(
|
| WebmMuxer::VideoParameters(video_frame),
|
| - base::WrapUnique(new std::string(encoded_video)),
|
| + base::WrapUnique(new std::string(encoded_video)), nullptr,
|
| base::TimeTicks::Now(), false /* keyframe */));
|
| }
|
|
|
|
|