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

Side by Side Diff: remoting/protocol/webrtc_video_renderer_adapter.h

Issue 2200273003: Enable video stats reporting when using WebRTC (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address feedback Created 4 years, 4 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 REMOTING_PROTOCOL_WEBRTC_VIDEO_RENDERER_ADAPTER_H_ 5 #ifndef REMOTING_PROTOCOL_WEBRTC_VIDEO_RENDERER_ADAPTER_H_
6 #define REMOTING_PROTOCOL_WEBRTC_VIDEO_RENDERER_ADAPTER_H_ 6 #define REMOTING_PROTOCOL_WEBRTC_VIDEO_RENDERER_ADAPTER_H_
7 7
8 #include <list>
8 #include <memory> 9 #include <memory>
9 10
11 #include "base/callback.h"
10 #include "base/memory/ref_counted.h" 12 #include "base/memory/ref_counted.h"
11 #include "base/memory/weak_ptr.h" 13 #include "base/memory/weak_ptr.h"
14 #include "remoting/protocol/client_video_stats_dispatcher.h"
15 #include "remoting/protocol/video_stats_stub.h"
12 #include "third_party/webrtc/api/mediastreaminterface.h" 16 #include "third_party/webrtc/api/mediastreaminterface.h"
13 #include "third_party/webrtc/media/base/videosinkinterface.h" 17 #include "third_party/webrtc/media/base/videosinkinterface.h"
14 18
15 namespace base { 19 namespace base {
16 class SingleThreadTaskRunner; 20 class SingleThreadTaskRunner;
17 } // namespace base 21 } // namespace base
18 22
19 namespace webrtc { 23 namespace webrtc {
20 class DesktopFrame; 24 class DesktopFrame;
21 class VideoFrameBuffer; 25 class VideoFrameBuffer;
22 } // namespace webrtc 26 } // namespace webrtc
23 27
24 namespace remoting { 28 namespace remoting {
25 namespace protocol { 29 namespace protocol {
26 30
31 class MessagePipe;
32 class VideoRenderer;
33 class WebrtcTransport;
27 struct ClientFrameStats; 34 struct ClientFrameStats;
28 class VideoRenderer; 35 struct HostFrameStats;
29 36
30 class WebrtcVideoRendererAdapter 37 class WebrtcVideoRendererAdapter
31 : public rtc::VideoSinkInterface<cricket::VideoFrame> { 38 : public rtc::VideoSinkInterface<cricket::VideoFrame>,
39 public VideoStatsStub,
40 public ClientVideoStatsDispatcher::EventHandler {
32 public: 41 public:
33 WebrtcVideoRendererAdapter( 42 WebrtcVideoRendererAdapter(const std::string& label,
34 scoped_refptr<webrtc::MediaStreamInterface> media_stream, 43 VideoRenderer* video_renderer);
35 VideoRenderer* video_renderer);
36 ~WebrtcVideoRendererAdapter() override; 44 ~WebrtcVideoRendererAdapter() override;
37 45
38 std::string label() const { return media_stream_->label(); } 46 std::string label() const { return label_; }
47
48 void SetMediaStream(scoped_refptr<webrtc::MediaStreamInterface> media_stream);
49 void SetVideoStatsChannel(std::unique_ptr<MessagePipe> message_pipe);
39 50
40 // rtc::VideoSinkInterface implementation. 51 // rtc::VideoSinkInterface implementation.
41 void OnFrame(const cricket::VideoFrame& frame) override; 52 void OnFrame(const cricket::VideoFrame& frame) override;
42 53
43 private: 54 private:
44 void HandleFrameOnMainThread(std::unique_ptr<ClientFrameStats> stats, 55 // VideoStatsStub interface.
56 void OnVideoFrameStats(uint32_t frame_id,
57 const HostFrameStats& frame_stats) override;
58
59 // ClientVideoStatsDispatcher::EventHandler interface.
60 void OnChannelInitialized(ChannelDispatcherBase* channel_dispatcher) override;
61 void OnChannelClosed(ChannelDispatcherBase* channel_dispatcher) override;
62
63 void HandleFrameOnMainThread(uint32_t frame_id,
64 base::TimeTicks time_received,
45 scoped_refptr<webrtc::VideoFrameBuffer> frame); 65 scoped_refptr<webrtc::VideoFrameBuffer> frame);
46 void DrawFrame(std::unique_ptr<ClientFrameStats> stats, 66 void DrawFrame(uint32_t frame_id,
67 std::unique_ptr<ClientFrameStats> stats,
47 std::unique_ptr<webrtc::DesktopFrame> frame); 68 std::unique_ptr<webrtc::DesktopFrame> frame);
48 void FrameRendered(std::unique_ptr<ClientFrameStats> stats); 69 void FrameRendered(uint32_t frame_id,
70 std::unique_ptr<ClientFrameStats> stats);
71
72 std::string label_;
49 73
50 scoped_refptr<webrtc::MediaStreamInterface> media_stream_; 74 scoped_refptr<webrtc::MediaStreamInterface> media_stream_;
51 VideoRenderer* video_renderer_; 75 VideoRenderer* video_renderer_;
76
77 std::unique_ptr<ClientVideoStatsDispatcher> video_stats_dispatcher_;
78
52 scoped_refptr<base::SingleThreadTaskRunner> task_runner_; 79 scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
53 80
81 std::list<std::pair<uint32_t, ClientFrameStats>> client_stats_queue_;
82 std::list<std::pair<uint32_t, HostFrameStats>> host_stats_queue_;
83
54 base::WeakPtrFactory<WebrtcVideoRendererAdapter> weak_factory_; 84 base::WeakPtrFactory<WebrtcVideoRendererAdapter> weak_factory_;
55 85
56 DISALLOW_COPY_AND_ASSIGN(WebrtcVideoRendererAdapter); 86 DISALLOW_COPY_AND_ASSIGN(WebrtcVideoRendererAdapter);
57 }; 87 };
58 88
59 } // namespace remoting 89 } // namespace remoting
60 } // namespace protocol 90 } // namespace protocol
61 91
62 #endif // REMOTING_PROTOCOL_WEBRTC_VIDEO_RENDERER_ADAPTER_H_ 92 #endif // REMOTING_PROTOCOL_WEBRTC_VIDEO_RENDERER_ADAPTER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698