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

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

Issue 218763007: Update MediaStreamTrack::Stop to latest draft. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed review comments and added tests. Created 6 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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_TRACK_EXTRA_DATA_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_TRACK_EXTRA_DATA_H_
6 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_TRACK_EXTRA_DATA_H_ 6 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_TRACK_EXTRA_DATA_H_
7 7
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
(...skipping 17 matching lines...) Expand all
28 MediaStreamTrack(webrtc::MediaStreamTrackInterface* track, 28 MediaStreamTrack(webrtc::MediaStreamTrackInterface* track,
29 bool is_local_track); 29 bool is_local_track);
30 virtual ~MediaStreamTrack(); 30 virtual ~MediaStreamTrack();
31 31
32 static MediaStreamTrack* GetTrack( 32 static MediaStreamTrack* GetTrack(
33 const blink::WebMediaStreamTrack& track); 33 const blink::WebMediaStreamTrack& track);
34 34
35 // If a subclass overrides this method it has to call the base class. 35 // If a subclass overrides this method it has to call the base class.
36 virtual void SetEnabled(bool enabled); 36 virtual void SetEnabled(bool enabled);
37 37
38 // TODO(xians): Make pure virtual when remote audio tracks has
tommi (sloooow) - chröme 2014/04/03 08:53:16 nit: s/has/have
perkj_chrome 2014/04/03 11:58:34 remote audio track has ...
tommi (sloooow) - chröme 2014/04/07 10:05:43 "tracks" is plural, so it should be "remote audio
perkj_chrome 2014/04/07 15:33:51 Done.
39 // implemented StopTrack.
40 virtual void StopTrack();
tommi (sloooow) - chröme 2014/04/03 08:53:16 Isn't it reduntant to have a MediaStreamTrack::Sto
perkj_chrome 2014/04/03 11:58:34 Done.
41
38 virtual webrtc::AudioTrackInterface* GetAudioAdapter(); 42 virtual webrtc::AudioTrackInterface* GetAudioAdapter();
39 virtual webrtc::VideoTrackInterface* GetVideoAdapter(); 43 virtual webrtc::VideoTrackInterface* GetVideoAdapter();
40 44
41 bool is_local_track () const { return is_local_track_; } 45 bool is_local_track () const { return is_local_track_; }
42 46
43 protected: 47 protected:
44 scoped_refptr<webrtc::MediaStreamTrackInterface> track_; 48 scoped_refptr<webrtc::MediaStreamTrackInterface> track_;
45 49
46 private: 50 private:
47 const bool is_local_track_; 51 const bool is_local_track_;
48 52
49 DISALLOW_COPY_AND_ASSIGN(MediaStreamTrack); 53 DISALLOW_COPY_AND_ASSIGN(MediaStreamTrack);
50 }; 54 };
51 55
52 } // namespace content 56 } // namespace content
53 57
54 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_TRACK_EXTRA_DATA_H_ 58 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_TRACK_EXTRA_DATA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698