highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vdpau: add support for the H.264 High 4:4:4 Predictive profile

Browse Source 
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
This commit is contained in:
Rémi Denis-Courmont
2014-12-19 19:15:05 +02:00
committed by Anton Khirnov
parent 1f9237f2ac
commit 737d35e334
2 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
libavcodec/vdpau_h264.c
View File

@ -123,6 +123,9 @@ static int vdpau_h264_start_frame(AVCodecContext *avctx,
H264Picture *pic = h->cur_pic_ptr; H264Picture *pic = h->cur_pic_ptr;
struct vdpau_picture_context *pic_ctx = pic->hwaccel_picture_private; struct vdpau_picture_context *pic_ctx = pic->hwaccel_picture_private;
VdpPictureInfoH264 *info = &pic_ctx->info.h264; VdpPictureInfoH264 *info = &pic_ctx->info.h264;
#ifdef VDP_DECODER_PROFILE_H264_HIGH_444_PREDICTIVE
VdpPictureInfoH264Predictive *info2 = &pic_ctx->info.h264_predictive;
#endif
/* init VdpPictureInfoH264 */ /* init VdpPictureInfoH264 */
info->slice_count = 0; info->slice_count = 0;
@ -149,6 +152,10 @@ static int vdpau_h264_start_frame(AVCodecContext *avctx,
info->log2_max_pic_order_cnt_lsb_minus4 = h->sps.poc_type ? 0 : h->sps.log2_max_poc_lsb - 4; info->log2_max_pic_order_cnt_lsb_minus4 = h->sps.poc_type ? 0 : h->sps.log2_max_poc_lsb - 4;
info->delta_pic_order_always_zero_flag = h->sps.delta_pic_order_always_zero_flag; info->delta_pic_order_always_zero_flag = h->sps.delta_pic_order_always_zero_flag;
info->direct_8x8_inference_flag = h->sps.direct_8x8_inference_flag; info->direct_8x8_inference_flag = h->sps.direct_8x8_inference_flag;
#ifdef VDP_DECODER_PROFILE_H264_HIGH_444_PREDICTIVE
info2->qpprime_y_zero_transform_bypass_flag = h->sps.transform_bypass;
info2->separate_colour_plane_flag = h->sps.residual_color_transform_flag;
#endif
info->entropy_coding_mode_flag = h->pps.cabac; info->entropy_coding_mode_flag = h->pps.cabac;
info->pic_order_present_flag = h->pps.pic_order_present; info->pic_order_present_flag = h->pps.pic_order_present;
info->deblocking_filter_control_present_flag = h->pps.deblocking_filter_parameters_present; info->deblocking_filter_control_present_flag = h->pps.deblocking_filter_parameters_present;
@ -227,6 +234,18 @@ static int vdpau_h264_init(AVCodecContext *avctx)
case FF_PROFILE_H264_EXTENDED: case FF_PROFILE_H264_EXTENDED:
profile = VDP_DECODER_PROFILE_H264_EXTENDED; profile = VDP_DECODER_PROFILE_H264_EXTENDED;
break; break;
#endif
case FF_PROFILE_H264_HIGH_10:
/* XXX: High 10 can be treated as High so long as only 8-bits per
* formats are supported. */
profile = VDP_DECODER_PROFILE_H264_HIGH;
break;
#ifdef VDP_DECODER_PROFILE_H264_HIGH_444_PREDICTIVE
case FF_PROFILE_H264_HIGH_422:
case FF_PROFILE_H264_HIGH_444_PREDICTIVE:
case FF_PROFILE_H264_CAVLC_444:
profile = VDP_DECODER_PROFILE_H264_HIGH_444_PREDICTIVE;
break;
#endif #endif
default: default:
return AVERROR(ENOTSUP); return AVERROR(ENOTSUP);

11
libavcodec/vdpau_internal.h
View File

@ -37,16 +37,15 @@ static inline uintptr_t ff_vdpau_get_surface_id(AVFrame *pic)
return (uintptr_t)pic->data[3]; return (uintptr_t)pic->data[3];
} }
#if !FF_API_BUFS_VDPAU union VDPAUPictureInfo {
union AVVDPAUPictureInfo {
VdpPictureInfoH264 h264; VdpPictureInfoH264 h264;
VdpPictureInfoMPEG1Or2 mpeg; VdpPictureInfoMPEG1Or2 mpeg;
VdpPictureInfoVC1 vc1; VdpPictureInfoVC1 vc1;
VdpPictureInfoMPEG4Part2 mpeg4; VdpPictureInfoMPEG4Part2 mpeg4;
}; #ifdef VDP_DECODER_PROFILE_H264_HIGH_444_PREDICTIVE
#else VdpPictureInfoH264Predictive h264_predictive;
#include "vdpau.h"
#endif #endif
};
typedef struct VDPAUHWContext { typedef struct VDPAUHWContext {
AVVDPAUContext context; AVVDPAUContext context;
@ -85,7 +84,7 @@ struct vdpau_picture_context {
/** /**
* VDPAU picture information. * VDPAU picture information.
*/ */
union AVVDPAUPictureInfo info; union VDPAUPictureInfo info;
/** /**
* Allocated size of the bitstream_buffers table. * Allocated size of the bitstream_buffers table.