[chrome.displaySource] Move video stream info creation to encoders.

extensions/renderer/api/display_source/wifi_display/wifi_display_media_pipeline.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "extensions/renderer/api/display_source/wifi_display/wifi_display_media_pipeline.h"
 
 #include "base/logging.h"
 #include "content/public/renderer/render_thread.h"
 #include "content/public/renderer/video_encode_accelerator.h"
 #include "extensions/renderer/api/display_source/wifi_display/wifi_display_elementary_stream_descriptor.h"
@@ skipping 55 matching lines @@
   video_encoder_->InsertRawVideoFrame(video_frame, reference_time);
 }
 
 void WiFiDisplayMediaPipeline::RequestIDRPicture() {
   DCHECK(video_encoder_);
   video_encoder_->RequestIDRPicture();
 }
 
 enum WiFiDisplayMediaPipeline::InitializationStep : unsigned {
   INITIALIZE_FIRST,
-  INITIALIZE_MEDIA_PACKETIZER = INITIALIZE_FIRST,
-  INITIALIZE_VIDEO_ENCODER,
+  INITIALIZE_VIDEO_ENCODER = INITIALIZE_FIRST,
+  INITIALIZE_MEDIA_PACKETIZER,
   INITIALIZE_MEDIA_SERVICE,
   INITIALIZE_LAST = INITIALIZE_MEDIA_SERVICE
 };
 
 void WiFiDisplayMediaPipeline::Initialize(
     const InitCompletionCallback& callback) {
   DCHECK(!video_encoder_ && !packetizer_);
   OnInitialize(callback, INITIALIZE_FIRST, true);
 }
 
 void WiFiDisplayMediaPipeline::OnInitialize(
     const InitCompletionCallback& callback,
     InitializationStep current_step,
     bool success) {
   if (!success) {
     callback.Run(false);
     return;
   }
 
   InitStepCompletionCallback init_step_callback;
   if (current_step < INITIALIZE_LAST) {
     InitializationStep next_step =
         static_cast<InitializationStep>(current_step + 1u);
     init_step_callback = base::Bind(&WiFiDisplayMediaPipeline::OnInitialize,
                                weak_factory_.GetWeakPtr(), callback, next_step);
   }
 
   switch (current_step) {
-    case INITIALIZE_MEDIA_PACKETIZER:
-      DCHECK(!packetizer_);
-      CreateMediaPacketizer();
-      init_step_callback.Run(true);
-      break;
     case INITIALIZE_VIDEO_ENCODER:
       DCHECK(!video_encoder_);
       if (type_ & wds::VideoSession) {
         auto result_callback =
             base::Bind(&WiFiDisplayMediaPipeline::OnVideoEncoderCreated,
                        weak_factory_.GetWeakPtr(), init_step_callback);
         WiFiDisplayVideoEncoder::Create(video_parameters_, result_callback);
       } else {
         init_step_callback.Run(true);
       }
       break;
+    case INITIALIZE_MEDIA_PACKETIZER:
+      DCHECK(!packetizer_);
+      CreateMediaPacketizer();
+      init_step_callback.Run(true);
+      break;
     case INITIALIZE_MEDIA_SERVICE:
       service_callback_.Run(
           mojo::GetProxy(&media_service_),
           base::Bind(&WiFiDisplayMediaPipeline::OnMediaServiceRegistered,
                      weak_factory_.GetWeakPtr(), callback));
       break;
   }
 }
 
 void WiFiDisplayMediaPipeline::CreateMediaPacketizer() {
   DCHECK(!packetizer_);
   std::vector<WiFiDisplayElementaryStreamInfo> stream_infos;
+
   if (type_ & wds::VideoSession) {
-    std::vector<WiFiDisplayElementaryStreamDescriptor> descriptors;
-    descriptors.emplace_back(
-        WiFiDisplayElementaryStreamDescriptor::AVCTimingAndHRD::Create());
-    stream_infos.emplace_back(WiFiDisplayElementaryStreamInfo::VIDEO_H264,
-                              std::move(descriptors));
+    DCHECK(video_encoder_);
+    stream_infos.push_back(video_encoder_->CreateElementaryStreamInfo());
   }
 
   if (type_ & wds::AudioSession) {
     using LPCMAudioStreamDescriptor =
         WiFiDisplayElementaryStreamDescriptor::LPCMAudioStream;
     std::vector<WiFiDisplayElementaryStreamDescriptor> descriptors;
     descriptors.emplace_back(
         LPCMAudioStreamDescriptor::Create(
             audio_codec_.modes.test(wds::LPCM_48K_16B_2CH)
                 ? LPCMAudioStreamDescriptor::SAMPLING_FREQUENCY_48K
                 : LPCMAudioStreamDescriptor::SAMPLING_FREQUENCY_44_1K,
             LPCMAudioStreamDescriptor::BITS_PER_SAMPLE_16,
             false,  // emphasis_flag
             LPCMAudioStreamDescriptor::NUMBER_OF_CHANNELS_STEREO));
     stream_infos.emplace_back(WiFiDisplayElementaryStreamInfo::AUDIO_LPCM,
                               std::move(descriptors));
   }
 
   packetizer_.reset(new WiFiDisplayMediaPacketizer(
-      base::TimeDelta::FromMilliseconds(200),
-      std::move(stream_infos),
+      base::TimeDelta::FromMilliseconds(200), stream_infos,
       base::Bind(&WiFiDisplayMediaPipeline::OnPacketizedMediaDatagramPacket,
                  base::Unretained(this))));
 }
 
 void WiFiDisplayMediaPipeline::OnVideoEncoderCreated(
     const InitStepCompletionCallback& callback,
     scoped_refptr<WiFiDisplayVideoEncoder> video_encoder) {
   DCHECK(!video_encoder_);
 
   if (!video_encoder) {
@@ skipping 33 matching lines @@
 }
 
 bool WiFiDisplayMediaPipeline::OnPacketizedMediaDatagramPacket(
     WiFiDisplayMediaDatagramPacket media_datagram_packet) {
   DCHECK(media_service_);
   media_service_->SendMediaPacket(std::move(media_datagram_packet));
   return true;
 }
 
 }  // namespace extensions