Add JPEG decoder for VAAPI JPEG decode acceleration

content/common/gpu/media/vaapi_h264_decoder_unittest.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 <string>
 
 // This has to be included first.
 // See http://code.google.com/p/googletest/issues/detail?id=371
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 93 matching lines @@
 
 void LogOnError(VaapiH264Decoder::VAVDAH264DecoderFailure error) {
   LOG(FATAL) << "Oh noes! Decoder failed: " << error;
 }
 
 bool VaapiH264DecoderLoop::Initialize(base::FilePath input_file,
                                       base::FilePath output_file) {
   media::VideoCodecProfile profile = media::H264PROFILE_BASELINE;
   base::Closure report_error_cb =
       base::Bind(&LogOnError, VaapiH264Decoder::VAAPI_ERROR);
-  wrapper_ =
-      VaapiWrapper::Create(VaapiWrapper::kDecode, profile, report_error_cb);
+  wrapper_ = VaapiWrapper::CreateForVideoCodec(VaapiWrapper::kDecode, profile,
+                                               report_error_cb);
   if (!wrapper_.get()) {
     LOG(ERROR) << "Can't create vaapi wrapper";
     return false;
   }
 
   decoder_.reset(new VaapiH264Decoder(
       wrapper_.get(),
       base::Bind(&VaapiH264DecoderLoop::OutputPicture, base::Unretained(this)),
       base::Bind(&LogOnError)));
 
@@ skipping 114 matching lines @@
 }
 
 void VaapiH264DecoderLoop::OutputPicture(
     int32 input_id,
     const scoped_refptr<VASurface>& va_surface) {
   DVLOG(1) << "OutputPicture: picture " << num_outputted_pictures_++;
 
   VAImage image;
   void* mem;
 
-  if (!wrapper_->GetVaImageForTesting(va_surface->id(), &image, &mem)) {
+  if (!wrapper_->GetDerivedVaImageForTesting(va_surface->id(), &image, &mem)) {
     LOG(ERROR) << "Cannot get VAImage.";
     return;
   }
 
   if (image.format.fourcc != VA_FOURCC_NV12) {
     LOG(ERROR) << "Unexpected image format: " << image.format.fourcc;
-    wrapper_->ReturnVaImageForTesting(&image);
+    wrapper_->ReturnVaImage(&image);
     return;
   }
 
   // Convert NV12 to I420 format.
   scoped_refptr<media::VideoFrame> frame = CopyNV12ToI420(&image, mem);
 
   if (frame.get()) {
     if (!ProcessVideoFrame(frame)) {
       LOG(ERROR) << "Write to file failed";
     }
   } else {
     LOG(ERROR) << "Cannot convert image to I420.";
   }
 
-  wrapper_->ReturnVaImageForTesting(&image);
+  wrapper_->ReturnVaImage(&image);
 }
 
 void VaapiH264DecoderLoop::RecycleSurface(VASurfaceID va_surface_id) {
   available_surfaces_.push_back(va_surface_id);
 }
 
 void VaapiH264DecoderLoop::RefillSurfaces() {
   for (size_t i = 0; i < available_surfaces_.size(); i++) {
     VASurface::ReleaseCB release_cb = base::Bind(
         &VaapiH264DecoderLoop::RecycleSurface, base::Unretained(this));
@@ skipping 77 matching lines @@
       content::g_md5sum = it->second;
       continue;
     }
     if (it->first == "v" || it->first == "vmodule")
       continue;
     LOG(FATAL) << "Unexpected switch: " << it->first << ":" << it->second;
   }
 
   return RUN_ALL_TESTS();
 }