MEDIA_LOG for large encoded timestamp gaps in decoder stream.

media/filters/decoder_stream_traits.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_TRAITS_H_
 #define MEDIA_FILTERS_DECODER_STREAM_TRAITS_H_
 
 #include "media/base/cdm_context.h"
 #include "media/base/demuxer_stream.h"
 #include "media/base/pipeline_status.h"
+#include "media/filters/audio_timestamp_validator.h"
 
 namespace media {
 
 class AudioBuffer;
 class AudioDecoder;
 class CdmContext;
 class DecryptingAudioDecoder;
 class DecryptingVideoDecoder;
 class DemuxerStream;
 class VideoDecoder;
 class VideoFrame;
 
 template <DemuxerStream::Type StreamType>
-struct DecoderStreamTraits {};
+class MEDIA_EXPORT DecoderStreamTraits {};

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

Is this change necessary?

[chcunningham, 2016/06/21 00:32:00]

Deleted

 
 template <>
-struct DecoderStreamTraits<DemuxerStream::AUDIO> {
+class MEDIA_EXPORT DecoderStreamTraits<DemuxerStream::AUDIO> {
+ public:
   typedef AudioBuffer OutputType;
   typedef AudioDecoder DecoderType;
+  typedef AudioDecoderConfig ConfigType;
   typedef DecryptingAudioDecoder DecryptingDecoderType;
   typedef base::Callback<void(bool success)> InitCB;
   typedef base::Callback<void(const scoped_refptr<OutputType>&)> OutputCB;
 
+  DecoderStreamTraits(const scoped_refptr<MediaLog>& media_log);

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

explicit

[chcunningham, 2016/06/21 00:32:00]

Done.

+
   static std::string ToString();
-  static void InitializeDecoder(DecoderType* decoder,
-                                DemuxerStream* stream,
-                                CdmContext* cdm_context,
-                                const InitCB& init_cb,
-                                const OutputCB& output_cb);
+  void InitializeDecoder(DecoderType* decoder,
+                         DemuxerStream* stream,
+                         CdmContext* cdm_context,
+                         const InitCB& init_cb,
+                         const OutputCB& output_cb);
   static bool NeedsBitstreamConversion(DecoderType* decoder);
+  void OnDecode(const scoped_refptr<DecoderBuffer>& buffer);
+  void OnDecodeDone(const scoped_refptr<OutputType>& buffer);
+  void OnStreamReset(ConfigType config);
   static void ReportStatistics(const StatisticsCB& statistics_cb,
                                int bytes_decoded);
   static scoped_refptr<OutputType> CreateEOSOutput();
+
+ private:
+  // Validates encoded timestamps match decoded output duration. MEDIA_LOG warns
+  // if timestamp gaps are detected. Sufficiently large gaps can lead to AV sync
+  // drift.
+  std::unique_ptr<AudioTimestampValidator> audio_ts_validator_;
+
+  scoped_refptr<MediaLog> media_log_;
 };
 
 template <>
-struct DecoderStreamTraits<DemuxerStream::VIDEO> {
+class MEDIA_EXPORT DecoderStreamTraits<DemuxerStream::VIDEO> {
+ public:
   typedef VideoFrame OutputType;
   typedef VideoDecoder DecoderType;
+  typedef VideoDecoderConfig ConfigType;
   typedef DecryptingVideoDecoder DecryptingDecoderType;
   typedef base::Callback<void(bool success)> InitCB;
   typedef base::Callback<void(const scoped_refptr<OutputType>&)> OutputCB;
 
+  DecoderStreamTraits(const scoped_refptr<MediaLog>& media_log);

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

explicit

[chcunningham, 2016/06/21 00:32:00]

Done.

+
   static std::string ToString();
-  static void InitializeDecoder(DecoderType* decoder,
-                                DemuxerStream* stream,
-                                CdmContext* cdm_context,
-                                const InitCB& init_cb,
-                                const OutputCB& output_cb);
+  void InitializeDecoder(DecoderType* decoder,
+                         DemuxerStream* stream,
+                         CdmContext* cdm_context,
+                         const InitCB& init_cb,
+                         const OutputCB& output_cb);
   static bool NeedsBitstreamConversion(DecoderType* decoder);
+  void OnDecode(const scoped_refptr<DecoderBuffer>& buffer);
+  void OnDecodeDone(const scoped_refptr<OutputType>& buffer);
+  void OnStreamReset(ConfigType config);
   static void ReportStatistics(const StatisticsCB& statistics_cb,
                                int bytes_decoded);
   static scoped_refptr<OutputType> CreateEOSOutput();
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_DECODER_STREAM_TRAITS_H_