Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1104)

Unified Diff: media/filters/source_buffer_range.cc

Issue 1692403002: MSE - Fix crash caused by incorrect GC of GOP with next buffer position (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Increased hardening + more code comments per chat w/chcunningham@ Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/filters/source_buffer_range.h ('k') | media/filters/source_buffer_stream.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/source_buffer_range.cc
diff --git a/media/filters/source_buffer_range.cc b/media/filters/source_buffer_range.cc
index bd99bc01d3c395d099b061d94fda12607ba05818..6e664f974854dca4a1e9d8fdf8202fd049985128 100644
--- a/media/filters/source_buffer_range.cc
+++ b/media/filters/source_buffer_range.cc
@@ -231,6 +231,7 @@ bool SourceBufferRange::TruncateAt(
}
size_t SourceBufferRange::DeleteGOPFromFront(BufferQueue* deleted_buffers) {
+ DCHECK(!buffers_.empty());
DCHECK(!FirstGOPContainsNextBufferPosition());
DCHECK(deleted_buffers);
@@ -279,6 +280,7 @@ size_t SourceBufferRange::DeleteGOPFromFront(BufferQueue* deleted_buffers) {
}
size_t SourceBufferRange::DeleteGOPFromBack(BufferQueue* deleted_buffers) {
+ DCHECK(!buffers_.empty());
DCHECK(!LastGOPContainsNextBufferPosition());
DCHECK(deleted_buffers);
@@ -351,7 +353,7 @@ size_t SourceBufferRange::GetRemovalGOP(
bool SourceBufferRange::FirstGOPEarlierThanMediaTime(
DecodeTimestamp media_time) const {
if (keyframe_map_.size() == 1u)
- return (GetEndTimestamp() < media_time);
+ return (GetBufferedEndTimestamp() <= media_time);
KeyframeMap::const_iterator second_gop = keyframe_map_.begin();
++second_gop;
« no previous file with comments | « media/filters/source_buffer_range.h ('k') | media/filters/source_buffer_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698