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

Unified Diff: media/base/android/media_decoder_job.cc

Issue 257323003: Remove the IPC to request DemuxerConfigs when config changes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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_decoder_job.cc
diff --git a/media/base/android/media_decoder_job.cc b/media/base/android/media_decoder_job.cc
index c57da3af1729fe0df9ba72e8613742dd38d97f68..fed2482ddcce6e87dedbc2a8b355abe1af7894c7 100644
--- a/media/base/android/media_decoder_job.cc
+++ b/media/base/android/media_decoder_job.cc
@@ -123,7 +123,6 @@ bool MediaDecoderJob::Decode(
if (DemuxerStream::kConfigChanged == CurrentAccessUnit().status) {
// Clear received data because we need to handle a config change.
decode_cb_.Reset();
wolenetz 2014/05/02 22:25:30 I'm confused: previously we needed to ClearData().
qinmin 2014/05/05 20:52:19 If there is a config change, MediaDecoderJob will
wolenetz 2014/05/05 22:06:55 sgtm thanks
- ClearData();
return false;
}
@@ -154,6 +153,18 @@ void MediaDecoderJob::BeginPrerolling(base::TimeDelta preroll_timestamp) {
prerolling_ = true;
}
+DemuxerConfigs* MediaDecoderJob::GetDemuxerConfigs() {
+ DVLOG(1) << __FUNCTION__;
+ DCHECK(ui_task_runner_->BelongsToCurrentThread());
+ DCHECK(!is_decoding());
+
+ int index = NoAccessUnitsRemainingInChunk(true) ?
wolenetz 2014/05/02 22:25:30 nit: seems like some code duplication of CurrentAc
qinmin 2014/05/05 20:52:19 Done.
+ inactive_demuxer_data_index() : current_demuxer_data_index_;
+ if (received_data_[index].demuxer_configs.size() > 0)
+ return &(received_data_[index].demuxer_configs[0]);
+ return NULL;
+}
+
void MediaDecoderJob::Release() {
DCHECK(ui_task_runner_->BelongsToCurrentThread());
DVLOG(1) << __FUNCTION__;

Powered by Google App Engine
This is Rietveld 408576698