X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fdxva2.c;h=9fedd03df839e20f9e64ef80ec8ce5882a64cdc8;hb=178b4ea5f9a43009781311af2737284fdca48a5c;hp=3f14311c9aca93d1348cf973d704c8fd0d4806c5;hpb=85167c46efda5a722226dc1a7c4044a72ccb1db0;p=ffmpeg diff --git a/libavcodec/dxva2.c b/libavcodec/dxva2.c index 3f14311c9ac..9fedd03df83 100644 --- a/libavcodec/dxva2.c +++ b/libavcodec/dxva2.c @@ -3,101 +3,205 @@ * * copyright (c) 2010 Laurent Aimar * - * This file is part of FFmpeg. + * This file is part of Libav. * - * FFmpeg is free software; you can redistribute it and/or + * Libav 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, + * Libav 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 + * License along with Libav; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include +#include + +#include "libavutil/log.h" +#include "libavutil/time.h" + +#include "avcodec.h" #include "dxva2_internal.h" -void *ff_dxva2_get_surface(const Picture *picture) +void *ff_dxva2_get_surface(const AVFrame *frame) { - return picture->data[3]; + return frame->data[3]; } -unsigned ff_dxva2_get_surface_index(const struct dxva_context *ctx, - const Picture *picture) +unsigned ff_dxva2_get_surface_index(const AVCodecContext *avctx, + const AVDXVAContext *ctx, + const AVFrame *frame) { - void *surface = ff_dxva2_get_surface(picture); + void *surface = ff_dxva2_get_surface(frame); unsigned i; - for (i = 0; i < ctx->surface_count; i++) - if (ctx->surface[i] == surface) + for (i = 0; i < DXVA_CONTEXT_COUNT(avctx, ctx); i++) { +#if CONFIG_D3D11VA + if (avctx->pix_fmt == AV_PIX_FMT_D3D11VA_VLD && ctx->d3d11va.surface[i] == surface) { + D3D11_VIDEO_DECODER_OUTPUT_VIEW_DESC viewDesc; + ID3D11VideoDecoderOutputView_GetDesc(ctx->d3d11va.surface[i], &viewDesc); + return viewDesc.Texture2D.ArraySlice; + } +#endif +#if CONFIG_DXVA2 + if (avctx->pix_fmt == AV_PIX_FMT_DXVA2_VLD && ctx->dxva2.surface[i] == surface) return i; +#endif + } assert(0); return 0; } int ff_dxva2_commit_buffer(AVCodecContext *avctx, - struct dxva_context *ctx, - DXVA2_DecodeBufferDesc *dsc, + AVDXVAContext *ctx, + DECODER_BUFFER_DESC *dsc, unsigned type, const void *data, unsigned size, unsigned mb_count) { void *dxva_data; unsigned dxva_size; int result; + HRESULT hr; - if (FAILED(IDirectXVideoDecoder_GetBuffer(ctx->decoder, type, - &dxva_data, &dxva_size))) { - av_log(avctx, AV_LOG_ERROR, "Failed to get a buffer for %d\n", type); +#if CONFIG_D3D11VA + if (avctx->pix_fmt == AV_PIX_FMT_D3D11VA_VLD) + hr = ID3D11VideoContext_GetDecoderBuffer(D3D11VA_CONTEXT(ctx)->video_context, + D3D11VA_CONTEXT(ctx)->decoder, + type, + &dxva_size, &dxva_data); +#endif +#if CONFIG_DXVA2 + if (avctx->pix_fmt == AV_PIX_FMT_DXVA2_VLD) + hr = IDirectXVideoDecoder_GetBuffer(DXVA2_CONTEXT(ctx)->decoder, type, + &dxva_data, &dxva_size); +#endif + if (FAILED(hr)) { + av_log(avctx, AV_LOG_ERROR, "Failed to get a buffer for %u: 0x%lx\n", + type, hr); return -1; } if (size <= dxva_size) { memcpy(dxva_data, data, size); - memset(dsc, 0, sizeof(*dsc)); - dsc->CompressedBufferType = type; - dsc->DataSize = size; - dsc->NumMBsInBuffer = mb_count; +#if CONFIG_D3D11VA + if (avctx->pix_fmt == AV_PIX_FMT_D3D11VA_VLD) { + D3D11_VIDEO_DECODER_BUFFER_DESC *dsc11 = dsc; + memset(dsc11, 0, sizeof(*dsc11)); + dsc11->BufferType = type; + dsc11->DataSize = size; + dsc11->NumMBsInBuffer = mb_count; + } +#endif +#if CONFIG_DXVA2 + if (avctx->pix_fmt == AV_PIX_FMT_DXVA2_VLD) { + DXVA2_DecodeBufferDesc *dsc2 = dsc; + memset(dsc2, 0, sizeof(*dsc2)); + dsc2->CompressedBufferType = type; + dsc2->DataSize = size; + dsc2->NumMBsInBuffer = mb_count; + } +#endif result = 0; } else { - av_log(avctx, AV_LOG_ERROR, "Buffer for type %d was too small\n", type); + av_log(avctx, AV_LOG_ERROR, "Buffer for type %u was too small\n", type); result = -1; } - if (FAILED(IDirectXVideoDecoder_ReleaseBuffer(ctx->decoder, type))) { - av_log(avctx, AV_LOG_ERROR, "Failed to release buffer type %d\n", type); + +#if CONFIG_D3D11VA + if (avctx->pix_fmt == AV_PIX_FMT_D3D11VA_VLD) + hr = ID3D11VideoContext_ReleaseDecoderBuffer(D3D11VA_CONTEXT(ctx)->video_context, D3D11VA_CONTEXT(ctx)->decoder, type); +#endif +#if CONFIG_DXVA2 + if (avctx->pix_fmt == AV_PIX_FMT_DXVA2_VLD) + hr = IDirectXVideoDecoder_ReleaseBuffer(DXVA2_CONTEXT(ctx)->decoder, type); +#endif + if (FAILED(hr)) { + av_log(avctx, AV_LOG_ERROR, + "Failed to release buffer type %u: 0x%lx\n", + type, hr); result = -1; } return result; } -int ff_dxva2_common_end_frame(AVCodecContext *avctx, MpegEncContext *s, +int ff_dxva2_common_end_frame(AVCodecContext *avctx, AVFrame *frame, const void *pp, unsigned pp_size, const void *qm, unsigned qm_size, int (*commit_bs_si)(AVCodecContext *, - DXVA2_DecodeBufferDesc *bs, - DXVA2_DecodeBufferDesc *slice)) + DECODER_BUFFER_DESC *bs, + DECODER_BUFFER_DESC *slice)) { - struct dxva_context *ctx = avctx->hwaccel_context; + AVDXVAContext *ctx = avctx->hwaccel_context; unsigned buffer_count = 0; - DXVA2_DecodeBufferDesc buffer[4]; - DXVA2_DecodeExecuteParams exec; - int result; +#if CONFIG_D3D11VA + D3D11_VIDEO_DECODER_BUFFER_DESC buffer11[4]; +#endif +#if CONFIG_DXVA2 + DXVA2_DecodeBufferDesc buffer2[4]; +#endif + DECODER_BUFFER_DESC *buffer,*buffer_slice; + int result, runs = 0; + HRESULT hr; + unsigned type; + + do { +#if CONFIG_D3D11VA + if (avctx->pix_fmt == AV_PIX_FMT_D3D11VA_VLD) { + if (D3D11VA_CONTEXT(ctx)->context_mutex != INVALID_HANDLE_VALUE) + WaitForSingleObjectEx(D3D11VA_CONTEXT(ctx)->context_mutex, INFINITE, FALSE); + hr = ID3D11VideoContext_DecoderBeginFrame(D3D11VA_CONTEXT(ctx)->video_context, D3D11VA_CONTEXT(ctx)->decoder, + ff_dxva2_get_surface(frame), + 0, NULL); + } +#endif +#if CONFIG_DXVA2 + if (avctx->pix_fmt == AV_PIX_FMT_DXVA2_VLD) + hr = IDirectXVideoDecoder_BeginFrame(DXVA2_CONTEXT(ctx)->decoder, + ff_dxva2_get_surface(frame), + NULL); +#endif + if (hr != E_PENDING || ++runs > 50) + break; +#if CONFIG_D3D11VA + if (avctx->pix_fmt == AV_PIX_FMT_D3D11VA_VLD) + if (D3D11VA_CONTEXT(ctx)->context_mutex != INVALID_HANDLE_VALUE) + ReleaseMutex(D3D11VA_CONTEXT(ctx)->context_mutex); +#endif + av_usleep(2000); + } while(1); - if (FAILED(IDirectXVideoDecoder_BeginFrame(ctx->decoder, - ff_dxva2_get_surface(s->current_picture_ptr), - NULL))) { - av_log(avctx, AV_LOG_ERROR, "Failed to begin frame\n"); + if (FAILED(hr)) { + av_log(avctx, AV_LOG_ERROR, "Failed to begin frame: 0x%lx\n", hr); +#if CONFIG_D3D11VA + if (avctx->pix_fmt == AV_PIX_FMT_D3D11VA_VLD) + if (D3D11VA_CONTEXT(ctx)->context_mutex != INVALID_HANDLE_VALUE) + ReleaseMutex(D3D11VA_CONTEXT(ctx)->context_mutex); +#endif return -1; } - result = ff_dxva2_commit_buffer(avctx, ctx, &buffer[buffer_count], - DXVA2_PictureParametersBufferType, +#if CONFIG_D3D11VA + if (avctx->pix_fmt == AV_PIX_FMT_D3D11VA_VLD) { + buffer = &buffer11[buffer_count]; + type = D3D11_VIDEO_DECODER_BUFFER_PICTURE_PARAMETERS; + } +#endif +#if CONFIG_DXVA2 + if (avctx->pix_fmt == AV_PIX_FMT_DXVA2_VLD) { + buffer = &buffer2[buffer_count]; + type = DXVA2_PictureParametersBufferType; + } +#endif + result = ff_dxva2_commit_buffer(avctx, ctx, buffer, + type, pp, pp_size, 0); if (result) { av_log(avctx, AV_LOG_ERROR, @@ -107,8 +211,20 @@ int ff_dxva2_common_end_frame(AVCodecContext *avctx, MpegEncContext *s, buffer_count++; if (qm_size > 0) { - result = ff_dxva2_commit_buffer(avctx, ctx, &buffer[buffer_count], - DXVA2_InverseQuantizationMatrixBufferType, +#if CONFIG_D3D11VA + if (avctx->pix_fmt == AV_PIX_FMT_D3D11VA_VLD) { + buffer = &buffer11[buffer_count]; + type = D3D11_VIDEO_DECODER_BUFFER_INVERSE_QUANTIZATION_MATRIX; + } +#endif +#if CONFIG_DXVA2 + if (avctx->pix_fmt == AV_PIX_FMT_DXVA2_VLD) { + buffer = &buffer2[buffer_count]; + type = DXVA2_InverseQuantizationMatrixBufferType; + } +#endif + result = ff_dxva2_commit_buffer(avctx, ctx, buffer, + type, qm, qm_size, 0); if (result) { av_log(avctx, AV_LOG_ERROR, @@ -118,9 +234,22 @@ int ff_dxva2_common_end_frame(AVCodecContext *avctx, MpegEncContext *s, buffer_count++; } +#if CONFIG_D3D11VA + if (avctx->pix_fmt == AV_PIX_FMT_D3D11VA_VLD) { + buffer = &buffer11[buffer_count + 0]; + buffer_slice = &buffer11[buffer_count + 1]; + } +#endif +#if CONFIG_DXVA2 + if (avctx->pix_fmt == AV_PIX_FMT_DXVA2_VLD) { + buffer = &buffer2[buffer_count + 0]; + buffer_slice = &buffer2[buffer_count + 1]; + } +#endif + result = commit_bs_si(avctx, - &buffer[buffer_count + 0], - &buffer[buffer_count + 1]); + buffer, + buffer_slice); if (result) { av_log(avctx, AV_LOG_ERROR, "Failed to add bitstream or slice control buffer\n"); @@ -132,23 +261,43 @@ int ff_dxva2_common_end_frame(AVCodecContext *avctx, MpegEncContext *s, assert(buffer_count == 1 + (qm_size > 0) + 2); - memset(&exec, 0, sizeof(exec)); - exec.NumCompBuffers = buffer_count; - exec.pCompressedBuffers = buffer; - exec.pExtensionData = NULL; - if (FAILED(IDirectXVideoDecoder_Execute(ctx->decoder, &exec))) { - av_log(avctx, AV_LOG_ERROR, "Failed to execute\n"); +#if CONFIG_D3D11VA + if (avctx->pix_fmt == AV_PIX_FMT_D3D11VA_VLD) + hr = ID3D11VideoContext_SubmitDecoderBuffers(D3D11VA_CONTEXT(ctx)->video_context, + D3D11VA_CONTEXT(ctx)->decoder, + buffer_count, buffer11); +#endif +#if CONFIG_DXVA2 + if (avctx->pix_fmt == AV_PIX_FMT_DXVA2_VLD) { + DXVA2_DecodeExecuteParams exec = { + .NumCompBuffers = buffer_count, + .pCompressedBuffers = buffer2, + .pExtensionData = NULL, + }; + hr = IDirectXVideoDecoder_Execute(DXVA2_CONTEXT(ctx)->decoder, &exec); + } +#endif + if (FAILED(hr)) { + av_log(avctx, AV_LOG_ERROR, "Failed to execute: 0x%lx\n", hr); result = -1; } end: - if (FAILED(IDirectXVideoDecoder_EndFrame(ctx->decoder, NULL))) { - av_log(avctx, AV_LOG_ERROR, "Failed to end frame\n"); +#if CONFIG_D3D11VA + if (avctx->pix_fmt == AV_PIX_FMT_D3D11VA_VLD) { + hr = ID3D11VideoContext_DecoderEndFrame(D3D11VA_CONTEXT(ctx)->video_context, D3D11VA_CONTEXT(ctx)->decoder); + if (D3D11VA_CONTEXT(ctx)->context_mutex != INVALID_HANDLE_VALUE) + ReleaseMutex(D3D11VA_CONTEXT(ctx)->context_mutex); + } +#endif +#if CONFIG_DXVA2 + if (avctx->pix_fmt == AV_PIX_FMT_DXVA2_VLD) + hr = IDirectXVideoDecoder_EndFrame(DXVA2_CONTEXT(ctx)->decoder, NULL); +#endif + if (FAILED(hr)) { + av_log(avctx, AV_LOG_ERROR, "Failed to end frame: 0x%lx\n", hr); result = -1; } - if (!result) - ff_draw_horiz_band(s, 0, s->avctx->height); return result; } -