media/filters/decoder_stream_traits.h - Issue 1954633002: MEDIA_LOG for large encoded timestamp gaps in decoder stream.

Unified Diff: media/filters/decoder_stream_traits.h

Issue 1954633002: MEDIA_LOG for large encoded timestamp gaps in decoder stream. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase Created 4 years, 6 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/decoder_stream_traits.h

diff --git a/media/filters/decoder_stream_traits.h b/media/filters/decoder_stream_traits.h

index 7d5389989b1a99ee879a0f295f42e0c24b4db28b..de21014c8610c11a44609dd953080465a7844858 100644

--- a/media/filters/decoder_stream_traits.h

+++ b/media/filters/decoder_stream_traits.h

@@ -8,6 +8,7 @@

#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 {

@@ -21,43 +22,65 @@ 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_;

};