Add vaapi_h264_decoder_test.

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 to interface
 // with libva (VA-API library for hardware video decode).
 
 #ifndef CONTENT_COMMON_GPU_MEDIA_VAAPI_WRAPPER_H_
 #define CONTENT_COMMON_GPU_MEDIA_VAAPI_WRAPPER_H_
 
 #include "base/callback.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 "third_party/libva/va/va.h"
 #include "third_party/libva/va/va_x11.h"
 #include "ui/gfx/size.h"
 
 namespace content {
 
 // This class handles VA-API calls and ensures proper locking of VA-API calls
 // to libva, the userspace shim to the HW decoder 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
@@ skipping 46 matching lines @@
 
   // Put data from |va_surface_id| into |x_pixmap| of size |size|,
   // converting/scaling to it.
   bool PutSurfaceIntoPixmap(VASurfaceID va_surface_id,
                             Pixmap x_pixmap,
                             gfx::Size dest_size);
 
   // Returns true if the VAAPI version is less than the specified version.
   bool VAAPIVersionLessThan(int major, int minor);
 
+  // Get a VAImage from a VASurface and map it into memory. The VAImage should

[Ami GONE FROM CHROMIUM, 2013/12/03 21:17:16]

If these APIs are only used for testing they should probably have a ForTesting
suffix.

[chihchung, 2013/12/04 05:38:10]

Done.

+  // be released using the ReturnVaImage function. Returns true when successful.
+  bool GetVaImage(VASurfaceID va_surface_id, VAImage* image, void** mem);
+
+  // Release the VAImage (and the associated memory mapping) obtained from
+  // GetVaImage().
+  void ReturnVaImage(VAImage* image);
+
  private:
   VaapiWrapper();
 
   bool Initialize(media::VideoCodecProfile profile,
                   Display* x_display,
                   const base::Closure& report_error__to_uma_cb);
   void Deinitialize();
 
   // Execute decode in hardware and destroy pending buffers. Return false if
   // vaapi driver refuses to accept parameter or slice buffers submitted
@@ skipping 33 matching lines @@
 
   // Has static initialization of pre-sandbox components completed successfully?
   static bool pre_sandbox_init_done_;
 
   DISALLOW_COPY_AND_ASSIGN(VaapiWrapper);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_GPU_MEDIA_VAAPI_WRAPPER_H_