Add JPEG decoder for VAAPI JPEG decode acceleration

content/common/gpu/media/vaapi_wrapper.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/media/vaapi_wrapper.h"
 
 #include <dlfcn.h>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
@@ skipping 51 matching lines @@
   VAProfile va_profile;
 };
 
 // A map between VideoCodecProfile and VAProfile.
 static const ProfileMap kProfileMap[] = {
     {media::H264PROFILE_BASELINE, VAProfileH264Baseline},
     {media::H264PROFILE_MAIN, VAProfileH264Main},
     // TODO(posciak): See if we can/want support other variants of
     // media::H264PROFILE_HIGH*.
     {media::H264PROFILE_HIGH, VAProfileH264High},
+    {media::MJPEGPROFILE, VAProfileJPEGBaseline},
 };
 
 static std::vector<VAConfigAttrib> GetRequiredAttribs(
     VaapiWrapper::CodecMode mode) {
   std::vector<VAConfigAttrib> required_attribs;
   required_attribs.insert(
       required_attribs.end(),
       kCommonVAConfigAttribs,
       kCommonVAConfigAttribs + arraysize(kCommonVAConfigAttribs));
   if (mode == VaapiWrapper::kEncode) {
@@ skipping 530 matching lines @@
   VA_LOG_ON_ERROR(va_res, "vaMapBuffer failed");
   if (va_res == VA_STATUS_SUCCESS)
     return true;
 
   va_res = vaDestroyImage(va_display_, image->image_id);
   VA_LOG_ON_ERROR(va_res, "vaDestroyImage failed");
 
   return false;
 }
 
+bool VaapiWrapper::GetVaImageWithFormat(VASurfaceID va_surface_id,

[wuchengli, 2015/01/12 09:08:53]

Is CreateVaImage better? This actually passes format and size.
GetVaImageWithFormatAndSize is a bit long. 

[kcwu, 2015/01/16 15:12:56]

Done.
In order to emphasis its difference to GetVaImageForTesting, I renamed
GetVaImageForTesting to GetDerivedVaImageForTesting.
 

+                                        VAImageFormat* format,
+                                        gfx::Size size,
+                                        VAImage* image,
+                                        void** mem) {
+  base::AutoLock auto_lock(va_lock_);
+
+  VAStatus va_res = vaSyncSurface(va_display_, va_surface_id);
+  VA_SUCCESS_OR_RETURN(va_res, "Failed syncing surface", false);
+
+  va_res =
+      vaCreateImage(va_display_, format, size.width(), size.height(), image);
+  VA_LOG_ON_ERROR(va_res, "vaCreateImage failed");

[wuchengli, 2015/01/12 09:08:53]

VA_SUCCESS_OR_RETURN

[kcwu, 2015/01/16 15:12:56]

Done.

+  if (va_res != VA_STATUS_SUCCESS)
+    return false;
+
+  va_res = vaGetImage(va_display_, va_surface_id, 0, 0, size.width(),
+                      size.height(), image->image_id);
+  VA_LOG_ON_ERROR(va_res, "vaDeriveImage failed");

[wuchengli, 2015/01/12 09:08:53]

s/vaDeriveImage/vaGetImage/ and VA_SUCCESS_OR_RETURN

[kcwu, 2015/01/16 15:12:56]

Done.

+  if (va_res != VA_STATUS_SUCCESS)

[Owen Lin, 2015/01/13 06:17:59]

free the resource of image (since it has been created) ?

[kcwu, 2015/01/16 15:12:56]

Done.

+    return false;
+
+  // Map the VAImage into memory
+  va_res = vaMapBuffer(va_display_, image->buf, mem);
+  VA_LOG_ON_ERROR(va_res, "vaMapBuffer failed");
+  if (va_res == VA_STATUS_SUCCESS)
+    return true;
+
+  va_res = vaDestroyImage(va_display_, image->image_id);
+  VA_LOG_ON_ERROR(va_res, "vaDestroyImage failed");
+
+  return false;

[wuchengli, 2015/01/12 09:08:53]

It's easier to understand to return true at the end.

if (va_res != VA_STATUS_SUCCESS) {
  vaDestroyImage
  return false;
}
return true;

[Owen Lin, 2015/01/13 06:17:59]

+1

[kcwu, 2015/01/16 15:12:56]

Since I need to call vaDestroyImage for failed case, I revised the code and
tried not to duplicate. PTAL.

+}
+
 void VaapiWrapper::ReturnVaImageForTesting(VAImage* image) {
   base::AutoLock auto_lock(va_lock_);
 
   VAStatus va_res = vaUnmapBuffer(va_display_, image->buf);
   VA_LOG_ON_ERROR(va_res, "vaUnmapBuffer failed");
 
   va_res = vaDestroyImage(va_display_, image->image_id);
   VA_LOG_ON_ERROR(va_res, "vaDestroyImage failed");
 }
 
@@ skipping 103 matching lines @@
 
 // static
 bool VaapiWrapper::PostSandboxInitialization() {
   StubPathMap paths;
   paths[kModuleVa].push_back(kVaLib);
 
   return InitializeStubs(paths);
 }
 
 }  // namespace content