diff options
Diffstat (limited to 'media')
| -rw-r--r-- | media/base/android/demuxer_stream_player_params.cc | 4 | ||||
| -rw-r--r-- | media/base/android/media_source_player.cc | 9 |
2 files changed, 5 insertions, 8 deletions
diff --git a/media/base/android/demuxer_stream_player_params.cc b/media/base/android/demuxer_stream_player_params.cc index 3ed1a8c..ab9fcaf 100644 --- a/media/base/android/demuxer_stream_player_params.cc +++ b/media/base/android/demuxer_stream_player_params.cc @@ -8,11 +8,9 @@ namespace media { MediaPlayerHostMsg_DemuxerReady_Params:: MediaPlayerHostMsg_DemuxerReady_Params() - : audio_codec(kUnknownAudioCodec), - audio_channels(0), + : audio_channels(0), audio_sampling_rate(0), is_audio_encrypted(false), - video_codec(kUnknownVideoCodec), is_video_encrypted(false), duration_ms(0) {} diff --git a/media/base/android/media_source_player.cc b/media/base/android/media_source_player.cc index f6cbd48..b29d182 100644 --- a/media/base/android/media_source_player.cc +++ b/media/base/android/media_source_player.cc @@ -208,6 +208,7 @@ MediaSourcePlayer::MediaSourcePlayer( waiting_for_audio_data_(false), waiting_for_video_data_(false), weak_this_(this) { + OnMediaMetadataChanged(duration_, width_, height_, false); } MediaSourcePlayer::~MediaSourcePlayer() { @@ -220,11 +221,9 @@ void MediaSourcePlayer::SetVideoSurface(jobject surface) { return; } - if (HasVideo()) { - video_decoder_job_.reset(new VideoDecoderJob( - base::MessageLoopProxy::current(), video_codec_, - gfx::Size(width_, height_), surface)); - } + video_decoder_job_.reset(new VideoDecoderJob( + base::MessageLoopProxy::current(), video_codec_, + gfx::Size(width_, height_), surface)); if (pending_play_) StartInternal(); |