MEDIA_LOG for large encoded timestamp gaps in decoder stream.

media/filters/decoder_stream.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/filters/decoder_stream.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
@@ skipping 24 matching lines @@
 template <>
 const char* GetTraceString<DemuxerStream::VIDEO>() {
   return "DecoderStream<VIDEO>::Decode";
 }
 
 template <>
 const char* GetTraceString<DemuxerStream::AUDIO>() {
   return "DecoderStream<AUDIO>::Decode";
 }
 
+template <typename T>
+AudioBuffer* GetAudioBuffer(T* buffer_ptr) {
+  return nullptr;
+}
+
+template <>
+AudioBuffer* GetAudioBuffer<>(AudioBuffer* buffer_ptr) {
+  return buffer_ptr;
+}
+
 template <DemuxerStream::Type StreamType>
 DecoderStream<StreamType>::DecoderStream(
     const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
     ScopedVector<Decoder> decoders,
     const scoped_refptr<MediaLog>& media_log)
     : task_runner_(task_runner),
       media_log_(media_log),
       state_(STATE_UNINITIALIZED),
       stream_(NULL),
       decoder_selector_(new DecoderSelector<StreamType>(task_runner,
@@ skipping 48 matching lines @@
   DCHECK(task_runner_->BelongsToCurrentThread());
   DCHECK_EQ(state_, STATE_UNINITIALIZED);
   DCHECK(init_cb_.is_null());
   DCHECK(!init_cb.is_null());
 
   statistics_cb_ = statistics_cb;
   init_cb_ = init_cb;
   waiting_for_decryption_key_cb_ = waiting_for_decryption_key_cb;
   stream_ = stream;
 
+  if (DecoderStreamTraits<StreamType>::kShouldValidateTimestamps) {
+    audio_ts_validator_.reset(new AudioTimestampValidator(
+        stream_->audio_decoder_config(), media_log_));
+  }
+
   state_ = STATE_INITIALIZING;
   SelectDecoder(cdm_context);
 }
 
 template <DemuxerStream::Type StreamType>
 void DecoderStream<StreamType>::Read(const ReadCB& read_cb) {
   FUNCTION_DVLOG(2);
   DCHECK(task_runner_->BelongsToCurrentThread());
   DCHECK(state_ != STATE_UNINITIALIZED && state_ != STATE_INITIALIZING)
       << state_;
@@ skipping 36 matching lines @@
   reset_cb_ = closure;
 
   if (!read_cb_.is_null()) {
     task_runner_->PostTask(FROM_HERE,
                            base::Bind(base::ResetAndReturn(&read_cb_), ABORTED,
                                       scoped_refptr<Output>()));
   }
 
   ready_outputs_.clear();
 
+  if (DecoderStreamTraits<StreamType>::kShouldValidateTimestamps) {
+    audio_ts_validator_.reset(new AudioTimestampValidator(
+        stream_->audio_decoder_config(), media_log_));
+  }
+
   // It's possible to have received a DECODE_ERROR and entered STATE_ERROR right
   // before a Reset() is executed. If we are still waiting for a demuxer read,
   // OnBufferReady() will handle the reset callback.
   // See crbug.com/597605 and crbug.com/607454.
   if (state_ == STATE_ERROR && !pending_demuxer_read_) {
     task_runner_->PostTask(FROM_HERE, base::ResetAndReturn(&reset_cb_));
     return;
   }
 
   // During decoder reinitialization, the Decoder does not need to be and
@@ skipping 162 matching lines @@
 
 template <DemuxerStream::Type StreamType>
 void DecoderStream<StreamType>::DecodeInternal(
     const scoped_refptr<DecoderBuffer>& buffer) {
   FUNCTION_DVLOG(2);
   DCHECK(state_ == STATE_NORMAL || state_ == STATE_FLUSHING_DECODER) << state_;
   DCHECK_LT(pending_decode_requests_, GetMaxDecodeRequests());
   DCHECK(reset_cb_.is_null());
   DCHECK(buffer.get());
 
+  if (DecoderStreamTraits<StreamType>::kShouldValidateTimestamps)
+    audio_ts_validator_->CheckForTimestampGap(buffer);
+
   int buffer_size = buffer->end_of_stream() ? 0 : buffer->data_size();
 
   TRACE_EVENT_ASYNC_BEGIN2(
       "media", GetTraceString<StreamType>(), this, "key frame",
       !buffer->end_of_stream() && buffer->is_key_frame(), "timestamp (ms)",
       !buffer->end_of_stream() ? buffer->timestamp().InMilliseconds() : 0);
 
   if (buffer->end_of_stream())
     decoding_eos_ = true;
   else if (buffer->duration() != kNoTimestamp())
@@ skipping 108 matching lines @@
   if (state_ == STATE_ERROR) {
     DCHECK(read_cb_.is_null());
     return;
   }
 
   // Drop decoding result if Reset() was called during decoding.
   // The resetting process will be handled when the decoder is reset.
   if (!reset_cb_.is_null())
     return;
 
+  if (DecoderStreamTraits<StreamType>::kShouldValidateTimestamps) {
+    // error: static_cast from 'media::VideoFrame *' to 'media::AudioBuffer *',

[chcunningham, 2016/05/27 21:35:05]

This comment is just for CR discussion. I was surprised to see this error
because I expected the constexpr kShouldValidateTimestamps to cause these lines
to be compiled out for the VideoFrame case. Am I doing it right?  

The GetAudioBuffer call is my hacky workaround. 

+    // which are not related by inheritance, is not allowed
+    // if (output.get()) {
+    //   AudioBuffer* audio_buffer = static_cast<AudioBuffer*>(output.get());
+    //   audio_ts_validator_->RecordOutputDuration(audio_buffer);
+    // }
+    audio_ts_validator_->RecordOutputDuration(GetAudioBuffer(output.get()));
+  }
+
   ++decoded_frames_since_fallback_;
 
   // |decoder_| sucessfully decoded a frame. No need to keep buffers for a
   // fallback decoder.
   // Note: |fallback_buffers_| might still have buffers, and we will keep
   // reading from there before requesting new buffers from |stream_|.
   pending_buffers_.clear();
 
   if (!read_cb_.is_null()) {
     // If |ready_outputs_| was non-empty, the read would have already been
@@ skipping 280 matching lines @@
   }
 
   // The resetting process will be continued in OnDecoderReinitialized().
   ReinitializeDecoder();
 }
 
 template class DecoderStream<DemuxerStream::VIDEO>;
 template class DecoderStream<DemuxerStream::AUDIO>;
 
 }  // namespace media