Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 EXTENSIONS_RENDERER_API_DISPLAY_SOURCE_WIFI_DISPLAY_WIFI_DISPLAY_MEDIA_P IPELINE_H_ | 5 #ifndef EXTENSIONS_RENDERER_API_DISPLAY_SOURCE_WIFI_DISPLAY_WIFI_DISPLAY_MEDIA_P IPELINE_H_ |
| 6 #define EXTENSIONS_RENDERER_API_DISPLAY_SOURCE_WIFI_DISPLAY_WIFI_DISPLAY_MEDIA_P IPELINE_H_ | 6 #define EXTENSIONS_RENDERER_API_DISPLAY_SOURCE_WIFI_DISPLAY_WIFI_DISPLAY_MEDIA_P IPELINE_H_ |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <utility> | 10 #include <utility> |
| 11 #include <vector> | 11 #include <vector> |
| 12 | 12 |
| 13 #include "base/callback.h" | 13 #include "base/callback.h" |
| 14 #include "base/memory/ref_counted.h" | 14 #include "base/memory/ref_counted.h" |
| 15 #include "base/memory/weak_ptr.h" | 15 #include "base/memory/weak_ptr.h" |
| 16 #include "base/synchronization/lock.h" | 16 #include "base/synchronization/lock.h" |
| 17 #include "extensions/common/mojo/wifi_display_session_service.mojom.h" | 17 #include "extensions/common/mojo/wifi_display_session_service.mojom.h" |
| 18 #include "extensions/renderer/api/display_source/wifi_display/wifi_display_audio _encoder.h" | |
| 18 #include "extensions/renderer/api/display_source/wifi_display/wifi_display_media _packetizer.h" | 19 #include "extensions/renderer/api/display_source/wifi_display/wifi_display_media _packetizer.h" |
| 19 #include "extensions/renderer/api/display_source/wifi_display/wifi_display_video _encoder.h" | 20 #include "extensions/renderer/api/display_source/wifi_display/wifi_display_video _encoder.h" |
| 20 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h" | 21 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h" |
| 21 #include "third_party/wds/src/libwds/public/media_manager.h" | 22 #include "third_party/wds/src/libwds/public/media_manager.h" |
| 22 | 23 |
| 23 namespace media { | 24 namespace media { |
| 24 class AudioBus; | 25 class AudioBus; |
| 25 } // namespace media | 26 } // namespace media |
| 26 | 27 |
| 27 namespace extensions { | 28 namespace extensions { |
| (...skipping 21 matching lines...) Expand all Loading... | |
| 49 ~WiFiDisplayMediaPipeline(); | 50 ~WiFiDisplayMediaPipeline(); |
| 50 // Note: to be called only once. | 51 // Note: to be called only once. |
| 51 void Initialize(const InitCompletionCallback& callback); | 52 void Initialize(const InitCompletionCallback& callback); |
| 52 | 53 |
| 53 void InsertRawVideoFrame( | 54 void InsertRawVideoFrame( |
| 54 const scoped_refptr<media::VideoFrame>& video_frame, | 55 const scoped_refptr<media::VideoFrame>& video_frame, |
| 55 base::TimeTicks reference_time); | 56 base::TimeTicks reference_time); |
| 56 | 57 |
| 57 void RequestIDRPicture(); | 58 void RequestIDRPicture(); |
| 58 | 59 |
| 60 content::MediaStreamAudioSink* audio_sink() { return audio_encoder_.get(); } | |
|
Mikhail
2016/04/28 12:28:19
better return it as it is: WiFiDisplayAudioEncoder
e_hakkinen
2016/04/28 12:50:57
Done.
| |
| 61 | |
| 59 private: | 62 private: |
| 60 using InitStepCompletionCallback = InitCompletionCallback; | 63 using InitStepCompletionCallback = InitCompletionCallback; |
| 61 enum InitializationStep : unsigned; | 64 enum InitializationStep : unsigned; |
| 62 | 65 |
| 63 WiFiDisplayMediaPipeline( | 66 WiFiDisplayMediaPipeline( |
| 64 wds::SessionType type, | 67 wds::SessionType type, |
| 65 const WiFiDisplayVideoEncoder::InitParameters& video_parameters, | 68 const WiFiDisplayVideoEncoder::InitParameters& video_parameters, |
| 66 const wds::AudioCodec& audio_codec, | 69 const wds::AudioCodec& audio_codec, |
| 67 const std::string& sink_ip_address, | 70 const std::string& sink_ip_address, |
| 68 const std::pair<int, int>& sink_rtp_ports, | 71 const std::pair<int, int>& sink_rtp_ports, |
| 69 const RegisterMediaServiceCallback& service_callback, | 72 const RegisterMediaServiceCallback& service_callback, |
| 70 const ErrorCallback& error_callback); | 73 const ErrorCallback& error_callback); |
| 71 | 74 |
| 72 void CreateMediaPacketizer(); | 75 void CreateMediaPacketizer(); |
| 73 void OnInitialize(const InitCompletionCallback& callback, | 76 void OnInitialize(const InitCompletionCallback& callback, |
| 74 InitializationStep current_step, | 77 InitializationStep current_step, |
| 75 bool success); | 78 bool success); |
| 79 void OnAudioEncoderCreated( | |
| 80 const InitStepCompletionCallback& callback, | |
| 81 scoped_refptr<WiFiDisplayAudioEncoder> audio_encoder); | |
| 76 void OnVideoEncoderCreated( | 82 void OnVideoEncoderCreated( |
| 77 const InitStepCompletionCallback& callback, | 83 const InitStepCompletionCallback& callback, |
| 78 scoped_refptr<WiFiDisplayVideoEncoder> video_encoder); | 84 scoped_refptr<WiFiDisplayVideoEncoder> video_encoder); |
| 79 void OnMediaServiceRegistered(const InitCompletionCallback& callback); | 85 void OnMediaServiceRegistered(const InitCompletionCallback& callback); |
| 80 | 86 |
| 87 void OnEncodedAudioUnit(std::unique_ptr<WiFiDisplayEncodedUnit> unit); | |
| 81 void OnEncodedVideoFrame(std::unique_ptr<WiFiDisplayEncodedFrame> frame); | 88 void OnEncodedVideoFrame(std::unique_ptr<WiFiDisplayEncodedFrame> frame); |
| 82 | 89 |
| 83 bool OnPacketizedMediaDatagramPacket( | 90 bool OnPacketizedMediaDatagramPacket( |
| 84 WiFiDisplayMediaDatagramPacket media_datagram_packet); | 91 WiFiDisplayMediaDatagramPacket media_datagram_packet); |
| 85 | 92 |
| 93 scoped_refptr<WiFiDisplayAudioEncoder> audio_encoder_; | |
| 86 scoped_refptr<WiFiDisplayVideoEncoder> video_encoder_; | 94 scoped_refptr<WiFiDisplayVideoEncoder> video_encoder_; |
| 87 std::unique_ptr<WiFiDisplayMediaPacketizer> packetizer_; | 95 std::unique_ptr<WiFiDisplayMediaPacketizer> packetizer_; |
| 88 | 96 |
| 89 wds::SessionType type_; | 97 wds::SessionType type_; |
| 90 WiFiDisplayVideoEncoder::InitParameters video_parameters_; | 98 WiFiDisplayVideoEncoder::InitParameters video_parameters_; |
| 91 wds::AudioCodec audio_codec_; | 99 wds::AudioCodec audio_codec_; |
| 92 std::string sink_ip_address_; | 100 std::string sink_ip_address_; |
| 93 std::pair<int, int> sink_rtp_ports_; | 101 std::pair<int, int> sink_rtp_ports_; |
| 94 | 102 |
| 95 RegisterMediaServiceCallback service_callback_; | 103 RegisterMediaServiceCallback service_callback_; |
| 96 ErrorCallback error_callback_; | 104 ErrorCallback error_callback_; |
| 97 WiFiDisplayMediaServicePtr media_service_; | 105 WiFiDisplayMediaServicePtr media_service_; |
| 98 | 106 |
| 99 base::WeakPtrFactory<WiFiDisplayMediaPipeline> weak_factory_; | 107 base::WeakPtrFactory<WiFiDisplayMediaPipeline> weak_factory_; |
| 100 | 108 |
| 101 DISALLOW_COPY_AND_ASSIGN(WiFiDisplayMediaPipeline); | 109 DISALLOW_COPY_AND_ASSIGN(WiFiDisplayMediaPipeline); |
| 102 }; | 110 }; |
| 103 | 111 |
| 104 } // namespace extensions | 112 } // namespace extensions |
| 105 | 113 |
| 106 #endif // EXTENSIONS_RENDERER_API_DISPLAY_SOURCE_WIFI_DISPLAY_WIFI_DISPLAY_MEDI A_PIPELINE_H_ | 114 #endif // EXTENSIONS_RENDERER_API_DISPLAY_SOURCE_WIFI_DISPLAY_WIFI_DISPLAY_MEDI A_PIPELINE_H_ |
| OLD | NEW |