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

Side by Side Diff: media/base/android/media_codec_bridge_unittest.cc

Issue 669623004: Switch to Lollipop APIs for MediaCodec (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years 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 unified diff | Download patch
« no previous file with comments | « media/base/android/media_codec_bridge.cc ('k') | media/base/android/media_decoder_job.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <string> 5 #include <string>
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "media/base/android/media_codec_bridge.h" 10 #include "media/base/android/media_codec_bridge.h"
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 NULL); 198 NULL);
199 switch (status) { 199 switch (status) {
200 case MEDIA_CODEC_DEQUEUE_OUTPUT_AGAIN_LATER: 200 case MEDIA_CODEC_DEQUEUE_OUTPUT_AGAIN_LATER:
201 FAIL(); 201 FAIL();
202 return; 202 return;
203 203
204 case MEDIA_CODEC_OUTPUT_FORMAT_CHANGED: 204 case MEDIA_CODEC_OUTPUT_FORMAT_CHANGED:
205 continue; 205 continue;
206 206
207 case MEDIA_CODEC_OUTPUT_BUFFERS_CHANGED: 207 case MEDIA_CODEC_OUTPUT_BUFFERS_CHANGED:
208 ASSERT_TRUE(media_codec->GetOutputBuffers());
209 continue; 208 continue;
210 209
211 default: 210 default:
212 break; 211 break;
213 } 212 }
214 ASSERT_GE(output_buf_index, 0); 213 ASSERT_GE(output_buf_index, 0);
215 EXPECT_LE(1u, size); 214 EXPECT_LE(1u, size);
216 if (!eos) 215 if (!eos)
217 EXPECT_EQ(++input_pts, timestamp.InMicroseconds()); 216 EXPECT_EQ(++input_pts, timestamp.InMicroseconds());
218 ASSERT_LE(input_pts, kPresentationTimeBase + 2); 217 ASSERT_LE(input_pts, kPresentationTimeBase + 2);
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
286 285
287 TEST(MediaCodecBridgeTest, CreateUnsupportedCodec) { 286 TEST(MediaCodecBridgeTest, CreateUnsupportedCodec) {
288 EXPECT_EQ(NULL, AudioCodecBridge::Create(kUnknownAudioCodec)); 287 EXPECT_EQ(NULL, AudioCodecBridge::Create(kUnknownAudioCodec));
289 EXPECT_EQ( 288 EXPECT_EQ(
290 NULL, 289 NULL,
291 VideoCodecBridge::CreateDecoder( 290 VideoCodecBridge::CreateDecoder(
292 kUnknownVideoCodec, false, gfx::Size(320, 240), NULL, NULL)); 291 kUnknownVideoCodec, false, gfx::Size(320, 240), NULL, NULL));
293 } 292 }
294 293
295 } // namespace media 294 } // namespace media
OLDNEW
« no previous file with comments | « media/base/android/media_codec_bridge.cc ('k') | media/base/android/media_decoder_job.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698