media/gpu: Minor consolidation & refactoring

This CL consolidates some of the error types in VaapiImageDecodeStatus
in preperation for the implementation of VaapiWebPDecoder.
This CL also moves the protected members from VaapiImageDecoder to the
implementing subclasses. This is done to address a concern raised by
andrescj@ on a future CL.
See here:
https://crrev.com/c/1672404/5/media/gpu/vaapi/vaapi_image_decoder.cc#20

Bug: 877694
Test: jpeg_decode_accelerator_unittest
Change-Id: I2192ce81b3366a0e284a3f3c7bdac5c229bb0dff
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1673576
Commit-Queue: Gil Dekel <gildekel@chromium.org>
Reviewed-by: Miguel Casas <mcasas@chromium.org>
Reviewed-by: Andres Calderon Jaramillo <andrescj@chromium.org>
Cr-Commit-Position: refs/heads/master@{#672597}

media/gpu/vaapi/vaapi_image_decoder.cc

@@ -11,9 +11,7 @@
 namespace media {
 
 VaapiImageDecoder::VaapiImageDecoder(VAProfile va_profile)
-    : va_profile_(va_profile),
-      va_surface_id_(VA_INVALID_SURFACE),
-      va_rt_format_(kInvalidVaRtFormat) {}
+    : va_profile_(va_profile) {}
 
 VaapiImageDecoder::~VaapiImageDecoder() = default;
 

media/gpu/vaapi/vaapi_image_decoder.h

@@ -14,26 +14,19 @@
 #include "base/macros.h"
 #include "base/memory/scoped_refptr.h"
 #include "gpu/config/gpu_info.h"
-#include "ui/gfx/geometry/size.h"
 
 namespace media {
 
 class VASurface;
 class VaapiWrapper;
 
-constexpr unsigned int kInvalidVaRtFormat = 0u;
-
 enum class VaapiImageDecodeStatus : uint32_t {
   kSuccess,
-  kParseJpegFailed,
-  kUnsupportedJpeg,
+  kParseFailed,
+  kUnsupportedImage,
   kUnsupportedSubsampling,
   kSurfaceCreationFailed,
-  kSubmitPicParamsFailed,
-  kSubmitIQMatrixFailed,
-  kSubmitHuffmanFailed,
-  kSubmitSliceParamsFailed,
-  kSubmitSliceDataFailed,
+  kSubmitVABuffersFailed,
   kExecuteDecodeFailed,
   kUnsupportedSurfaceFormat,
   kCannotGetImage,
@@ -77,14 +70,9 @@ class VaapiImageDecoder {
 
   scoped_refptr<VaapiWrapper> vaapi_wrapper_;
 
+ private:
   // The VA profile used for the current image decoder.
   const VAProfile va_profile_;
-  // The current VA surface for decoding.
-  VASurfaceID va_surface_id_;
-  // The coded size associated with |va_surface_id_|.
-  gfx::Size coded_size_;
-  // The VA RT format associated with |va_surface_id_|.
-  unsigned int va_rt_format_;
 
   DISALLOW_COPY_AND_ASSIGN(VaapiImageDecoder);
 };

media/gpu/vaapi/vaapi_jpeg_decoder.cc

@@ -213,7 +213,9 @@ unsigned int VaSurfaceFormatForJpeg(const JpegFrameHeader& frame_header) {
 }
 
 VaapiJpegDecoder::VaapiJpegDecoder()
-    : VaapiImageDecoder(VAProfileJPEGBaseline) {}
+    : VaapiImageDecoder(VAProfileJPEGBaseline),
+      va_surface_id_(VA_INVALID_SURFACE),
+      va_rt_format_(kInvalidVaRtFormat) {}
 
 VaapiJpegDecoder::~VaapiJpegDecoder() {
   if (vaapi_wrapper_) {
@@ -236,7 +238,7 @@ scoped_refptr<VASurface> VaapiJpegDecoder::Decode(
   if (!ParseJpegPicture(encoded_image.data(), encoded_image.size(),
                         &parse_result)) {
     VLOGF(1) << "ParseJpegPicture failed";
-    *status = VaapiImageDecodeStatus::kParseJpegFailed;
+    *status = VaapiImageDecodeStatus::kParseFailed;
     return nullptr;
   }
 
@@ -252,7 +254,7 @@ scoped_refptr<VASurface> VaapiJpegDecoder::Decode(
   // Make sure this JPEG can be decoded.
   if (!IsVaapiSupportedJpeg(parse_result)) {
     VLOGF(1) << "The supplied JPEG is unsupported";
-    *status = VaapiImageDecodeStatus::kUnsupportedJpeg;
+    *status = VaapiImageDecodeStatus::kUnsupportedImage;
     return nullptr;
   }
 
@@ -283,7 +285,7 @@ scoped_refptr<VASurface> VaapiJpegDecoder::Decode(
   FillPictureParameters(parse_result.frame_header, &pic_param);
   if (!vaapi_wrapper_->SubmitBuffer(VAPictureParameterBufferType, &pic_param)) {
     VLOGF(1) << "Could not submit VAPictureParameterBufferType";
-    *status = VaapiImageDecodeStatus::kSubmitPicParamsFailed;
+    *status = VaapiImageDecodeStatus::kSubmitVABuffersFailed;
     return nullptr;
   }
 
@@ -292,7 +294,7 @@ scoped_refptr<VASurface> VaapiJpegDecoder::Decode(
   FillIQMatrix(parse_result.q_table, &iq_matrix);
   if (!vaapi_wrapper_->SubmitBuffer(VAIQMatrixBufferType, &iq_matrix)) {
     VLOGF(1) << "Could not submit VAIQMatrixBufferType";
-    *status = VaapiImageDecodeStatus::kSubmitIQMatrixFailed;
+    *status = VaapiImageDecodeStatus::kSubmitVABuffersFailed;
     return nullptr;
   }
 
@@ -302,7 +304,7 @@ scoped_refptr<VASurface> VaapiJpegDecoder::Decode(
                    &huffman_table);
   if (!vaapi_wrapper_->SubmitBuffer(VAHuffmanTableBufferType, &huffman_table)) {
     VLOGF(1) << "Could not submit VAHuffmanTableBufferType";
-    *status = VaapiImageDecodeStatus::kSubmitHuffmanFailed;
+    *status = VaapiImageDecodeStatus::kSubmitVABuffersFailed;
     return nullptr;
   }
 
@@ -311,7 +313,7 @@ scoped_refptr<VASurface> VaapiJpegDecoder::Decode(
   FillSliceParameters(parse_result, &slice_param);
   if (!vaapi_wrapper_->SubmitBuffer(VASliceParameterBufferType, &slice_param)) {
     VLOGF(1) << "Could not submit VASliceParameterBufferType";
-    *status = VaapiImageDecodeStatus::kSubmitSliceParamsFailed;
+    *status = VaapiImageDecodeStatus::kSubmitVABuffersFailed;
     return nullptr;
   }
 
@@ -320,7 +322,7 @@ scoped_refptr<VASurface> VaapiJpegDecoder::Decode(
                                     parse_result.data_size,
                                     const_cast<char*>(parse_result.data))) {
     VLOGF(1) << "Could not submit VASliceDataBufferType";
-    *status = VaapiImageDecodeStatus::kSubmitSliceDataFailed;
+    *status = VaapiImageDecodeStatus::kSubmitVABuffersFailed;
     return nullptr;
   }
 

media/gpu/vaapi/vaapi_jpeg_decoder.h

@@ -11,12 +11,15 @@
 
 #include "base/macros.h"
 #include "media/gpu/vaapi/vaapi_image_decoder.h"
+#include "ui/gfx/geometry/size.h"
 
 namespace media {
 
 struct JpegFrameHeader;
 class ScopedVAImage;
 
+constexpr unsigned int kInvalidVaRtFormat = 0u;
+
 // Returns the internal format required for a JPEG image given its parsed
 // |frame_header|. If the image's subsampling format is not one of 4:2:0, 4:2:2,
 // or 4:4:4, returns kInvalidVaRtFormat.
@@ -42,6 +45,14 @@ class VaapiJpegDecoder : public VaapiImageDecoder {
   std::unique_ptr<ScopedVAImage> GetImage(uint32_t preferred_image_fourcc,
                                           VaapiImageDecodeStatus* status);
 
+ private:
+  // The current VA surface for decoding.
+  VASurfaceID va_surface_id_;
+  // The coded size associated with |va_surface_id_|.
+  gfx::Size coded_size_;
+  // The VA RT format associated with |va_surface_id_|.
+  unsigned int va_rt_format_;
+
   DISALLOW_COPY_AND_ASSIGN(VaapiJpegDecoder);
 };
 

media/gpu/vaapi/vaapi_jpeg_decoder_unittest.cc

@@ -590,7 +590,7 @@ TEST_F(VaapiJpegDecoderTest, DecodeFailsForBelowMinSize) {
                             jpeg_data.size()),
                         &status))
         << "Decode unexpectedly succeeded for size = " << test_size.ToString();
-    EXPECT_EQ(VaapiImageDecodeStatus::kUnsupportedJpeg, status);
+    EXPECT_EQ(VaapiImageDecodeStatus::kUnsupportedImage, status);
   }
 }
 
@@ -639,7 +639,7 @@ TEST_F(VaapiJpegDecoderTest, DecodeFailsForAboveMaxSize) {
                             jpeg_data.size()),
                         &status))
         << "Decode unexpectedly succeeded for size = " << test_size.ToString();
-    EXPECT_EQ(VaapiImageDecodeStatus::kUnsupportedJpeg, status);
+    EXPECT_EQ(VaapiImageDecodeStatus::kUnsupportedImage, status);
   }
 }
 

media/gpu/vaapi/vaapi_mjpeg_decode_accelerator.cc

@@ -58,7 +58,7 @@ VaapiJpegDecodeStatusToError(VaapiImageDecodeStatus status) {
   switch (status) {
     case VaapiImageDecodeStatus::kSuccess:
       return chromeos_camera::MjpegDecodeAccelerator::Error::NO_ERRORS;
-    case VaapiImageDecodeStatus::kParseJpegFailed:
+    case VaapiImageDecodeStatus::kParseFailed:
       return chromeos_camera::MjpegDecodeAccelerator::Error::PARSE_JPEG_FAILED;
     case VaapiImageDecodeStatus::kUnsupportedSubsampling:
       return chromeos_camera::MjpegDecodeAccelerator::Error::UNSUPPORTED_JPEG;