OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "media/filters/source_buffer_stream.h" | 5 #include "media/filters/source_buffer_stream.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <map> | 8 #include <map> |
9 #include <sstream> | 9 #include <sstream> |
10 | 10 |
(...skipping 581 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
592 } | 592 } |
593 } | 593 } |
594 | 594 |
595 void SourceBufferStream::GarbageCollectIfNeeded() { | 595 void SourceBufferStream::GarbageCollectIfNeeded() { |
596 // Compute size of |ranges_|. | 596 // Compute size of |ranges_|. |
597 int ranges_size = 0; | 597 int ranges_size = 0; |
598 for (RangeList::iterator itr = ranges_.begin(); itr != ranges_.end(); ++itr) | 598 for (RangeList::iterator itr = ranges_.begin(); itr != ranges_.end(); ++itr) |
599 ranges_size += (*itr)->size_in_bytes(); | 599 ranges_size += (*itr)->size_in_bytes(); |
600 | 600 |
601 // Return if we're under or at the memory limit. | 601 // Return if we're under or at the memory limit. |
602 if (ranges_size <= memory_limit_) | 602 if (ranges_size <= GetMemoryLimit()) |
603 return; | 603 return; |
604 | 604 |
605 int bytes_to_free = ranges_size - memory_limit_; | 605 int bytes_to_free = ranges_size - GetMemoryLimit(); |
606 | 606 |
607 DVLOG(2) << __FUNCTION__ << " " << GetStreamTypeName() << ": Before GC" | 607 DVLOG(2) << __FUNCTION__ << " " << GetStreamTypeName() << ": Before GC" |
608 << " ranges_size=" << ranges_size | 608 << " ranges_size=" << ranges_size |
609 << " ranges_=" << RangesToString(ranges_) | 609 << " ranges_=" << RangesToString(ranges_) |
610 << " memory_limit_=" << memory_limit_; | 610 << " GetMemoryLimit()=" << GetMemoryLimit(); |
611 | 611 |
612 // Begin deleting after the last appended buffer. | 612 // Begin deleting after the last appended buffer. |
613 int bytes_freed = FreeBuffersAfterLastAppended(bytes_to_free); | 613 int bytes_freed = FreeBuffersAfterLastAppended(bytes_to_free); |
614 | 614 |
615 // Begin deleting from the front. | 615 // Begin deleting from the front. |
616 if (bytes_to_free - bytes_freed > 0) | 616 if (bytes_to_free - bytes_freed > 0) |
617 bytes_freed += FreeBuffers(bytes_to_free - bytes_freed, false); | 617 bytes_freed += FreeBuffers(bytes_to_free - bytes_freed, false); |
618 | 618 |
619 // Begin deleting from the back. | 619 // Begin deleting from the back. |
620 if (bytes_to_free - bytes_freed > 0) | 620 if (bytes_to_free - bytes_freed > 0) |
(...skipping 967 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1588 return false; | 1588 return false; |
1589 | 1589 |
1590 DCHECK_NE(have_splice_buffers, have_preroll_buffer); | 1590 DCHECK_NE(have_splice_buffers, have_preroll_buffer); |
1591 splice_buffers_index_ = 0; | 1591 splice_buffers_index_ = 0; |
1592 pending_buffer_.swap(*out_buffer); | 1592 pending_buffer_.swap(*out_buffer); |
1593 pending_buffers_complete_ = false; | 1593 pending_buffers_complete_ = false; |
1594 return true; | 1594 return true; |
1595 } | 1595 } |
1596 | 1596 |
1597 } // namespace media | 1597 } // namespace media |
OLD | NEW |