| Index: webrtc/base/stream.cc
|
| diff --git a/webrtc/base/stream.cc b/webrtc/base/stream.cc
|
| index 744cf083b94e10a1de2ca06c58009a76c91fcbb4..607d86dc2696bc863f93dff4f662c5923e6860d4 100644
|
| --- a/webrtc/base/stream.cc
|
| +++ b/webrtc/base/stream.cc
|
| @@ -434,7 +434,7 @@ bool FileStream::SetPosition(size_t position) {
|
| }
|
|
|
| bool FileStream::GetPosition(size_t* position) const {
|
| - ASSERT(NULL != position);
|
| + RTC_DCHECK(NULL != position);
|
| if (!file_)
|
| return false;
|
| long result = ftell(file_);
|
| @@ -446,7 +446,7 @@ bool FileStream::GetPosition(size_t* position) const {
|
| }
|
|
|
| bool FileStream::GetSize(size_t* size) const {
|
| - ASSERT(NULL != size);
|
| + RTC_DCHECK(NULL != size);
|
| if (!file_)
|
| return false;
|
| struct stat file_stats;
|
| @@ -458,7 +458,7 @@ bool FileStream::GetSize(size_t* size) const {
|
| }
|
|
|
| bool FileStream::GetAvailable(size_t* size) const {
|
| - ASSERT(NULL != size);
|
| + RTC_DCHECK(NULL != size);
|
| if (!GetSize(size))
|
| return false;
|
| long result = ftell(file_);
|
| @@ -563,7 +563,7 @@ StreamResult MemoryStreamBase::Write(const void* buffer, size_t bytes,
|
| if (SR_SUCCESS != result) {
|
| return result;
|
| }
|
| - ASSERT(buffer_length_ >= new_buffer_length);
|
| + RTC_DCHECK(buffer_length_ >= new_buffer_length);
|
| available = buffer_length_ - seek_position_;
|
| }
|
|
|
| @@ -808,7 +808,7 @@ const void* FifoBuffer::GetReadData(size_t* size) {
|
|
|
| void FifoBuffer::ConsumeReadData(size_t size) {
|
| CritScope cs(&crit_);
|
| - ASSERT(size <= data_length_);
|
| + RTC_DCHECK(size <= data_length_);
|
| const bool was_writable = data_length_ < buffer_length_;
|
| read_position_ = (read_position_ + size) % buffer_length_;
|
| data_length_ -= size;
|
| @@ -838,7 +838,7 @@ void* FifoBuffer::GetWriteBuffer(size_t* size) {
|
|
|
| void FifoBuffer::ConsumeWriteBuffer(size_t size) {
|
| CritScope cs(&crit_);
|
| - ASSERT(size <= buffer_length_ - data_length_);
|
| + RTC_DCHECK(size <= buffer_length_ - data_length_);
|
| const bool was_readable = (data_length_ > 0);
|
| data_length_ += size;
|
| if (!was_readable && size > 0) {
|
| @@ -1070,7 +1070,7 @@ StreamResult Flow(StreamInterface* source,
|
| char* buffer, size_t buffer_len,
|
| StreamInterface* sink,
|
| size_t* data_len /* = NULL */) {
|
| - ASSERT(buffer_len > 0);
|
| + RTC_DCHECK(buffer_len > 0);
|
|
|
| StreamResult result;
|
| size_t count, read_pos, write_pos;
|
|
|