Message ID | 7129e7ea-87cc-1b58-99cf-a820e71aef7e@gmail.com |
---|---|
State | Accepted |
Commit | 5b8a708492f84ab49bcf9f694c50ac87cbdcc21b |
Headers | show |
On 18/07/17 05:08, Jun Zhao wrote: > From ee094ddd0fedecc81ee0107df58fc0ec80369c13 Mon Sep 17 00:00:00 2001 > From: Jun Zhao <jun.zhao@intel.com> > Date: Tue, 18 Jul 2017 00:01:09 -0400 > Subject: [PATCH] lavc/vaapi_encode_h265: Remove duplicate > slice_segment_address. > > the VAEncSliceParameterBufferHEVC in libva have support this field, > so remove the duplicate field in VAAPIEncodeH265MiscSliceParams. > > Signed-off-by: Jun Zhao <jun.zhao@intel.com> > --- > libavcodec/vaapi_encode_h265.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/libavcodec/vaapi_encode_h265.c b/libavcodec/vaapi_encode_h265.c > index 1d648a6d87..cf6b9388d1 100644 > --- a/libavcodec/vaapi_encode_h265.c > +++ b/libavcodec/vaapi_encode_h265.c > @@ -149,7 +149,6 @@ typedef struct VAAPIEncodeH265MiscSequenceParams { > typedef struct VAAPIEncodeH265MiscSliceParams { > // Slice segments. > char first_slice_segment_in_pic_flag; > - unsigned int slice_segment_address; > > // Short-term reference picture sets. > char short_term_ref_pic_set_sps_flag; > @@ -586,7 +585,7 @@ static void vaapi_encode_h265_write_slice_header2(PutBitContext *pbc, > if (vpic->pic_fields.bits.dependent_slice_segments_enabled_flag) > u(1, vslice_field(dependent_slice_segment_flag)); > u(av_log2((priv->ctu_width * priv->ctu_height) - 1) + 1, > - mslice_var(slice_segment_address)); > + vslice_var(slice_segment_address)); > } > if (!vslice->slice_fields.bits.dependent_slice_segment_flag) { > for (i = 0; i < mseq->num_extra_slice_header_bits; i++) > -- > 2.11.0 > LGTM, applied. Thanks, - Mark
diff --git a/libavcodec/vaapi_encode_h265.c b/libavcodec/vaapi_encode_h265.c index 1d648a6d87..cf6b9388d1 100644 --- a/libavcodec/vaapi_encode_h265.c +++ b/libavcodec/vaapi_encode_h265.c @@ -149,7 +149,6 @@ typedef struct VAAPIEncodeH265MiscSequenceParams { typedef struct VAAPIEncodeH265MiscSliceParams { // Slice segments. char first_slice_segment_in_pic_flag; - unsigned int slice_segment_address; // Short-term reference picture sets. char short_term_ref_pic_set_sps_flag; @@ -586,7 +585,7 @@ static void vaapi_encode_h265_write_slice_header2(PutBitContext *pbc, if (vpic->pic_fields.bits.dependent_slice_segments_enabled_flag) u(1, vslice_field(dependent_slice_segment_flag)); u(av_log2((priv->ctu_width * priv->ctu_height) - 1) + 1, - mslice_var(slice_segment_address)); + vslice_var(slice_segment_address)); } if (!vslice->slice_fields.bits.dependent_slice_segment_flag) { for (i = 0; i < mseq->num_extra_slice_header_bits; i++)