Merge pull request #16 from seanvk/master

[android-x86/hardware-intel-common-libva.git] / va / va_enc_vp8.h

diff --git a/va/va_enc_vp8.h b/va/va_enc_vp8.h
index 35b31d9..d294042 100644 (file)
--- a/va/va_enc_vp8.h
+++ b/va/va_enc_vp8.h
@@ -122,19 +122,33 @@ typedef struct  _VAEncPictureParameterBufferVP8
         struct {
             /* force this frame to be a keyframe */
             unsigned int force_kf                       : 1;
-           /* don't reference the last frame */
+            /* don't reference the last frame */
             unsigned int no_ref_last                    : 1;
-           /* don't reference the golden frame */
+            /* don't reference the golden frame */
             unsigned int no_ref_gf                      : 1;
-           /* don't reference the alternate reference frame */
+            /* don't reference the alternate reference frame */
             unsigned int no_ref_arf                     : 1;
+            unsigned int reserved                       : 28;
+        } bits;
+        unsigned int value;
+    } ref_flags;
+
+    union {
+        struct {
+            /* version */
+            unsigned int frame_type                     : 1;
+            unsigned int version                        : 3;
+            /* show_frame */
+            unsigned int show_frame                     : 1;
+            /* color_space */                                             
+            unsigned int color_space                    : 1;
             /*  0: bicubic, 1: bilinear, other: none */
             unsigned int recon_filter_type              : 2;
             /*  0: no loop fitler, 1: simple loop filter */
             unsigned int loop_filter_type               : 2;
             /* 0: disabled, 1: normal, 2: simple */
             unsigned int auto_partitions                : 1;
-            /* number of token partitions */
+            /* same as log2_nbr_of_dct_partitions in frame header syntax */
             unsigned int num_token_partitions           : 2;
 
             /** 
@@ -216,7 +230,7 @@ typedef struct  _VAEncPictureParameterBufferVP8
             * Encoder application is advised to set this flag to 1 at key frames.
             */
             unsigned int forced_lf_adjustment           : 1;
-           unsigned int reserved                       : 4;
+            unsigned int reserved                       : 2;
         } bits;
         unsigned int value;
     } pic_flags;
@@ -301,9 +315,6 @@ typedef struct _VAEncMBMapBufferVP8
  */
 typedef struct _VAQMatrixBufferVP8
 {
-    /* 
-     * array first dimensional is segment and 2nd dimensional is Q index
-     */
     unsigned short quantization_index[4];
     short quantization_index_delta[5];
 } VAQMatrixBufferVP8;