Index: media/base/decoder_buffer.cc |
diff --git a/media/base/decoder_buffer.cc b/media/base/decoder_buffer.cc |
index d3acc26687fb69125667317389df212da2727a08..9eaa128ceb2ce66a8778666a680bf04d45c37d72 100644 |
--- a/media/base/decoder_buffer.cc |
+++ b/media/base/decoder_buffer.cc |
@@ -70,67 +70,8 @@ scoped_refptr<DecoderBuffer> DecoderBuffer::CreateEOSBuffer() { |
return make_scoped_refptr(new DecoderBuffer(NULL, 0, NULL, 0)); |
} |
-base::TimeDelta DecoderBuffer::GetTimestamp() const { |
- DCHECK(!IsEndOfStream()); |
- return timestamp_; |
-} |
- |
-void DecoderBuffer::SetTimestamp(const base::TimeDelta& timestamp) { |
- DCHECK(!IsEndOfStream()); |
- timestamp_ = timestamp; |
-} |
- |
-base::TimeDelta DecoderBuffer::GetDuration() const { |
- DCHECK(!IsEndOfStream()); |
- return duration_; |
-} |
- |
-void DecoderBuffer::SetDuration(const base::TimeDelta& duration) { |
- DCHECK(!IsEndOfStream()); |
- duration_ = duration; |
-} |
- |
-const uint8* DecoderBuffer::GetData() const { |
- DCHECK(!IsEndOfStream()); |
- return data_.get(); |
-} |
- |
-uint8* DecoderBuffer::GetWritableData() const { |
- DCHECK(!IsEndOfStream()); |
- return data_.get(); |
-} |
- |
-int DecoderBuffer::GetDataSize() const { |
- DCHECK(!IsEndOfStream()); |
- return size_; |
-} |
- |
-const uint8* DecoderBuffer::GetSideData() const { |
- DCHECK(!IsEndOfStream()); |
- return side_data_.get(); |
-} |
- |
-int DecoderBuffer::GetSideDataSize() const { |
- DCHECK(!IsEndOfStream()); |
- return side_data_size_; |
-} |
- |
-const DecryptConfig* DecoderBuffer::GetDecryptConfig() const { |
- DCHECK(!IsEndOfStream()); |
- return decrypt_config_.get(); |
-} |
- |
-void DecoderBuffer::SetDecryptConfig(scoped_ptr<DecryptConfig> decrypt_config) { |
- DCHECK(!IsEndOfStream()); |
- decrypt_config_ = decrypt_config.Pass(); |
-} |
- |
-bool DecoderBuffer::IsEndOfStream() const { |
- return data_ == NULL; |
-} |
- |
std::string DecoderBuffer::AsHumanReadableString() { |
- if (IsEndOfStream()) { |
+ if (end_of_stream()) { |
return "end of stream"; |
} |