travis: Add hooks for slack

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

diff --git a/va/va_enc_h264.h b/va/va_enc_h264.h
index 974e7dc..2e7eb8d 100644 (file)
--- a/va/va_enc_h264.h
+++ b/va/va_enc_h264.h
@@ -121,7 +121,8 @@ typedef enum {
 } VAEncPackedHeaderTypeH264;
 
 /**
- * \brief Sequence parameter for H.264 encoding in main & high profiles.
+ * \brief Sequence parameter for H.264 encoding in baseline, main & high 
+ * profiles.
  *
  * This structure holds information for \c seq_parameter_set_data() as
  * defined by the H.264 specification.
@@ -231,6 +232,8 @@ typedef struct _VAEncSequenceParameterBufferH264 {
     union {
         struct {
             /** \brief Same as the H.264 bitstream syntax element. */
+            unsigned int aspect_ratio_info_present_flag         : 1;
+            /** \brief Same as the H.264 bitstream syntax element. */
             unsigned int timing_info_present_flag               : 1;
             /** \brief Same as the H.264 bitstream syntax element. */
             unsigned int bitstream_restriction_flag             : 1;
@@ -242,6 +245,12 @@ typedef struct _VAEncSequenceParameterBufferH264 {
         unsigned int value;
     } vui_fields;
     /** \brief Same as the H.264 bitstream syntax element. */
+    unsigned char   aspect_ratio_idc;
+    /** \brief Same as the H.264 bitstream syntax element. */
+    unsigned int    sar_width;
+    /** \brief Same as the H.264 bitstream syntax element. */
+    unsigned int    sar_height;
+    /** \brief Same as the H.264 bitstream syntax element. */
     unsigned int    num_units_in_tick;
     /** \brief Same as the H.264 bitstream syntax element. */
     unsigned int    time_scale;
@@ -249,7 +258,8 @@ typedef struct _VAEncSequenceParameterBufferH264 {
 } VAEncSequenceParameterBufferH264;
 
 /**
- * \brief Picture parameter for H.264 encoding in main & high profiles.
+ * \brief Picture parameter for H.264 encoding in baseline, main & high 
+ * profiles.
  *
  * This structure holds information for \c pic_parameter_set_rbsp() as
  * defined by the H.264 specification.
@@ -359,7 +369,7 @@ typedef struct _VAEncPictureParameterBufferH264 {
 } VAEncPictureParameterBufferH264;
 
 /**
- * \brief Slice parameter for H.264 encoding in main & high profiles.
+ * \brief Slice parameter for H.264 encoding in baseline, main & high profiles.
  *
  * This structure holds information for \c
  * slice_layer_without_partitioning_rbsp() as defined by the H.264
@@ -376,8 +386,7 @@ typedef struct _VAEncPictureParameterBufferH264 {
  *
  * If per-macroblock encoder configuration is needed, \c macroblock_info
  * references a buffer of type #VAEncMacroblockParameterBufferH264. This
- * buffer is not passed to vaRenderPicture(). i.e. it is not destroyed
- * by subsequent calls to vaRenderPicture() and then can be re-used
+ * buffer is not passed to vaRenderPicture() and it can be re-used
  * without re-allocating the whole buffer.
  */
 typedef struct _VAEncSliceParameterBufferH264 {
@@ -514,7 +523,8 @@ typedef struct _VAEncSliceParameterBufferH264 {
 /**@}*/
 
 /**
- * \brief Macroblock parameter for H.264 encoding in main & high profiles.
+ * \brief Macroblock parameter for H.264 encoding in baseline, main & high 
+ * profiles.
  *
  * This structure holds per-macroblock information. The buffer must be
  * allocated with as many elements (macroblocks) as necessary to fit