OLD | NEW |
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 "media/base/android/media_source_player.h" | 5 #include "media/base/android/media_source_player.h" |
6 | 6 |
7 #include "base/android/jni_android.h" | 7 #include "base/android/jni_android.h" |
8 #include "base/android/jni_string.h" | 8 #include "base/android/jni_string.h" |
9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
160 thread_->message_loop()->DeleteSoon(FROM_HERE, this); | 160 thread_->message_loop()->DeleteSoon(FROM_HERE, this); |
161 } else { | 161 } else { |
162 delete this; | 162 delete this; |
163 } | 163 } |
164 } | 164 } |
165 | 165 |
166 VideoDecoderJob::VideoDecoderJob( | 166 VideoDecoderJob::VideoDecoderJob( |
167 const scoped_refptr<base::MessageLoopProxy>& message_loop, | 167 const scoped_refptr<base::MessageLoopProxy>& message_loop, |
168 const VideoCodec video_codec, const gfx::Size& size, jobject surface) | 168 const VideoCodec video_codec, const gfx::Size& size, jobject surface) |
169 : MediaDecoderJob(false, message_loop) { | 169 : MediaDecoderJob(false, message_loop) { |
170 scoped_ptr<VideoCodecBridge> codec(new VideoCodecBridge(video_codec)); | 170 scoped_ptr<VideoCodecBridge> codec(VideoCodecBridge::Create(video_codec)); |
171 codec->Start(video_codec, size, surface); | 171 codec->Start(video_codec, size, surface); |
172 media_codec_bridge_.reset(codec.release()); | 172 media_codec_bridge_.reset(codec.release()); |
173 thread_.reset(new base::Thread("MediaSource_VideoDecoderThread")); | 173 thread_.reset(new base::Thread("MediaSource_VideoDecoderThread")); |
174 } | 174 } |
175 | 175 |
176 AudioDecoderJob::AudioDecoderJob( | 176 AudioDecoderJob::AudioDecoderJob( |
177 const scoped_refptr<base::MessageLoopProxy>& message_loop, | 177 const scoped_refptr<base::MessageLoopProxy>& message_loop, |
178 const AudioCodec audio_codec, | 178 const AudioCodec audio_codec, |
179 int sample_rate, | 179 int sample_rate, |
180 int channel_count, | 180 int channel_count, |
181 const uint8* extra_data, | 181 const uint8* extra_data, |
182 size_t extra_data_size) | 182 size_t extra_data_size) |
183 : MediaDecoderJob(true, message_loop) { | 183 : MediaDecoderJob(true, message_loop) { |
184 scoped_ptr<AudioCodecBridge> codec(new AudioCodecBridge(audio_codec)); | 184 scoped_ptr<AudioCodecBridge> codec(AudioCodecBridge::Create(audio_codec)); |
185 codec->Start(audio_codec, sample_rate, channel_count, extra_data, | 185 codec->Start(audio_codec, sample_rate, channel_count, extra_data, |
186 extra_data_size, true); | 186 extra_data_size, true); |
187 media_codec_bridge_.reset(codec.release()); | 187 media_codec_bridge_.reset(codec.release()); |
188 thread_.reset(new base::Thread("MediaSource_AudioDecoderThread")); | 188 thread_.reset(new base::Thread("MediaSource_AudioDecoderThread")); |
189 } | 189 } |
190 | 190 |
191 MediaSourcePlayer::MediaSourcePlayer( | 191 MediaSourcePlayer::MediaSourcePlayer( |
192 int player_id, | 192 int player_id, |
193 MediaPlayerManager* manager) | 193 MediaPlayerManager* manager) |
194 : MediaPlayerAndroid(player_id, manager), | 194 : MediaPlayerAndroid(player_id, manager), |
(...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
452 | 452 |
453 bool MediaSourcePlayer::HasVideo() { | 453 bool MediaSourcePlayer::HasVideo() { |
454 return kUnknownVideoCodec != video_codec_; | 454 return kUnknownVideoCodec != video_codec_; |
455 } | 455 } |
456 | 456 |
457 bool MediaSourcePlayer::HasAudio() { | 457 bool MediaSourcePlayer::HasAudio() { |
458 return kUnknownAudioCodec != audio_codec_; | 458 return kUnknownAudioCodec != audio_codec_; |
459 } | 459 } |
460 | 460 |
461 } // namespace media | 461 } // namespace media |
OLD | NEW |