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

Side by Side Diff: third_party/WebKit/Source/platform/mediastream/MediaStreamComponent.cpp

Issue 2651353002: Get the device ID in getSettings() (Closed)
Patch Set: Created 3 years, 11 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 /* 1 /*
2 * Copyright (C) 2011 Ericsson AB. All rights reserved. 2 * Copyright (C) 2011 Ericsson AB. All rights reserved.
3 * Copyright (C) 2013 Google Inc. All rights reserved. 3 * Copyright (C) 2013 Google Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are 6 * modification, are permitted provided that the following conditions are
7 * met: 7 * met:
8 * 8 *
9 * * Redistributions of source code must retain the above copyright 9 * * Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 87
88 void MediaStreamComponent::AudioSourceProviderImpl::wrap( 88 void MediaStreamComponent::AudioSourceProviderImpl::wrap(
89 WebAudioSourceProvider* provider) { 89 WebAudioSourceProvider* provider) {
90 MutexLocker locker(m_provideInputLock); 90 MutexLocker locker(m_provideInputLock);
91 m_webAudioSourceProvider = provider; 91 m_webAudioSourceProvider = provider;
92 } 92 }
93 93
94 void MediaStreamComponent::getSettings( 94 void MediaStreamComponent::getSettings(
95 WebMediaStreamTrack::Settings& settings) { 95 WebMediaStreamTrack::Settings& settings) {
96 DCHECK(m_trackData); 96 DCHECK(m_trackData);
97 m_source->getSettings(settings);
97 m_trackData->getSettings(settings); 98 m_trackData->getSettings(settings);
miu 2017/01/31 01:23:20 There was the earlier change to WebMediaStreamTrac
hta - Chromium 2017/02/06 01:33:10 I am staring at (in another CL) whether or not tha
98 } 99 }
99 100
100 void MediaStreamComponent::setContentHint( 101 void MediaStreamComponent::setContentHint(
101 WebMediaStreamTrack::ContentHintType hint) { 102 WebMediaStreamTrack::ContentHintType hint) {
102 switch (hint) { 103 switch (hint) {
103 case WebMediaStreamTrack::ContentHintType::None: 104 case WebMediaStreamTrack::ContentHintType::None:
104 break; 105 break;
105 case WebMediaStreamTrack::ContentHintType::AudioSpeech: 106 case WebMediaStreamTrack::ContentHintType::AudioSpeech:
106 case WebMediaStreamTrack::ContentHintType::AudioMusic: 107 case WebMediaStreamTrack::ContentHintType::AudioMusic:
107 DCHECK_EQ(MediaStreamSource::TypeAudio, source()->type()); 108 DCHECK_EQ(MediaStreamSource::TypeAudio, source()->type());
(...skipping 30 matching lines...) Expand all
138 webAudioData[i] = bus->channel(i)->mutableData(); 139 webAudioData[i] = bus->channel(i)->mutableData();
139 140
140 m_webAudioSourceProvider->provideInput(webAudioData, framesToProcess); 141 m_webAudioSourceProvider->provideInput(webAudioData, framesToProcess);
141 } 142 }
142 143
143 DEFINE_TRACE(MediaStreamComponent) { 144 DEFINE_TRACE(MediaStreamComponent) {
144 visitor->trace(m_source); 145 visitor->trace(m_source);
145 } 146 }
146 147
147 } // namespace blink 148 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698