VaapiVEA: Get maximum resolution from libva

content/common/gpu/media/vaapi_wrapper.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.
 //
 // This file contains an implementation of VaapiWrapper, used by
 // VaapiVideoDecodeAccelerator and VaapiH264Decoder for decode,
 // and VaapiVideoEncodeAccelerator for encode, to interface
 // with libva (VA-API library for hardware video codec).
 
 #ifndef CONTENT_COMMON_GPU_MEDIA_VAAPI_WRAPPER_H_
 #define CONTENT_COMMON_GPU_MEDIA_VAAPI_WRAPPER_H_
 
 #include <set>
 #include <vector>
 
+#include "base/lazy_instance.h"
 #include "base/memory/ref_counted.h"
 #include "base/synchronization/lock.h"
 #include "content/common/content_export.h"
 #include "content/common/gpu/media/va_surface.h"
 #include "media/base/video_decoder_config.h"
 #include "media/base/video_frame.h"
+#include "media/video/video_encode_accelerator.h"
 #include "third_party/libva/va/va.h"
 #include "third_party/libva/va/va_vpp.h"
 #include "ui/gfx/geometry/size.h"
 #if defined(USE_X11)
 #include "third_party/libva/va/va_x11.h"
 #endif  // USE_X11
 
 namespace content {
 
 // This class handles VA-API calls and ensures proper locking of VA-API calls
 // to libva, the userspace shim to the HW codec driver. libva is not
 // thread-safe, so we have to perform locking ourselves. This class is fully
 // synchronous and its methods can be called from any thread and may wait on
 // the va_lock_ while other, concurrent calls run.
 //
 // This class is responsible for managing VAAPI connection, contexts and state.
 // It is also responsible for managing and freeing VABuffers (not VASurfaces),
 // which are used to queue parameters and slice data to the HW codec,
 // as well as underlying memory for VASurfaces themselves.
 class CONTENT_EXPORT VaapiWrapper {
  public:
   enum CodecMode {
     kDecode,
     kEncode,
+    kCodecModeMax,
   };
 
-  // Create VaapiWrapper for VAProfile.
-  // |report_error_to_uma_cb| will be called independently from reporting
-  // errors to clients via method return values.
+  // Return an instance of VaapiWrapper and initialize by |va_profile| and

[Pawel Osciak, 2015/03/02 11:00:21]

s/and initialize by/initialized for/

[henryhsu, 2015/03/03 10:48:03]

Done.

+  // |mode|. |report_error_to_uma_cb| will be called independently from
+  // reporting errors to clients via method return values.
   static scoped_ptr<VaapiWrapper> Create(
       CodecMode mode,
-      VAProfile profile,
+      VAProfile va_profile,
       const base::Closure& report_error_to_uma_cb);
 
   // Create VaapiWrapper for VideoCodecProfile. It maps VideoCodecProfile
   // |profile| to VAProfile.
   // |report_error_to_uma_cb| will be called independently from reporting
   // errors to clients via method return values.
   static scoped_ptr<VaapiWrapper> CreateForVideoCodec(
       CodecMode mode,
       media::VideoCodecProfile profile,
       const base::Closure& report_error_to_uma_cb);
 
   // Return the supported encode profiles.
-  static std::vector<media::VideoCodecProfile> GetSupportedEncodeProfiles(
-      const base::Closure& report_error_to_uma_cb);
+  static std::vector<media::VideoEncodeAccelerator::SupportedProfile>
+      GetSupportedEncodeProfiles();
 
   ~VaapiWrapper();
 
   // Create |num_surfaces| backing surfaces in driver for VASurfaces, each
   // of size |size|. Returns true when successful, with the created IDs in
   // |va_surfaces| to be managed and later wrapped in VASurfaces.
   // The client must DestroySurfaces() each time before calling this method
   // again to free the allocated surfaces first, but is not required to do so
   // at destruction time, as this will be done automatically from
   // the destructor.
@@ skipping 98 matching lines @@
 
   // Blits a VASurface |va_surface_id_src| into another VASurface
   // |va_surface_id_dest| applying pixel format conversion and scaling
   // if needed.
   bool BlitSurface(VASurfaceID va_surface_id_src,
                    const gfx::Size& src_size,
                    VASurfaceID va_surface_id_dest,
                    const gfx::Size& dest_size);
 
  private:
+  struct ProfileInfo {
+    VAProfile va_profile;
+    VaapiWrapper::CodecMode mode;

[Pawel Osciak, 2015/03/02 11:00:20]

s/VaapiWrapper::// ?

[henryhsu, 2015/03/03 10:48:02]

Done.

+    gfx::Size max_resolution;
+  };
+
+  class LazyProfileInfo {

[wuchengli, 2015/03/02 07:10:12]

s/LazyProfileInfo/LazyProfileInfos/ to distinguish between ProfileInfo and
LazyProfileInfo.

[henryhsu, 2015/03/03 10:48:02]

Done.

+    public:
+      LazyProfileInfo();
+      ~LazyProfileInfo();
+      std::vector<VaapiWrapper::ProfileInfo> GetSupportedProfileInfos(

[Pawel Osciak, 2015/03/02 11:00:21]

Are VaapiWrapper:: prefixes needed?

[henryhsu, 2015/03/03 10:48:02]

Done.

+          VaapiWrapper::CodecMode mode);
+      bool IsProfileSupported(
+          VaapiWrapper::CodecMode mode, VAProfile va_profile);
+    private:
+      std::vector<VaapiWrapper::ProfileInfo>
+          supported_profiles_[VaapiWrapper::kCodecModeMax];
+  };
+
   VaapiWrapper();
 
+  // Initialize all supported profile configs.
+  static std::vector<ProfileInfo> InitSupportedProfileInfos();

[wuchengli, 2015/03/02 07:10:12]

Move this near PostSandboxInitialization(). Static functions should be together.

[henryhsu, 2015/03/03 10:48:02]

Done.

+
   bool Initialize(CodecMode mode, VAProfile va_profile);
   void Deinitialize();
   bool VaInitialize(const base::Closure& report_error_to_uma_cb);
   bool GetSupportedVaProfiles(std::vector<VAProfile>* profiles);
   bool IsEntrypointSupported(VAProfile va_profile, VAEntrypoint entrypoint);
   bool AreAttribsSupported(VAProfile va_profile,
                            VAEntrypoint entrypoint,
                            const std::vector<VAConfigAttrib>& required_attribs);
+  bool GetVaCodecMaxResolution(VAConfigID config, gfx::Size* resolution);

[wuchengli, 2015/03/02 07:10:12]

Add function comments.

[Pawel Osciak, 2015/03/02 11:00:20]

s/config/va_config_id/

Could we just return empty (0,0) gfx::Size on failure?

Also, GetMaxResolutionForVAConfigID() perhaps?

[henryhsu, 2015/03/03 10:48:02]

I prefer to return boolean value to consist with other functions which do VA
APIs.

[henryhsu, 2015/03/03 10:48:02]

Done.

 
   // Destroys a |va_surface| created using CreateUnownedSurface.
   void DestroyUnownedSurface(VASurfaceID va_surface_id);
 
   // Initialize the video post processing context with the |size| of
   // the input pictures to be processed.
   bool InitializeVpp_Locked();
 
   // Deinitialize the video post processing context.
   void DeinitializeVpp();
 
   // Execute pending job in hardware and destroy pending buffers. Return false
   // if vaapi driver refuses to accept parameter or slice buffers submitted
   // by client, or if execution fails in hardware.
   bool Execute(VASurfaceID va_surface_id);
 
   // Attempt to set render mode to "render to texture.". Failure is non-fatal.
   void TryToSetVADisplayAttributeToLocalGPU();
 
+  // Get all supported profile configs.

[wuchengli, 2015/03/02 07:10:12]

s/configs/infos/

[henryhsu, 2015/03/03 10:48:02]

Done.

+  std::vector<ProfileInfo> GetSupportedProfileInfos();
+
   // Lazily initialize static data after sandbox is enabled.  Return false on
   // init failure.
   static bool PostSandboxInitialization();
 
   // Libva is not thread safe, so we have to do locking for it ourselves.
   // This lock is to be taken for the duration of all VA-API calls and for
   // the entire job submission sequence in ExecuteAndDestroyPendingBuffers().
   base::Lock va_lock_;
 
   // Allocated ids for VASurfaces.
@@ skipping 23 matching lines @@
   // return values from public methods.
   base::Closure report_error_to_uma_cb_;
 
   // VPP (Video Post Processing) context, this is used to convert
   // pictures used by the decoder to RGBA pictures usable by GL or the
   // display hardware.
   VAConfigID va_vpp_config_id_;
   VAContextID va_vpp_context_id_;
   VABufferID va_vpp_buffer_id_;
 
+  static base::LazyInstance<LazyProfileInfo> profile_info_;

[wuchengli, 2015/03/02 07:10:12]

s/profile_info/profile_infos_/. Add variable comments.

[henryhsu, 2015/03/03 10:48:02]

Done.

+
   DISALLOW_COPY_AND_ASSIGN(VaapiWrapper);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_GPU_MEDIA_VAAPI_WRAPPER_H_