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

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

Issue 14932020: Add Create() function to AudioCodecBridge and VideoCodecBridge to allow return of null pointers (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove dependency, remove target in another CL Created 7 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/base/android/media_codec_bridge.cc ('k') | media/base/android/media_jni_registrar.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 ea95c529d4e6de083bd947f9c156c3d8478ae7ce..962ae3a7b93387afb6a8cbee5b4cbaf1ac3ceb37 100644
--- a/media/base/android/media_codec_bridge_unittest.cc
+++ b/media/base/android/media_codec_bridge_unittest.cc
@@ -97,7 +97,7 @@ TEST(MediaCodecBridgeTest, Initialize) {
return;
scoped_ptr<media::MediaCodecBridge> media_codec;
- media_codec.reset(new VideoCodecBridge(kCodecH264));
+ media_codec.reset(VideoCodecBridge::Create(kCodecH264));
}
TEST(MediaCodecBridgeTest, DoNormal) {
@@ -105,7 +105,7 @@ TEST(MediaCodecBridgeTest, DoNormal) {
return;
scoped_ptr<media::AudioCodecBridge> media_codec;
- media_codec.reset(new AudioCodecBridge(kCodecMP3));
+ media_codec.reset(AudioCodecBridge::Create(kCodecMP3));
media_codec->Start(kCodecMP3, 44100, 2, NULL, 0, false);
@@ -162,7 +162,7 @@ TEST(MediaCodecBridgeTest, InvalidVorbisHeader) {
return;
scoped_ptr<media::AudioCodecBridge> media_codec;
- media_codec.reset(new AudioCodecBridge(kCodecVorbis));
+ media_codec.reset(AudioCodecBridge::Create(kCodecVorbis));
// The first byte of the header is not 0x02.
uint8 invalid_first_byte[] = { 0x00, 0xff, 0xff, 0xff, 0xff };
@@ -187,4 +187,9 @@ TEST(MediaCodecBridgeTest, InvalidVorbisHeader) {
delete[] very_large_header;
}
+TEST(MediaCodecBridgeTest, CreateUnsupportedCodec) {
+ EXPECT_EQ(NULL, AudioCodecBridge::Create(kUnknownAudioCodec));
+ EXPECT_EQ(NULL, VideoCodecBridge::Create(kUnknownVideoCodec));
+}
+
} // namespace media
« no previous file with comments | « media/base/android/media_codec_bridge.cc ('k') | media/base/android/media_jni_registrar.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698