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

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

Issue 872253008: Passing key frame info flag renderer to browser process (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rename end_of_stream to is_end_of_stream Created 5 years, 11 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 d96785e2121de96e6162c280da8ee3f6ef6dbdbf..926f2668a8c95ffd08fa3475d2518d601b3533ba 100644
--- a/media/base/android/media_decoder_job.cc
+++ b/media/base/android/media_decoder_job.cc
@@ -45,7 +45,7 @@ MediaDecoderJob::MediaDecoderJob(
drm_bridge_(NULL),
drain_decoder_(false) {
InitializeReceivedData();
- eos_unit_.end_of_stream = true;
+ eos_unit_.is_end_of_stream = true;
}
MediaDecoderJob::~MediaDecoderJob() {
@@ -246,7 +246,7 @@ MediaCodecStatus MediaDecoderJob::QueueInputBuffer(const AccessUnit& unit) {
// TODO(qinmin): skip frames if video is falling far behind.
DCHECK_GE(input_buf_index, 0);
- if (unit.end_of_stream || unit.data.empty()) {
+ if (unit.is_end_of_stream || unit.data.empty()) {
media_codec_bridge_->QueueEOS(input_buf_index);
return MEDIA_CODEC_INPUT_END_OF_STREAM;
}
@@ -386,7 +386,7 @@ void MediaDecoderJob::DecodeInternal(
}
if (skip_eos_enqueue_) {
- if (unit.end_of_stream || unit.data.empty()) {
+ if (unit.is_end_of_stream || unit.data.empty()) {
input_eos_encountered_ = true;
output_eos_encountered_ = true;
callback.Run(MEDIA_CODEC_OUTPUT_END_OF_STREAM, kNoTimestamp(),
@@ -590,7 +590,7 @@ void MediaDecoderJob::RequestCurrentChunkIfEmpty() {
current_demuxer_data_index_ = inactive_demuxer_data_index();
const AccessUnit last_access_unit =
received_data_[current_demuxer_data_index_].access_units.back();
- if (!last_access_unit.end_of_stream &&
+ if (!last_access_unit.is_end_of_stream &&
last_access_unit.status != DemuxerStream::kAborted) {
RequestData(base::Closure());
}
« no previous file with comments | « media/base/android/demuxer_stream_player_params.cc ('k') | media/base/android/media_source_player_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698