[VDPAU] [PATCH v7] Extend the VDPAU API to support H.265/HEVC Decoding
Aaron Plattner
aplattner at nvidia.com
Sat Feb 7 11:08:00 PST 2015
On 02/03/2015 09:59 AM, José Hiram Soltren wrote:
> This patch adds an API for player applications to utilize VDPAU for
> hardware-accelerated playback of H.265/HEVC streams.
>
> The goals of this API are:
> - enable hardware accelerated decoding of H.265/HEVC content under VDPAU;
> - provide a reference implementation for H.265/HEVC hardware decoding that
> is vendor agnostic;
> - provide enough data for H.265/HEVC hardware acceleration implementations
> from multiple vendors to be able to use the same API;
>
> This patch is written against "version one" of the H.265/HEVC Specification,
> Rec. ITU-T H.265 (04/2013), available at:
>
> http://handle.itu.int/11.1002/1000/12296
>
> A future patch against this header may address bug fixes, and may support
> the new features described in "version two" of the H.265/HEVC Specification,
> Rec. ITU-T H.265 v2 (10/2014).
>
> Note that the API does need to be self documenting with Doxygen markup,
> which we (NVIDIA) will generate and post as an update to our public VDPAU
> documentation.
>
> This is version 7 of the patch.
>
> Version 1 was the original version.
>
> Version 2 was a minor cleanup change.
>
> Version 3 incorporated 10- and 12-bit formats.
>
> Version 4 clarified some documentation related to H.265/HEVC support.
>
> Version 5 clarified some documentation related to H.265/HEVC support
> and correcting the Specification URI above.
>
> Version 6 further corrected the Specification URI above, re-ordered the
> fields in VdpPictureInfoHEVC to agree with the Specification, and added
> additional documentation for some fields. It also corrected some cosmetic
> indentation errors.
>
> Version 7 removed the sps_sub_layer_ordering_info_present_flag, added a
> note on implementing clauses 8.3 through 8.7, clarified the meaning of
> sps_max_dec_pic_buffering_minus1, moved the scaling lists to follow
> scaling_list_enabled_flag, clarified comments on pps_beta_offset_div2
> and pps_tc_offset_div2, and added "Ignored otherwise." or "Invalid
> values are ignored" comments to several fields.
> ---
> include/vdpau/vdpau.h | 329 ++++++++++++++++++++++++++++++++++++++++++++++++-
> 1 file changed, 328 insertions(+), 1 deletion(-)
>
> diff --git a/include/vdpau/vdpau.h b/include/vdpau/vdpau.h
> index b386825..68dba0c 100644
> --- a/include/vdpau/vdpau.h
> +++ b/include/vdpau/vdpau.h
> @@ -6,7 +6,7 @@
> /*
> * This copyright notice applies to this header file:
> *
> - * Copyright (c) 2008-2010 NVIDIA Corporation
> + * Copyright (c) 2008-2015 NVIDIA Corporation
> *
> * Permission is hereby granted, free of charge, to any person
> * obtaining a copy of this software and associated documentation
> @@ -432,6 +432,26 @@
> * Include all slices beginning with start codes 0x000001B6. The slice start
> * code must be included for all slices.
> *
> + * \subsection bitstream_hevc H.265/HEVC - High Efficiency Video Codec
> + *
> + * Include all video coding layer (VCL) NAL units, with nal_unit_type values
> + * of 0 (TRAIL_N) through 31 (RSV_VCL31) inclusive. In addition to parsing
> + * and providing NAL units, an H.265/HEVC decoder application using VDPAU
> + * for decoding must parse certain values of the first slice segment header
> + * in a VCL NAL unit and provide it through VdpPictureInfoHEVC. Please see
> + * the documentation for VdpPictureInfoHEVC below for further details.
> + *
> + * The complete slice start code (including the 0x000001 prefix) must be
> + * included for all slices, even when the prefix is not included in the
> + * bitstream.
> + *
> + * Note that if desired:
> + *
> + * - The slice start code prefix may be included in a separate bitstream
> + * buffer array entry to the actual slice data extracted from the bitstream.
> + * - Multiple bitstream buffer array entries (e.g. one per slice) may point at
> + * the same physical data storage for the slice start code prefix.
> + *
> * \section video_mixer_usage Video Mixer Usage
> *
> * \subsection video_surface_content VdpVideoSurface Content
> @@ -2463,6 +2483,17 @@ typedef uint32_t VdpDecoderProfile;
> /** \hideinitializer */
> /** \brief Support for 8 bit depth only */
> #define VDP_DECODER_PROFILE_H264_HIGH_444_PREDICTIVE ((VdpDecoderProfile)26)
> +/** \hideinitializer */
> +/** \brief MPEG-H Part 2 == H.265 == HEVC */
> +#define VDP_DECODER_PROFILE_HEVC_MAIN ((VdpDecoderProfile)50)
> +/** \hideinitializer */
> +#define VDP_DECODER_PROFILE_HEVC_MAIN_10 ((VdpDecoderProfile)51)
> +/** \hideinitializer */
> +#define VDP_DECODER_PROFILE_HEVC_MAIN_STILL ((VdpDecoderProfile)52)
> +/** \hideinitializer */
> +#define VDP_DECODER_PROFILE_HEVC_MAIN_12 ((VdpDecoderProfile)53)
> +/** \hideinitializer */
> +#define VDP_DECODER_PROFILE_HEVC_MAIN_444 ((VdpDecoderProfile)54)
>
> /** \hideinitializer */
> #define VDP_DECODER_LEVEL_MPEG1_NA 0
> @@ -2558,6 +2589,38 @@ typedef uint32_t VdpDecoderProfile;
> #define VDP_DECODER_LEVEL_DIVX_NA 0
>
> /**
> + * The VDPAU H.265/HEVC decoder levels correspond to the values of
> + * general_level_idc as described in the H.265 Specification, Annex A,
> + * Table A.1. The enumeration values are equal to thirty times the level
> + * number.
> + */
> +#define VDP_DECODER_LEVEL_HEVC_1 30
> +/** \hideinitializer */
> +#define VDP_DECODER_LEVEL_HEVC_2 60
> +/** \hideinitializer */
> +#define VDP_DECODER_LEVEL_HEVC_2_1 63
> +/** \hideinitializer */
> +#define VDP_DECODER_LEVEL_HEVC_3 90
> +/** \hideinitializer */
> +#define VDP_DECODER_LEVEL_HEVC_3_1 93
> +/** \hideinitializer */
> +#define VDP_DECODER_LEVEL_HEVC_4 120
> +/** \hideinitializer */
> +#define VDP_DECODER_LEVEL_HEVC_4_1 123
> +/** \hideinitializer */
> +#define VDP_DECODER_LEVEL_HEVC_5 150
> +/** \hideinitializer */
> +#define VDP_DECODER_LEVEL_HEVC_5_1 153
> +/** \hideinitializer */
> +#define VDP_DECODER_LEVEL_HEVC_5_2 156
> +/** \hideinitializer */
> +#define VDP_DECODER_LEVEL_HEVC_6 180
> +/** \hideinitializer */
> +#define VDP_DECODER_LEVEL_HEVC_6_1 183
> +/** \hideinitializer */
> +#define VDP_DECODER_LEVEL_HEVC_6_2 186
> +
> +/**
> * \brief Query the implementation's VdpDecoder capabilities.
> * \param[in] device The device to query.
> * \param[in] profile The decoder profile for which information is requested.
> @@ -3054,6 +3117,270 @@ typedef VdpPictureInfoMPEG4Part2 VdpPictureInfoDivX4;
> typedef VdpPictureInfoMPEG4Part2 VdpPictureInfoDivX5;
>
> /**
> + * \brief Picture parameter information for an H.265/HEVC picture.
> + *
> + * References to "copy of ... bitstream field" in the field descriptions
> + * may refer to data literally parsed from the bitstream,
> + * or derived from the bitstream using a mechanism described in
> + * Rec. ITU-T H.265 (04/2013), hereafter referred to as
> + * "the H.265/HEVC Specification".
> + *
> + * VDPAU H.265/HEVC implementations implement the portion of the decoding
> + * process described by clauses 8.4, 8.5, 8.6 and 8.7 of the the
> + * H.265/HEVC Specification. VdpPictureInfoHEVC provides enough data
> + * to complete this portion of the decoding process, plus additional
> + * information not defined in the H.265/HEVC Specification that may be
> + * useful to particular implementations.
> + *
> + * Client applications must supply every field in this struct.
> + */
> +typedef struct {
> + /** Copy of the Sequence Parameter Set bitstream field. */
> + uint8_t chroma_format_idc;
> + /** Copy of the Sequence Parameter Set bitstream field.
> + Only valid if chroma_format_idc == 3. Ignored otherwise.*/
> + uint8_t separate_colour_plane_flag;
> + /** Copy of the Sequence Parameter Set bitstream field. */
> + uint32_t pic_width_in_luma_samples;
> + /** Copy of the Sequence Parameter Set bitstream field. */
> + uint32_t pic_height_in_luma_samples;
> + /** Copy of the Sequence Parameter Set bitstream field. */
> + uint8_t bit_depth_luma_minus8;
> + /** Copy of the Sequence Parameter Set bitstream field. */
> + uint8_t bit_depth_chroma_minus8;
> + /** Copy of the Sequence Parameter Set bitstream field. */
> + uint8_t log2_max_pic_order_cnt_lsb_minus4;
> + /** Copy of the Sequence Parameter Set bitstream field. Provides
> + the value corresponding to the nuh_temporal_id of the frame
> + to be decoded. */
> + uint8_t sps_max_dec_pic_buffering_minus1;
> + /** Copy of the Sequence Parameter Set bitstream field. */
> + uint8_t log2_min_luma_coding_block_size_minus3;
> + /** Copy of the Sequence Parameter Set bitstream field. */
> + uint8_t log2_diff_max_min_luma_coding_block_size;
> + /** Copy of the Sequence Parameter Set bitstream field. */
> + uint8_t log2_min_transform_block_size_minus2;
> + /** Copy of the Sequence Parameter Set bitstream field. */
> + uint8_t log2_diff_max_min_transform_block_size;
> + /** Copy of the Sequence Parameter Set bitstream field. */
> + uint8_t max_transform_hierarchy_depth_inter;
> + /** Copy of the Sequence Parameter Set bitstream field. */
> + uint8_t max_transform_hierarchy_depth_intra;
> + /** Copy of the Sequence Parameter Set bitstream field. */
> + uint8_t scaling_list_enabled_flag;
> + /** Scaling lists, in diagonal order, to be used for this frame. */
> + /** Scaling List for 4x4 quantization matrix,
> + indexed as ScalingList4x4[matrixId][i]. */
> + uint8_t ScalingList4x4[6][16];
> + /** Scaling List for 8x8 quantization matrix,
> + indexed as ScalingList8x8[matrixId][i]. */
> + uint8_t ScalingList8x8[6][64];
> + /** Scaling List for 16x16 quantization matrix,
> + indexed as ScalingList16x16[matrixId][i]. */
> + uint8_t ScalingList16x16[6][64];
> + /** Scaling List for 32x32 quantization matrix,
> + indexed as ScalingList32x32[matrixId][i]. */
> + uint8_t ScalingList32x32[2][64];
> + /** Scaling List DC Coefficients for 16x16,
> + indexed as ScalingListDCCoeff16x16[matrixId]. */
> + uint8_t ScalingListDCCoeff16x16[6];
> + /** Scaling List DC Coefficients for 32x32,
> + indexed as ScalingListDCCoeff32x32[matrixId]. */
> + uint8_t ScalingListDCCoeff32x32[2];
> + /** Copy of the Sequence Parameter Set bitstream field. */
> + uint8_t amp_enabled_flag;
> + /** Copy of the Sequence Parameter Set bitstream field. */
> + uint8_t sample_adaptive_offset_enabled_flag;
> + /** Copy of the Sequence Parameter Set bitstream field. */
> + uint8_t pcm_enabled_flag;
> + /** Copy of the Sequence Parameter Set bitstream field.
> + Only needs to be set if pcm_enabled_flag is set. Ignored otherwise. */
> + uint8_t pcm_sample_bit_depth_luma_minus1;
> + /** Copy of the Sequence Parameter Set bitstream field.
> + Only needs to be set if pcm_enabled_flag is set. Ignored otherwise. */
> + uint8_t pcm_sample_bit_depth_chroma_minus1;
> + /** Copy of the Sequence Parameter Set bitstream field.
> + Only needs to be set if pcm_enabled_flag is set. Ignored otherwise. */
> + uint8_t log2_min_pcm_luma_coding_block_size_minus3;
> + /** Copy of the Sequence Parameter Set bitstream field.
> + Only needs to be set if pcm_enabled_flag is set. Ignored otherwise. */
> + uint8_t log2_diff_max_min_pcm_luma_coding_block_size;
> + /** Copy of the Sequence Parameter Set bitstream field.
> + Only needs to be set if pcm_enabled_flag is set. Ignored otherwise. */
> + uint8_t pcm_loop_filter_disabled_flag;
> + /** Copy of the Sequence Parameter Set bitstream field.
> + Per spec, when zero, assume short_term_ref_pic_set_sps_flag
> + is also zero. */
> + uint8_t num_short_term_ref_pic_sets;
> + /** Copy of the Sequence Parameter Set bitstream field. */
> + uint8_t long_term_ref_pics_present_flag;
> + /** Copy of the Sequence Parameter Set bitstream field.
> + Only needed if long_term_ref_pics_present_flag is set. Ignored
> + otherwise. */
> + uint8_t num_long_term_ref_pics_sps;
> + /** Copy of the Sequence Parameter Set bitstream field. */
> + uint8_t sps_temporal_mvp_enabled_flag;
> + /** Copy of the Sequence Parameter Set bitstream field. */
> + uint8_t strong_intra_smoothing_enabled_flag;
> +
> + /** Copy of the Picture Parameter Set bitstream field. */
> + uint8_t dependent_slice_segments_enabled_flag;
> + /** Copy of the Picture Parameter Set bitstream field. */
> + uint8_t output_flag_present_flag;
> + /** Copy of the Picture Parameter Set bitstream field. */
> + uint8_t num_extra_slice_header_bits;
> + /** Copy of the Picture Parameter Set bitstream field. */
> + uint8_t sign_data_hiding_enabled_flag;
> + /** Copy of the Picture Parameter Set bitstream field. */
> + uint8_t cabac_init_present_flag;
> + /** Copy of the Picture Parameter Set bitstream field. */
> + uint8_t num_ref_idx_l0_default_active_minus1;
> + /** Copy of the Picture Parameter Set bitstream field. */
> + uint8_t num_ref_idx_l1_default_active_minus1;
> + /** Copy of the Picture Parameter Set bitstream field. */
> + int8_t init_qp_minus26;
> + /** Copy of the Picture Parameter Set bitstream field. */
> + uint8_t constrained_intra_pred_flag;
> + /** Copy of the Picture Parameter Set bitstream field. */
> + uint8_t transform_skip_enabled_flag;
> + /** Copy of the Picture Parameter Set bitstream field. */
> + uint8_t cu_qp_delta_enabled_flag;
> + /** Copy of the Picture Parameter Set bitstream field.
> + Only needed if cu_qp_delta_enabled_flag is set. Ignored otherwise. */
> + uint8_t diff_cu_qp_delta_depth;
> + /** Copy of the Picture Parameter Set bitstream field. */
> + int8_t pps_cb_qp_offset;
> + /** Copy of the Picture Parameter Set bitstream field. */
> + int8_t pps_cr_qp_offset;
> + /** Copy of the Picture Parameter Set bitstream field. */
> + uint8_t pps_slice_chroma_qp_offsets_present_flag;
> + /** Copy of the Picture Parameter Set bitstream field. */
> + uint8_t weighted_pred_flag;
> + /** Copy of the Picture Parameter Set bitstream field. */
> + uint8_t weighted_bipred_flag;
> + /** Copy of the Picture Parameter Set bitstream field. */
> + uint8_t transquant_bypass_enabled_flag;
> + /** Copy of the Picture Parameter Set bitstream field. */
> + uint8_t tiles_enabled_flag;
> + /** Copy of the Picture Parameter Set bitstream field. */
> + uint8_t entropy_coding_sync_enabled_flag;
> + /** Copy of the Picture Parameter Set bitstream field.
> + Only valid if tiles_enabled_flag is set. Ignored otherwise. */
> + uint8_t num_tile_columns_minus1;
> + /** Copy of the Picture Parameter Set bitstream field.
> + Only valid if tiles_enabled_flag is set. Ignored otherwise. */
> + uint8_t num_tile_rows_minus1;
> + /** Copy of the Picture Parameter Set bitstream field.
> + Only valid if tiles_enabled_flag is set. Ignored otherwise. */
> + uint8_t uniform_spacing_flag;
> + /** Copy of the Picture Parameter Set bitstream field.
> + Only need to set 0..num_tile_columns_minus1. The struct
> + definition reserves up to the maximum of 22. Invalid values are
> + ignored. */
> + uint16_t column_width_minus1[22];
> + /** Copy of the Picture Parameter Set bitstream field.
> + Only need to set 0..num_tile_rows_minus1. The struct
> + definition reserves up to the maximum of 20. Invalid values are
> + ignored.*/
> + uint16_t row_height_minus1[20];
> + /** Copy of the Picture Parameter Set bitstream field.
> + Only needed if tiles_enabled_flag is set. Invalid values are
> + ignored. */
> + uint8_t loop_filter_across_tiles_enabled_flag;
> + /** Copy of the Picture Parameter Set bitstream field. */
> + uint8_t pps_loop_filter_across_slices_enabled_flag;
> + /** Copy of the Picture Parameter Set bitstream field. */
> + uint8_t deblocking_filter_control_present_flag;
> + /** Copy of the Picture Parameter Set bitstream field.
> + Only valid if deblocking_filter_control_present_flag is set. Ignored
> + otherwise. */
> + uint8_t deblocking_filter_override_enabled_flag;
> + /** Copy of the Picture Parameter Set bitstream field.
> + Only valid if deblocking_filter_control_present_flag is set. Ignored
> + otherwise. */
> + uint8_t pps_deblocking_filter_disabled_flag;
> + /** Copy of the Picture Parameter Set bitstream field.
> + Only valid if deblocking_filter_control_present_flag is set and
> + pps_deblocking_filter_disabled_flag is not set. Ignored otherwise.*/
> + int8_t pps_beta_offset_div2;
> + /** Copy of the Picture Parameter Set bitstream field.
> + Only valid if deblocking_filter_control_present_flag is set and
> + pps_deblocking_filter_disabled_flag is not set. Ignored otherwise. */
> + int8_t pps_tc_offset_div2;
> + /** Copy of the Picture Parameter Set bitstream field. */
> + uint8_t lists_modification_present_flag;
> + /** Copy of the Picture Parameter Set bitstream field. */
> + uint8_t log2_parallel_merge_level_minus2;
> + /** Copy of the Picture Parameter Set bitstream field. */
> + uint8_t slice_segment_header_extension_present_flag;
> +
> + /** Slice Segment Header bitstream fields and calculated values. */
> + /** Set to 1 if nal_unit_type is equal to IDR_W_RADL or IDR_N_LP.
> + Set to zero otherwise. */
> + uint32_t IDRPicFlag;
> + /** Set to 1 if nal_unit_type in the range of BLA_W_LP to
> + RSV_IRAP_VCL23, inclusive. Set to zero otherwise.*/
> + uint32_t RAPPicFlag;
Should these two be uint8_ts since they're just flags?
> + /** Copy of specification field, CurrRpsIdx, see 7.4.7.1. */
> + uint32_t CurrRpsIdx;
This is at most num_short_term_ref_pic_sets, right? And that's a uint8_t.
> + /** Copy of specification field, see Section 7.4.7.2 of the
> + H.265/HEVC Specification. */
> + uint32_t NumPocTotalCurr;
> + /** Corresponds to specification field, NumDeltaPocs[RefRpsIdx].
> + Only applicable when short_term_ref_pic_set_sps_flag == 0.
> + Implementations will ignore this value in other cases. See 7.4.8. */
> + uint32_t NumDeltaPocsOfRefRpsIdx;
> + /** Section 7.6.3.1 of the H.265/HEVC Specification defines the syntax of
> + the slice_segment_header. This header contains information that
> + some VDPAU implementations may choose to skip. The VDPAU API
> + requires client applications to track the number of bits used in the
> + slice header for structures associated with short term and long term
> + reference pictures. First, VDPAU requires the number of bits used by
> + the short_term_ref_pic_set array in the slice_segment_header. */
> + uint32_t NumShortTermPictureSliceHeaderBits;
> + /** Second, VDPAU requires the number of bits used for long term reference
> + pictures in the slice_segment_header. This is equal to the number
> + of bits used for the contents of the block beginning with
> + "if(long_term_ref_pics_present_flag)". */
> + uint32_t NumLongTermPictureSliceHeaderBits;
> +
> + /** Slice Decoding Process - Picture Order Count */
> + /** The value of PicOrderCntVal of the picture in the access unit
> + containing the SEI message. The picture being decoded. */
> + int32_t CurrPicOrderCntVal;
> +
> + /** Slice Decoding Process - Reference Picture Sets */
> + /** Array of video reference surfaces.
> + Set any unused positions to VDP_INVALID_HANDLE. */
> + VdpVideoSurface RefPics[16];
> + /** Array of picture order counts. These correspond to positions
> + in the RefPics array. */
> + int32_t PicOrderCntVal[16];
> + /** Array used to specify whether a particular RefPic is
> + a long term reference. A value of "1" indicates a long-term
> + reference. */
> + uint8_t IsLongTerm[16];
> + /** Copy of specification field, see Section 8.3.2 of the
> + H.265/HEVC Specification. */
> + uint32_t NumPocStCurrBefore;
> + /** Copy of specification field, see Section 8.3.2 of the
> + H.265/HEVC Specification. */
> + uint32_t NumPocStCurrAfter;
> + /** Copy of specification field, see Section 8.3.2 of the
> + H.265/HEVC Specification. */
> + uint32_t NumPocLtCurr;
> + /** Reference Picture Set list, one of the short-term RPS. These
> + correspond to positions in the RefPics array. */
> + int8_t RefPicSetStCurrBefore[8];
> + /** Reference Picture Set list, one of the short-term RPS. These
> + correspond to positions in the RefPics array. */
> + int8_t RefPicSetStCurrAfter[8];
> + /** Reference Picture Set list, one of the long-term RPS. These
> + correspond to positions in the RefPics array. */
> + int8_t RefPicSetLtCurr[8];
> +} VdpPictureInfoHEVC;
> +
> +/**
> * \brief Decode a compressed field/frame and render the result
> * into a \ref VdpVideoSurface "VdpVideoSurface".
> * \param[in] decoder The decoder object that will perform the
I checked that the signedness of the field agrees with the spec, but I
didn't check that the ranges make sense and will just trust your
judgment on that. The sizes of the derived fields being possibly too
large doesn't seem like a big deal, so unless you disagree, I'll push
this on Monday with
Reviewed-by: Aaron Plattner <aplattner at nvidia.com>
Christian, can I consider this reviewed by you too based on your
feedback on patch v5?
--
Aaron
More information about the VDPAU
mailing list