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

Unified Diff: media/base/android/media_codec_bridge.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: 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
Index: media/base/android/media_codec_bridge.cc
diff --git a/media/base/android/media_codec_bridge.cc b/media/base/android/media_codec_bridge.cc
index bd4c274b87a36aa5d1e9cd31642ce7f951431605..26fd5eb28807a4e5499431f05726f904e4fb6215 100644
--- a/media/base/android/media_codec_bridge.cc
+++ b/media/base/android/media_codec_bridge.cc
@@ -277,8 +277,8 @@ int MediaCodecBridge::GetOutputBuffers() {
return env->GetArrayLength(j_output_buffers_.obj());
}
-AudioCodecBridge::AudioCodecBridge(const AudioCodec codec)
- : MediaCodecBridge(AudioCodecToMimeType(codec)) {
+AudioCodecBridge::AudioCodecBridge(const char* mime)
+ : MediaCodecBridge(mime) {
}
bool AudioCodecBridge::Start(
@@ -350,8 +350,8 @@ bool AudioCodecBridge::Start(
return true;
}
-VideoCodecBridge::VideoCodecBridge(const VideoCodec codec)
- : MediaCodecBridge(VideoCodecToMimeType(codec)) {
+VideoCodecBridge::VideoCodecBridge(const char* mime)
+ : MediaCodecBridge(mime) {
}
bool VideoCodecBridge::Start(
@@ -371,5 +371,17 @@ bool VideoCodecBridge::Start(
return true;
}
+AudioCodecBridge* AudioCodecBridge::Create(
+ const AudioCodec codec) {
+ const char* mime = AudioCodecToMimeType(codec);
+ return mime ? new AudioCodecBridge(mime) : NULL;
+}
+
+VideoCodecBridge* VideoCodecBridge::Create(
+ const VideoCodec codec) {
+ const char* mime = VideoCodecToMimeType(codec);
+ return mime ? new VideoCodecBridge(mime) : NULL;
+}
+
} // namespace media

Powered by Google App Engine
This is Rietveld 408576698