Duplicate VideoEncodeAccelerator::SupportedProfile in gpu_info.h.

content/common/gpu/client/gpu_video_encode_accelerator_host.cc

 // 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.
 
 #include "content/common/gpu/client/gpu_video_encode_accelerator_host.h"
 
 #include "base/logging.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "content/common/gpu/client/gpu_channel_host.h"
 #include "content/common/gpu/gpu_messages.h"
@@ skipping 56 matching lines @@
     channel_ = NULL;
   }
   NOTIFY_ERROR(kPlatformFailureError) << "OnChannelError()";
 }
 
 std::vector<media::VideoEncodeAccelerator::SupportedProfile>
 GpuVideoEncodeAcceleratorHost::GetSupportedProfiles() {
   DCHECK(CalledOnValidThread());
   if (!channel_)
     return std::vector<media::VideoEncodeAccelerator::SupportedProfile>();
-  return channel_->gpu_info().video_encode_accelerator_supported_profiles;
+  return ConvertGpuToMediaProfiles(
+      channel_->gpu_info().video_encode_accelerator_supported_profiles);
+}
+
+std::vector<media::VideoEncodeAccelerator::SupportedProfile>
+GpuVideoEncodeAcceleratorHost::ConvertGpuToMediaProfiles(const std::vector<
+    gpu::VideoEncodeAcceleratorSupportedProfile>& gpu_profiles) {
+  std::vector<media::VideoEncodeAccelerator::SupportedProfile> profiles;
+  for (size_t i = 0; i < gpu_profiles.size(); i++) {
+    media::VideoEncodeAccelerator::SupportedProfile profile;
+    profile.profile =
+        static_cast<media::VideoCodecProfile>(gpu_profiles[i].profile);

[piman, 2014/10/22 20:46:31]

Can you add a list of static_asserts that check that the enums match? Including
min/max so that if someone adds a new value in one they'll know to change the
other one.

static_assert(media::VIDEO_CODEC_PROFILE_MAX == gpu::VIDEO_CODEC_PROFILE_MAX,
"VIDEO_CODEC_PROFILE_MAX value must match in media and gpu")' and so on.

+    profile.max_resolution = gpu_profiles[i].max_resolution;
+    profile.max_framerate_numerator = gpu_profiles[i].max_framerate_numerator;
+    profile.max_framerate_denominator =
+        gpu_profiles[i].max_framerate_denominator;
+    profiles.push_back(profile);
+  }
+  return profiles;
 }
 
 bool GpuVideoEncodeAcceleratorHost::Initialize(
     media::VideoFrame::Format input_format,
     const gfx::Size& input_visible_size,
     media::VideoCodecProfile output_profile,
     uint32 initial_bitrate,
     Client* client) {
   DCHECK(CalledOnValidThread());
   client_ = client;
@@ skipping 181 matching lines @@
   weak_this_factory_.InvalidateWeakPtrs();
 
   // Client::NotifyError() may Destroy() |this|, so calling it needs to be the
   // last thing done on this stack!
   media::VideoEncodeAccelerator::Client* client = NULL;
   std::swap(client_, client);
   client->NotifyError(error);
 }
 
 }  // namespace content