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

Unified Diff: media/base/android/media_source_player.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_jni_registrar.cc ('k') | media/media.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/android/media_source_player.cc
diff --git a/media/base/android/media_source_player.cc b/media/base/android/media_source_player.cc
index 00cddb75bd3982a2c2538ac1a4a5404ecbdf19fa..193c1a33fd61c814157c6544d89c43e301809642 100644
--- a/media/base/android/media_source_player.cc
+++ b/media/base/android/media_source_player.cc
@@ -167,7 +167,7 @@ VideoDecoderJob::VideoDecoderJob(
const scoped_refptr<base::MessageLoopProxy>& message_loop,
const VideoCodec video_codec, const gfx::Size& size, jobject surface)
: MediaDecoderJob(false, message_loop) {
- scoped_ptr<VideoCodecBridge> codec(new VideoCodecBridge(video_codec));
+ scoped_ptr<VideoCodecBridge> codec(VideoCodecBridge::Create(video_codec));
codec->Start(video_codec, size, surface);
media_codec_bridge_.reset(codec.release());
thread_.reset(new base::Thread("MediaSource_VideoDecoderThread"));
@@ -181,7 +181,7 @@ AudioDecoderJob::AudioDecoderJob(
const uint8* extra_data,
size_t extra_data_size)
: MediaDecoderJob(true, message_loop) {
- scoped_ptr<AudioCodecBridge> codec(new AudioCodecBridge(audio_codec));
+ scoped_ptr<AudioCodecBridge> codec(AudioCodecBridge::Create(audio_codec));
codec->Start(audio_codec, sample_rate, channel_count, extra_data,
extra_data_size, true);
media_codec_bridge_.reset(codec.release());
« no previous file with comments | « media/base/android/media_jni_registrar.cc ('k') | media/media.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698