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

Side by Side Diff: content/renderer/media/android/media_source_delegate.cc

Issue 1083883003: Move BindToCurrentLoop from media/base/ to base/ Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix media/base/callback_holder.h compile Created 5 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
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/android/media_source_delegate.h" 5 #include "content/renderer/media/android/media_source_delegate.h"
6 6
7 #include <limits> 7 #include <limits>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/bind_to_current_loop.h"
11 #include "base/message_loop/message_loop_proxy.h" 12 #include "base/message_loop/message_loop_proxy.h"
12 #include "base/strings/string_number_conversions.h" 13 #include "base/strings/string_number_conversions.h"
13 #include "content/renderer/media/android/renderer_demuxer_android.h" 14 #include "content/renderer/media/android/renderer_demuxer_android.h"
14 #include "media/base/android/demuxer_stream_player_params.h" 15 #include "media/base/android/demuxer_stream_player_params.h"
15 #include "media/base/bind_to_current_loop.h"
16 #include "media/base/demuxer_stream.h" 16 #include "media/base/demuxer_stream.h"
17 #include "media/base/media_log.h" 17 #include "media/base/media_log.h"
18 #include "media/blink/webmediaplayer_util.h" 18 #include "media/blink/webmediaplayer_util.h"
19 #include "media/blink/webmediasource_impl.h" 19 #include "media/blink/webmediasource_impl.h"
20 #include "media/filters/chunk_demuxer.h" 20 #include "media/filters/chunk_demuxer.h"
21 #include "media/filters/decrypting_demuxer_stream.h" 21 #include "media/filters/decrypting_demuxer_stream.h"
22 #include "third_party/WebKit/public/platform/WebString.h" 22 #include "third_party/WebKit/public/platform/WebString.h"
23 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h" 23 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h"
24 24
25 using media::DemuxerStream; 25 using media::DemuxerStream;
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 const media::Demuxer::EncryptedMediaInitDataCB& 146 const media::Demuxer::EncryptedMediaInitDataCB&
147 encrypted_media_init_data_cb, 147 encrypted_media_init_data_cb,
148 const media::SetDecryptorReadyCB& set_decryptor_ready_cb, 148 const media::SetDecryptorReadyCB& set_decryptor_ready_cb,
149 const UpdateNetworkStateCB& update_network_state_cb, 149 const UpdateNetworkStateCB& update_network_state_cb,
150 const DurationChangeCB& duration_change_cb, 150 const DurationChangeCB& duration_change_cb,
151 const base::Closure& waiting_for_decryption_key_cb) { 151 const base::Closure& waiting_for_decryption_key_cb) {
152 DCHECK(main_task_runner_->BelongsToCurrentThread()); 152 DCHECK(main_task_runner_->BelongsToCurrentThread());
153 DCHECK(!media_source_opened_cb.is_null()); 153 DCHECK(!media_source_opened_cb.is_null());
154 media_source_opened_cb_ = media_source_opened_cb; 154 media_source_opened_cb_ = media_source_opened_cb;
155 encrypted_media_init_data_cb_ = encrypted_media_init_data_cb; 155 encrypted_media_init_data_cb_ = encrypted_media_init_data_cb;
156 set_decryptor_ready_cb_ = media::BindToCurrentLoop(set_decryptor_ready_cb); 156 set_decryptor_ready_cb_ = base::BindToCurrentLoop(set_decryptor_ready_cb);
157 update_network_state_cb_ = media::BindToCurrentLoop(update_network_state_cb); 157 update_network_state_cb_ = base::BindToCurrentLoop(update_network_state_cb);
158 duration_change_cb_ = duration_change_cb; 158 duration_change_cb_ = duration_change_cb;
159 waiting_for_decryption_key_cb_ = 159 waiting_for_decryption_key_cb_ =
160 media::BindToCurrentLoop(waiting_for_decryption_key_cb); 160 base::BindToCurrentLoop(waiting_for_decryption_key_cb);
161 access_unit_size_ = kAccessUnitSizeForMediaSource; 161 access_unit_size_ = kAccessUnitSizeForMediaSource;
162 162
163 chunk_demuxer_.reset(new media::ChunkDemuxer( 163 chunk_demuxer_.reset(new media::ChunkDemuxer(
164 media::BindToCurrentLoop( 164 base::BindToCurrentLoop(
165 base::Bind(&MediaSourceDelegate::OnDemuxerOpened, main_weak_this_)), 165 base::Bind(&MediaSourceDelegate::OnDemuxerOpened, main_weak_this_)),
166 media::BindToCurrentLoop(base::Bind( 166 base::BindToCurrentLoop(base::Bind(
167 &MediaSourceDelegate::OnEncryptedMediaInitData, main_weak_this_)), 167 &MediaSourceDelegate::OnEncryptedMediaInitData, main_weak_this_)),
168 base::Bind(&media::MediaLog::AddLogEvent, media_log_), media_log_, 168 base::Bind(&media::MediaLog::AddLogEvent, media_log_), media_log_,
169 false)); 169 false));
170 170
171 // |this| will be retained until StopDemuxer() is posted, so Unretained() is 171 // |this| will be retained until StopDemuxer() is posted, so Unretained() is
172 // safe here. 172 // safe here.
173 media_task_runner_->PostTask(FROM_HERE, 173 media_task_runner_->PostTask(FROM_HERE,
174 base::Bind(&MediaSourceDelegate::InitializeDemuxer, 174 base::Bind(&MediaSourceDelegate::InitializeDemuxer,
175 base::Unretained(this))); 175 base::Unretained(this)));
176 } 176 }
(...skipping 577 matching lines...) Expand 10 before | Expand all | Expand 10 after
754 configs->video_size = config.natural_size(); 754 configs->video_size = config.natural_size();
755 configs->is_video_encrypted = config.is_encrypted(); 755 configs->is_video_encrypted = config.is_encrypted();
756 configs->video_extra_data = std::vector<uint8>( 756 configs->video_extra_data = std::vector<uint8>(
757 config.extra_data(), config.extra_data() + config.extra_data_size()); 757 config.extra_data(), config.extra_data() + config.extra_data_size());
758 return true; 758 return true;
759 } 759 }
760 return false; 760 return false;
761 } 761 }
762 762
763 } // namespace content 763 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698