RTCVideoEncoder: Report H264 profile information to WebRTC

content/renderer/media/gpu/rtc_video_encoder_factory.h

 // Copyright 2013 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.
 
 #ifndef CONTENT_RENDERER_MEDIA_GPU_RTC_VIDEO_ENCODER_FACTORY_H_
 #define CONTENT_RENDERER_MEDIA_GPU_RTC_VIDEO_ENCODER_FACTORY_H_
 
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "content/common/content_export.h"
+#include "media/base/video_codecs.h"
 #include "third_party/webrtc/media/engine/webrtcvideoencoderfactory.h"
 
 namespace media {
 class GpuVideoAcceleratorFactories;
 }  // namespace media
 
 namespace content {
 
 // This class creates RTCVideoEncoder instances (each wrapping a
 // media::VideoEncodeAccelerator) on behalf of the WebRTC stack.
 class CONTENT_EXPORT RTCVideoEncoderFactory
     : NON_EXPORTED_BASE(public cricket::WebRtcVideoEncoderFactory) {
  public:
   explicit RTCVideoEncoderFactory(
       media::GpuVideoAcceleratorFactories* gpu_factories);
   ~RTCVideoEncoderFactory() override;
 
   // cricket::WebRtcVideoEncoderFactory implementation.
   webrtc::VideoEncoder* CreateVideoEncoder(
-      webrtc::VideoCodecType type) override;
-  const std::vector<VideoCodec>& codecs() const override;
+      const cricket::VideoCodec& codec) override;
+  const std::vector<cricket::VideoCodec>& supported_codecs() const override;
   void DestroyVideoEncoder(webrtc::VideoEncoder* encoder) override;
 
  private:
   media::GpuVideoAcceleratorFactories* gpu_factories_;
 
   // List of supported cricket::WebRtcVideoEncoderFactory::VideoCodec.
-  std::vector<VideoCodec> codecs_;
+  // |profiles_| and |supported_codecs_| have the same length and the profile
+  // for |supported_codecs_[i]| is |profiles_[i]|.
+  std::vector<media::VideoCodecProfile> profiles_;

[Pawel Osciak, 2016/11/17 07:30:05]

Perhaps std::pair<media::VCP, cricket::VC> instead?

[magjed_chromium, 2016/11/17 13:08:03]

Yes, I would prefer this myself, but the problem is that we need to return
std::vector<cricket::VC>& in supported_codecs(). So then we would need to store
both std::vector<cricket::VC> and std::vector<std::pair<media::VCP,
cricket::VC>>.

[emircan, 2016/11/17 19:02:15]

Can you add CHECK_EQ(profiles_.size(), supported_codecs_.size()) then? I would
prefer if their synchronization is enforced by code as well.

[magjed_chromium, 2016/11/18 09:46:47]

Done.

+  std::vector<cricket::VideoCodec> supported_codecs_;
 
   DISALLOW_COPY_AND_ASSIGN(RTCVideoEncoderFactory);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_GPU_RTC_VIDEO_ENCODER_FACTORY_H_