[FFmpeg-devel] [PATCH]NVIDIA VDPAU patch for h264
Carl Eugen Hoyos
cehoyos
Sun Nov 30 22:03:39 CET 2008
Hi!
Attached is the h.264 part of the VDPAU patch.
Tested on GeForce9400.
ENABLE* is bad for mplayer-based options: It is also never used for xvmc.
Please comment, Carl Eugen
-------------- next part --------------
Index: configure
===================================================================
--- configure (Revision 15958)
+++ configure (Arbeitskopie)
@@ -969,6 +969,7 @@
h263_encoder_select="aandct"
h263p_encoder_select="aandct"
h264_decoder_select="golomb"
+h264_vdpau_decoder_deps="vdpau"
imc_decoder_select="fft mdct"
jpegls_decoder_select="golomb"
jpegls_encoder_select="golomb"
Index: libavcodec/utils.c
===================================================================
--- libavcodec/utils.c (Revision 15958)
+++ libavcodec/utils.c (Arbeitskopie)
@@ -644,6 +644,7 @@
{"context", "context model", OFFSET(context_model), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E},
{"slice_flags", NULL, OFFSET(slice_flags), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX},
{"xvmc_acceleration", NULL, OFFSET(xvmc_acceleration), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX},
+{"vdpau_acceleration", NULL, OFFSET(vdpau_acceleration), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX},
{"mbd", "macroblock decision algorithm (high quality mode)", OFFSET(mb_decision), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E, "mbd"},
{"simple", "use mbcmp (default)", 0, FF_OPT_TYPE_CONST, FF_MB_DECISION_SIMPLE, INT_MIN, INT_MAX, V|E, "mbd"},
{"bits", "use fewest bits", 0, FF_OPT_TYPE_CONST, FF_MB_DECISION_BITS, INT_MIN, INT_MAX, V|E, "mbd"},
Index: libavcodec/h264.c
===================================================================
--- libavcodec/h264.c (Revision 15958)
+++ libavcodec/h264.c (Arbeitskopie)
@@ -72,6 +72,9 @@
static VLC_TYPE run7_vlc_table[96][2];
static const int run7_vlc_table_size = 96;
+extern int ff_VDPAU_h264_add_data_chunk(H264Context *h, const uint8_t *buf, int buf_size);
+extern int ff_VDPAU_h264_picture_complete(H264Context *h);
+
static void svq3_luma_dc_dequant_idct_c(DCTELEM *block, int qp);
static void svq3_add_idct_c(uint8_t *dst, DCTELEM *block, int stride, int qp, int dc);
static void filter_mb( H264Context *h, int mb_x, int mb_y, uint8_t *img_y, uint8_t *img_cb, uint8_t *img_cr, unsigned int linesize, unsigned int uvlinesize);
@@ -101,6 +104,16 @@
{0,2,0,2,7,10,7,10}
};
+static const enum PixelFormat pixfmt_vdpau_h264_baseline_420[] = {
+ PIX_FMT_VDPAU_H264_BASELINE,
+ PIX_FMT_NONE};
+static const enum PixelFormat pixfmt_vdpau_h264_main_420[] = {
+ PIX_FMT_VDPAU_H264_MAIN,
+ PIX_FMT_NONE};
+static const enum PixelFormat pixfmt_vdpau_h264_high_420[] = {
+ PIX_FMT_VDPAU_H264_HIGH,
+ PIX_FMT_NONE};
+
static void fill_caches(H264Context *h, int mb_type, int for_deblock){
MpegEncContext * const s = &h->s;
const int mb_xy= h->mb_xy;
@@ -2142,10 +2155,8 @@
s->quarter_sample = 1;
s->low_delay= 1;
- if(avctx->codec_id == CODEC_ID_SVQ3)
- avctx->pix_fmt= PIX_FMT_YUVJ420P;
- else
- avctx->pix_fmt= PIX_FMT_YUV420P;
+ // Set in decode_postinit() once initial parsing is complete
+ avctx->pix_fmt = PIX_FMT_NONE;
decode_init_vlc();
@@ -2163,6 +2174,35 @@
return 0;
}
+static int decode_postinit(H264Context *h, SPS *sps){
+ AVCodecContext * const avctx= h->s.avctx;
+
+ if (avctx->pix_fmt != PIX_FMT_NONE){
+ return 0;
+ }
+
+ if (avctx->vdpau_acceleration) {
+ if(h->s.chroma_format >= 2) {
+ return -2;
+ }
+ if (sps->profile_idc == 66) {
+ avctx->pix_fmt = avctx->get_format(avctx, pixfmt_vdpau_h264_baseline_420);
+ } else if (sps->profile_idc == 77) {
+ avctx->pix_fmt = avctx->get_format(avctx, pixfmt_vdpau_h264_main_420);
+ } else if (sps->profile_idc == 100) {
+ avctx->pix_fmt = avctx->get_format(avctx, pixfmt_vdpau_h264_high_420);
+ } else {
+ return -2;
+ }
+ } else if (avctx->codec_id == CODEC_ID_SVQ3) {
+ avctx->pix_fmt= PIX_FMT_YUVJ420P;
+ } else {
+ avctx->pix_fmt= PIX_FMT_YUV420P;
+ }
+
+ return 0;
+}
+
static int frame_start(H264Context *h){
MpegEncContext * const s = &h->s;
int i;
@@ -7125,6 +7165,10 @@
((const char*[]){"Gray","420","422","444"})[sps->chroma_format_idc]
);
}
+
+ if (decode_postinit(h, sps) < 0)
+ return -1;
+
return 0;
}
@@ -7257,6 +7301,9 @@
H264Context *hx;
int i;
+ if(avctx->vdpau_acceleration) {
+ return;
+ } else
if(context_count == 1) {
decode_slice(avctx, &h);
} else {
@@ -7384,8 +7431,26 @@
&& (avctx->skip_frame < AVDISCARD_NONREF || hx->nal_ref_idc)
&& (avctx->skip_frame < AVDISCARD_BIDIR || hx->slice_type_nos!=FF_B_TYPE)
&& (avctx->skip_frame < AVDISCARD_NONKEY || hx->slice_type_nos==FF_I_TYPE)
- && avctx->skip_frame < AVDISCARD_ALL)
+ && avctx->skip_frame < AVDISCARD_ALL) {
+#ifdef CONFIG_VDPAU
+ if (avctx->vdpau_acceleration) {
+ if(h->is_avc) {
+ static const uint8_t start_code[] = {0x00, 0x00, 0x01};
+ ff_VDPAU_h264_add_data_chunk(h, start_code, sizeof(start_code));
+ ff_VDPAU_h264_add_data_chunk(h, &buf[buf_index - consumed], consumed );
+ }
+ else
+ {
+ // +/-3: Add back 00 00 01 to start of data
+ ff_VDPAU_h264_add_data_chunk(h, &buf[buf_index - consumed - 3], consumed + 3);
+ }
+ }
+ else
+#endif
+ {
context_count++;
+ }
+ }
break;
case NAL_DPA:
init_get_bits(&hx->s.gb, ptr, bit_length);
@@ -7588,6 +7653,12 @@
h->prev_frame_num_offset= h->frame_num_offset;
h->prev_frame_num= h->frame_num;
+#ifdef CONFIG_VDPAU
+ if (avctx->vdpau_acceleration) {
+ ff_VDPAU_h264_picture_complete(h);
+ }
+#endif
+
/*
* FIXME: Error handling code does not seem to support interlaced
* when slices span multiple rows
@@ -7600,6 +7671,9 @@
* past end by one (callers fault) and resync_mb_y != 0
* causes problems for the first MB line, too.
*/
+#ifdef CONFIG_VDPAU
+ if (!avctx->vdpau_acceleration)
+#endif
if (!FIELD_PICTURE)
ff_er_frame_end(s);
@@ -7973,4 +8047,35 @@
.long_name = NULL_IF_CONFIG_SMALL("H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10"),
};
+#ifdef CONFIG_VDPAU
+static av_cold int h264_vdpau_decode_init(AVCodecContext *avctx){
+ if( avctx->thread_count > 1)
+ return -1;
+ if( !(avctx->slice_flags & SLICE_FLAG_CODED_ORDER) )
+ return -1;
+ if( !(avctx->slice_flags & SLICE_FLAG_ALLOW_FIELD) ){
+ dprintf(avctx, "h264.c: VDPAU decoder does not set SLICE_FLAG_ALLOW_FIELD\n");
+ }
+ decode_init(avctx);
+
+ avctx->vdpau_acceleration = 1;
+
+ return 0;
+}
+
+AVCodec h264_vdpau_decoder = {
+ "h264_vdpau",
+ CODEC_TYPE_VIDEO,
+ CODEC_ID_H264_VDPAU,
+ sizeof(H264Context),
+ h264_vdpau_decode_init,
+ NULL,
+ decode_end,
+ decode_frame,
+ CODEC_CAP_DR1 | CODEC_CAP_DELAY | CODEC_CAP_HWACCEL_VDPAU,
+ .flush= flush_dpb,
+ .long_name = NULL_IF_CONFIG_SMALL("H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10 (VDPAU acceleration)"),
+};
+#endif
+
#include "svq3.c"
Index: libavcodec/Makefile
===================================================================
--- libavcodec/Makefile (Revision 15958)
+++ libavcodec/Makefile (Arbeitskopie)
@@ -388,6 +388,7 @@
OBJS-$(HAVE_W32THREADS) += w32thread.o
OBJS-$(HAVE_XVMC) += xvmcvideo.o
+OBJS-$(CONFIG_VDPAU) += vdpauvideo.o
# processor-specific code
MMX-OBJS-$(CONFIG_CAVS_DECODER) += i386/cavsdsp_mmx.o
Index: libavcodec/vdpauvideo.c
===================================================================
--- libavcodec/vdpauvideo.c (Revision 0)
+++ libavcodec/vdpauvideo.c (Revision 0)
@@ -0,0 +1,212 @@
+/*
+ * Video Decode and Presentation API for UNIX (VDPAU) is used for
+ * HW decode acceleration for H.264.
+ *
+ * Copyright (c) 2008 NVIDIA.
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "h264.h"
+
+#undef NDEBUG
+#include <assert.h>
+
+#include "vdpau_render.h"
+
+static void VDPAU_ensure_has_buffers(vdpau_render_state_t * render, int need_entries)
+{
+ int new_alloced;
+
+ if (render->bitstreamBuffersAlloced >= need_entries) {
+ return;
+ }
+
+ if (!render->bitstreamBuffersAlloced || !render->bitstreamBuffers) {
+ new_alloced = 4;
+ }
+ else {
+ new_alloced = render->bitstreamBuffersAlloced * 2;
+ }
+
+ render->bitstreamBuffers = av_realloc(
+ render->bitstreamBuffers,
+ new_alloced * sizeof(render->bitstreamBuffers[0])
+ );
+ render->bitstreamBuffersAlloced = new_alloced;
+}
+
+static int VDPAU_h264_set_reference_frames(H264Context *h)
+{
+ MpegEncContext * s = &h->s;
+ vdpau_render_state_t * render, * render_ref;
+ VdpReferenceFrameH264 * rf, * rf2;
+ Picture * pic;
+ int i, list;
+
+ render = (vdpau_render_state_t*)s->current_picture_ptr->data[2];
+ assert(render != NULL);
+ assert(render->magic == MP_VDPAU_RENDER_MAGIC);
+ if ((render == NULL) || (render->magic != MP_VDPAU_RENDER_MAGIC))
+ return -1; // make sure that this is render packet
+
+ rf = &render->info.h264.referenceFrames[0];
+#define H264_RF_COUNT FF_ARRAY_ELEMS(render->info.h264.referenceFrames)
+
+ for (list = 0; list < 2; ++list) {
+ Picture **lp = list ? h->long_ref : h->short_ref;
+ int ls = list ? h->long_ref_count : h->short_ref_count;
+
+ for (i = 0; i < ls; ++i) {
+ pic = lp[i];
+ if (!pic || !pic->reference) {
+ continue;
+ }
+
+ render_ref = (vdpau_render_state_t*)pic->data[2];
+ assert(render_ref != NULL);
+ if (render_ref == NULL)
+ return -1; // make sure that this is render packet
+
+ rf2 = &render->info.h264.referenceFrames[0];
+ while (rf2 != rf) {
+ if (
+ (rf2->surface == render_ref->surface)
+ && (rf2->is_long_term == pic->long_ref)
+ && (rf2->frame_idx == pic->frame_num)
+ ) {
+ break;
+ }
+ ++rf2;
+ }
+ if (rf2 != rf) {
+ rf2->top_is_reference |= (pic->reference & PICT_TOP_FIELD) ? VDP_TRUE : VDP_FALSE;
+ rf2->bottom_is_reference |= (pic->reference & PICT_BOTTOM_FIELD) ? VDP_TRUE : VDP_FALSE;
+ continue;
+ }
+
+ if (rf >= &render->info.h264.referenceFrames[H264_RF_COUNT]) {
+ continue;
+ }
+
+ rf->surface = render_ref->surface;
+ rf->is_long_term = pic->long_ref;
+ rf->top_is_reference = (pic->reference & PICT_TOP_FIELD) ? VDP_TRUE : VDP_FALSE;
+ rf->bottom_is_reference = (pic->reference & PICT_BOTTOM_FIELD) ? VDP_TRUE : VDP_FALSE;
+ rf->field_order_cnt[0] = pic->field_poc[0];
+ rf->field_order_cnt[1] = pic->field_poc[1];
+ rf->frame_idx = pic->frame_num;
+
+ ++rf;
+ }
+ }
+
+ for (; rf < &render->info.h264.referenceFrames[H264_RF_COUNT]; ++rf) {
+ rf->surface = VDP_INVALID_HANDLE;
+ rf->is_long_term = 0;
+ rf->top_is_reference = 0;
+ rf->bottom_is_reference = 0;
+ rf->field_order_cnt[0] = 0;
+ rf->field_order_cnt[1] = 0;
+ rf->frame_idx = 0;
+ }
+
+ return 0;
+}
+
+int ff_VDPAU_h264_add_data_chunk(H264Context *h, const uint8_t *buf, int buf_size)
+{
+ MpegEncContext * s = &h->s;
+ vdpau_render_state_t * render;
+
+ render = (vdpau_render_state_t*)s->current_picture_ptr->data[2];
+ assert(render != NULL);
+ assert(render->magic == MP_VDPAU_RENDER_MAGIC);
+ if ((render == NULL) || (render->magic != MP_VDPAU_RENDER_MAGIC))
+ return -1; // make sure that this is render packet
+
+ if (!render->bitstreamBuffersUsed) {
+ VDPAU_h264_set_reference_frames(h);
+ }
+
+ VDPAU_ensure_has_buffers(render, render->bitstreamBuffersUsed + 1);
+
+ render->bitstreamBuffers[render->bitstreamBuffersUsed].struct_version = VDP_BITSTREAM_BUFFER_VERSION;
+ render->bitstreamBuffers[render->bitstreamBuffersUsed].bitstream = buf;
+ render->bitstreamBuffers[render->bitstreamBuffersUsed].bitstream_bytes = buf_size;
+ render->bitstreamBuffersUsed++;
+
+ return 0;
+}
+
+int ff_VDPAU_h264_picture_complete(H264Context *h)
+{
+ MpegEncContext * s = &h->s;
+ vdpau_render_state_t * render;
+
+ render = (vdpau_render_state_t*)s->current_picture_ptr->data[2];
+ assert(render != NULL);
+ assert(render->magic == MP_VDPAU_RENDER_MAGIC);
+ if ((render == NULL) || (render->magic != MP_VDPAU_RENDER_MAGIC))
+ return -1; // make sure that this is render packet
+
+ render->info.h264.slice_count = h->slice_num;
+ if (render->info.h264.slice_count < 1)
+ return 0;
+
+ for (int i = 0; i < 2; ++i) {
+ int foc = s->current_picture_ptr->field_poc[i];
+ if (foc == INT_MAX) {
+ foc = 0;
+ }
+ render->info.h264.field_order_cnt[i] = foc;
+ }
+
+ render->info.h264.is_reference = s->current_picture_ptr->reference ? VDP_TRUE : VDP_FALSE;
+ render->info.h264.frame_num = h->frame_num;
+ render->info.h264.field_pic_flag = (s->picture_structure != PICT_FRAME) ? 1 : 0;
+ render->info.h264.bottom_field_flag = (s->picture_structure == PICT_BOTTOM_FIELD) ? 1 : 0;
+ render->info.h264.num_ref_frames = h->sps.ref_frame_count;
+ render->info.h264.mb_adaptive_frame_field_flag = h->sps.mb_aff;
+ render->info.h264.constrained_intra_pred_flag = h->pps.constrained_intra_pred;
+ render->info.h264.weighted_pred_flag = h->pps.weighted_pred;
+ render->info.h264.weighted_bipred_idc = h->pps.weighted_bipred_idc;
+ render->info.h264.frame_mbs_only_flag = h->sps.frame_mbs_only_flag;
+ render->info.h264.transform_8x8_mode_flag = h->pps.transform_8x8_mode;
+ render->info.h264.chroma_qp_index_offset = h->pps.chroma_qp_index_offset[0];
+ render->info.h264.second_chroma_qp_index_offset = h->pps.chroma_qp_index_offset[1];
+ render->info.h264.pic_init_qp_minus26 = h->pps.init_qp - 26;
+ render->info.h264.num_ref_idx_l0_active_minus1 = h->pps.ref_count[0] - 1;
+ render->info.h264.num_ref_idx_l1_active_minus1 = h->pps.ref_count[1] - 1;
+ render->info.h264.log2_max_frame_num_minus4 = h->sps.log2_max_frame_num - 4;
+ render->info.h264.pic_order_cnt_type = h->sps.poc_type;
+ render->info.h264.log2_max_pic_order_cnt_lsb_minus4 = h->sps.log2_max_poc_lsb - 4;
+ render->info.h264.delta_pic_order_always_zero_flag = h->sps.delta_pic_order_always_zero_flag;
+ render->info.h264.direct_8x8_inference_flag = h->sps.direct_8x8_inference_flag;
+ render->info.h264.entropy_coding_mode_flag = h->pps.cabac;
+ render->info.h264.pic_order_present_flag = h->pps.pic_order_present;
+ render->info.h264.deblocking_filter_control_present_flag = h->pps.deblocking_filter_parameters_present;
+ render->info.h264.redundant_pic_cnt_present_flag = h->pps.redundant_pic_cnt_present;
+ memcpy(render->info.h264.scaling_lists_4x4, h->pps.scaling_matrix4, sizeof(render->info.h264.scaling_lists_4x4));
+ memcpy(render->info.h264.scaling_lists_8x8, h->pps.scaling_matrix8, sizeof(render->info.h264.scaling_lists_8x8));
+
+ ff_draw_horiz_band(s, 0, s->avctx->height);
+ render->bitstreamBuffersUsed = 0;
+
+ return 0;
+}
+
Index: libavcodec/mpegvideo.c
===================================================================
--- libavcodec/mpegvideo.c (Revision 15958)
+++ libavcodec/mpegvideo.c (Arbeitskopie)
@@ -954,6 +954,9 @@
XVMC_field_end(s);
}else
#endif
+#ifdef CONFIG_VDPAU
+ if(!s->avctx->vdpau_acceleration)
+#endif
if(s->unrestricted_mv && s->current_picture.reference && !s->intra_only && !(s->flags&CODEC_FLAG_EMU_EDGE)) {
s->dsp.draw_edges(s->current_picture.data[0], s->linesize , s->h_edge_pos , s->v_edge_pos , EDGE_WIDTH );
s->dsp.draw_edges(s->current_picture.data[1], s->uvlinesize, s->h_edge_pos>>1, s->v_edge_pos>>1, EDGE_WIDTH/2);
Index: libavcodec/allcodecs.c
===================================================================
--- libavcodec/allcodecs.c (Revision 15958)
+++ libavcodec/allcodecs.c (Arbeitskopie)
@@ -98,6 +98,7 @@
REGISTER_DECODER (H263I, h263i);
REGISTER_ENCODER (H263P, h263p);
REGISTER_DECODER (H264, h264);
+ REGISTER_DECODER (H264_VDPAU, h264_vdpau);
REGISTER_ENCDEC (HUFFYUV, huffyuv);
REGISTER_DECODER (IDCIN, idcin);
REGISTER_DECODER (INDEO2, indeo2);
Index: libavcodec/vdpau_render.h
===================================================================
--- libavcodec/vdpau_render.h (Revision 0)
+++ libavcodec/vdpau_render.h (Revision 0)
@@ -0,0 +1,61 @@
+/*
+ * Video Decode and Presentation API for UNIX (VDPAU) is used for
+ * HW decode acceleration for MPEG-1/2, H.264 and VC-1.
+ *
+ * Copyright (C) 2008 NVIDIA.
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef FFMPEG_VDPAU_RENDER_H
+#define FFMPEG_VDPAU_RENDER_H
+
+#include "vdpau/vdpau.h"
+#include "vdpau/vdpau_x11.h"
+
+/**
+ * \brief The videoSurface is used for render.
+ */
+#define MP_VDPAU_STATE_USED_FOR_RENDER 1
+
+/**
+ * \brief The videoSurface is needed for reference/prediction,
+ * codec manipulates this.
+ */
+#define MP_VDPAU_STATE_USED_FOR_REFERENCE 2
+
+#define MP_VDPAU_RENDER_MAGIC 0x1DC8E14B
+
+typedef struct {
+ int magic;
+
+ VdpVideoSurface surface; //used as rendered surface, never changed.
+
+ int state; // Holds MP_VDPAU_STATE_* values
+
+ union _VdpPictureInfo {
+ VdpPictureInfoMPEG1Or2 mpeg;
+ VdpPictureInfoH264 h264;
+ VdpPictureInfoVC1 vc1;
+ } info;
+
+ int bitstreamBuffersAlloced;
+ int bitstreamBuffersUsed;
+ VdpBitstreamBuffer *bitstreamBuffers;
+} vdpau_render_state_t;
+
+#endif /* FFMPEG_VDPAU_RENDER_H */
Index: libavcodec/avcodec.h
===================================================================
--- libavcodec/avcodec.h (Revision 15958)
+++ libavcodec/avcodec.h (Arbeitskopie)
@@ -191,6 +191,9 @@
CODEC_ID_TGV,
CODEC_ID_TGQ,
+ /* "codecs" for HW decoding with VDPAU */
+ CODEC_ID_H264_VDPAU= 0x9000,
+
/* various PCM "codecs" */
CODEC_ID_PCM_S16LE= 0x10000,
CODEC_ID_PCM_S16BE,
@@ -526,6 +529,8 @@
* This can be used to prevent truncation of the last audio samples.
*/
#define CODEC_CAP_SMALL_LAST_FRAME 0x0040
+/* Codec can export data for HW decoding (VDPAU). */
+#define CODEC_CAP_HWACCEL_VDPAU 0x0080
//The following defines may change, don't expect compatibility if you use them.
#define MB_TYPE_INTRA4x4 0x0001
@@ -2297,6 +2302,13 @@
* - decoding: unused.
*/
float rc_min_vbv_overflow_use;
+
+ /**
+ * VDPAU Acceleration
+ * - encoding: forbidden
+ * - decoding: set by decoder
+ */
+ int vdpau_acceleration;
} AVCodecContext;
/**
Index: libavcodec/imgconvert.c
===================================================================
--- libavcodec/imgconvert.c (Revision 15958)
+++ libavcodec/imgconvert.c (Arbeitskopie)
@@ -266,6 +266,15 @@
[PIX_FMT_XVMC_MPEG2_IDCT] = {
.name = "xvmcidct",
},
+ [PIX_FMT_VDPAU_H264_BASELINE] = {
+ .name = "vdpau_h264_baseline",
+ },
+ [PIX_FMT_VDPAU_H264_MAIN] = {
+ .name = "vdpau_h264_main",
+ },
+ [PIX_FMT_VDPAU_H264_HIGH] = {
+ .name = "vdpau_h264_high",
+ },
[PIX_FMT_UYYVYY411] = {
.name = "uyyvyy411",
.nb_channels = 1,
Index: libavutil/avutil.h
===================================================================
--- libavutil/avutil.h (Revision 15958)
+++ libavutil/avutil.h (Arbeitskopie)
@@ -121,6 +121,9 @@
PIX_FMT_YUV440P, ///< Planar YUV 4:4:0 (1 Cr & Cb sample per 1x2 Y samples)
PIX_FMT_YUVJ440P, ///< Planar YUV 4:4:0 full scale (jpeg)
PIX_FMT_YUVA420P, ///< Planar YUV 4:2:0, 20bpp, (1 Cr & Cb sample per 2x2 Y & A samples)
+ PIX_FMT_VDPAU_H264_BASELINE,///< H264 HW decoding with VDPAU (base profile)
+ PIX_FMT_VDPAU_H264_MAIN, ///< H264 HW decoding with VDPAU (main profile)
+ PIX_FMT_VDPAU_H264_HIGH, ///< H264 HW decoding with VDPAU (high profile)
PIX_FMT_NB, ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions
};
More information about the ffmpeg-devel
mailing list