Index: media/base/android/media_codec_bridge_unittest.cc |
diff --git a/media/base/android/media_codec_bridge_unittest.cc b/media/base/android/media_codec_bridge_unittest.cc |
index 0a08cadd6053090065b7e1635e96ff1cf7a7ff38..63b1ea2242719c86e87c2694eec51c2806ebb40c 100644 |
--- a/media/base/android/media_codec_bridge_unittest.cc |
+++ b/media/base/android/media_codec_bridge_unittest.cc |
@@ -118,7 +118,7 @@ void DecodeMediaFrame( |
for (int i = 0; i < 10; ++i) { |
int input_buf_index = -1; |
MediaCodecStatus status = |
- media_codec->DequeueInputBuffer(InfiniteTimeOut(), &input_buf_index); |
+ media_codec->DequeueInputBuffer(InfiniteTimeOut(), &input_buf_index, 0); |
ASSERT_EQ(MEDIA_CODEC_OK, status); |
media_codec->QueueInputBuffer( |
@@ -144,7 +144,7 @@ TEST(MediaCodecBridgeTest, Initialize) { |
SKIP_TEST_IF_MEDIA_CODEC_BRIDGE_IS_NOT_AVAILABLE(); |
scoped_ptr<media::MediaCodecBridge> media_codec; |
- media_codec.reset(VideoCodecBridge::Create(kCodecH264, false)); |
+ media_codec.reset(VideoCodecBridge::Create(kCodecH264, false, false)); |
} |
TEST(MediaCodecBridgeTest, DoNormal) { |
@@ -157,14 +157,14 @@ TEST(MediaCodecBridgeTest, DoNormal) { |
int input_buf_index = -1; |
MediaCodecStatus status = |
- media_codec->DequeueInputBuffer(InfiniteTimeOut(), &input_buf_index); |
+ media_codec->DequeueInputBuffer(InfiniteTimeOut(), &input_buf_index, 0); |
ASSERT_EQ(MEDIA_CODEC_OK, status); |
ASSERT_GE(input_buf_index, 0); |
int64 input_pts = kPresentationTimeBase; |
- media_codec->QueueInputBuffer( |
- input_buf_index, test_mp3, sizeof(test_mp3), |
- base::TimeDelta::FromMicroseconds(++input_pts)); |
+ media_codec->QueueInputBuffer(input_buf_index, test_mp3, sizeof(test_mp3), |
+ base::TimeDelta::FromMicroseconds(++input_pts), |
+ 0); |
status = media_codec->DequeueInputBuffer(InfiniteTimeOut(), &input_buf_index); |
media_codec->QueueInputBuffer( |
@@ -240,7 +240,7 @@ TEST(MediaCodecBridgeTest, PresentationTimestampsDoNotDecrease) { |
SKIP_TEST_IF_MEDIA_CODEC_BRIDGE_IS_NOT_AVAILABLE(); |
scoped_ptr<VideoCodecBridge> media_codec; |
- media_codec.reset(VideoCodecBridge::Create(kCodecVP8, false)); |
+ media_codec.reset(VideoCodecBridge::Create(kCodecVP8, false, false)); |
EXPECT_TRUE(media_codec->Start( |
kCodecVP8, gfx::Size(320, 240), NULL, NULL)); |
scoped_refptr<DecoderBuffer> buffer = |
@@ -268,7 +268,7 @@ TEST(MediaCodecBridgeTest, PresentationTimestampsDoNotDecrease) { |
TEST(MediaCodecBridgeTest, CreateUnsupportedCodec) { |
EXPECT_EQ(NULL, AudioCodecBridge::Create(kUnknownAudioCodec)); |
- EXPECT_EQ(NULL, VideoCodecBridge::Create(kUnknownVideoCodec, false)); |
+ EXPECT_EQ(NULL, VideoCodecBridge::Create(kUnknownVideoCodec, false, false)); |
} |
} // namespace media |