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

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

Issue 213283003: Move splice frame setting to ChunkDemuxer(). Disable for now. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Default off everywhere. Created 6 years, 8 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 | « content/renderer/media/android/media_source_delegate.cc ('k') | media/filters/chunk_demuxer.h » ('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 1129 matching lines...) Expand 10 before | Expand all | Expand 10 after
1140 media_loop_, data_source_.get(), 1140 media_loop_, data_source_.get(),
1141 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnNeedKey), 1141 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnNeedKey),
1142 media_log_)); 1142 media_log_));
1143 } else { 1143 } else {
1144 DCHECK(!chunk_demuxer_); 1144 DCHECK(!chunk_demuxer_);
1145 DCHECK(!data_source_); 1145 DCHECK(!data_source_);
1146 1146
1147 chunk_demuxer_ = new media::ChunkDemuxer( 1147 chunk_demuxer_ = new media::ChunkDemuxer(
1148 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnDemuxerOpened), 1148 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnDemuxerOpened),
1149 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnNeedKey), 1149 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnNeedKey),
1150 base::Bind(&LogMediaSourceError, media_log_)); 1150 base::Bind(&LogMediaSourceError, media_log_),
1151 false);
1151 demuxer_.reset(chunk_demuxer_); 1152 demuxer_.reset(chunk_demuxer_);
1152 } 1153 }
1153 1154
1154 scoped_ptr<media::FilterCollection> filter_collection( 1155 scoped_ptr<media::FilterCollection> filter_collection(
1155 new media::FilterCollection()); 1156 new media::FilterCollection());
1156 filter_collection->SetDemuxer(demuxer_.get()); 1157 filter_collection->SetDemuxer(demuxer_.get());
1157 1158
1158 media::SetDecryptorReadyCB set_decryptor_ready_cb = 1159 media::SetDecryptorReadyCB set_decryptor_ready_cb =
1159 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::SetDecryptorReadyCB); 1160 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::SetDecryptorReadyCB);
1160 1161
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
1310 1311
1311 if (web_cdm_) { 1312 if (web_cdm_) {
1312 decryptor_ready_cb.Run(web_cdm_->GetDecryptor()); 1313 decryptor_ready_cb.Run(web_cdm_->GetDecryptor());
1313 return; 1314 return;
1314 } 1315 }
1315 1316
1316 decryptor_ready_cb_ = decryptor_ready_cb; 1317 decryptor_ready_cb_ = decryptor_ready_cb;
1317 } 1318 }
1318 1319
1319 } // namespace content 1320 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/android/media_source_delegate.cc ('k') | media/filters/chunk_demuxer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698