Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add VC-1 bitstream decoding through VA API.

Browse Source 
Originally committed as revision 18324 to svn://svn.ffmpeg.org/ffmpeg/trunk
release/0.6
Gwenole Beauchesne 16 years ago
parent b1516707c4
commit 68367bdef0
3 changed files with 359 additions and 0 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      libavcodec/Makefile
  2. 2
      libavcodec/allcodecs.c
  3. 355
      libavcodec/vaapi_vc1.c

2
libavcodec/Makefile
Unescape View File

@ -230,6 +230,7 @@ OBJS-$(CONFIG_TXD_DECODER) += txd.o s3tc.o
OBJS-$(CONFIG_ULTI_DECODER) += ulti.o
OBJS-$(CONFIG_VB_DECODER) += vb.o
OBJS-$(CONFIG_VC1_DECODER) += vc1.o vc1data.o vc1dsp.o msmpeg4data.o h263dec.o h263.o intrax8.o intrax8dsp.o error_resilience.o mpegvideo.o msmpeg4.o
OBJS-$(CONFIG_VC1_VAAPI_HWACCEL) += vc1.o vc1data.o vc1dsp.o msmpeg4data.o h263dec.o h263.o intrax8.o intrax8dsp.o error_resilience.o mpegvideo.o msmpeg4.o vaapi.o vaapi_vc1.o
OBJS-$(CONFIG_VC1_VDPAU_DECODER) += vdpau.o vc1.o vc1data.o vc1dsp.o msmpeg4data.o h263dec.o h263.o intrax8.o intrax8dsp.o error_resilience.o mpegvideo.o msmpeg4.o
OBJS-$(CONFIG_VCR1_DECODER) += vcr1.o
OBJS-$(CONFIG_VCR1_ENCODER) += vcr1.o
@ -254,6 +255,7 @@ OBJS-$(CONFIG_WMV1_ENCODER) += mpegvideo_enc.o motion_est.o ratecontr
OBJS-$(CONFIG_WMV2_DECODER) += wmv2dec.o wmv2.o msmpeg4.o msmpeg4data.o h263dec.o h263.o intrax8.o intrax8dsp.o mpeg12data.o mpegvideo.o error_resilience.o
OBJS-$(CONFIG_WMV2_ENCODER) += wmv2enc.o wmv2.o msmpeg4.o msmpeg4data.o mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o
OBJS-$(CONFIG_WMV3_DECODER) += vc1.o vc1data.o vc1dsp.o msmpeg4data.o h263dec.o h263.o intrax8.o intrax8dsp.o error_resilience.o mpegvideo.o msmpeg4.o
OBJS-$(CONFIG_WMV3_VAAPI_HWACCEL) += vc1.o vc1data.o vc1dsp.o msmpeg4data.o h263dec.o h263.o intrax8.o intrax8dsp.o error_resilience.o mpegvideo.o msmpeg4.o vaapi.o vaapi_vc1.o
OBJS-$(CONFIG_WMV3_VDPAU_DECODER) += vdpau.o vc1.o vc1data.o vc1dsp.o msmpeg4data.o h263dec.o h263.o intrax8.o intrax8dsp.o error_resilience.o mpegvideo.o msmpeg4.o
OBJS-$(CONFIG_WNV1_DECODER) += wnv1.o
OBJS-$(CONFIG_WS_SND1_DECODER) += ws-snd1.o

2
libavcodec/allcodecs.c
Unescape View File

@ -57,6 +57,8 @@ void avcodec_register_all(void)
REGISTER_HWACCEL (H263_VAAPI, h263_vaapi);
REGISTER_HWACCEL (MPEG2_VAAPI, mpeg2_vaapi);
REGISTER_HWACCEL (MPEG4_VAAPI, mpeg4_vaapi);
REGISTER_HWACCEL (VC1_VAAPI, vc1_vaapi);
REGISTER_HWACCEL (WMV3_VAAPI, wmv3_vaapi);
/* video codecs */
REGISTER_DECODER (AASC, aasc);

355
libavcodec/vaapi_vc1.c
Unescape View File

