diff options
Diffstat (limited to 'libavcodec/dxva2_vc1.c')
| -rw-r--r-- | libavcodec/dxva2_vc1.c | 154 |
1 files changed, 108 insertions, 46 deletions
diff --git a/libavcodec/dxva2_vc1.c b/libavcodec/dxva2_vc1.c index fc09f88f05..f08ac8b5a0 100644 --- a/libavcodec/dxva2_vc1.c +++ b/libavcodec/dxva2_vc1.c @@ -3,20 +3,20 @@ * * copyright (c) 2010 Laurent Aimar * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * 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. * - * Libav is distributed in the hope that it will be useful, + * 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 Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -25,9 +25,12 @@ #include "vc1.h" #include "vc1data.h" +#define MAX_SLICES 1024 + struct dxva2_picture_context { DXVA_PictureParameters pp; - DXVA_SliceInfo si; + unsigned slice_count; + DXVA_SliceInfo slice[MAX_SLICES]; const uint8_t *bitstream; unsigned bitstream_size; @@ -39,6 +42,15 @@ static void fill_picture_parameters(AVCodecContext *avctx, { const MpegEncContext *s = &v->s; const Picture *current_picture = s->current_picture_ptr; + int intcomp = 0; + + // determine if intensity compensation is needed + if (s->pict_type == AV_PICTURE_TYPE_P) { + if ((v->fcm == ILACE_FRAME && v->intcomp) || (v->fcm != ILACE_FRAME && v->mv_mode == MV_PMODE_INTENSITY_COMP)) { + if (v->lumscale != 32 || v->lumshift != 0 || (s->picture_structure != PICT_FRAME && (v->lumscale2 != 32 || v->lumshift2 != 0))) + intcomp = 1; + } + } memset(pp, 0, sizeof(*pp)); pp->wDecodedPictureIndex = @@ -69,13 +81,13 @@ static void fill_picture_parameters(AVCodecContext *avctx, pp->bPicStructure |= 0x01; if (s->picture_structure & PICT_BOTTOM_FIELD) pp->bPicStructure |= 0x02; - pp->bSecondField = v->interlace && v->fcm != ILACE_FIELD && !s->first_field; + pp->bSecondField = v->interlace && v->fcm == ILACE_FIELD && v->second_field; pp->bPicIntra = s->pict_type == AV_PICTURE_TYPE_I || v->bi_type; pp->bPicBackwardPrediction = s->pict_type == AV_PICTURE_TYPE_B && !v->bi_type; pp->bBidirectionalAveragingMode = (1 << 7) | ((DXVA_CONTEXT_CFG_INTRARESID(avctx, ctx) != 0) << 6) | ((DXVA_CONTEXT_CFG_RESIDACCEL(avctx, ctx) != 0) << 5) | - ((v->lumscale != 32 || v->lumshift != 0) << 4) | + (intcomp << 4) | ((v->profile == PROFILE_ADVANCED) << 3); pp->bMVprecisionAndChromaRelation = ((v->mv_mode == MV_PMODE_1MV_HPEL_BILIN) << 3) | (1 << 2) | @@ -123,15 +135,25 @@ static void fill_picture_parameters(AVCodecContext *avctx, (v->range_mapuv_flag << 3) | (v->range_mapuv ); pp->bPicBinPB = 0; - pp->bMV_RPS = 0; - pp->bReservedBits = 0; + pp->bMV_RPS = (v->fcm == ILACE_FIELD && pp->bPicBackwardPrediction) ? v->refdist + 9 : 0; + pp->bReservedBits = v->pq; if (s->picture_structure == PICT_FRAME) { - pp->wBitstreamFcodes = v->lumscale; - pp->wBitstreamPCEelements = v->lumshift; + if (intcomp) { + pp->wBitstreamFcodes = v->lumscale; + pp->wBitstreamPCEelements = v->lumshift; + } else { + pp->wBitstreamFcodes = 32; + pp->wBitstreamPCEelements = 0; + } } else { /* Syntax: (top_field_param << 8) | bottom_field_param */ - pp->wBitstreamFcodes = (v->lumscale << 8) | v->lumscale; - pp->wBitstreamPCEelements = (v->lumshift << 8) | v->lumshift; + if (intcomp) { + pp->wBitstreamFcodes = (v->lumscale << 8) | v->lumscale2; + pp->wBitstreamPCEelements = (v->lumshift << 8) | v->lumshift2; + } else { + pp->wBitstreamFcodes = (32 << 8) | 32; + pp->wBitstreamPCEelements = 0; + } } pp->bBitstreamConcealmentNeed = 0; pp->bBitstreamConcealmentMethod = 0; @@ -149,9 +171,10 @@ static void fill_slice(AVCodecContext *avctx, DXVA_SliceInfo *slice, slice->dwSliceBitsInBuffer = 8 * size; slice->dwSliceDataLocation = position; slice->bStartCodeBitOffset = 0; - slice->bReservedBits = 0; - slice->wMBbitOffset = get_bits_count(&s->gb); - slice->wNumberMBsInSlice = s->mb_width * s->mb_height; /* XXX We assume 1 slice */ + slice->bReservedBits = (s->pict_type == AV_PICTURE_TYPE_B && !v->bi_type) ? v->bfraction_lut_index + 9 : 0; + slice->wMBbitOffset = v->p_frame_skipped ? 0xffff : get_bits_count(&s->gb) + (avctx->codec_id == AV_CODEC_ID_VC1 ? 32 : 0); + /* XXX We store the index of the first MB and it will be fixed later */ + slice->wNumberMBsInSlice = (s->mb_y >> v->field_mode) * s->mb_width + s->mb_x; slice->wQuantizerScaleCode = v->pq; slice->wBadSliceChopping = 0; } @@ -165,18 +188,15 @@ static int commit_bitstream_and_slice_buffer(AVCodecContext *avctx, const MpegEncContext *s = &v->s; struct dxva2_picture_context *ctx_pic = s->current_picture_ptr->hwaccel_picture_private; - DXVA_SliceInfo *slice = &ctx_pic->si; - static const uint8_t start_code[] = { 0, 0, 1, 0x0d }; const unsigned start_code_size = avctx->codec_id == AV_CODEC_ID_VC1 ? sizeof(start_code) : 0; - const unsigned slice_size = slice->dwSliceBitsInBuffer / 8; - const unsigned padding = 128 - ((start_code_size + slice_size) & 127); - const unsigned data_size = start_code_size + slice_size + padding; - + const unsigned mb_count = s->mb_width * (s->mb_height >> v->field_mode); + DXVA_SliceInfo *slice = NULL; void *dxva_data_ptr; - uint8_t *dxva_data; + uint8_t *dxva_data, *current, *end; unsigned dxva_size; - int result; + unsigned padding; + unsigned i; unsigned type; #if CONFIG_D3D11VA @@ -200,16 +220,49 @@ static int commit_bitstream_and_slice_buffer(AVCodecContext *avctx, #endif dxva_data = dxva_data_ptr; - result = data_size <= dxva_size ? 0 : -1; - if (!result) { - if (start_code_size > 0) - memcpy(dxva_data, start_code, start_code_size); - memcpy(dxva_data + start_code_size, - ctx_pic->bitstream + slice->dwSliceDataLocation, slice_size); - if (padding > 0) - memset(dxva_data + start_code_size + slice_size, 0, padding); - slice->dwSliceBitsInBuffer = 8 * data_size; + current = dxva_data; + end = dxva_data + dxva_size; + + for (i = 0; i < ctx_pic->slice_count; i++) { + unsigned position, size; + slice = &ctx_pic->slice[i]; + position = slice->dwSliceDataLocation; + size = slice->dwSliceBitsInBuffer / 8; + if (start_code_size + size > end - current) { + av_log(avctx, AV_LOG_ERROR, "Failed to build bitstream"); + break; + } + slice->dwSliceDataLocation = current - dxva_data; + + if (i < ctx_pic->slice_count - 1) + slice->wNumberMBsInSlice = + slice[1].wNumberMBsInSlice - slice[0].wNumberMBsInSlice; + else + slice->wNumberMBsInSlice = + mb_count - slice[0].wNumberMBsInSlice; + + /* write the appropriate frame, field or slice start code */ + if (start_code_size) { + memcpy(current, start_code, start_code_size); + if (i == 0 && v->second_field) + current[3] = 0x0c; + else if (i > 0) + current[3] = 0x0b; + + current += start_code_size; + slice->dwSliceBitsInBuffer += start_code_size * 8; + } + + memcpy(current, &ctx_pic->bitstream[position], size); + current += size; + } + padding = FFMIN(128 - ((current - dxva_data) & 127), end - current); + if (slice && padding > 0) { + memset(current, 0, padding); + current += padding; + slice->dwSliceBitsInBuffer += padding * 8; } + #if CONFIG_D3D11VA if (ff_dxva2_is_d3d11(avctx)) if (FAILED(ID3D11VideoContext_ReleaseDecoderBuffer(D3D11VA_CONTEXT(ctx)->video_context, D3D11VA_CONTEXT(ctx)->decoder, type))) @@ -220,16 +273,16 @@ static int commit_bitstream_and_slice_buffer(AVCodecContext *avctx, if (FAILED(IDirectXVideoDecoder_ReleaseBuffer(DXVA2_CONTEXT(ctx)->decoder, type))) return -1; #endif - if (result) - return result; + if (i < ctx_pic->slice_count) + return -1; #if CONFIG_D3D11VA if (ff_dxva2_is_d3d11(avctx)) { D3D11_VIDEO_DECODER_BUFFER_DESC *dsc11 = bs; memset(dsc11, 0, sizeof(*dsc11)); dsc11->BufferType = type; - dsc11->DataSize = data_size; - dsc11->NumMBsInBuffer = s->mb_width * s->mb_height; + dsc11->DataSize = current - dxva_data; + dsc11->NumMBsInBuffer = mb_count; type = D3D11_VIDEO_DECODER_BUFFER_SLICE_CONTROL; } @@ -239,17 +292,18 @@ static int commit_bitstream_and_slice_buffer(AVCodecContext *avctx, DXVA2_DecodeBufferDesc *dsc2 = bs; memset(dsc2, 0, sizeof(*dsc2)); dsc2->CompressedBufferType = type; - dsc2->DataSize = data_size; - dsc2->NumMBsInBuffer = s->mb_width * s->mb_height; + dsc2->DataSize = current - dxva_data; + dsc2->NumMBsInBuffer = mb_count; type = DXVA2_SliceControlBufferType; } #endif - assert((data_size & 127) == 0); return ff_dxva2_commit_buffer(avctx, ctx, sc, type, - slice, sizeof(*slice), s->mb_width * s->mb_height); + ctx_pic->slice, + ctx_pic->slice_count * sizeof(*ctx_pic->slice), + mb_count); } static int dxva2_vc1_start_frame(AVCodecContext *avctx, @@ -266,6 +320,7 @@ static int dxva2_vc1_start_frame(AVCodecContext *avctx, fill_picture_parameters(avctx, ctx, v, &ctx_pic->pp); + ctx_pic->slice_count = 0; ctx_pic->bitstream_size = 0; ctx_pic->bitstream = NULL; return 0; @@ -278,9 +333,13 @@ static int dxva2_vc1_decode_slice(AVCodecContext *avctx, const VC1Context *v = avctx->priv_data; const Picture *current_picture = v->s.current_picture_ptr; struct dxva2_picture_context *ctx_pic = current_picture->hwaccel_picture_private; + unsigned position; - if (ctx_pic->bitstream_size > 0) + if (ctx_pic->slice_count >= MAX_SLICES) { + avpriv_request_sample(avctx, "%d slices in dxva2", + ctx_pic->slice_count); return -1; + } if (avctx->codec_id == AV_CODEC_ID_VC1 && size >= 4 && IS_MARKER(AV_RB32(buffer))) { @@ -288,10 +347,12 @@ static int dxva2_vc1_decode_slice(AVCodecContext *avctx, size -= 4; } - ctx_pic->bitstream_size = size; - ctx_pic->bitstream = buffer; + if (!ctx_pic->bitstream) + ctx_pic->bitstream = buffer; + ctx_pic->bitstream_size += size; - fill_slice(avctx, &ctx_pic->si, 0, size); + position = buffer - ctx_pic->bitstream; + fill_slice(avctx, &ctx_pic->slice[ctx_pic->slice_count++], position, size); return 0; } @@ -301,7 +362,7 @@ static int dxva2_vc1_end_frame(AVCodecContext *avctx) struct dxva2_picture_context *ctx_pic = v->s.current_picture_ptr->hwaccel_picture_private; int ret; - if (ctx_pic->bitstream_size <= 0) + if (ctx_pic->slice_count <= 0 || ctx_pic->bitstream_size <= 0) return -1; ret = ff_dxva2_common_end_frame(avctx, v->s.current_picture_ptr->f, @@ -409,6 +470,7 @@ const AVHWAccel ff_vc1_d3d11va2_hwaccel = { .start_frame = dxva2_vc1_start_frame, .decode_slice = dxva2_vc1_decode_slice, .end_frame = dxva2_vc1_end_frame, + .frame_params = ff_dxva2_common_frame_params, .frame_priv_data_size = sizeof(struct dxva2_picture_context), .priv_data_size = sizeof(FFDXVASharedContext), }; |