Commit c9b870cc authored by Dave Tapuska's avatar Dave Tapuska Committed by Commit Bot

Fix 64 bit narrowing issues in mediastream.

Use appropriate types instead of size_t.

BUG=879657

Change-Id: I5372e622570dbfed1628e6a1c70882ed85a17b51
Reviewed-on: https://chromium-review.googlesource.com/c/1347431Reviewed-by: default avatarDavid Bokan <bokan@chromium.org>
Commit-Queue: Dave Tapuska <dtapuska@chromium.org>
Cr-Commit-Position: refs/heads/master@{#610464}
parent cba7acd7
...@@ -72,10 +72,10 @@ void MediaStreamCenter::DidCreateMediaStreamAndTracks( ...@@ -72,10 +72,10 @@ void MediaStreamCenter::DidCreateMediaStreamAndTracks(
if (!private_) if (!private_)
return; return;
for (size_t i = 0; i < stream->NumberOfAudioComponents(); ++i) for (uint32_t i = 0; i < stream->NumberOfAudioComponents(); ++i)
DidCreateMediaStreamTrack(stream->AudioComponent(i)); DidCreateMediaStreamTrack(stream->AudioComponent(i));
for (size_t i = 0; i < stream->NumberOfVideoComponents(); ++i) for (uint32_t i = 0; i < stream->NumberOfVideoComponents(); ++i)
DidCreateMediaStreamTrack(stream->VideoComponent(i)); DidCreateMediaStreamTrack(stream->VideoComponent(i));
} }
......
...@@ -129,9 +129,9 @@ void MediaStreamComponent::AudioSourceProviderImpl::ProvideInput( ...@@ -129,9 +129,9 @@ void MediaStreamComponent::AudioSourceProviderImpl::ProvideInput(
} }
// Wrap the AudioBus channel data using WebVector. // Wrap the AudioBus channel data using WebVector.
size_t n = bus->NumberOfChannels(); uint32_t n = bus->NumberOfChannels();
WebVector<float*> web_audio_data(n); WebVector<float*> web_audio_data(n);
for (size_t i = 0; i < n; ++i) for (uint32_t i = 0; i < n; ++i)
web_audio_data[i] = bus->Channel(i)->MutableData(); web_audio_data[i] = bus->Channel(i)->MutableData();
web_audio_source_provider_->ProvideInput(web_audio_data, frames_to_process); web_audio_source_provider_->ProvideInput(web_audio_data, frames_to_process);
......
...@@ -87,7 +87,7 @@ void MediaStreamDescriptor::AddComponent(MediaStreamComponent* component) { ...@@ -87,7 +87,7 @@ void MediaStreamDescriptor::AddComponent(MediaStreamComponent* component) {
} }
void MediaStreamDescriptor::RemoveComponent(MediaStreamComponent* component) { void MediaStreamDescriptor::RemoveComponent(MediaStreamComponent* component) {
size_t pos = kNotFound; wtf_size_t pos = kNotFound;
switch (component->Source()->GetType()) { switch (component->Source()->GetType()) {
case MediaStreamSource::kTypeAudio: case MediaStreamSource::kTypeAudio:
pos = audio_components_.Find(component); pos = audio_components_.Find(component);
...@@ -138,7 +138,7 @@ void MediaStreamDescriptor::AddObserver(WebMediaStreamObserver* observer) { ...@@ -138,7 +138,7 @@ void MediaStreamDescriptor::AddObserver(WebMediaStreamObserver* observer) {
} }
void MediaStreamDescriptor::RemoveObserver(WebMediaStreamObserver* observer) { void MediaStreamDescriptor::RemoveObserver(WebMediaStreamObserver* observer) {
size_t index = observers_.Find(observer); wtf_size_t index = observers_.Find(observer);
DCHECK(index != kNotFound); DCHECK(index != kNotFound);
observers_.EraseAt(index); observers_.EraseAt(index);
} }
...@@ -149,11 +149,11 @@ MediaStreamDescriptor::MediaStreamDescriptor( ...@@ -149,11 +149,11 @@ MediaStreamDescriptor::MediaStreamDescriptor(
const MediaStreamSourceVector& video_sources) const MediaStreamSourceVector& video_sources)
: client_(nullptr), id_(id), unique_id_(GenerateUniqueId()), active_(true) { : client_(nullptr), id_(id), unique_id_(GenerateUniqueId()), active_(true) {
DCHECK(id_.length()); DCHECK(id_.length());
for (size_t i = 0; i < audio_sources.size(); i++) for (MediaStreamSource* source : audio_sources)
audio_components_.push_back(MediaStreamComponent::Create(audio_sources[i])); audio_components_.push_back(MediaStreamComponent::Create(source));
for (size_t i = 0; i < video_sources.size(); i++) for (MediaStreamSource* source : video_sources)
video_components_.push_back(MediaStreamComponent::Create(video_sources[i])); video_components_.push_back(MediaStreamComponent::Create(source));
} }
MediaStreamDescriptor::MediaStreamDescriptor( MediaStreamDescriptor::MediaStreamDescriptor(
......
...@@ -87,7 +87,7 @@ void MediaStreamSource::SetReadyState(ReadyState ready_state) { ...@@ -87,7 +87,7 @@ void MediaStreamSource::SetReadyState(ReadyState ready_state) {
// //
// TODO(sof): consider adding run-time checks that disallows this kind // TODO(sof): consider adding run-time checks that disallows this kind
// of dead object revivification by default. // of dead object revivification by default.
for (size_t i = 0; i < observers.size(); ++i) for (wtf_size_t i = 0; i < observers.size(); ++i)
observers[i] = nullptr; observers[i] = nullptr;
} }
} }
......
...@@ -53,9 +53,9 @@ void MediaStreamWebAudioSource::ProvideInput(AudioBus* bus, ...@@ -53,9 +53,9 @@ void MediaStreamWebAudioSource::ProvideInput(AudioBus* bus,
} }
// Wrap the AudioBus channel data using WebVector. // Wrap the AudioBus channel data using WebVector.
size_t n = bus->NumberOfChannels(); uint32_t n = bus->NumberOfChannels();
WebVector<float*> web_audio_data(n); WebVector<float*> web_audio_data(n);
for (size_t i = 0; i < n; ++i) for (uint32_t i = 0; i < n; ++i)
web_audio_data[i] = bus->Channel(i)->MutableData(); web_audio_data[i] = bus->Channel(i)->MutableData();
web_audio_source_provider_->ProvideInput(web_audio_data, frames_to_process); web_audio_source_provider_->ProvideInput(web_audio_data, frames_to_process);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment