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

Unified Diff: media/filters/chunk_demuxer.cc

Issue 9225001: Remove two static initializers (media/base/{buffers,media_log}.cc) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 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/filters/chunk_demuxer.cc
diff --git a/media/filters/chunk_demuxer.cc b/media/filters/chunk_demuxer.cc
index ba3224b90cc8f03af6e621111610c96dde94c93a..e4f1700f11a5db5a13b123f6a0fc51676a019ccd 100644
--- a/media/filters/chunk_demuxer.cc
+++ b/media/filters/chunk_demuxer.cc
@@ -69,7 +69,7 @@ ChunkDemuxerStream::ChunkDemuxerStream(const AudioDecoderConfig& audio_config)
: type_(AUDIO),
shutdown_called_(false),
received_end_of_stream_(false),
- last_buffer_timestamp_(kNoTimestamp) {
+ last_buffer_timestamp_(kNoTimestamp()) {
audio_config_.CopyFrom(audio_config);
}
@@ -78,7 +78,7 @@ ChunkDemuxerStream::ChunkDemuxerStream(const VideoDecoderConfig& video_config)
: type_(VIDEO),
shutdown_called_(false),
received_end_of_stream_(false),
- last_buffer_timestamp_(kNoTimestamp) {
+ last_buffer_timestamp_(kNoTimestamp()) {
video_config_.CopyFrom(video_config);
}
@@ -89,14 +89,14 @@ void ChunkDemuxerStream::Flush() {
base::AutoLock auto_lock(lock_);
buffers_.clear();
received_end_of_stream_ = false;
- last_buffer_timestamp_ = kNoTimestamp;
+ last_buffer_timestamp_ = kNoTimestamp();
}
bool ChunkDemuxerStream::CanAddBuffers(const BufferQueue& buffers) const {
base::AutoLock auto_lock(lock_);
// If we haven't seen any buffers yet, then anything can be added.
- if (last_buffer_timestamp_ == kNoTimestamp)
+ if (last_buffer_timestamp_ == kNoTimestamp())
return true;
if (buffers.empty())
@@ -131,7 +131,7 @@ void ChunkDemuxerStream::AddBuffers(const BufferQueue& buffers) {
}
} else {
base::TimeDelta current_ts = (*itr)->GetTimestamp();
- if (last_buffer_timestamp_ != kNoTimestamp) {
+ if (last_buffer_timestamp_ != kNoTimestamp()) {
DCHECK_GT(current_ts.ToInternalValue(),
last_buffer_timestamp_.ToInternalValue());
}

Powered by Google App Engine
This is Rietveld 408576698