commit d0101a261d44ae3f4cad1f02410ff1a80ddb9112
author Nana GUo <nana.n.guo@intel.com> Fri Apr 12 13:42:35 2013 -0400
committer Patrick Tjin <pattjin@google.com> Mon Jul 21 21:51:36 2014 -0700
tree c8ab06bbf6c3a8879dd00da707eea7d53e69d7da
parent 57e0c100dbf91f45d094ee984098056720718aa2

libmix: refine code with libva rebase in HW JPEG

BZ: 99978

refine code with libva rebase in HW JPEG for data
structure rename

Change-Id: I660a2123d562159847dd51750358d3b08af7c28a
Signed-off-by: Nana GUo <nana.n.guo@intel.com>
Reviewed-on: http://android.intel.com:8080/101683
Reviewed-by: cactus <cactus@intel.com>
Reviewed-by: Shi, PingX <pingx.shi@intel.com>
Tested-by: Shi, PingX <pingx.shi@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

imagedecoder/JPEGDecoder.c

diff --git a/imagedecoder/JPEGDecoder.c b/imagedecoder/JPEGDecoder.c
index f692ede..ccbea4e 100644
--- a/imagedecoder/JPEGDecoder.c
+++ b/imagedecoder/JPEGDecoder.c
@@ -258,14 +258,14 @@
         status = DECODE_DRIVER_FAIL;
         return status;
     }
-    va_status = vaCreateBuffer(jd_libva_ptr->va_display, jd_libva_ptr->va_context, VAPictureParameterBufferType, sizeof(VAPictureParameterBufferJPEG), 1, &jd_libva_ptr->picture_param_buf, &desc_buf[buf_idx]);
+    va_status = vaCreateBuffer(jd_libva_ptr->va_display, jd_libva_ptr->va_context, VAPictureParameterBufferType, sizeof(VAPictureParameterBufferJPEGBaseline), 1, &jd_libva_ptr->picture_param_buf, &desc_buf[buf_idx]);
     if (va_status != VA_STATUS_SUCCESS) {
         ETRACE("vaCreateBuffer failed. va_status = 0x%x", va_status);
         status = DECODE_DRIVER_FAIL;
         return status;
     }
     buf_idx++;
-    va_status = vaCreateBuffer(jd_libva_ptr->va_display, jd_libva_ptr->va_context, VAIQMatrixBufferType, sizeof(VAIQMatrixParameterBufferJPEG), 1, &jd_libva_ptr->qmatrix_buf, &desc_buf[buf_idx]);
+    va_status = vaCreateBuffer(jd_libva_ptr->va_display, jd_libva_ptr->va_context, VAIQMatrixBufferType, sizeof(VAIQMatrixBufferJPEGBaseline), 1, &jd_libva_ptr->qmatrix_buf, &desc_buf[buf_idx]);
 
     if (va_status != VA_STATUS_SUCCESS) {
         ETRACE("vaCreateBuffer failed. va_status = 0x%x", va_status);
@@ -273,7 +273,7 @@
         return status;
     }
     buf_idx++;
-    va_status = vaCreateBuffer(jd_libva_ptr->va_display, jd_libva_ptr->va_context, VAHuffmanTableBufferType, sizeof(VAHuffmanTableParameterBufferJPEG), 1, &jd_libva_ptr->hufman_table_buf, &desc_buf[buf_idx]);
+    va_status = vaCreateBuffer(jd_libva_ptr->va_display, jd_libva_ptr->va_context, VAHuffmanTableBufferType, sizeof(VAHuffmanTableBufferJPEGBaseline), 1, &jd_libva_ptr->hufman_table_buf, &desc_buf[buf_idx]);
     if (va_status != VA_STATUS_SUCCESS) {
         ETRACE("vaCreateBuffer failed. va_status = 0x%x", va_status);
         status = DECODE_DRIVER_FAIL;
@@ -285,7 +285,7 @@
         uint32_t bytes = ( bytes_remaining < bitstream_buffer_size ) ? bytes_remaining : bitstream_buffer_size;
         bytes_remaining -= bytes;
         /* Get Slice Control Buffer */
-        VASliceParameterBufferJPEG dest_scan_ctrl[JPEG_MAX_COMPONENTS];
+        VASliceParameterBufferJPEGBaseline dest_scan_ctrl[JPEG_MAX_COMPONENTS];
         uint32_t src_idx = 0;
         uint32_t dest_idx = 0;
         memset(dest_scan_ctrl, 0, sizeof(dest_scan_ctrl));
@@ -330,7 +330,7 @@
         }
         scan_idx = src_idx;
         /* Get Slice Control Buffer */
-        va_status = vaCreateBuffer(jd_libva_ptr->va_display, jd_libva_ptr->va_context, VASliceParameterBufferType, sizeof(VASliceParameterBufferJPEG) * dest_idx, 1, dest_scan_ctrl, &desc_buf[buf_idx]);
+        va_status = vaCreateBuffer(jd_libva_ptr->va_display, jd_libva_ptr->va_context, VASliceParameterBufferType, sizeof(VASliceParameterBufferJPEGBaseline) * dest_idx, 1, dest_scan_ctrl, &desc_buf[buf_idx]);
         if (va_status != VA_STATUS_SUCCESS) {
             ETRACE("vaCreateBuffer failed. va_status = 0x%x", va_status);
             status = DECODE_DRIVER_FAIL;

imagedecoder/JPEGDecoder.h

diff --git a/imagedecoder/JPEGDecoder.h b/imagedecoder/JPEGDecoder.h
index b1e84b0..8e4ee17 100644
--- a/imagedecoder/JPEGDecoder.h
+++ b/imagedecoder/JPEGDecoder.h
@@ -49,10 +49,10 @@
     VASurfaceID* va_surfaces;
     VAConfigID va_config;
 
-    VAPictureParameterBufferJPEG picture_param_buf;
-    VASliceParameterBufferJPEG slice_param_buf[JPEG_MAX_COMPONENTS];
-    VAIQMatrixParameterBufferJPEG qmatrix_buf;
-    VAHuffmanTableParameterBufferJPEG hufman_table_buf;
+    VAPictureParameterBufferJPEGBaseline picture_param_buf;
+    VASliceParameterBufferJPEGBaseline slice_param_buf[JPEG_MAX_COMPONENTS];
+    VAIQMatrixBufferJPEGBaseline qmatrix_buf;
+    VAHuffmanTableBufferJPEGBaseline hufman_table_buf;
 
     uint32_t dht_byte_offset[4];
     uint32_t dqt_byte_offset[4];