Index: extensions/renderer/api/display_source/wifi_display/wifi_display_media_pipeline.h |
diff --git a/extensions/renderer/api/display_source/wifi_display/wifi_display_media_pipeline.h b/extensions/renderer/api/display_source/wifi_display/wifi_display_media_pipeline.h |
index 254f315e1eeb420e7499922fe0535204565e272e..4c9ea916b7bbc3841ea4540b62a8a64bfbacfa77 100644 |
--- a/extensions/renderer/api/display_source/wifi_display/wifi_display_media_pipeline.h |
+++ b/extensions/renderer/api/display_source/wifi_display/wifi_display_media_pipeline.h |
@@ -47,8 +47,7 @@ class WiFiDisplayMediaPipeline { |
const ErrorCallback& error_callback); |
~WiFiDisplayMediaPipeline(); |
// Note: to be called only once. |
- void Initialize( |
- const InitCompletionCallback& callback); |
+ void Initialize(const InitCompletionCallback& callback); |
void InsertRawVideoFrame( |
const scoped_refptr<media::VideoFrame>& video_frame, |
@@ -57,6 +56,9 @@ class WiFiDisplayMediaPipeline { |
void RequestIDRPicture(); |
private: |
+ using InitStepCompletionCallback = InitCompletionCallback; |
+ enum InitializationStep : unsigned; |
+ |
WiFiDisplayMediaPipeline( |
wds::SessionType type, |
const WiFiDisplayVideoEncoder::InitParameters& video_parameters, |
@@ -66,11 +68,14 @@ class WiFiDisplayMediaPipeline { |
const RegisterMediaServiceCallback& service_callback, |
const ErrorCallback& error_callback); |
- void CreateVideoEncoder(); |
void CreateMediaPacketizer(); |
+ void OnInitialize(const InitCompletionCallback& callback, |
+ InitializationStep current_step, |
+ bool success); |
void OnVideoEncoderCreated( |
+ const InitStepCompletionCallback& callback, |
scoped_refptr<WiFiDisplayVideoEncoder> video_encoder); |
- void OnMediaServiceRegistered(); |
+ void OnMediaServiceRegistered(const InitCompletionCallback& callback); |
void OnEncodedVideoFrame(const WiFiDisplayEncodedFrame& frame); |
@@ -88,7 +93,6 @@ class WiFiDisplayMediaPipeline { |
RegisterMediaServiceCallback service_callback_; |
ErrorCallback error_callback_; |
- InitCompletionCallback init_completion_callback_; |
WiFiDisplayMediaServicePtr media_service_; |
base::WeakPtrFactory<WiFiDisplayMediaPipeline> weak_factory_; |