summaryrefslogtreecommitdiff
path: root/chromium/media/filters/decoder_stream.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/media/filters/decoder_stream.cc')
-rw-r--r--chromium/media/filters/decoder_stream.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/chromium/media/filters/decoder_stream.cc b/chromium/media/filters/decoder_stream.cc
index aaefc04fac4..1236cbc038a 100644
--- a/chromium/media/filters/decoder_stream.cc
+++ b/chromium/media/filters/decoder_stream.cc
@@ -13,7 +13,9 @@
#include "media/base/bind_to_current_loop.h"
#include "media/base/decoder_buffer.h"
#include "media/base/media_log.h"
+#include "media/base/timestamp_constants.h"
#include "media/base/video_decoder.h"
+#include "media/base/video_frame.h"
#include "media/filters/decrypting_demuxer_stream.h"
namespace media {
@@ -298,7 +300,7 @@ void DecoderStream<StreamType>::Decode(
TRACE_EVENT_ASYNC_BEGIN2(
"media", GetTraceString<StreamType>(), this, "key frame",
!buffer->end_of_stream() && buffer->is_key_frame(), "timestamp (ms)",
- buffer->timestamp().InMilliseconds());
+ !buffer->end_of_stream() ? buffer->timestamp().InMilliseconds() : 0);
if (buffer->end_of_stream())
decoding_eos_ = true;