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

Side by Side Diff: content/renderer/media/media_stream_center.h

Issue 1834323002: MediaStream audio: Refactor 3 separate "glue" implementations into one. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: REBASE + Workaround to ensure MediaStreamAudioProcessor is destroyed on the main thread. Created 4 years, 7 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_CENTER_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_CENTER_H_
6 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_CENTER_H_ 6 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_CENTER_H_
7 7
8 #include <map> 8 #include <map>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
11 #include "base/macros.h" 11 #include "base/macros.h"
12 #include "content/common/content_export.h" 12 #include "content/common/content_export.h"
13 #include "content/common/media/media_stream_options.h" 13 #include "content/common/media/media_stream_options.h"
14 #include "third_party/WebKit/public/platform/WebMediaStream.h" 14 #include "third_party/WebKit/public/platform/WebMediaStream.h"
15 #include "third_party/WebKit/public/platform/WebMediaStreamCenter.h" 15 #include "third_party/WebKit/public/platform/WebMediaStreamCenter.h"
16 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h" 16 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"
17 #include "third_party/WebKit/public/platform/WebMediaStreamTrackSourcesRequest.h " 17 #include "third_party/WebKit/public/platform/WebMediaStreamTrackSourcesRequest.h "
18 18
19 namespace blink { 19 namespace blink {
20 class WebAudioSourceProvider; 20 class WebAudioSourceProvider;
21 class WebMediaStreamCenterClient; 21 class WebMediaStreamCenterClient;
22 } 22 }
23 23
24 namespace content { 24 namespace content {
25 class PeerConnectionDependencyFactory; 25 class PeerConnectionDependencyFactory;
26 26
27 class CONTENT_EXPORT MediaStreamCenter 27 class CONTENT_EXPORT MediaStreamCenter
28 : NON_EXPORTED_BASE(public blink::WebMediaStreamCenter) { 28 : NON_EXPORTED_BASE(public blink::WebMediaStreamCenter) {
29 public: 29 public:
30 // TODO(miu): Remove these constructor args. They are no longer used.
31 // http://crbug.com/577874
30 MediaStreamCenter(blink::WebMediaStreamCenterClient* client, 32 MediaStreamCenter(blink::WebMediaStreamCenterClient* client,
31 PeerConnectionDependencyFactory* factory); 33 PeerConnectionDependencyFactory* factory);
32 ~MediaStreamCenter() override; 34 ~MediaStreamCenter() override;
33 35
34 private: 36 private:
35 void didCreateMediaStreamTrack( 37 void didCreateMediaStreamTrack(
36 const blink::WebMediaStreamTrack& track) override; 38 const blink::WebMediaStreamTrack& track) override;
37 39
38 void didEnableMediaStreamTrack( 40 void didEnableMediaStreamTrack(
39 const blink::WebMediaStreamTrack& track) override; 41 const blink::WebMediaStreamTrack& track) override;
(...skipping 11 matching lines...) Expand all
51 53
52 void didCreateMediaStream(blink::WebMediaStream& stream) override; 54 void didCreateMediaStream(blink::WebMediaStream& stream) override;
53 55
54 bool didAddMediaStreamTrack(const blink::WebMediaStream& stream, 56 bool didAddMediaStreamTrack(const blink::WebMediaStream& stream,
55 const blink::WebMediaStreamTrack& track) override; 57 const blink::WebMediaStreamTrack& track) override;
56 58
57 bool didRemoveMediaStreamTrack( 59 bool didRemoveMediaStreamTrack(
58 const blink::WebMediaStream& stream, 60 const blink::WebMediaStream& stream,
59 const blink::WebMediaStreamTrack& track) override; 61 const blink::WebMediaStreamTrack& track) override;
60 62
61 // |rtc_factory_| is a weak pointer and is owned by the RenderThreadImpl.
62 // It is valid as long as RenderThreadImpl exist.
63 PeerConnectionDependencyFactory* rtc_factory_;
64
65 DISALLOW_COPY_AND_ASSIGN(MediaStreamCenter); 63 DISALLOW_COPY_AND_ASSIGN(MediaStreamCenter);
66 }; 64 };
67 65
68 } // namespace content 66 } // namespace content
69 67
70 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_CENTER_H_ 68 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_CENTER_H_
OLDNEW
« no previous file with comments | « content/renderer/media/media_stream_audio_unittest.cc ('k') | content/renderer/media/media_stream_center.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698