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

Unified Diff: media/filters/source_buffer_stream.cc

Issue 2492953003: media: Delete renderer/demuxer splicing code. (Closed)
Patch Set: Fix/format EsAdapterVideoTest Created 4 years, 1 month 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.cc ('k') | media/filters/video_frame_stream_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/source_buffer_stream.cc
diff --git a/media/filters/source_buffer_stream.cc b/media/filters/source_buffer_stream.cc
index c0cb7ff6ef672b665059fb76501c1078cba6cc3e..82fe81f1f26b327420c16937386caab7fbfeec4e 100644
--- a/media/filters/source_buffer_stream.cc
+++ b/media/filters/source_buffer_stream.cc
@@ -1310,7 +1310,7 @@ SourceBufferStream::Status SourceBufferStream::GetNextBufferInternal(
// If the next buffer is an audio splice frame, the next effective config id
// comes from the first splice buffer.
- if (next_buffer->GetSpliceBufferConfigId(0) != current_config_index_) {
+ if (next_buffer->GetConfigId() != current_config_index_) {
config_change_pending_ = true;
DVLOG(1) << "Config change (track buffer config ID does not match).";
return kConfigChange;
@@ -1591,7 +1591,7 @@ void SourceBufferStream::CompleteConfigChange() {
config_change_pending_ = false;
if (!track_buffer_.empty()) {
- current_config_index_ = track_buffer_.front()->GetSpliceBufferConfigId(0);
+ current_config_index_ = track_buffer_.front()->GetConfigId();
return;
}
« no previous file with comments | « media/filters/source_buffer_range.cc ('k') | media/filters/video_frame_stream_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698