MEDIA_LOG for large encoded timestamp gaps in decoder stream.

media/filters/decoder_stream.h

 // 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.
 
 #ifndef MEDIA_FILTERS_DECODER_STREAM_H_
 #define MEDIA_FILTERS_DECODER_STREAM_H_
 
 #include <deque>
 #include <list>
+#include <memory>
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
 #include "media/base/audio_decoder.h"
+#include "media/base/audio_timestamp_helper.h"
 #include "media/base/demuxer_stream.h"
 #include "media/base/media_export.h"
 #include "media/base/media_log.h"
 #include "media/base/moving_average.h"
 #include "media/base/pipeline_status.h"
 #include "media/base/timestamp_constants.h"
+#include "media/filters/audio_timestamp_validator.h"
 #include "media/filters/decoder_selector.h"
 #include "media/filters/decoder_stream_traits.h"
 
 namespace base {
 class SingleThreadTaskRunner;
 }
 
 namespace media {
 
 class CdmContext;
 class DecryptingDemuxerStream;
 
 // Wraps a DemuxerStream and a list of Decoders and provides decoded
 // output to its client (e.g. Audio/VideoRendererImpl).
 template<DemuxerStream::Type StreamType>
 class MEDIA_EXPORT DecoderStream {
  public:
   typedef DecoderStreamTraits<StreamType> StreamTraits;
   typedef typename StreamTraits::DecoderType Decoder;
   typedef typename StreamTraits::OutputType Output;
+  typedef typename StreamTraits::ConfigType Config;
 
   enum Status {
     OK,  // Everything went as planned.
     ABORTED,  // Read aborted due to Reset() during pending read.
     DEMUXER_READ_ABORTED,  // Demuxer returned aborted read.
     DECODE_ERROR,  // Decoder returned decode error.
   };
 
   // Indicates completion of a DecoderStream initialization.
   typedef base::Callback<void(bool success)> InitCB;
@@ skipping 132 matching lines @@
   void ReinitializeDecoder();
 
   // Callback for Decoder reinitialization.
   void OnDecoderReinitialized(bool success);
 
   void CompleteDecoderReinitialization(bool success);
 
   void ResetDecoder();
   void OnDecoderReset();
 
+  DecoderStreamTraits<StreamType> traits_;
+
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
 
   scoped_refptr<MediaLog> media_log_;
 
   State state_;
 
   StatisticsCB statistics_cb_;
   InitCB init_cb_;
   base::Closure waiting_for_decryption_key_cb_;
 
@@ skipping 45 matching lines @@
   std::deque<scoped_refptr<DecoderBuffer>> fallback_buffers_;
 
   // TODO(tguilbert): support config changes during decoder fallback, see
   // crbug.com/603713
   bool received_config_change_during_reinit_;
 
   // Used to track read requests in case the STATE_PENDIND_DEMUXER_READ get
   // overwritten by an error.
   bool pending_demuxer_read_;
 
+  // Validates encoded timestamps match decoded output duration. MEDIA_LOG warns

[DaleCurtis, 2016/06/20 18:40:33]

Delete now?

[chcunningham, 2016/06/21 00:31:59]

Whoops, definitely!

+  // if timestamp gaps are detected. Sufficiently large gaps can lead to AV sync
+  // drift.
+  std::unique_ptr<AudioTimestampValidator> audio_ts_validator_;
+
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<DecoderStream<StreamType>> weak_factory_;
 
   // Used to invalidate pending decode requests and output callbacks when
   // falling back to a new decoder (on first decode error).
   base::WeakPtrFactory<DecoderStream<StreamType>> fallback_weak_factory_;
 };
 
 template <>
 bool DecoderStream<DemuxerStream::AUDIO>::CanReadWithoutStalling() const;
 
 template <>
 int DecoderStream<DemuxerStream::AUDIO>::GetMaxDecodeRequests() const;
 
 typedef DecoderStream<DemuxerStream::VIDEO> VideoFrameStream;
 typedef DecoderStream<DemuxerStream::AUDIO> AudioBufferStream;
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_DECODER_STREAM_H_