VaapiVEA: Get maximum resolution from libva

content/common/gpu/media/vaapi_video_encode_accelerator.cc

 // Copyright 2014 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/media/vaapi_video_encode_accelerator.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/message_loop/message_loop_proxy.h"
@@ skipping 96 matching lines @@
 
 std::vector<media::VideoEncodeAccelerator::SupportedProfile>
 VaapiVideoEncodeAccelerator::GetSupportedProfiles() {
   std::vector<SupportedProfile> profiles;
 
   const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
   if (cmd_line->HasSwitch(switches::kDisableVaapiAcceleratedVideoEncode))
     return profiles;
 
   std::vector<media::VideoCodecProfile> hw_profiles =
-      VaapiWrapper::GetSupportedEncodeProfiles(base::Bind(&base::DoNothing));
+      VaapiWrapper::GetSupportedProfiles(VaapiWrapper::kEncode);
 
   media::VideoEncodeAccelerator::SupportedProfile profile;
   profile.max_resolution.SetSize(1920, 1088);

[wuchengli, 2015/02/03 03:17:33]

remove

[henryhsu, 2015/02/13 04:01:03]

Done.

   profile.max_framerate_numerator = kDefaultFramerate;
   profile.max_framerate_denominator = 1;
   for (size_t i = 0; i < hw_profiles.size(); i++) {
     profile.profile = hw_profiles[i];
+    profile.max_resolution = VaapiWrapper::GetCodecMaxResolution(
+        profile.profile,
+        VaapiWrapper::kEncode);
     profiles.push_back(profile);
   }
   return profiles;
 }
 
 static unsigned int Log2OfPowerOf2(unsigned int x) {
   CHECK_GT(x, 0u);
   DCHECK_EQ(x & (x - 1), 0u);
 
   int log = 0;
@@ skipping 945 matching lines @@
 }
 
 VaapiVideoEncodeAccelerator::EncodeJob::EncodeJob()
     : coded_buffer(VA_INVALID_ID), keyframe(false) {
 }
 
 VaapiVideoEncodeAccelerator::EncodeJob::~EncodeJob() {
 }
 
 }  // namespace content