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