Hello community, here is the log from the commit of package libvdpau for openSUSE:Factory checked in at 2015-03-19 20:50:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libvdpau (Old) and /work/SRC/openSUSE:Factory/.libvdpau.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libvdpau" Changes: -------- --- /work/SRC/openSUSE:Factory/libvdpau/libvdpau.changes 2014-12-29 00:34:17.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libvdpau.new/libvdpau.changes 2015-03-19 20:50:37.000000000 +0100 @@ -1,0 +2,25 @@ +Tue Mar 17 08:38:21 UTC 2015 - [email protected] + +- Update libvdpau to version 1.1 + * This release fixes a bug in the new VdpPictureInfoHEVC structure: + the column_width_minus1 and row_height_minus1 arrays had the wrong + dimensions. To avoid the incorrect structure being used, the profile + numbers for the HEVC profiles have been changed. Please use the new + profiles rather than the ones from libvdpau 1.0. + +------------------------------------------------------------------- +Mon Mar 16 11:44:43 UTC 2015 - [email protected] + +- Update libvdpau to version 1.0 + * This release adds support for the following HEVC / H.265 profiles: + VDP_DECODER_PROFILE_HEVC_MAIN + VDP_DECODER_PROFILE_HEVC_MAIN_10 + VDP_DECODER_PROFILE_HEVC_MAIN_STILL + VDP_DECODER_PROFILE_HEVC_MAIN_12 + VDP_DECODER_PROFILE_HEVC_MAIN_444 +- Updated vdpauinfo to version 0.9 + * This release adds support for querying the new profiles added in + libvdpau 1.0 (see above) +- cleanup: removed empty patch 'vdpauinfo-missing-lX11.diff' + +------------------------------------------------------------------- Old: ---- libvdpau-0.9.tar.bz2 vdpauinfo-0.9.tar.gz vdpauinfo-missing-lX11.diff New: ---- libvdpau-1.1.tar.bz2 vdpauinfo-1.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libvdpau.spec ++++++ --- /var/tmp/diff_new_pack.H8uOeB/_old 2015-03-19 20:50:38.000000000 +0100 +++ /var/tmp/diff_new_pack.H8uOeB/_new 2015-03-19 20:50:38.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libvdpau # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,19 +17,17 @@ Name: libvdpau -Version: 0.9 +Version: 1.1 Release: 0 Summary: VDPAU wrapper and trace libraries License: MIT Group: System/Libraries Url: http://www.freedesktop.org/wiki/Software/VDPAU/ Source: http://people.freedesktop.org/~aplattner/vdpau/%{name}-%{version}.tar.bz2 -Source1: http://people.freedesktop.org/~aplattner/vdpau/vdpauinfo-%{version}.tar.gz +Source1: http://people.freedesktop.org/~aplattner/vdpau/vdpauinfo-1.0.tar.gz Source2: README Source99: baselibs.conf Source100: %{name}-rpmlintrc -# PATCH-FIX-OPENSUSE vdpauinfo-missing-lX11.diff -- add missing lX11 library -Patch0: vdpauinfo-missing-lX11.diff # PATCH-FIX-OPENSUSE libvdpau-nopdftex.patch -- don't requires pdftex for building Patch1: libvdpau-nopdftex.patch BuildRequires: autoconf @@ -88,9 +86,6 @@ %prep %setup -q -b1 %patch1 -p1 -pushd ../vdpauinfo-* -%patch0 -p1 -popd %build autoreconf -fi ++++++ libvdpau-0.9.tar.bz2 -> libvdpau-1.1.tar.bz2 ++++++ ++++ 2626 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libvdpau-0.9/ChangeLog new/libvdpau-1.1/ChangeLog --- old/libvdpau-0.9/ChangeLog 2014-12-19 18:33:45.000000000 +0100 +++ new/libvdpau-1.1/ChangeLog 2015-03-16 22:31:43.000000000 +0100 @@ -1,3 +1,171 @@ +commit 0962da95cdf1d87a883d1d0db7d2697d6d103348 +Author: Aaron Plattner <[email protected]> +Date: Mon Mar 16 14:31:31 2015 -0700 + + Bump version to 1.1 + + Signed-off-by: Aaron Plattner <[email protected]> + +commit 0b3d6a0387c1a4b494349c9385c81e06992d80ad +Author: Aaron Plattner <[email protected]> +Date: Mon Mar 16 12:15:17 2015 -0700 + + Change HEVC profile numbers to 100 through 104 + + libvdpau 1.0 contained an error in its HEVC picture info structures. Rather + than try to maintain backward compatibility with the incorrect definition, the + existing VdpPictureInfoHEVC was updated to contain the fixed definition. Since + the new structure is no longer compatible with the ABI defined by libvdpau 1.0, + change the profile numbers for HEVC so that software built against the incorrect + definition will not recognize the new profiles. + + Signed-off-by: Aaron Plattner <[email protected]> + Reviewed-by: José Hiram Soltren <[email protected]> + +commit 8e1e235cbd81ed49b2646cf344503587b4e7a70a +Author: José Hiram Soltren <[email protected]> +Date: Fri Mar 13 13:39:35 2015 -0500 + + Fix error in sizes of H265 column width and row height, arrays + + An NVIDIA internal hardware document noted: + + #define MAX_TILE_COLS 20 + #define MAX_TILE_ROWS 22 + + As of this writing the VDPAU API writes: + + /** 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]; + /** 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]; + + This is not correct. The correct definitions ought to be: + + uint16_t column_width_minus1[20]; + uint16_t row_height_minus1[22]; + + The H.265 Specification does not give an explicit range for the sizes + of these arrays. It is possible to calculate an upper limit for a particular + video frame implicitly using these equations: + + MinCbLog2SizeY = log2_min_luma_coding_block_size_minus3 + 3 (7-10) + CtbLog2SizeY = MinCbLog2SizeY + log2_diff_max_min_luma_coding_block_size (7-11) + CtbSizeY = 1 << CtbLog2SizeY (7-13) + PicWidthInCtbsY = Ceil( pic_width_in_luma_samples ÷ CtbSizeY ) (7-15) + num_tile_columns_minus1 ϵ [0, PicWidthInCtbsY − 1] + + (num_tile_rows_minus1 is similar) + + For a video with: + log2_min_luma_coding_block_size_minus3 = 0 + log2_diff_max_min_luma_coding_block_size = 0 + pic_width_in_luma_samples = 4096 + + num_tile_columns_minus1 < 512 + + This seems patological. Perhaps we could cap column_width_minus1[] and + row_height_minus1[] at 32 or 64 elements apiece if other hardware + implementations saw a reason to do so. + + This change as proposed does not alter the size of VdpPictureInfoHEVC, but + it *does* change the ABI. We can either add it as a fixup to the just + released VDPAU 1.0, or create a follow-on patch structure. Since few have + adopted VdpPictureInfoHEVC since Monday my preference is to fix the + existing structure. + + Signed-off-by: Aaron Plattner <[email protected]> + Acked-by: Aaron Plattner <[email protected]> + +commit 686633d21b10293a10c1d6ba77499b0d67c23056 +Author: Aaron Plattner <[email protected]> +Date: Mon Mar 9 14:22:56 2015 -0700 + + Bump version to 1.0 + + Signed-off-by: Aaron Plattner <[email protected]> + +commit 705a8166e03446f77143455c270d9f69fc459eb8 +Author: Aaron Plattner <[email protected]> +Date: Thu Jan 29 13:11:25 2015 -0800 + + Use member groups to simplify documentation + + For lists of fields that are copied or derived from the video bitstreams, use + Doxygen member groups to document them once as a block, rather than copying the + text "Copy of the <whatever> bitstream field." all over the place. This groups + the fields together in the HTML. + + Reviewed-by: Christian König <[email protected]> + v2: Rebase on top of José's HEVC work. + Signed-off-by: Aaron Plattner <[email protected]> + Reviewed-by: José Hiram Soltren <[email protected]> + +commit c199b6107fda78cc575f0bdace6327e85add7fa9 +Author: José Hiram Soltren <[email protected]> +Date: Mon Feb 9 12:40:11 2015 -0600 + + Extend the VDPAU API to support H.265/HEVC Decoding + + 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 8 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. + + Version 8 truncated a number of fields related to reference pictures to + 8 bit types, e.g. uint8_t. + + Signed-off-by: Aaron Plattner <[email protected]> + Reviewed-by: Aaron Plattner <[email protected]> + Acked-by: Christian König <[email protected]> + commit 1836c6bc73a1f505490f67144e2d37c4d8646685 Author: Aaron Plattner <[email protected]> Date: Fri Dec 19 09:33:09 2014 -0800 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libvdpau-0.9/configure.ac new/libvdpau-1.1/configure.ac --- old/libvdpau-0.9/configure.ac 2014-12-19 18:32:57.000000000 +0100 +++ new/libvdpau-1.1/configure.ac 2015-03-16 22:31:19.000000000 +0100 @@ -1,6 +1,6 @@ AC_PREREQ(2.60) -AC_INIT(libvdpau, 0.9, [[email protected]], libvdpau) +AC_INIT(libvdpau, 1.1, [[email protected]], libvdpau) AM_INIT_AUTOMAKE([dist-bzip2 foreign]) AM_MAINTAINER_MODE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libvdpau-0.9/include/vdpau/vdpau.h new/libvdpau-1.1/include/vdpau/vdpau.h --- old/libvdpau-0.9/include/vdpau/vdpau.h 2014-12-12 21:33:51.000000000 +0100 +++ new/libvdpau-1.1/include/vdpau/vdpau.h 2015-03-16 20:15:04.000000000 +0100 @@ -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 @@ /** \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)100) +/** \hideinitializer */ +#define VDP_DECODER_PROFILE_HEVC_MAIN_10 ((VdpDecoderProfile)101) +/** \hideinitializer */ +#define VDP_DECODER_PROFILE_HEVC_MAIN_STILL ((VdpDecoderProfile)102) +/** \hideinitializer */ +#define VDP_DECODER_PROFILE_HEVC_MAIN_12 ((VdpDecoderProfile)103) +/** \hideinitializer */ +#define VDP_DECODER_PROFILE_HEVC_MAIN_444 ((VdpDecoderProfile)104) /** \hideinitializer */ #define VDP_DECODER_LEVEL_MPEG1_NA 0 @@ -2558,6 +2589,38 @@ #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. @@ -2679,9 +2742,9 @@ * \brief Picture parameter information for an MPEG 1 or MPEG 2 * picture. * - * Note: 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 the specification. + * Note: References to bitstream fields below may refer to data literally parsed + * from the bitstream, or derived from the bitstream using a mechanism described + * in the specification. */ typedef struct { /** @@ -2697,45 +2760,38 @@ /** Number of slices in the bitstream provided. */ uint32_t slice_count; - /** Copy of the MPEG bitstream field. */ + /** \name MPEG bitstream + * + * Copies of the MPEG bitstream fields. + * @{ */ uint8_t picture_structure; - /** Copy of the MPEG bitstream field. */ uint8_t picture_coding_type; - /** Copy of the MPEG bitstream field. */ uint8_t intra_dc_precision; - /** Copy of the MPEG bitstream field. */ uint8_t frame_pred_frame_dct; - /** Copy of the MPEG bitstream field. */ uint8_t concealment_motion_vectors; - /** Copy of the MPEG bitstream field. */ uint8_t intra_vlc_format; - /** Copy of the MPEG bitstream field. */ uint8_t alternate_scan; - /** Copy of the MPEG bitstream field. */ uint8_t q_scale_type; - /** Copy of the MPEG bitstream field. */ uint8_t top_field_first; - /** Copy of the MPEG-1 bitstream field. For MPEG-2, set to 0. */ + /** MPEG-1 only. For MPEG-2, set to 0. */ uint8_t full_pel_forward_vector; - /** Copy of the MPEG-1 bitstream field. For MPEG-2, set to 0. */ + /** MPEG-1 only. For MPEG-2, set to 0. */ uint8_t full_pel_backward_vector; - /** - * Copy of the MPEG bitstream field. - * For MPEG-1, fill both horizontal and vertical entries. - */ + /** For MPEG-1, fill both horizontal and vertical entries. */ uint8_t f_code[2][2]; - /** Copy of the MPEG bitstream field, converted to raster order. */ + /** Convert to raster order. */ uint8_t intra_quantizer_matrix[64]; - /** Copy of the MPEG bitstream field, converted to raster order. */ + /** Convert to raster order. */ uint8_t non_intra_quantizer_matrix[64]; + /** @} */ } VdpPictureInfoMPEG1Or2; /** * \brief Information about an H.264 reference frame * - * Note: 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 the specification. + * Note: References to bitstream fields below may refer to data literally parsed + * from the bitstream, or derived from the bitstream using a mechanism described + * in the specification. */ typedef struct { /** @@ -2779,9 +2835,9 @@ * VdpDecoderRender may be used as reference frames. In particular, * surfaces filled using any "put bits" API will not work. * - * Note: 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 the specification. + * Note: References to bitstream fields below may refer to data literally parsed + * from the bitstream, or derived from the bitstream using a mechanism described + * in the specification. * * Note: VDPAU clients must use VdpPictureInfoH264Predictive to describe the * attributes of a frame being decoded with @@ -2795,59 +2851,39 @@ /** Will the decoded frame be used as a reference later. */ VdpBool is_reference; - /** Copy of the H.264 bitstream field. */ + /** \name H.264 bitstream + * + * Copies of the H.264 bitstream fields. + * @{ */ uint16_t frame_num; - /** Copy of the H.264 bitstream field. */ uint8_t field_pic_flag; - /** Copy of the H.264 bitstream field. */ uint8_t bottom_field_flag; - /** Copy of the H.264 bitstream field. */ uint8_t num_ref_frames; - /** Copy of the H.264 bitstream field. */ uint8_t mb_adaptive_frame_field_flag; - /** Copy of the H.264 bitstream field. */ uint8_t constrained_intra_pred_flag; - /** Copy of the H.264 bitstream field. */ uint8_t weighted_pred_flag; - /** Copy of the H.264 bitstream field. */ uint8_t weighted_bipred_idc; - /** Copy of the H.264 bitstream field. */ uint8_t frame_mbs_only_flag; - /** Copy of the H.264 bitstream field. */ uint8_t transform_8x8_mode_flag; - /** Copy of the H.264 bitstream field. */ int8_t chroma_qp_index_offset; - /** Copy of the H.264 bitstream field. */ int8_t second_chroma_qp_index_offset; - /** Copy of the H.264 bitstream field. */ int8_t pic_init_qp_minus26; - /** Copy of the H.264 bitstream field. */ uint8_t num_ref_idx_l0_active_minus1; - /** Copy of the H.264 bitstream field. */ uint8_t num_ref_idx_l1_active_minus1; - /** Copy of the H.264 bitstream field. */ uint8_t log2_max_frame_num_minus4; - /** Copy of the H.264 bitstream field. */ uint8_t pic_order_cnt_type; - /** Copy of the H.264 bitstream field. */ uint8_t log2_max_pic_order_cnt_lsb_minus4; - /** Copy of the H.264 bitstream field. */ uint8_t delta_pic_order_always_zero_flag; - /** Copy of the H.264 bitstream field. */ uint8_t direct_8x8_inference_flag; - /** Copy of the H.264 bitstream field. */ uint8_t entropy_coding_mode_flag; - /** Copy of the H.264 bitstream field. */ uint8_t pic_order_present_flag; - /** Copy of the H.264 bitstream field. */ uint8_t deblocking_filter_control_present_flag; - /** Copy of the H.264 bitstream field. */ uint8_t redundant_pic_cnt_present_flag; - - /** Copy of the H.264 bitstream field, converted to raster order. */ + /** Convert to raster order. */ uint8_t scaling_lists_4x4[6][16]; - /** Copy of the H.264 bitstream field, converted to raster order. */ + /** Convert to raster order. */ uint8_t scaling_lists_8x8[2][64]; + /** @} */ /** See \ref VdpPictureInfoH264 for instructions regarding this field. */ VdpReferenceFrameH264 referenceFrames[16]; @@ -2866,26 +2902,30 @@ typedef struct { /** \ref VdpPictureInfoH264 struct. */ VdpPictureInfoH264 pictureInfo; - /** Copy of the H.264 bitstream field. + + /** \name H.264 bitstream * + * Copies of the H.264 bitstream fields. + * @{ */ + /** * 0 - lossless disabled * 1 - lossless enabled */ uint8_t qpprime_y_zero_transform_bypass_flag; - /** Copy of the H.264 bitstream field. + /** * 0 - disabled * 1 - enabled */ uint8_t separate_colour_plane_flag; - + /** @} */ } VdpPictureInfoH264Predictive; /** * \brief Picture parameter information for a VC1 picture. * - * Note: 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 the specification. + * Note: References to bitstream fields below may refer to data literally parsed + * from the bitstream, or derived from the bitstream using a mechanism described + * in the specification. */ typedef struct { /** @@ -2906,54 +2946,56 @@ /** Progressive=0, Frame-interlace=2, Field-interlace=3; see VC-1 7.1.1.15. */ uint8_t frame_coding_mode; - /** Copy of the VC-1 bitstream field. See VC-1 6.1.5. */ + /** \name VC-1 bitstream + * + * Copies of the VC-1 bitstream fields. + * @{ */ + /** See VC-1 6.1.5. */ uint8_t postprocflag; - /** Copy of the VC-1 bitstream field. See VC-1 6.1.8. */ + /** See VC-1 6.1.8. */ uint8_t pulldown; - /** Copy of the VC-1 bitstream field. See VC-1 6.1.9. */ + /** See VC-1 6.1.9. */ uint8_t interlace; - /** Copy of the VC-1 bitstream field. See VC-1 6.1.10. */ + /** See VC-1 6.1.10. */ uint8_t tfcntrflag; - /** Copy of the VC-1 bitstream field. See VC-1 6.1.11. */ + /** See VC-1 6.1.11. */ uint8_t finterpflag; - /** Copy of the VC-1 bitstream field. See VC-1 6.1.3. */ + /** See VC-1 6.1.3. */ uint8_t psf; - /** Copy of the VC-1 bitstream field. See VC-1 6.2.8. */ + /** See VC-1 6.2.8. */ uint8_t dquant; - /** Copy of the VC-1 bitstream field. See VC-1 6.2.3. */ + /** See VC-1 6.2.3. */ uint8_t panscan_flag; - /** Copy of the VC-1 bitstream field. See VC-1 6.2.4. */ + /** See VC-1 6.2.4. */ uint8_t refdist_flag; - /** Copy of the VC-1 bitstream field. See VC-1 6.2.11. */ + /** See VC-1 6.2.11. */ uint8_t quantizer; - /** Copy of the VC-1 bitstream field. See VC-1 6.2.7. */ + /** See VC-1 6.2.7. */ uint8_t extended_mv; - /** Copy of the VC-1 bitstream field. See VC-1 6.2.14. */ + /** See VC-1 6.2.14. */ uint8_t extended_dmv; - /** Copy of the VC-1 bitstream field. See VC-1 6.2.10. */ + /** See VC-1 6.2.10. */ uint8_t overlap; - /** Copy of the VC-1 bitstream field. See VC-1 6.2.9. */ + /** See VC-1 6.2.9. */ uint8_t vstransform; - /** Copy of the VC-1 bitstream field. See VC-1 6.2.5. */ + /** See VC-1 6.2.5. */ uint8_t loopfilter; - /** Copy of the VC-1 bitstream field. See VC-1 6.2.6. */ + /** See VC-1 6.2.6. */ uint8_t fastuvmc; - /** Copy of the VC-1 bitstream field. See VC-1 6.12.15. */ + /** See VC-1 6.12.15. */ uint8_t range_mapy_flag; - /** Copy of the VC-1 bitstream field. */ uint8_t range_mapy; - /** Copy of the VC-1 bitstream field. See VC-1 6.2.16. */ + /** See VC-1 6.2.16. */ uint8_t range_mapuv_flag; - /** Copy of the VC-1 bitstream field. */ uint8_t range_mapuv; /** - * Copy of the VC-1 bitstream field. See VC-1 J.1.10. + * See VC-1 J.1.10. * Only used by simple and main profiles. */ uint8_t multires; /** - * Copy of the VC-1 bitstream field. See VC-1 J.1.16. + * See VC-1 J.1.16. * Only used by simple and main profiles. */ uint8_t syncmarker; @@ -2965,10 +3007,11 @@ */ uint8_t rangered; /** - * Copy of the VC-1 bitstream field. See VC-1 J.1.17. + * See VC-1 J.1.17. * Only used by simple and main profiles. */ uint8_t maxbframes; + /** @} */ /** * Out-of-loop deblocking enable. @@ -2987,9 +3030,9 @@ /** * \brief Picture parameter information for an MPEG-4 Part 2 picture. * - * Note: 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 the specification. + * Note: References to bitstream fields below may refer to data literally parsed + * from the bitstream, or derived from the bitstream using a mechanism described + * in the specification. */ typedef struct { /** @@ -3003,38 +3046,28 @@ */ VdpVideoSurface backward_reference; - /** Copy of the bitstream field. */ + /** \name MPEG 4 part 2 bitstream + * + * Copies of the MPEG 4 part 2 bitstream fields. + * @{ */ int32_t trd[2]; - /** Copy of the bitstream field. */ int32_t trb[2]; - /** Copy of the bitstream field. */ uint16_t vop_time_increment_resolution; - /** Copy of the bitstream field. */ uint8_t vop_coding_type; - /** Copy of the bitstream field. */ uint8_t vop_fcode_forward; - /** Copy of the bitstream field. */ uint8_t vop_fcode_backward; - /** Copy of the bitstream field. */ uint8_t resync_marker_disable; - /** Copy of the bitstream field. */ uint8_t interlaced; - /** Copy of the bitstream field. */ uint8_t quant_type; - /** Copy of the bitstream field. */ uint8_t quarter_sample; - /** Copy of the bitstream field. */ uint8_t short_video_header; /** Derived from vop_rounding_type bitstream field. */ uint8_t rounding_control; - /** Copy of the bitstream field. */ uint8_t alternate_vertical_scan_flag; - /** Copy of the bitstream field. */ uint8_t top_field_first; - /** Copy of the bitstream field. */ uint8_t intra_quantizer_matrix[64]; - /** Copy of the bitstream field. */ uint8_t non_intra_quantizer_matrix[64]; + /** @} */ } VdpPictureInfoMPEG4Part2; /** @@ -3054,6 +3087,219 @@ typedef VdpPictureInfoMPEG4Part2 VdpPictureInfoDivX5; /** + * \brief Picture parameter information for an H.265/HEVC picture. + * + * References to bitsream fields below 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 { + /** \name HEVC Sequence Parameter Set + * + * Copies of the HEVC Sequence Parameter Set bitstream fields. + * @{ */ + uint8_t chroma_format_idc; + /** Only valid if chroma_format_idc == 3. Ignored otherwise.*/ + uint8_t separate_colour_plane_flag; + uint32_t pic_width_in_luma_samples; + uint32_t pic_height_in_luma_samples; + uint8_t bit_depth_luma_minus8; + uint8_t bit_depth_chroma_minus8; + uint8_t log2_max_pic_order_cnt_lsb_minus4; + /** Provides the value corresponding to the nuh_temporal_id of the frame + to be decoded. */ + uint8_t sps_max_dec_pic_buffering_minus1; + uint8_t log2_min_luma_coding_block_size_minus3; + uint8_t log2_diff_max_min_luma_coding_block_size; + uint8_t log2_min_transform_block_size_minus2; + uint8_t log2_diff_max_min_transform_block_size; + uint8_t max_transform_hierarchy_depth_inter; + uint8_t max_transform_hierarchy_depth_intra; + 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]; + uint8_t amp_enabled_flag; + uint8_t sample_adaptive_offset_enabled_flag; + uint8_t pcm_enabled_flag; + /** Only needs to be set if pcm_enabled_flag is set. Ignored otherwise. */ + uint8_t pcm_sample_bit_depth_luma_minus1; + /** Only needs to be set if pcm_enabled_flag is set. Ignored otherwise. */ + uint8_t pcm_sample_bit_depth_chroma_minus1; + /** Only needs to be set if pcm_enabled_flag is set. Ignored otherwise. */ + uint8_t log2_min_pcm_luma_coding_block_size_minus3; + /** Only needs to be set if pcm_enabled_flag is set. Ignored otherwise. */ + uint8_t log2_diff_max_min_pcm_luma_coding_block_size; + /** Only needs to be set if pcm_enabled_flag is set. Ignored otherwise. */ + uint8_t pcm_loop_filter_disabled_flag; + /** Per spec, when zero, assume short_term_ref_pic_set_sps_flag + is also zero. */ + uint8_t num_short_term_ref_pic_sets; + uint8_t long_term_ref_pics_present_flag; + /** Only needed if long_term_ref_pics_present_flag is set. Ignored + otherwise. */ + uint8_t num_long_term_ref_pics_sps; + uint8_t sps_temporal_mvp_enabled_flag; + uint8_t strong_intra_smoothing_enabled_flag; + /** @} */ + + /** \name HEVC Picture Parameter Set + * + * Copies of the HEVC Picture Parameter Set bitstream fields. + * @{ */ + uint8_t dependent_slice_segments_enabled_flag; + uint8_t output_flag_present_flag; + uint8_t num_extra_slice_header_bits; + uint8_t sign_data_hiding_enabled_flag; + uint8_t cabac_init_present_flag; + uint8_t num_ref_idx_l0_default_active_minus1; + uint8_t num_ref_idx_l1_default_active_minus1; + int8_t init_qp_minus26; + uint8_t constrained_intra_pred_flag; + uint8_t transform_skip_enabled_flag; + uint8_t cu_qp_delta_enabled_flag; + /** Only needed if cu_qp_delta_enabled_flag is set. Ignored otherwise. */ + uint8_t diff_cu_qp_delta_depth; + int8_t pps_cb_qp_offset; + int8_t pps_cr_qp_offset; + uint8_t pps_slice_chroma_qp_offsets_present_flag; + uint8_t weighted_pred_flag; + uint8_t weighted_bipred_flag; + uint8_t transquant_bypass_enabled_flag; + uint8_t tiles_enabled_flag; + uint8_t entropy_coding_sync_enabled_flag; + /** Only valid if tiles_enabled_flag is set. Ignored otherwise. */ + uint8_t num_tile_columns_minus1; + /** Only valid if tiles_enabled_flag is set. Ignored otherwise. */ + uint8_t num_tile_rows_minus1; + /** Only valid if tiles_enabled_flag is set. Ignored otherwise. */ + uint8_t uniform_spacing_flag; + /** Only need to set 0..num_tile_columns_minus1. The struct + definition reserves up to the maximum of 20. Invalid values are + ignored. */ + uint16_t column_width_minus1[20]; + /** Only need to set 0..num_tile_rows_minus1. The struct + definition reserves up to the maximum of 22. Invalid values are + ignored.*/ + uint16_t row_height_minus1[22]; + /** Only needed if tiles_enabled_flag is set. Invalid values are + ignored. */ + uint8_t loop_filter_across_tiles_enabled_flag; + uint8_t pps_loop_filter_across_slices_enabled_flag; + uint8_t deblocking_filter_control_present_flag; + /** Only valid if deblocking_filter_control_present_flag is set. Ignored + otherwise. */ + uint8_t deblocking_filter_override_enabled_flag; + /** Only valid if deblocking_filter_control_present_flag is set. Ignored + otherwise. */ + uint8_t pps_deblocking_filter_disabled_flag; + /** 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; + /** 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; + uint8_t lists_modification_present_flag; + uint8_t log2_parallel_merge_level_minus2; + uint8_t slice_segment_header_extension_present_flag; + + /** \name HEVC Slice Segment Header + * + * Copies of the HEVC Slice Segment Header bitstream fields and calculated + * values detailed in the specification. + * @{ */ + /** Set to 1 if nal_unit_type is equal to IDR_W_RADL or IDR_N_LP. + Set to zero otherwise. */ + uint8_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.*/ + uint8_t RAPPicFlag; + /** See section 7.4.7.1 of the specification. */ + uint8_t CurrRpsIdx; + /** See section 7.4.7.2 of the 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. */ + uint8_t NumPocStCurrBefore; + /** Copy of specification field, see Section 8.3.2 of the + H.265/HEVC Specification. */ + uint8_t NumPocStCurrAfter; + /** Copy of specification field, see Section 8.3.2 of the + H.265/HEVC Specification. */ + uint8_t NumPocLtCurr; + /** Reference Picture Set list, one of the short-term RPS. These + correspond to positions in the RefPics array. */ + uint8_t RefPicSetStCurrBefore[8]; + /** Reference Picture Set list, one of the short-term RPS. These + correspond to positions in the RefPics array. */ + uint8_t RefPicSetStCurrAfter[8]; + /** Reference Picture Set list, one of the long-term RPS. These + correspond to positions in the RefPics array. */ + uint8_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 ++++++ vdpauinfo-0.9.tar.gz -> vdpauinfo-1.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vdpauinfo-0.9/ChangeLog new/vdpauinfo-1.0/ChangeLog --- old/vdpauinfo-0.9/ChangeLog 2014-12-19 21:52:52.000000000 +0100 +++ new/vdpauinfo-1.0/ChangeLog 2015-03-11 22:06:04.000000000 +0100 @@ -1,3 +1,21 @@ +commit 7b8eee7ae26255490347cebe6cd3475b078bc2f7 +Author: Aaron Plattner <[email protected]> +Date: Wed Mar 11 14:05:42 2015 -0700 + + Bump version to 1.0 + + Signed-off-by: Aaron Plattner <[email protected]> + +commit ca7a7d145cd8e6381e8c2f9f9df1080acb311295 +Author: Aaron Plattner <[email protected]> +Date: Mon Mar 9 14:44:39 2015 -0700 + + Support new HEVC / H.265 profiles added in libvdpau 1.0 + + Signed-off-by: Aaron Plattner <[email protected]> + Reviewed-by: José Hiram Soltren <[email protected]> + Reviewed-by: Christian König <[email protected]> + commit 4a4feb8af58a94a2acd86528c58ffc71ec0c1cc7 Author: Aaron Plattner <[email protected]> Date: Fri Dec 19 12:45:22 2014 -0800 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vdpauinfo-0.9/Makefile.in new/vdpauinfo-1.0/Makefile.in --- old/vdpauinfo-0.9/Makefile.in 2014-12-19 21:52:51.000000000 +0100 +++ new/vdpauinfo-1.0/Makefile.in 2015-03-11 22:06:03.000000000 +0100 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,14 +88,13 @@ POST_UNINSTALL = : bin_PROGRAMS = vdpauinfo$(EXEEXT) subdir = . -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/configure $(am__configure_deps) depcomp COPYING \ - ChangeLog INSTALL install-sh missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ + $(am__configure_deps) $(am__DIST_COMMON) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d @@ -160,6 +169,8 @@ CTAGS = ctags CSCOPE = cscope AM_RECURSIVE_TARGETS = cscope +am__DIST_COMMON = $(srcdir)/Makefile.in COPYING ChangeLog INSTALL \ + depcomp install-sh missing DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -294,7 +305,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -513,15 +523,15 @@ $(am__post_remove_distdir) dist-tarZ: distdir - @echo WARNING: "Support for shar distribution archives is" \ - "deprecated." >&2 + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__post_remove_distdir) dist-shar: distdir - @echo WARNING: "Support for distribution archives compressed with" \ - "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz $(am__post_remove_distdir) @@ -557,17 +567,17 @@ esac chmod -R a-w $(distdir) chmod u+w $(distdir) - mkdir $(distdir)/_build $(distdir)/_inst + mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst chmod a-w $(distdir) test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ && am__cwd=`pwd` \ - && $(am__cd) $(distdir)/_build \ - && ../configure \ + && $(am__cd) $(distdir)/_build/sub \ + && ../../configure \ $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ - --srcdir=.. --prefix="$$dc_install_base" \ + --srcdir=../.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ @@ -749,6 +759,8 @@ mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \ uninstall-am uninstall-binPROGRAMS +.PRECIOUS: Makefile + .PHONY: ChangeLog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vdpauinfo-0.9/aclocal.m4 new/vdpauinfo-1.0/aclocal.m4 --- old/vdpauinfo-0.9/aclocal.m4 2014-12-19 21:52:50.000000000 +0100 +++ new/vdpauinfo-1.0/aclocal.m4 2015-03-11 22:06:02.000000000 +0100 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.14.1 -*- Autoconf -*- +# generated automatically by aclocal 1.15 -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -235,7 +235,7 @@ AS_VAR_IF([$1], [""], [$5], [$4])dnl ])# PKG_CHECK_VAR -# Copyright (C) 2002-2013 Free Software Foundation, Inc. +# Copyright (C) 2002-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -247,10 +247,10 @@ # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.14' +[am__api_version='1.15' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.14.1], [], +m4_if([$1], [1.15], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -266,14 +266,14 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.14.1])dnl +[AM_AUTOMAKE_VERSION([1.15])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -318,15 +318,14 @@ # configured tree to be moved without reconfiguration. AC_DEFUN([AM_AUX_DIR_EXPAND], -[dnl Rely on autoconf to set up CDPATH properly. -AC_PREREQ([2.50])dnl -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` +[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` ]) # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2013 Free Software Foundation, Inc. +# Copyright (C) 1997-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -357,7 +356,7 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -548,7 +547,7 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -624,7 +623,7 @@ # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -714,8 +713,8 @@ # <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> AC_SUBST([mkdir_p], ['$(MKDIR_P)']) -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. +# We need awk for the "check" target (and possibly the TAP driver). The +# system "awk" is bad on some platforms. AC_REQUIRE([AC_PROG_AWK])dnl AC_REQUIRE([AC_PROG_MAKE_SET])dnl AC_REQUIRE([AM_SET_LEADING_DOT])dnl @@ -788,7 +787,11 @@ END AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) fi -fi]) +fi +dnl The trailing newline in this macro's definition is deliberate, for +dnl backward compatibility and to allow trailing 'dnl'-style comments +dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841. +]) dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further @@ -817,7 +820,7 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -828,7 +831,7 @@ # Define $install_sh. AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -if test x"${install_sh}" != xset; then +if test x"${install_sh+set}" != xset; then case $am_aux_dir in *\ * | *\ *) install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; @@ -838,7 +841,7 @@ fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2013 Free Software Foundation, Inc. +# Copyright (C) 2003-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -860,7 +863,7 @@ # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -895,7 +898,7 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -945,7 +948,7 @@ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2013 Free Software Foundation, Inc. +# Copyright (C) 1997-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -984,7 +987,7 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1015,7 +1018,7 @@ # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1096,7 +1099,7 @@ rm -f conftest.file ]) -# Copyright (C) 2009-2013 Free Software Foundation, Inc. +# Copyright (C) 2009-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1156,7 +1159,7 @@ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1184,7 +1187,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2013 Free Software Foundation, Inc. +# Copyright (C) 2006-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1203,7 +1206,7 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2013 Free Software Foundation, Inc. +# Copyright (C) 2004-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vdpauinfo-0.9/configure new/vdpauinfo-1.0/configure --- old/vdpauinfo-0.9/configure 2014-12-19 21:52:51.000000000 +0100 +++ new/vdpauinfo-1.0/configure 2015-03-11 22:06:03.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for vdpauinfo 0.9. +# Generated by GNU Autoconf 2.69 for vdpauinfo 1.0. # # Report bugs to <[email protected]>. # @@ -579,8 +579,8 @@ # Identity of this package. PACKAGE_NAME='vdpauinfo' PACKAGE_TARNAME='vdpauinfo' -PACKAGE_VERSION='0.9' -PACKAGE_STRING='vdpauinfo 0.9' +PACKAGE_VERSION='1.0' +PACKAGE_STRING='vdpauinfo 1.0' PACKAGE_BUGREPORT='[email protected]' PACKAGE_URL='' @@ -1243,7 +1243,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures vdpauinfo 0.9 to adapt to many kinds of systems. +\`configure' configures vdpauinfo 1.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1309,7 +1309,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of vdpauinfo 0.9:";; + short | recursive ) echo "Configuration of vdpauinfo 1.0:";; esac cat <<\_ACEOF @@ -1410,7 +1410,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -vdpauinfo configure 0.9 +vdpauinfo configure 1.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1465,7 +1465,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by vdpauinfo $as_me 0.9, which was +It was created by vdpauinfo $as_me 1.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -1813,7 +1813,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -am__api_version='1.14' +am__api_version='1.15' ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do @@ -2014,8 +2014,8 @@ ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` if test x"${MISSING+set}" != xset; then case $am_aux_dir in @@ -2034,7 +2034,7 @@ $as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi -if test x"${install_sh}" != xset; then +if test x"${install_sh+set}" != xset; then case $am_aux_dir in *\ * | *\ *) install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; @@ -2328,7 +2328,7 @@ # Define the identity of the package. PACKAGE='vdpauinfo' - VERSION='0.9' + VERSION='1.0' cat >>confdefs.h <<_ACEOF @@ -2362,8 +2362,8 @@ # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> mkdir_p='$(MKDIR_P)' -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. +# We need awk for the "check" target (and possibly the TAP driver). The +# system "awk" is bad on some platforms. # Always define AMTAR for backward compatibility. Yes, it's still used # in the wild :-( We should find a proper way to deprecate it ... AMTAR='$${TAR-tar}' @@ -2421,6 +2421,7 @@ fi fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. @@ -3273,12 +3274,12 @@ pkg_cv_VDPAU_CFLAGS="$VDPAU_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11 vdpau >= 0.9\""; } >&5 - ($PKG_CONFIG --exists --print-errors "x11 vdpau >= 0.9") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11 vdpau >= 1.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "x11 vdpau >= 1.0") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_VDPAU_CFLAGS=`$PKG_CONFIG --cflags "x11 vdpau >= 0.9" 2>/dev/null` + pkg_cv_VDPAU_CFLAGS=`$PKG_CONFIG --cflags "x11 vdpau >= 1.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -3290,12 +3291,12 @@ pkg_cv_VDPAU_LIBS="$VDPAU_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11 vdpau >= 0.9\""; } >&5 - ($PKG_CONFIG --exists --print-errors "x11 vdpau >= 0.9") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11 vdpau >= 1.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "x11 vdpau >= 1.0") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_VDPAU_LIBS=`$PKG_CONFIG --libs "x11 vdpau >= 0.9" 2>/dev/null` + pkg_cv_VDPAU_LIBS=`$PKG_CONFIG --libs "x11 vdpau >= 1.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -3316,14 +3317,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - VDPAU_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "x11 vdpau >= 0.9" 2>&1` + VDPAU_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "x11 vdpau >= 1.0" 2>&1` else - VDPAU_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "x11 vdpau >= 0.9" 2>&1` + VDPAU_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "x11 vdpau >= 1.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$VDPAU_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (x11 vdpau >= 0.9) were not met: + as_fn_error $? "Package requirements (x11 vdpau >= 1.0) were not met: $VDPAU_PKG_ERRORS @@ -3942,7 +3943,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by vdpauinfo $as_me 0.9, which was +This file was extended by vdpauinfo $as_me 1.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3999,7 +4000,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -vdpauinfo config.status 0.9 +vdpauinfo config.status 1.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vdpauinfo-0.9/configure.ac new/vdpauinfo-1.0/configure.ac --- old/vdpauinfo-0.9/configure.ac 2014-12-19 21:45:11.000000000 +0100 +++ new/vdpauinfo-1.0/configure.ac 2015-03-11 00:24:26.000000000 +0100 @@ -1,12 +1,12 @@ AC_PREREQ([2.57]) -AC_INIT(vdpauinfo,[0.9],[[email protected]],vdpauinfo) +AC_INIT(vdpauinfo,[1.0],[[email protected]],vdpauinfo) AM_INIT_AUTOMAKE([dist-bzip2 foreign]) AM_MAINTAINER_MODE AC_PROG_CXX AC_PROG_INSTALL -PKG_CHECK_MODULES(VDPAU, x11 [vdpau >= 0.9]) +PKG_CHECK_MODULES(VDPAU, x11 [vdpau >= 1.0]) VDPAUINFO_CXXFLAGS="$VDPAUINFO_CXXFLAGS $VDPAU_CFLAGS" VDPAUINFO_LIBS="$VDPAUINFO_LIBS $VDPAU_LIBS" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vdpauinfo-0.9/vdpauinfo.cpp new/vdpauinfo-1.0/vdpauinfo.cpp --- old/vdpauinfo-0.9/vdpauinfo.cpp 2014-12-19 21:21:10.000000000 +0100 +++ new/vdpauinfo-1.0/vdpauinfo.cpp 2015-03-09 22:44:02.000000000 +0100 @@ -357,6 +357,11 @@ {"H264_PROGRESSIVE_HIGH", VDP_DECODER_PROFILE_H264_PROGRESSIVE_HIGH}, {"H264_CONSTRAINED_HIGH", VDP_DECODER_PROFILE_H264_CONSTRAINED_HIGH}, {"H264_HIGH_444_PREDICTIVE", VDP_DECODER_PROFILE_H264_HIGH_444_PREDICTIVE}, +{"HEVC_MAIN", VDP_DECODER_PROFILE_HEVC_MAIN}, +{"HEVC_MAIN_10", VDP_DECODER_PROFILE_HEVC_MAIN_10}, +{"HEVC_MAIN_STILL", VDP_DECODER_PROFILE_HEVC_MAIN_STILL}, +{"HEVC_MAIN_12", VDP_DECODER_PROFILE_HEVC_MAIN_12}, +{"HEVC_MAIN_444", VDP_DECODER_PROFILE_HEVC_MAIN_444}, }; const size_t decoder_profile_count = sizeof(decoder_profiles)/sizeof(Desc); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
