avcodec: add D3D12VA hardware accelerated VC1 decoding
The command below is how to enable d3d12va: ffmpeg -hwaccel d3d12va -i input.mp4 output.mp4 Signed-off-by: Wu Jianhua <toqsxw@outlook.com> Signed-off-by: Tong Wu <tong1.wu@intel.com>
This commit is contained in:
parent
c6c05dd34a
commit
ffa158edbd
3
configure
vendored
3
configure
vendored
@ -3158,6 +3158,8 @@ vc1_d3d11va_hwaccel_deps="d3d11va"
|
|||||||
vc1_d3d11va_hwaccel_select="vc1_decoder"
|
vc1_d3d11va_hwaccel_select="vc1_decoder"
|
||||||
vc1_d3d11va2_hwaccel_deps="d3d11va"
|
vc1_d3d11va2_hwaccel_deps="d3d11va"
|
||||||
vc1_d3d11va2_hwaccel_select="vc1_decoder"
|
vc1_d3d11va2_hwaccel_select="vc1_decoder"
|
||||||
|
vc1_d3d12va_hwaccel_deps="d3d12va"
|
||||||
|
vc1_d3d12va_hwaccel_select="vc1_decoder"
|
||||||
vc1_dxva2_hwaccel_deps="dxva2"
|
vc1_dxva2_hwaccel_deps="dxva2"
|
||||||
vc1_dxva2_hwaccel_select="vc1_decoder"
|
vc1_dxva2_hwaccel_select="vc1_decoder"
|
||||||
vc1_nvdec_hwaccel_deps="nvdec"
|
vc1_nvdec_hwaccel_deps="nvdec"
|
||||||
@ -3188,6 +3190,7 @@ vp9_videotoolbox_hwaccel_deps="videotoolbox"
|
|||||||
vp9_videotoolbox_hwaccel_select="vp9_decoder"
|
vp9_videotoolbox_hwaccel_select="vp9_decoder"
|
||||||
wmv3_d3d11va_hwaccel_select="vc1_d3d11va_hwaccel"
|
wmv3_d3d11va_hwaccel_select="vc1_d3d11va_hwaccel"
|
||||||
wmv3_d3d11va2_hwaccel_select="vc1_d3d11va2_hwaccel"
|
wmv3_d3d11va2_hwaccel_select="vc1_d3d11va2_hwaccel"
|
||||||
|
wmv3_d3d12va_hwaccel_select="vc1_d3d12va_hwaccel"
|
||||||
wmv3_dxva2_hwaccel_select="vc1_dxva2_hwaccel"
|
wmv3_dxva2_hwaccel_select="vc1_dxva2_hwaccel"
|
||||||
wmv3_nvdec_hwaccel_select="vc1_nvdec_hwaccel"
|
wmv3_nvdec_hwaccel_select="vc1_nvdec_hwaccel"
|
||||||
wmv3_vaapi_hwaccel_select="vc1_vaapi_hwaccel"
|
wmv3_vaapi_hwaccel_select="vc1_vaapi_hwaccel"
|
||||||
|
@ -1039,6 +1039,7 @@ OBJS-$(CONFIG_MPEG4_VDPAU_HWACCEL) += vdpau_mpeg4.o
|
|||||||
OBJS-$(CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL) += videotoolbox.o
|
OBJS-$(CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL) += videotoolbox.o
|
||||||
OBJS-$(CONFIG_VC1_D3D11VA_HWACCEL) += dxva2_vc1.o
|
OBJS-$(CONFIG_VC1_D3D11VA_HWACCEL) += dxva2_vc1.o
|
||||||
OBJS-$(CONFIG_VC1_DXVA2_HWACCEL) += dxva2_vc1.o
|
OBJS-$(CONFIG_VC1_DXVA2_HWACCEL) += dxva2_vc1.o
|
||||||
|
OBJS-$(CONFIG_VC1_D3D12VA_HWACCEL) += dxva2_vc1.o d3d12va_vc1.o
|
||||||
OBJS-$(CONFIG_VC1_NVDEC_HWACCEL) += nvdec_vc1.o
|
OBJS-$(CONFIG_VC1_NVDEC_HWACCEL) += nvdec_vc1.o
|
||||||
OBJS-$(CONFIG_VC1_QSV_HWACCEL) += qsvdec.o
|
OBJS-$(CONFIG_VC1_QSV_HWACCEL) += qsvdec.o
|
||||||
OBJS-$(CONFIG_VC1_VAAPI_HWACCEL) += vaapi_vc1.o
|
OBJS-$(CONFIG_VC1_VAAPI_HWACCEL) += vaapi_vc1.o
|
||||||
|
214
libavcodec/d3d12va_vc1.c
Normal file
214
libavcodec/d3d12va_vc1.c
Normal file
@ -0,0 +1,214 @@
|
|||||||
|
/*
|
||||||
|
* Direct3D12 WMV3/VC-1 HW acceleration
|
||||||
|
*
|
||||||
|
* copyright (c) 2022-2023 Wu Jianhua <toqsxw@outlook.com>
|
||||||
|
*
|
||||||
|
* 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 "config_components.h"
|
||||||
|
#include "libavutil/avassert.h"
|
||||||
|
#include "libavutil/hwcontext_d3d12va_internal.h"
|
||||||
|
#include "mpegutils.h"
|
||||||
|
#include "mpegvideodec.h"
|
||||||
|
#include "vc1.h"
|
||||||
|
#include "vc1data.h"
|
||||||
|
#include "d3d12va_decode.h"
|
||||||
|
#include "dxva2_internal.h"
|
||||||
|
|
||||||
|
#define MAX_SLICES 1024
|
||||||
|
#define INVALID_REF 0xffff
|
||||||
|
|
||||||
|
#define REF_RESOURCE(index) if (index != INVALID_REF) { \
|
||||||
|
ctx->ref_resources[index] = frames_hwctx->texture_infos[index].texture; \
|
||||||
|
}
|
||||||
|
|
||||||
|
typedef struct D3D12DecodePictureContext {
|
||||||
|
DXVA_PictureParameters pp;
|
||||||
|
unsigned slice_count;
|
||||||
|
DXVA_SliceInfo slices[MAX_SLICES];
|
||||||
|
const uint8_t *bitstream;
|
||||||
|
unsigned bitstream_size;
|
||||||
|
} D3D12DecodePictureContext;
|
||||||
|
|
||||||
|
static int d3d12va_vc1_start_frame(AVCodecContext *avctx, av_unused const uint8_t *buffer, av_unused uint32_t size)
|
||||||
|
{
|
||||||
|
const VC1Context *v = avctx->priv_data;
|
||||||
|
D3D12VADecodeContext *ctx = D3D12VA_DECODE_CONTEXT(avctx);
|
||||||
|
D3D12DecodePictureContext *ctx_pic = v->s.current_picture_ptr->hwaccel_picture_private;
|
||||||
|
|
||||||
|
if (!ctx)
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
av_assert0(ctx_pic);
|
||||||
|
|
||||||
|
ctx->used_mask = 0;
|
||||||
|
|
||||||
|
ff_dxva2_vc1_fill_picture_parameters(avctx, (AVDXVAContext *)ctx, &ctx_pic->pp);
|
||||||
|
ctx_pic->pp.wDeblockedPictureIndex = INVALID_REF;
|
||||||
|
|
||||||
|
ctx_pic->bitstream = NULL;
|
||||||
|
ctx_pic->bitstream_size = 0;
|
||||||
|
ctx_pic->slice_count = 0;
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int d3d12va_vc1_decode_slice(AVCodecContext *avctx, const uint8_t *buffer, uint32_t size)
|
||||||
|
{
|
||||||
|
const VC1Context *v = avctx->priv_data;
|
||||||
|
D3D12DecodePictureContext *ctx_pic = v->s.current_picture_ptr->hwaccel_picture_private;
|
||||||
|
|
||||||
|
if (ctx_pic->slice_count >= MAX_SLICES) {
|
||||||
|
return AVERROR(ERANGE);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (avctx->codec_id == AV_CODEC_ID_VC1 &&
|
||||||
|
size >= 4 && IS_MARKER(AV_RB32(buffer))) {
|
||||||
|
buffer += 4;
|
||||||
|
size -= 4;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!ctx_pic->bitstream)
|
||||||
|
ctx_pic->bitstream = buffer;
|
||||||
|
ctx_pic->bitstream_size += size;
|
||||||
|
|
||||||
|
ff_dxva2_vc1_fill_slice(avctx, &ctx_pic->slices[ctx_pic->slice_count++],
|
||||||
|
buffer - ctx_pic->bitstream, size);
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int update_input_arguments(AVCodecContext *avctx, D3D12_VIDEO_DECODE_INPUT_STREAM_ARGUMENTS *input_args, ID3D12Resource *buffer)
|
||||||
|
{
|
||||||
|
D3D12VADecodeContext *ctx = D3D12VA_DECODE_CONTEXT(avctx);
|
||||||
|
AVHWFramesContext *frames_ctx = D3D12VA_FRAMES_CONTEXT(avctx);
|
||||||
|
AVD3D12VAFramesContext *frames_hwctx = frames_ctx->hwctx;
|
||||||
|
const VC1Context *v = avctx->priv_data;
|
||||||
|
const MpegEncContext *s = &v->s;
|
||||||
|
D3D12DecodePictureContext *ctx_pic = s->current_picture_ptr->hwaccel_picture_private;
|
||||||
|
D3D12_VIDEO_DECODE_FRAME_ARGUMENT *args = &input_args->FrameArguments[input_args->NumFrameArguments++];
|
||||||
|
|
||||||
|
const unsigned mb_count = s->mb_width * (s->mb_height >> v->field_mode);
|
||||||
|
uint8_t *mapped_data, *mapped_ptr;
|
||||||
|
|
||||||
|
static const uint8_t start_code[] = { 0, 0, 1, 0x0d };
|
||||||
|
|
||||||
|
if (FAILED(ID3D12Resource_Map(buffer, 0, NULL, &mapped_data))) {
|
||||||
|
av_log(avctx, AV_LOG_ERROR, "Failed to map D3D12 Buffer resource!\n");
|
||||||
|
return AVERROR(EINVAL);
|
||||||
|
}
|
||||||
|
|
||||||
|
mapped_ptr = mapped_data;
|
||||||
|
for (int i = 0; i < ctx_pic->slice_count; i++) {
|
||||||
|
DXVA_SliceInfo *slice = &ctx_pic->slices[i];
|
||||||
|
unsigned position = slice->dwSliceDataLocation;
|
||||||
|
unsigned size = slice->dwSliceBitsInBuffer / 8;
|
||||||
|
|
||||||
|
slice->dwSliceDataLocation = mapped_ptr - mapped_data;
|
||||||
|
if (i < ctx_pic->slice_count - 1)
|
||||||
|
slice->wNumberMBsInSlice = slice[1].wNumberMBsInSlice - slice[0].wNumberMBsInSlice;
|
||||||
|
else
|
||||||
|
slice->wNumberMBsInSlice = mb_count - slice[0].wNumberMBsInSlice;
|
||||||
|
|
||||||
|
if (avctx->codec_id == AV_CODEC_ID_VC1) {
|
||||||
|
memcpy(mapped_ptr, start_code, sizeof(start_code));
|
||||||
|
if (i == 0 && v->second_field)
|
||||||
|
mapped_ptr[3] = 0x0c;
|
||||||
|
else if (i > 0)
|
||||||
|
mapped_ptr[3] = 0x0b;
|
||||||
|
|
||||||
|
mapped_ptr += sizeof(start_code);
|
||||||
|
slice->dwSliceBitsInBuffer += sizeof(start_code) * 8;
|
||||||
|
}
|
||||||
|
|
||||||
|
memcpy(mapped_ptr, &ctx_pic->bitstream[position], size);
|
||||||
|
mapped_ptr += size;
|
||||||
|
}
|
||||||
|
|
||||||
|
ID3D12Resource_Unmap(buffer, 0, NULL);
|
||||||
|
|
||||||
|
args->Type = D3D12_VIDEO_DECODE_ARGUMENT_TYPE_SLICE_CONTROL;
|
||||||
|
args->Size = sizeof(DXVA_SliceInfo) * ctx_pic->slice_count;
|
||||||
|
args->pData = ctx_pic->slices;
|
||||||
|
|
||||||
|
input_args->CompressedBitstream = (D3D12_VIDEO_DECODE_COMPRESSED_BITSTREAM){
|
||||||
|
.pBuffer = buffer,
|
||||||
|
.Offset = 0,
|
||||||
|
.Size = mapped_ptr - mapped_data,
|
||||||
|
};
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int d3d12va_vc1_end_frame(AVCodecContext *avctx)
|
||||||
|
{
|
||||||
|
const VC1Context *v = avctx->priv_data;
|
||||||
|
D3D12DecodePictureContext *ctx_pic = v->s.current_picture_ptr->hwaccel_picture_private;
|
||||||
|
|
||||||
|
if (ctx_pic->slice_count <= 0 || ctx_pic->bitstream_size <= 0)
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
return ff_d3d12va_common_end_frame(avctx, v->s.current_picture_ptr->f,
|
||||||
|
&ctx_pic->pp, sizeof(ctx_pic->pp),
|
||||||
|
NULL, 0,
|
||||||
|
update_input_arguments);
|
||||||
|
}
|
||||||
|
|
||||||
|
static int d3d12va_vc1_decode_init(AVCodecContext *avctx)
|
||||||
|
{
|
||||||
|
D3D12VADecodeContext *ctx = D3D12VA_DECODE_CONTEXT(avctx);
|
||||||
|
ctx->cfg.DecodeProfile = D3D12_VIDEO_DECODE_PROFILE_VC1;
|
||||||
|
|
||||||
|
ctx->max_num_ref = 3;
|
||||||
|
|
||||||
|
return ff_d3d12va_decode_init(avctx);
|
||||||
|
}
|
||||||
|
|
||||||
|
#if CONFIG_WMV3_D3D12VA_HWACCEL
|
||||||
|
const FFHWAccel ff_wmv3_d3d12va_hwaccel = {
|
||||||
|
.p.name = "wmv3_d3d12va",
|
||||||
|
.p.type = AVMEDIA_TYPE_VIDEO,
|
||||||
|
.p.id = AV_CODEC_ID_WMV3,
|
||||||
|
.p.pix_fmt = AV_PIX_FMT_D3D12,
|
||||||
|
.init = d3d12va_vc1_decode_init,
|
||||||
|
.uninit = ff_d3d12va_decode_uninit,
|
||||||
|
.start_frame = d3d12va_vc1_start_frame,
|
||||||
|
.decode_slice = d3d12va_vc1_decode_slice,
|
||||||
|
.end_frame = d3d12va_vc1_end_frame,
|
||||||
|
.frame_params = ff_d3d12va_common_frame_params,
|
||||||
|
.frame_priv_data_size = sizeof(D3D12DecodePictureContext),
|
||||||
|
.priv_data_size = sizeof(D3D12VADecodeContext),
|
||||||
|
};
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if CONFIG_VC1_D3D12VA_HWACCEL
|
||||||
|
const FFHWAccel ff_vc1_d3d12va_hwaccel = {
|
||||||
|
.p.name = "vc1_d3d12va",
|
||||||
|
.p.type = AVMEDIA_TYPE_VIDEO,
|
||||||
|
.p.id = AV_CODEC_ID_VC1,
|
||||||
|
.p.pix_fmt = AV_PIX_FMT_D3D12,
|
||||||
|
.init = d3d12va_vc1_decode_init,
|
||||||
|
.uninit = ff_d3d12va_decode_uninit,
|
||||||
|
.start_frame = d3d12va_vc1_start_frame,
|
||||||
|
.decode_slice = d3d12va_vc1_decode_slice,
|
||||||
|
.end_frame = d3d12va_vc1_end_frame,
|
||||||
|
.frame_params = ff_d3d12va_common_frame_params,
|
||||||
|
.frame_priv_data_size = sizeof(D3D12DecodePictureContext),
|
||||||
|
.priv_data_size = sizeof(D3D12VADecodeContext),
|
||||||
|
};
|
||||||
|
#endif
|
@ -187,4 +187,8 @@ void ff_dxva2_mpeg2_fill_quantization_matrices(AVCodecContext *avctx, AVDXVACont
|
|||||||
|
|
||||||
void ff_dxva2_mpeg2_fill_slice(AVCodecContext *avctx, DXVA_SliceInfo *slice, unsigned position, const uint8_t *buffer, unsigned size);
|
void ff_dxva2_mpeg2_fill_slice(AVCodecContext *avctx, DXVA_SliceInfo *slice, unsigned position, const uint8_t *buffer, unsigned size);
|
||||||
|
|
||||||
|
void ff_dxva2_vc1_fill_picture_parameters(AVCodecContext *avctx, AVDXVAContext *ctx, DXVA_PictureParameters *pp);
|
||||||
|
|
||||||
|
void ff_dxva2_vc1_fill_slice(AVCodecContext *avctx, DXVA_SliceInfo *slice, unsigned position, unsigned size);
|
||||||
|
|
||||||
#endif /* AVCODEC_DXVA2_INTERNAL_H */
|
#endif /* AVCODEC_DXVA2_INTERNAL_H */
|
||||||
|
@ -40,10 +40,11 @@ struct dxva2_picture_context {
|
|||||||
unsigned bitstream_size;
|
unsigned bitstream_size;
|
||||||
};
|
};
|
||||||
|
|
||||||
static void fill_picture_parameters(AVCodecContext *avctx,
|
void ff_dxva2_vc1_fill_picture_parameters(AVCodecContext *avctx,
|
||||||
AVDXVAContext *ctx, const VC1Context *v,
|
AVDXVAContext *ctx,
|
||||||
DXVA_PictureParameters *pp)
|
DXVA_PictureParameters *pp)
|
||||||
{
|
{
|
||||||
|
const VC1Context *v = avctx->priv_data;
|
||||||
const MpegEncContext *s = &v->s;
|
const MpegEncContext *s = &v->s;
|
||||||
const Picture *current_picture = s->current_picture_ptr;
|
const Picture *current_picture = s->current_picture_ptr;
|
||||||
int intcomp = 0;
|
int intcomp = 0;
|
||||||
@ -57,8 +58,6 @@ static void fill_picture_parameters(AVCodecContext *avctx,
|
|||||||
}
|
}
|
||||||
|
|
||||||
memset(pp, 0, sizeof(*pp));
|
memset(pp, 0, sizeof(*pp));
|
||||||
pp->wDecodedPictureIndex =
|
|
||||||
pp->wDeblockedPictureIndex = ff_dxva2_get_surface_index(avctx, ctx, current_picture->f, 1);
|
|
||||||
if (s->pict_type != AV_PICTURE_TYPE_I && !v->bi_type)
|
if (s->pict_type != AV_PICTURE_TYPE_I && !v->bi_type)
|
||||||
pp->wForwardRefPictureIndex = ff_dxva2_get_surface_index(avctx, ctx, s->last_picture.f, 0);
|
pp->wForwardRefPictureIndex = ff_dxva2_get_surface_index(avctx, ctx, s->last_picture.f, 0);
|
||||||
else
|
else
|
||||||
@ -67,6 +66,8 @@ static void fill_picture_parameters(AVCodecContext *avctx,
|
|||||||
pp->wBackwardRefPictureIndex = ff_dxva2_get_surface_index(avctx, ctx, s->next_picture.f, 0);
|
pp->wBackwardRefPictureIndex = ff_dxva2_get_surface_index(avctx, ctx, s->next_picture.f, 0);
|
||||||
else
|
else
|
||||||
pp->wBackwardRefPictureIndex = 0xffff;
|
pp->wBackwardRefPictureIndex = 0xffff;
|
||||||
|
pp->wDecodedPictureIndex =
|
||||||
|
pp->wDeblockedPictureIndex = ff_dxva2_get_surface_index(avctx, ctx, current_picture->f, 1);
|
||||||
if (v->profile == PROFILE_ADVANCED) {
|
if (v->profile == PROFILE_ADVANCED) {
|
||||||
/* It is the cropped width/height -1 of the frame */
|
/* It is the cropped width/height -1 of the frame */
|
||||||
pp->wPicWidthInMBminus1 = avctx->width - 1;
|
pp->wPicWidthInMBminus1 = avctx->width - 1;
|
||||||
@ -163,7 +164,7 @@ static void fill_picture_parameters(AVCodecContext *avctx,
|
|||||||
pp->bBitstreamConcealmentMethod = 0;
|
pp->bBitstreamConcealmentMethod = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void fill_slice(AVCodecContext *avctx, DXVA_SliceInfo *slice,
|
void ff_dxva2_vc1_fill_slice(AVCodecContext *avctx, DXVA_SliceInfo *slice,
|
||||||
unsigned position, unsigned size)
|
unsigned position, unsigned size)
|
||||||
{
|
{
|
||||||
const VC1Context *v = avctx->priv_data;
|
const VC1Context *v = avctx->priv_data;
|
||||||
@ -322,7 +323,7 @@ static int dxva2_vc1_start_frame(AVCodecContext *avctx,
|
|||||||
return -1;
|
return -1;
|
||||||
assert(ctx_pic);
|
assert(ctx_pic);
|
||||||
|
|
||||||
fill_picture_parameters(avctx, ctx, v, &ctx_pic->pp);
|
ff_dxva2_vc1_fill_picture_parameters(avctx, ctx, &ctx_pic->pp);
|
||||||
|
|
||||||
ctx_pic->slice_count = 0;
|
ctx_pic->slice_count = 0;
|
||||||
ctx_pic->bitstream_size = 0;
|
ctx_pic->bitstream_size = 0;
|
||||||
@ -356,7 +357,7 @@ static int dxva2_vc1_decode_slice(AVCodecContext *avctx,
|
|||||||
ctx_pic->bitstream_size += size;
|
ctx_pic->bitstream_size += size;
|
||||||
|
|
||||||
position = buffer - ctx_pic->bitstream;
|
position = buffer - ctx_pic->bitstream;
|
||||||
fill_slice(avctx, &ctx_pic->slice[ctx_pic->slice_count++], position, size);
|
ff_dxva2_vc1_fill_slice(avctx, &ctx_pic->slice[ctx_pic->slice_count++], position, size);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -67,6 +67,7 @@ extern const struct FFHWAccel ff_mpeg4_videotoolbox_hwaccel;
|
|||||||
extern const struct FFHWAccel ff_prores_videotoolbox_hwaccel;
|
extern const struct FFHWAccel ff_prores_videotoolbox_hwaccel;
|
||||||
extern const struct FFHWAccel ff_vc1_d3d11va_hwaccel;
|
extern const struct FFHWAccel ff_vc1_d3d11va_hwaccel;
|
||||||
extern const struct FFHWAccel ff_vc1_d3d11va2_hwaccel;
|
extern const struct FFHWAccel ff_vc1_d3d11va2_hwaccel;
|
||||||
|
extern const struct FFHWAccel ff_vc1_d3d12va_hwaccel;
|
||||||
extern const struct FFHWAccel ff_vc1_dxva2_hwaccel;
|
extern const struct FFHWAccel ff_vc1_dxva2_hwaccel;
|
||||||
extern const struct FFHWAccel ff_vc1_nvdec_hwaccel;
|
extern const struct FFHWAccel ff_vc1_nvdec_hwaccel;
|
||||||
extern const struct FFHWAccel ff_vc1_vaapi_hwaccel;
|
extern const struct FFHWAccel ff_vc1_vaapi_hwaccel;
|
||||||
@ -83,6 +84,7 @@ extern const struct FFHWAccel ff_vp9_vdpau_hwaccel;
|
|||||||
extern const struct FFHWAccel ff_vp9_videotoolbox_hwaccel;
|
extern const struct FFHWAccel ff_vp9_videotoolbox_hwaccel;
|
||||||
extern const struct FFHWAccel ff_wmv3_d3d11va_hwaccel;
|
extern const struct FFHWAccel ff_wmv3_d3d11va_hwaccel;
|
||||||
extern const struct FFHWAccel ff_wmv3_d3d11va2_hwaccel;
|
extern const struct FFHWAccel ff_wmv3_d3d11va2_hwaccel;
|
||||||
|
extern const struct FFHWAccel ff_wmv3_d3d12va_hwaccel;
|
||||||
extern const struct FFHWAccel ff_wmv3_dxva2_hwaccel;
|
extern const struct FFHWAccel ff_wmv3_dxva2_hwaccel;
|
||||||
extern const struct FFHWAccel ff_wmv3_nvdec_hwaccel;
|
extern const struct FFHWAccel ff_wmv3_nvdec_hwaccel;
|
||||||
extern const struct FFHWAccel ff_wmv3_vaapi_hwaccel;
|
extern const struct FFHWAccel ff_wmv3_vaapi_hwaccel;
|
||||||
|
@ -1373,6 +1373,9 @@ static const enum AVPixelFormat vc1_hwaccel_pixfmt_list_420[] = {
|
|||||||
AV_PIX_FMT_D3D11VA_VLD,
|
AV_PIX_FMT_D3D11VA_VLD,
|
||||||
AV_PIX_FMT_D3D11,
|
AV_PIX_FMT_D3D11,
|
||||||
#endif
|
#endif
|
||||||
|
#if CONFIG_VC1_D3D12VA_HWACCEL
|
||||||
|
AV_PIX_FMT_D3D12,
|
||||||
|
#endif
|
||||||
#if CONFIG_VC1_NVDEC_HWACCEL
|
#if CONFIG_VC1_NVDEC_HWACCEL
|
||||||
AV_PIX_FMT_CUDA,
|
AV_PIX_FMT_CUDA,
|
||||||
#endif
|
#endif
|
||||||
@ -1408,6 +1411,9 @@ const FFCodec ff_vc1_decoder = {
|
|||||||
#if CONFIG_VC1_D3D11VA2_HWACCEL
|
#if CONFIG_VC1_D3D11VA2_HWACCEL
|
||||||
HWACCEL_D3D11VA2(vc1),
|
HWACCEL_D3D11VA2(vc1),
|
||||||
#endif
|
#endif
|
||||||
|
#if CONFIG_VC1_D3D12VA_HWACCEL
|
||||||
|
HWACCEL_D3D12VA(vc1),
|
||||||
|
#endif
|
||||||
#if CONFIG_VC1_NVDEC_HWACCEL
|
#if CONFIG_VC1_NVDEC_HWACCEL
|
||||||
HWACCEL_NVDEC(vc1),
|
HWACCEL_NVDEC(vc1),
|
||||||
#endif
|
#endif
|
||||||
@ -1445,6 +1451,9 @@ const FFCodec ff_wmv3_decoder = {
|
|||||||
#if CONFIG_WMV3_D3D11VA2_HWACCEL
|
#if CONFIG_WMV3_D3D11VA2_HWACCEL
|
||||||
HWACCEL_D3D11VA2(wmv3),
|
HWACCEL_D3D11VA2(wmv3),
|
||||||
#endif
|
#endif
|
||||||
|
#if CONFIG_WMV3_D3D12VA_HWACCEL
|
||||||
|
HWACCEL_D3D12VA(wmv3),
|
||||||
|
#endif
|
||||||
#if CONFIG_WMV3_NVDEC_HWACCEL
|
#if CONFIG_WMV3_NVDEC_HWACCEL
|
||||||
HWACCEL_NVDEC(wmv3),
|
HWACCEL_NVDEC(wmv3),
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
Reference in New Issue
Block a user