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

Unified Diff: media/base/android/media_codec_bridge_unittest.cc

Issue 74563002: AndroidVideoEncodeAccelerator is born! (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added blacklist-based disabling Created 7 years, 1 month 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: 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..aa2bb3df0468da78d94cdad06e6e06e46ccdae4f 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,16 @@ 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 +242,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 +270,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

Powered by Google App Engine
This is Rietveld 408576698