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

Side by Side Diff: third_party/WebKit/Source/platform/exported/WebMediaStreamSource.cpp

Issue 2645613005: MediaStreamTrack: Add echo-cancellation and device-id to 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 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 namespace blink { 42 namespace blink {
43 43
44 namespace { 44 namespace {
45 45
46 class ExtraDataContainer : public MediaStreamSource::ExtraData { 46 class ExtraDataContainer : public MediaStreamSource::ExtraData {
47 public: 47 public:
48 ExtraDataContainer(std::unique_ptr<WebMediaStreamSource::ExtraData> extraData) 48 ExtraDataContainer(std::unique_ptr<WebMediaStreamSource::ExtraData> extraData)
49 : m_extraData(std::move(extraData)) {} 49 : m_extraData(std::move(extraData)) {}
50 50
51 WebMediaStreamSource::ExtraData* getExtraData() { return m_extraData.get(); } 51 WebMediaStreamSource::ExtraData* getExtraData() { return m_extraData.get(); }
52 void getSettings(WebMediaStreamTrack::Settings& settings) override {
53 m_extraData->getSettings(settings);
54 }
52 55
53 private: 56 private:
54 std::unique_ptr<WebMediaStreamSource::ExtraData> m_extraData; 57 std::unique_ptr<WebMediaStreamSource::ExtraData> m_extraData;
55 }; 58 };
56 59
57 } // namespace 60 } // namespace
58 61
59 WebMediaStreamSource WebMediaStreamSource::ExtraData::owner() { 62 WebMediaStreamSource WebMediaStreamSource::ExtraData::owner() {
60 ASSERT(m_owner); 63 ASSERT(m_owner);
61 return WebMediaStreamSource(m_owner); 64 return WebMediaStreamSource(m_owner);
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 ConsumerWrapper* wrapper = static_cast<ConsumerWrapper*>(it->get()); 220 ConsumerWrapper* wrapper = static_cast<ConsumerWrapper*>(it->get());
218 if (wrapper->consumer() == consumer) { 221 if (wrapper->consumer() == consumer) {
219 m_private->removeAudioConsumer(wrapper); 222 m_private->removeAudioConsumer(wrapper);
220 return true; 223 return true;
221 } 224 }
222 } 225 }
223 return false; 226 return false;
224 } 227 }
225 228
226 } // namespace blink 229 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698