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

Side by Side Diff: media/base/android/audio_decoder_job.cc

Issue 898843002: Use cached Key frames to avoid browser seek (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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/audio_decoder_job.h" 5 #include "media/base/android/audio_decoder_job.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/lazy_instance.h" 8 #include "base/lazy_instance.h"
9 #include "base/threading/thread.h" 9 #include "base/threading/thread.h"
10 #include "media/base/android/media_codec_bridge.h" 10 #include "media/base/android/media_codec_bridge.h"
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 return audio_codec_ != configs.audio_codec || 128 return audio_codec_ != configs.audio_codec ||
129 num_channels_ != configs.audio_channels || 129 num_channels_ != configs.audio_channels ||
130 config_sampling_rate_ != configs.audio_sampling_rate || 130 config_sampling_rate_ != configs.audio_sampling_rate ||
131 is_content_encrypted() != configs.is_audio_encrypted || 131 is_content_encrypted() != configs.is_audio_encrypted ||
132 audio_extra_data_.size() != configs.audio_extra_data.size() || 132 audio_extra_data_.size() != configs.audio_extra_data.size() ||
133 !std::equal(audio_extra_data_.begin(), 133 !std::equal(audio_extra_data_.begin(),
134 audio_extra_data_.end(), 134 audio_extra_data_.end(),
135 configs.audio_extra_data.begin()); 135 configs.audio_extra_data.begin());
136 } 136 }
137 137
138 bool AudioDecoderJob::CreateMediaCodecBridgeInternal() { 138 MediaDecoderJob::MediaDecoderJobStatus
139 AudioDecoderJob::CreateMediaCodecBridgeInternal() {
139 media_codec_bridge_.reset(AudioCodecBridge::Create(audio_codec_)); 140 media_codec_bridge_.reset(AudioCodecBridge::Create(audio_codec_));
140 if (!media_codec_bridge_) 141 if (!media_codec_bridge_)
141 return false; 142 return STATUS_FAILURE;
142 143
143 if (!(static_cast<AudioCodecBridge*>(media_codec_bridge_.get()))->Start( 144 if (!(static_cast<AudioCodecBridge*>(media_codec_bridge_.get()))->Start(
144 audio_codec_, config_sampling_rate_, num_channels_, &audio_extra_data_[0], 145 audio_codec_, config_sampling_rate_, num_channels_, &audio_extra_data_[0],
145 audio_extra_data_.size(), true, GetMediaCrypto().obj())) { 146 audio_extra_data_.size(), true, GetMediaCrypto().obj())) {
146 media_codec_bridge_.reset(); 147 media_codec_bridge_.reset();
147 return false; 148 return STATUS_FAILURE;
148 } 149 }
149 150
150 SetVolumeInternal(); 151 SetVolumeInternal();
151 152
152 // Reset values used to track codec bridge output 153 // Reset values used to track codec bridge output
153 frame_count_ = 0; 154 frame_count_ = 0;
154 ResetTimestampHelper(); 155 ResetTimestampHelper();
155 156
156 return true; 157 return STATUS_SUCCESS;
157 } 158 }
158 159
159 void AudioDecoderJob::SetVolumeInternal() { 160 void AudioDecoderJob::SetVolumeInternal() {
160 if (media_codec_bridge_) { 161 if (media_codec_bridge_) {
161 static_cast<AudioCodecBridge*>(media_codec_bridge_.get())->SetVolume( 162 static_cast<AudioCodecBridge*>(media_codec_bridge_.get())->SetVolume(
162 volume_); 163 volume_);
163 } 164 }
164 } 165 }
165 166
166 void AudioDecoderJob::OnOutputFormatChanged() { 167 void AudioDecoderJob::OnOutputFormatChanged() {
167 DCHECK(media_codec_bridge_); 168 DCHECK(media_codec_bridge_);
168 169
169 int old_sampling_rate = output_sampling_rate_; 170 int old_sampling_rate = output_sampling_rate_;
170 output_sampling_rate_ = media_codec_bridge_->GetOutputSamplingRate(); 171 output_sampling_rate_ = media_codec_bridge_->GetOutputSamplingRate();
171 if (output_sampling_rate_ != old_sampling_rate) 172 if (output_sampling_rate_ != old_sampling_rate)
172 ResetTimestampHelper(); 173 ResetTimestampHelper();
173 } 174 }
174 175
175 } // namespace media 176 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698