diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-03-28 15:31:22 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-03-28 15:31:22 +0000 |
| commit | 2a99a7e74a7f215066514fe81d2bfa6639d9eddd (patch) | |
| tree | 7c2d04841fcd599fd83b0f0bb1100e1c89a35bae /media/base/stream_parser_buffer.cc | |
| parent | 61c449bbbb53310a8c041d8cefdd6b01a126cc7e (diff) | |
| download | chromium_org-2a99a7e74a7f215066514fe81d2bfa6639d9eddd.tar.gz | |
Merge from Chromium at DEPS revision r190564
This commit was generated by merge_to_master.py.
Change-Id: Icadecbce29854b8fa25fd335b2c1949b5ca5d170
Diffstat (limited to 'media/base/stream_parser_buffer.cc')
| -rw-r--r-- | media/base/stream_parser_buffer.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/media/base/stream_parser_buffer.cc b/media/base/stream_parser_buffer.cc index 04f9513464..547cf27748 100644 --- a/media/base/stream_parser_buffer.cc +++ b/media/base/stream_parser_buffer.cc @@ -5,6 +5,7 @@ #include "media/base/stream_parser_buffer.h" #include "base/logging.h" +#include "media/base/buffers.h" namespace media { @@ -34,7 +35,12 @@ StreamParserBuffer::StreamParserBuffer(const uint8* data, int data_size, is_keyframe_(is_keyframe), decode_timestamp_(kNoTimestamp()), config_id_(kInvalidConfigId) { - SetDuration(kNoTimestamp()); + // TODO(scherkus): Should DataBuffer constructor accept a timestamp and + // duration to force clients to set them? Today they end up being zero which + // is both a common and valid value and could lead to bugs. + if (data) { + SetDuration(kNoTimestamp()); + } } StreamParserBuffer::~StreamParserBuffer() { |