diff options
| author | Aaron Plattner <aplattner@nvidia.com> | 2014-11-04 15:10:44 -0800 |
|---|---|---|
| committer | Aaron Plattner <aplattner@nvidia.com> | 2014-12-19 11:10:45 -0800 |
| commit | 2ecd4961fd6fb292aab064221c21456a059811cc (patch) | |
| tree | b51923cbe922f3b183a3dc6cadb610f8fcad3bc4 | |
| parent | 178f33ec5ad1c7f0cb31458fa6eb675bb96f0420 (diff) | |
Support new H.264 profiles added in libvdpau 0.9
The new profile names are slightly longer, so widen the table to preserve column
alignment.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | vdpauinfo.cpp | 11 |
2 files changed, 9 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 4b78eaa..a10e3d1 100644 --- a/configure.ac +++ b/configure.ac @@ -6,7 +6,7 @@ AM_MAINTAINER_MODE AC_PROG_CXX AC_PROG_INSTALL -PKG_CHECK_MODULES(VDPAU, x11 [vdpau >= 0.2]) +PKG_CHECK_MODULES(VDPAU, x11 [vdpau >= 0.9]) VDPAUINFO_CXXFLAGS="$VDPAUINFO_CXXFLAGS $VDPAU_CFLAGS" VDPAUINFO_LIBS="$VDPAUINFO_LIBS $VDPAU_LIBS" diff --git a/vdpauinfo.cpp b/vdpauinfo.cpp index 5e97f5b..147d61a 100644 --- a/vdpauinfo.cpp +++ b/vdpauinfo.cpp @@ -352,6 +352,11 @@ Desc decoder_profiles[] = { {"DIVX5_MOBILE", VDP_DECODER_PROFILE_DIVX5_MOBILE}, {"DIVX5_HOME_THEATER", VDP_DECODER_PROFILE_DIVX5_HOME_THEATER}, {"DIVX5_HD_1080P", VDP_DECODER_PROFILE_DIVX5_HD_1080P}, +{"H264_CONSTRAINED_BASELINE", VDP_DECODER_PROFILE_H264_CONSTRAINED_BASELINE}, +{"H264_EXTENDED", VDP_DECODER_PROFILE_H264_EXTENDED}, +{"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}, }; const size_t decoder_profile_count = sizeof(decoder_profiles)/sizeof(Desc); @@ -359,8 +364,8 @@ void queryDecoderCaps(VDPDeviceImpl *device) { VdpStatus rv; printf("\nDecoder capabilities:\n\n"); - printf("name level macbs width height\n"); - printf("-------------------------------------------\n"); + printf("name level macbs width height\n"); + printf("----------------------------------------------------\n"); for(int x=0; x<decoder_profile_count; ++x) { VdpBool is_supported; @@ -370,7 +375,7 @@ void queryDecoderCaps(VDPDeviceImpl *device) &is_supported, &max_level, &max_macroblocks, &max_width, &max_height); if(rv == VDP_STATUS_OK && is_supported) { - printf("%-20s %2i %5i %5i %5i\n", decoder_profiles[x].name, + printf("%-30s %2i %5i %5i %5i\n", decoder_profiles[x].name, max_level, max_macroblocks, max_width, max_height); } } |