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

Side by Side Diff: content/renderer/media/webmediaplayer_impl.cc

Issue 251903008: Fix incorrect config id being associated with post splice buffer. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix ChunkDemuxer test. Created 6 years, 7 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | media/filters/chunk_demuxer_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "content/renderer/media/webmediaplayer_impl.h" 5 #include "content/renderer/media/webmediaplayer_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <limits> 8 #include <limits>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 1149 matching lines...) Expand 10 before | Expand all | Expand 10 after
1160 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnNeedKey), 1160 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnNeedKey),
1161 media_log_)); 1161 media_log_));
1162 } else { 1162 } else {
1163 DCHECK(!chunk_demuxer_); 1163 DCHECK(!chunk_demuxer_);
1164 DCHECK(!data_source_); 1164 DCHECK(!data_source_);
1165 1165
1166 chunk_demuxer_ = new media::ChunkDemuxer( 1166 chunk_demuxer_ = new media::ChunkDemuxer(
1167 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnDemuxerOpened), 1167 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnDemuxerOpened),
1168 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnNeedKey), 1168 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnNeedKey),
1169 base::Bind(&LogMediaSourceError, media_log_), 1169 base::Bind(&LogMediaSourceError, media_log_),
1170 false); 1170 true);
1171 demuxer_.reset(chunk_demuxer_); 1171 demuxer_.reset(chunk_demuxer_);
1172 } 1172 }
1173 1173
1174 scoped_ptr<media::FilterCollection> filter_collection( 1174 scoped_ptr<media::FilterCollection> filter_collection(
1175 new media::FilterCollection()); 1175 new media::FilterCollection());
1176 filter_collection->SetDemuxer(demuxer_.get()); 1176 filter_collection->SetDemuxer(demuxer_.get());
1177 1177
1178 media::SetDecryptorReadyCB set_decryptor_ready_cb = 1178 media::SetDecryptorReadyCB set_decryptor_ready_cb =
1179 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::SetDecryptorReadyCB); 1179 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::SetDecryptorReadyCB);
1180 1180
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
1340 1340
1341 if (web_cdm_) { 1341 if (web_cdm_) {
1342 decryptor_ready_cb.Run(web_cdm_->GetDecryptor()); 1342 decryptor_ready_cb.Run(web_cdm_->GetDecryptor());
1343 return; 1343 return;
1344 } 1344 }
1345 1345
1346 decryptor_ready_cb_ = decryptor_ready_cb; 1346 decryptor_ready_cb_ = decryptor_ready_cb;
1347 } 1347 }
1348 1348
1349 } // namespace content 1349 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | media/filters/chunk_demuxer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698