@ -0,0 +1,355 @@
/*
* VC-1 HW decode acceleration through VA API
*
* Copyright (C) 2008-2009 Splitted-Desktop Systems
*
* 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 "vaapi_internal.h"
#include "vc1.h"
#include "vc1data.h"
/** Translates FFmpeg MV modes to VA API */
static int get_VAMvModeVC1(enum MVModes mv_mode)
{
switch (mv_mode) {
case MV_PMODE_1MV_HPEL_BILIN: return VAMvMode1MvHalfPelBilinear;
case MV_PMODE_1MV: return VAMvMode1Mv;
case MV_PMODE_1MV_HPEL: return VAMvMode1MvHalfPel;
case MV_PMODE_MIXED_MV: return VAMvModeMixedMv;
case MV_PMODE_INTENSITY_COMP: return VAMvModeIntensityCompensation;
}
return 0;
}
/** Checks whether the MVTYPEMB bitplane is present */
static inline int vc1_has_MVTYPEMB_bitplane(VC1Context *v)
{
if (v->mv_type_is_raw)
return 0;
return (v->s.pict_type == FF_P_TYPE &&
(v->mv_mode == MV_PMODE_MIXED_MV ||
(v->mv_mode == MV_PMODE_INTENSITY_COMP &&
v->mv_mode2 == MV_PMODE_MIXED_MV)));
}
/** Checks whether the SKIPMB bitplane is present */
static inline int vc1_has_SKIPMB_bitplane(VC1Context *v)
{
if (v->skip_is_raw)
return 0;
return (v->s.pict_type == FF_P_TYPE ||
(v->s.pict_type == FF_B_TYPE && !v->bi_type));
}
/** Checks whether the DIRECTMB bitplane is present */
static inline int vc1_has_DIRECTMB_bitplane(VC1Context *v)
{
if (v->dmb_is_raw)
return 0;
return v->s.pict_type == FF_B_TYPE && !v->bi_type;
}
/** Checks whether the ACPRED bitplane is present */
static inline int vc1_has_ACPRED_bitplane(VC1Context *v)
{
if (v->acpred_is_raw)
return 0;
return (v->profile == PROFILE_ADVANCED &&
(v->s.pict_type == FF_I_TYPE ||
(v->s.pict_type == FF_B_TYPE && v->bi_type)));
}
/** Check whether the OVERFLAGS bitplane is present */
static inline int vc1_has_OVERFLAGS_bitplane(VC1Context *v)
{
if (v->overflg_is_raw)
return 0;
return (v->profile == PROFILE_ADVANCED &&
(v->s.pict_type == FF_I_TYPE ||
(v->s.pict_type == FF_B_TYPE && v->bi_type)) &&
(v->overlap && v->pq <= 8) &&
v->condover == CONDOVER_SELECT);
}
/** Reconstruct bitstream PTYPE (7.1.1.4, index into Table-35) */
static int vc1_get_PTYPE(VC1Context *v)
{
MpegEncContext * const s = &v->s;
switch (s->pict_type) {
case FF_I_TYPE: return 0;
case FF_P_TYPE: return v->p_frame_skipped ? 4 : 1;
case FF_B_TYPE: return v->bi_type ? 3 : 2;
}
return 0;
}
/** Reconstruct bitstream MVMODE (7.1.1.32) */
static inline VAMvModeVC1 vc1_get_MVMODE(VC1Context *v)
{
if (v->s.pict_type == FF_P_TYPE ||
(v->s.pict_type == FF_B_TYPE && !v->bi_type))
return get_VAMvModeVC1(v->mv_mode);
return 0;
}
/** Reconstruct bitstream MVMODE2 (7.1.1.33) */
static inline VAMvModeVC1 vc1_get_MVMODE2(VC1Context *v)
{
if (v->s.pict_type == FF_P_TYPE && v->mv_mode == MV_PMODE_INTENSITY_COMP)
return get_VAMvModeVC1(v->mv_mode2);
return 0;
}
/** Pack FFmpeg bitplanes into a VABitPlaneBuffer element */
static inline uint8_t vc1_pack_bitplanes(const uint8_t *ff_bp[3], int x, int y, int stride)
{
const int n = y * stride + x;
uint8_t v = 0;
if (ff_bp[0])
v = ff_bp[0][n];
if (ff_bp[1])
v |= ff_bp[1][n] << 1;
if (ff_bp[2])
v |= ff_bp[2][n] << 2;
return v;
}
static int vaapi_vc1_start_frame(AVCodecContext *avctx, av_unused const uint8_t *buffer, av_unused uint32_t size)
{
VC1Context * const v = avctx->priv_data;
MpegEncContext * const s = &v->s;
struct vaapi_context * const vactx = avctx->hwaccel_context;
VAPictureParameterBufferVC1 *pic_param;
dprintf(avctx, "vaapi_vc1_start_frame()\n");
vactx->slice_param_size = sizeof(VASliceParameterBufferVC1);
/* Fill in VAPictureParameterBufferVC1 */
pic_param = ff_vaapi_alloc_picture(vactx, sizeof(VAPictureParameterBufferVC1));
if (!pic_param)
return -1;
pic_param->forward_reference_picture = 0xffffffff;
pic_param->backward_reference_picture = 0xffffffff;
pic_param->inloop_decoded_picture = 0xffffffff;
pic_param->sequence_fields.value = 0; /* reset all bits */
pic_param->sequence_fields.bits.pulldown = v->broadcast;
pic_param->sequence_fields.bits.interlace = v->interlace;
pic_param->sequence_fields.bits.tfcntrflag = v->tfcntrflag;
pic_param->sequence_fields.bits.finterpflag = v->finterpflag;
pic_param->sequence_fields.bits.psf = v->psf;
pic_param->sequence_fields.bits.multires = v->multires;
pic_param->sequence_fields.bits.overlap = v->overlap;
pic_param->sequence_fields.bits.syncmarker = s->resync_marker;
pic_param->sequence_fields.bits.rangered = v->rangered;
pic_param->sequence_fields.bits.max_b_frames = s->avctx->max_b_frames;
pic_param->coded_width = s->avctx->coded_width;
pic_param->coded_height = s->avctx->coded_height;
pic_param->entrypoint_fields.value = 0; /* reset all bits */
pic_param->entrypoint_fields.bits.broken_link = v->broken_link;
pic_param->entrypoint_fields.bits.closed_entry = v->closed_entry;
pic_param->entrypoint_fields.bits.panscan_flag = v->panscanflag;
pic_param->entrypoint_fields.bits.loopfilter = s->loop_filter;
pic_param->conditional_overlap_flag = v->condover;
pic_param->fast_uvmc_flag = v->fastuvmc;
pic_param->range_mapping_fields.value = 0; /* reset all bits */
pic_param->range_mapping_fields.bits.luma_flag = v->range_mapy_flag;
pic_param->range_mapping_fields.bits.luma = v->range_mapy;
pic_param->range_mapping_fields.bits.chroma_flag = v->range_mapuv_flag;
pic_param->range_mapping_fields.bits.chroma = v->range_mapuv;
pic_param->b_picture_fraction = v->bfraction_lut_index;
pic_param->cbp_table = v->cbpcy_vlc ? v->cbpcy_vlc - ff_vc1_cbpcy_p_vlc : 0;
pic_param->mb_mode_table = 0; /* XXX: interlaced frame */
pic_param->range_reduction_frame = v->rangeredfrm;
pic_param->rounding_control = v->rnd;
pic_param->post_processing = v->postproc;
pic_param->picture_resolution_index = v->respic;
pic_param->luma_scale = v->lumscale;
pic_param->luma_shift = v->lumshift;
pic_param->picture_fields.value = 0; /* reset all bits */
pic_param->picture_fields.bits.picture_type = vc1_get_PTYPE(v);
pic_param->picture_fields.bits.frame_coding_mode = v->fcm;
pic_param->picture_fields.bits.top_field_first = v->tff;
pic_param->picture_fields.bits.is_first_field = v->fcm == 0; /* XXX: interlaced frame */
pic_param->picture_fields.bits.intensity_compensation = v->mv_mode == MV_PMODE_INTENSITY_COMP;
pic_param->raw_coding.value = 0; /* reset all bits */
pic_param->raw_coding.flags.mv_type_mb = v->mv_type_is_raw;
pic_param->raw_coding.flags.direct_mb = v->dmb_is_raw;
pic_param->raw_coding.flags.skip_mb = v->skip_is_raw;
pic_param->raw_coding.flags.field_tx = 0; /* XXX: interlaced frame */
pic_param->raw_coding.flags.forward_mb = 0; /* XXX: interlaced frame */
pic_param->raw_coding.flags.ac_pred = v->acpred_is_raw;
pic_param->raw_coding.flags.overflags = v->overflg_is_raw;
pic_param->bitplane_present.value = 0; /* reset all bits */
pic_param->bitplane_present.flags.bp_mv_type_mb = vc1_has_MVTYPEMB_bitplane(v);
pic_param->bitplane_present.flags.bp_direct_mb = vc1_has_DIRECTMB_bitplane(v);
pic_param->bitplane_present.flags.bp_skip_mb = vc1_has_SKIPMB_bitplane(v);
pic_param->bitplane_present.flags.bp_field_tx = 0; /* XXX: interlaced frame */
pic_param->bitplane_present.flags.bp_forward_mb = 0; /* XXX: interlaced frame */
pic_param->bitplane_present.flags.bp_ac_pred = vc1_has_ACPRED_bitplane(v);
pic_param->bitplane_present.flags.bp_overflags = vc1_has_OVERFLAGS_bitplane(v);
pic_param->reference_fields.value = 0; /* reset all bits */
pic_param->reference_fields.bits.reference_distance_flag = v->refdist_flag;
pic_param->reference_fields.bits.reference_distance = 0; /* XXX: interlaced frame */
pic_param->reference_fields.bits.num_reference_pictures = 0; /* XXX: interlaced frame */
pic_param->reference_fields.bits.reference_field_pic_indicator = 0; /* XXX: interlaced frame */
pic_param->mv_fields.value = 0; /* reset all bits */
pic_param->mv_fields.bits.mv_mode = vc1_get_MVMODE(v);
pic_param->mv_fields.bits.mv_mode2 = vc1_get_MVMODE2(v);
pic_param->mv_fields.bits.mv_table = s->mv_table_index;
pic_param->mv_fields.bits.two_mv_block_pattern_table = 0; /* XXX: interlaced frame */
pic_param->mv_fields.bits.four_mv_switch = 0; /* XXX: interlaced frame */
pic_param->mv_fields.bits.four_mv_block_pattern_table = 0; /* XXX: interlaced frame */
pic_param->mv_fields.bits.extended_mv_flag = v->extended_mv;
pic_param->mv_fields.bits.extended_mv_range = v->mvrange;
pic_param->mv_fields.bits.extended_dmv_flag = v->extended_dmv;
pic_param->mv_fields.bits.extended_dmv_range = 0; /* XXX: interlaced frame */
pic_param->pic_quantizer_fields.value = 0; /* reset all bits */
pic_param->pic_quantizer_fields.bits.dquant = v->dquant;
pic_param->pic_quantizer_fields.bits.quantizer = v->quantizer_mode;
pic_param->pic_quantizer_fields.bits.half_qp = v->halfpq;
pic_param->pic_quantizer_fields.bits.pic_quantizer_scale = v->pq;
pic_param->pic_quantizer_fields.bits.pic_quantizer_type = v->pquantizer;
pic_param->pic_quantizer_fields.bits.dq_frame = v->dquantfrm;
pic_param->pic_quantizer_fields.bits.dq_profile = v->dqprofile;
pic_param->pic_quantizer_fields.bits.dq_sb_edge = v->dqprofile == DQPROFILE_SINGLE_EDGE ? v->dqsbedge : 0;
pic_param->pic_quantizer_fields.bits.dq_db_edge = v->dqprofile == DQPROFILE_DOUBLE_EDGES ? v->dqsbedge : 0;
pic_param->pic_quantizer_fields.bits.dq_binary_level = v->dqbilevel;
pic_param->pic_quantizer_fields.bits.alt_pic_quantizer = v->altpq;
pic_param->transform_fields.value = 0; /* reset all bits */
pic_param->transform_fields.bits.variable_sized_transform_flag = v->vstransform;
pic_param->transform_fields.bits.mb_level_transform_type_flag = v->ttmbf;
pic_param->transform_fields.bits.frame_level_transform_type = v->ttfrm;
pic_param->transform_fields.bits.transform_ac_codingset_idx1 = v->c_ac_table_index;
pic_param->transform_fields.bits.transform_ac_codingset_idx2 = v->y_ac_table_index;
pic_param->transform_fields.bits.intra_transform_dc_table = v->s.dc_table_index;
switch (s->pict_type) {
case FF_B_TYPE:
pic_param->backward_reference_picture = ff_vaapi_get_surface(&s->next_picture);
// fall-through
case FF_P_TYPE:
pic_param->forward_reference_picture = ff_vaapi_get_surface(&s->last_picture);
break;
}
if (pic_param->bitplane_present.value) {
uint8_t *bitplane;
const uint8_t *ff_bp[3];
int x, y, n;
switch (s->pict_type) {
case FF_P_TYPE:
ff_bp[0] = pic_param->bitplane_present.flags.bp_direct_mb ? v->direct_mb_plane : NULL;
ff_bp[1] = pic_param->bitplane_present.flags.bp_skip_mb ? s->mbskip_table : NULL;
ff_bp[2] = pic_param->bitplane_present.flags.bp_mv_type_mb ? v->mv_type_mb_plane : NULL;
break;
case FF_B_TYPE:
if (!v->bi_type) {
ff_bp[0] = pic_param->bitplane_present.flags.bp_direct_mb ? v->direct_mb_plane : NULL;
ff_bp[1] = pic_param->bitplane_present.flags.bp_skip_mb ? s->mbskip_table : NULL;
ff_bp[2] = NULL; /* XXX: interlaced frame (FORWARD plane) */
break;
}
/* fall-through (BI-type) */
case FF_I_TYPE:
ff_bp[0] = NULL; /* XXX: interlaced frame (FIELDTX plane) */
ff_bp[1] = pic_param->bitplane_present.flags.bp_ac_pred ? v->acpred_plane : NULL;
ff_bp[2] = pic_param->bitplane_present.flags.bp_overflags ? v->over_flags_plane : NULL;
break;
default:
ff_bp[0] = NULL;
ff_bp[1] = NULL;
ff_bp[2] = NULL;
break;
}
bitplane = ff_vaapi_alloc_bitplane(vactx, s->mb_height * ((s->mb_width + 1) / 2));
if (!bitplane)
return -1;
n = 0;
for (y = 0; y < s->mb_height; y++) {
for (x = 0; x < s->mb_width; x += 2) {
bitplane[n] = vc1_pack_bitplanes(ff_bp, x+1, y, s->mb_stride);
bitplane[n] |= (vc1_pack_bitplanes(ff_bp, x, y, s->mb_stride) << 4);
++n;
}
}
}
return 0;
}
static int vaapi_vc1_end_frame(AVCodecContext *avctx)
{
VC1Context * const v = avctx->priv_data;
return ff_vaapi_common_end_frame(&v->s);
}
static int vaapi_vc1_decode_slice(AVCodecContext *avctx, const uint8_t *buffer, uint32_t size)
{
VC1Context * const v = avctx->priv_data;
MpegEncContext * const s = &v->s;
VASliceParameterBufferVC1 *slice_param;
dprintf(avctx, "vaapi_vc1_decode_slice(): buffer %p, size %d\n", buffer, size);
/* Current bit buffer is beyond any marker for VC-1, so skip it */
if (avctx->codec_id == CODEC_ID_VC1 && IS_MARKER(AV_RB32(buffer))) {
buffer += 4;
size -= 4;
}
/* Fill in VASliceParameterBufferVC1 */
slice_param = (VASliceParameterBufferVC1 *)ff_vaapi_alloc_slice(avctx->hwaccel_context, buffer, size);
if (!slice_param)
return -1;
slice_param->macroblock_offset = get_bits_count(&s->gb);
slice_param->slice_vertical_position = s->mb_y;
return 0;
}
#if CONFIG_WMV3_VAAPI_HWACCEL
AVHWAccel wmv3_vaapi_hwaccel = {
.name = "wmv3_vaapi",
.type = CODEC_TYPE_VIDEO,
.id = CODEC_ID_WMV3,
.pix_fmt = PIX_FMT_VAAPI_VLD,
.capabilities = 0,
.start_frame = vaapi_vc1_start_frame,
.end_frame = vaapi_vc1_end_frame,
.decode_slice = vaapi_vc1_decode_slice,
.priv_data_size = 0,
};
#endif
#if CONFIG_VC1_VAAPI_HWACCEL
AVHWAccel vc1_vaapi_hwaccel = {
.name = "vc1_vaapi",
.type = CODEC_TYPE_VIDEO,
.id = CODEC_ID_VC1,
.pix_fmt = PIX_FMT_VAAPI_VLD,
.capabilities = 0,
.start_frame = vaapi_vc1_start_frame,
.end_frame = vaapi_vc1_end_frame,
.decode_slice = vaapi_vc1_decode_slice,
.priv_data_size = 0,
};
#endif
Write Preview
Loading…
Cancel
Save