It is not public.
---
libavcodec/dxva2.c | 10 +++++-----
libavcodec/dxva2_av1.c | 6 +++---
libavcodec/dxva2_h264.c | 14 +++++++-------
libavcodec/dxva2_hevc.c | 8 ++++----
libavcodec/dxva2_internal.h | 10 +++++-----
libavcodec/dxva2_mpeg2.c | 8 ++++----
libavcodec/dxva2_vc1.c | 6 +++---
libavcodec/dxva2_vp9.c | 6 +++---
8 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/libavcodec/dxva2.c b/libavcodec/dxva2.c
index 568d686f39..c31a71ba3b 100644
--- a/libavcodec/dxva2.c
+++ b/libavcodec/dxva2.c
@@ -562,7 +562,7 @@ static void ff_dxva2_lock(AVCodecContext *avctx)
#if CONFIG_D3D11VA
if (ff_dxva2_is_d3d11(avctx)) {
FFDXVASharedContext *sctx = DXVA_SHARED_CONTEXT(avctx);
- AVDXVAContext *ctx = DXVA_CONTEXT(avctx);
+ DXVAContext *ctx = DXVA_CONTEXT(avctx);
if (D3D11VA_CONTEXT(ctx)->context_mutex != INVALID_HANDLE_VALUE)
WaitForSingleObjectEx(D3D11VA_CONTEXT(ctx)->context_mutex,
INFINITE, FALSE);
if (sctx->device_ctx) {
@@ -578,7 +578,7 @@ static void ff_dxva2_unlock(AVCodecContext *avctx)
#if CONFIG_D3D11VA
if (ff_dxva2_is_d3d11(avctx)) {
FFDXVASharedContext *sctx = DXVA_SHARED_CONTEXT(avctx);
- AVDXVAContext *ctx = DXVA_CONTEXT(avctx);
+ DXVAContext *ctx = DXVA_CONTEXT(avctx);
if (D3D11VA_CONTEXT(ctx)->context_mutex != INVALID_HANDLE_VALUE)
ReleaseMutex(D3D11VA_CONTEXT(ctx)->context_mutex);
if (sctx->device_ctx) {
@@ -768,7 +768,7 @@ static void *get_surface(const AVCodecContext *avctx, const
AVFrame *frame)
}
unsigned ff_dxva2_get_surface_index(const AVCodecContext *avctx,
- const AVDXVAContext *ctx,
+ const DXVAContext *ctx,
const AVFrame *frame)
{
void *surface = get_surface(avctx, frame);
@@ -795,7 +795,7 @@ unsigned ff_dxva2_get_surface_index(const AVCodecContext
*avctx,
}
int ff_dxva2_commit_buffer(AVCodecContext *avctx,
- AVDXVAContext *ctx,
+ DXVAContext *ctx,
DECODER_BUFFER_DESC *dsc,
unsigned type, const void *data, unsigned size,
unsigned mb_count)
@@ -890,7 +890,7 @@ int ff_dxva2_common_end_frame(AVCodecContext *avctx,
AVFrame *frame,
DECODER_BUFFER_DESC *bs,
DECODER_BUFFER_DESC *slice))
{
- AVDXVAContext *ctx = DXVA_CONTEXT(avctx);
+ DXVAContext *ctx = DXVA_CONTEXT(avctx);
unsigned buffer_count = 0;
#if CONFIG_D3D11VA
D3D11_VIDEO_DECODER_BUFFER_DESC buffer11[4];
diff --git a/libavcodec/dxva2_av1.c b/libavcodec/dxva2_av1.c
index 7b4483f855..66a4594550 100644
--- a/libavcodec/dxva2_av1.c
+++ b/libavcodec/dxva2_av1.c
@@ -53,7 +53,7 @@ static int get_bit_depth_from_seq(const AV1RawSequenceHeader
*seq)
return 8;
}
-static int fill_picture_parameters(const AVCodecContext *avctx, AVDXVAContext
*ctx, const AV1DecContext *h,
+static int fill_picture_parameters(const AVCodecContext *avctx, DXVAContext
*ctx, const AV1DecContext *h,
DXVA_PicParams_AV1 *pp)
{
int i,j, uses_lr;
@@ -270,7 +270,7 @@ static int dxva2_av1_start_frame(AVCodecContext *avctx,
av_unused uint32_t size)
{
const AV1DecContext *h = avctx->priv_data;
- AVDXVAContext *ctx = DXVA_CONTEXT(avctx);
+ DXVAContext *ctx = DXVA_CONTEXT(avctx);
struct av1_dxva2_picture_context *ctx_pic =
h->cur_frame.hwaccel_picture_private;
if (!DXVA_CONTEXT_VALID(avctx, ctx))
@@ -346,7 +346,7 @@ static int commit_bitstream_and_slice_buffer(AVCodecContext
*avctx,
DECODER_BUFFER_DESC *sc)
{
const AV1DecContext *h = avctx->priv_data;
- AVDXVAContext *ctx = DXVA_CONTEXT(avctx);
+ DXVAContext *ctx = DXVA_CONTEXT(avctx);
struct av1_dxva2_picture_context *ctx_pic =
h->cur_frame.hwaccel_picture_private;
void *dxva_data_ptr;
uint8_t *dxva_data;
diff --git a/libavcodec/dxva2_h264.c b/libavcodec/dxva2_h264.c
index 5b23b28f12..489b9bb0f5 100644
--- a/libavcodec/dxva2_h264.c
+++ b/libavcodec/dxva2_h264.c
@@ -45,7 +45,7 @@ static void fill_picture_entry(DXVA_PicEntry_H264 *pic,
pic->bPicEntry = index | (flag << 7);
}
-static void fill_picture_parameters(const AVCodecContext *avctx, AVDXVAContext
*ctx, const H264Context *h,
+static void fill_picture_parameters(const AVCodecContext *avctx, DXVAContext
*ctx, const H264Context *h,
DXVA_PicParams_H264 *pp)
{
const H264Picture *current_picture = h->cur_pic_ptr;
@@ -161,7 +161,7 @@ static void fill_picture_parameters(const AVCodecContext
*avctx, AVDXVAContext *
//pp->SliceGroupMap[810]; /* XXX not implemented by FFmpeg */
}
-static void fill_scaling_lists(const AVCodecContext *avctx, AVDXVAContext
*ctx, const H264Context *h, DXVA_Qmatrix_H264 *qm)
+static void fill_scaling_lists(const AVCodecContext *avctx, DXVAContext *ctx,
const H264Context *h, DXVA_Qmatrix_H264 *qm)
{
const PPS *pps = h->ps.pps;
unsigned i, j;
@@ -187,7 +187,7 @@ static void fill_scaling_lists(const AVCodecContext *avctx,
AVDXVAContext *ctx,
}
}
-static int is_slice_short(const AVCodecContext *avctx, AVDXVAContext *ctx)
+static int is_slice_short(const AVCodecContext *avctx, DXVAContext *ctx)
{
assert(DXVA_CONTEXT_CFG_BITSTREAM(avctx, ctx) == 1 ||
DXVA_CONTEXT_CFG_BITSTREAM(avctx, ctx) == 2);
@@ -218,7 +218,7 @@ static void fill_slice_long(AVCodecContext *avctx,
DXVA_Slice_H264_Long *slice,
{
const H264Context *h = avctx->priv_data;
H264SliceContext *sl = &h->slice_ctx[0];
- AVDXVAContext *ctx = DXVA_CONTEXT(avctx);
+ DXVAContext *ctx = DXVA_CONTEXT(avctx);
unsigned list;
memset(slice, 0, sizeof(*slice));
@@ -300,7 +300,7 @@ static int commit_bitstream_and_slice_buffer(AVCodecContext
*avctx,
{
const H264Context *h = avctx->priv_data;
const unsigned mb_count = h->mb_width * h->mb_height;
- AVDXVAContext *ctx = DXVA_CONTEXT(avctx);
+ DXVAContext *ctx = DXVA_CONTEXT(avctx);
const H264Picture *current_picture = h->cur_pic_ptr;
struct dxva2_picture_context *ctx_pic =
current_picture->hwaccel_picture_private;
DXVA_Slice_H264_Short *slice = NULL;
@@ -443,7 +443,7 @@ static int dxva2_h264_start_frame(AVCodecContext *avctx,
av_unused uint32_t size)
{
const H264Context *h = avctx->priv_data;
- AVDXVAContext *ctx = DXVA_CONTEXT(avctx);
+ DXVAContext *ctx = DXVA_CONTEXT(avctx);
struct dxva2_picture_context *ctx_pic =
h->cur_pic_ptr->hwaccel_picture_private;
if (!DXVA_CONTEXT_VALID(avctx, ctx))
@@ -468,7 +468,7 @@ static int dxva2_h264_decode_slice(AVCodecContext *avctx,
{
const H264Context *h = avctx->priv_data;
const H264SliceContext *sl = &h->slice_ctx[0];
- AVDXVAContext *ctx = DXVA_CONTEXT(avctx);
+ DXVAContext *ctx = DXVA_CONTEXT(avctx);
const H264Picture *current_picture = h->cur_pic_ptr;
struct dxva2_picture_context *ctx_pic =
current_picture->hwaccel_picture_private;
unsigned position;
diff --git a/libavcodec/dxva2_hevc.c b/libavcodec/dxva2_hevc.c
index dbb701fb1c..ba8bbd28c7 100644
--- a/libavcodec/dxva2_hevc.c
+++ b/libavcodec/dxva2_hevc.c
@@ -54,7 +54,7 @@ static int get_refpic_index(const DXVA_PicParams_HEVC *pp,
int surface_index)
return 0xff;
}
-static void fill_picture_parameters(const AVCodecContext *avctx, AVDXVAContext
*ctx, const HEVCContext *h,
+static void fill_picture_parameters(const AVCodecContext *avctx, DXVAContext
*ctx, const HEVCContext *h,
DXVA_PicParams_HEVC *pp)
{
const HEVCFrame *current_picture = h->ref;
@@ -197,7 +197,7 @@ static void fill_picture_parameters(const AVCodecContext
*avctx, AVDXVAContext *
pp->StatusReportFeedbackNumber = 1 + DXVA_CONTEXT_REPORT_ID(avctx, ctx)++;
}
-static void fill_scaling_lists(AVDXVAContext *ctx, const HEVCContext *h,
DXVA_Qmatrix_HEVC *qm)
+static void fill_scaling_lists(DXVAContext *ctx, const HEVCContext *h,
DXVA_Qmatrix_HEVC *qm)
{
unsigned i, j, pos;
const ScalingList *sl = h->ps.pps->scaling_list_data_present_flag ?
@@ -239,7 +239,7 @@ static int commit_bitstream_and_slice_buffer(AVCodecContext
*avctx,
DECODER_BUFFER_DESC *sc)
{
const HEVCContext *h = avctx->priv_data;
- AVDXVAContext *ctx = DXVA_CONTEXT(avctx);
+ DXVAContext *ctx = DXVA_CONTEXT(avctx);
const HEVCFrame *current_picture = h->ref;
struct hevc_dxva2_picture_context *ctx_pic =
current_picture->hwaccel_picture_private;
DXVA_Slice_HEVC_Short *slice = NULL;
@@ -358,7 +358,7 @@ static int dxva2_hevc_start_frame(AVCodecContext *avctx,
av_unused uint32_t size)
{
const HEVCContext *h = avctx->priv_data;
- AVDXVAContext *ctx = DXVA_CONTEXT(avctx);
+ DXVAContext *ctx = DXVA_CONTEXT(avctx);
struct hevc_dxva2_picture_context *ctx_pic =
h->ref->hwaccel_picture_private;
if (!DXVA_CONTEXT_VALID(avctx, ctx))
diff --git a/libavcodec/dxva2_internal.h b/libavcodec/dxva2_internal.h
index b822af59cd..d14b696a3b 100644
--- a/libavcodec/dxva2_internal.h
+++ b/libavcodec/dxva2_internal.h
@@ -62,7 +62,7 @@ typedef union {
#if CONFIG_DXVA2
struct dxva_context dxva2;
#endif
-} AVDXVAContext;
+} DXVAContext;
typedef struct FFDXVASharedContext {
AVBufferRef *decoder_ref;
@@ -91,12 +91,12 @@ typedef struct FFDXVASharedContext {
// Legacy (but used by code outside of setup)
// In generic mode, DXVA_CONTEXT() will return a pointer to this.
- AVDXVAContext ctx;
+ DXVAContext ctx;
} FFDXVASharedContext;
#define DXVA_SHARED_CONTEXT(avctx) ((FFDXVASharedContext
*)((avctx)->internal->hwaccel_priv_data))
-#define DXVA_CONTEXT(avctx) (AVDXVAContext *)((avctx)->hwaccel_context ?
(avctx)->hwaccel_context : (&(DXVA_SHARED_CONTEXT(avctx)->ctx)))
+#define DXVA_CONTEXT(avctx) (DXVAContext *)((avctx)->hwaccel_context ?
(avctx)->hwaccel_context : (&(DXVA_SHARED_CONTEXT(avctx)->ctx)))
#define D3D11VA_CONTEXT(ctx) (&ctx->d3d11va)
#define DXVA2_CONTEXT(ctx) (&ctx->dxva2)
@@ -136,10 +136,10 @@ typedef struct FFDXVASharedContext {
#endif
unsigned ff_dxva2_get_surface_index(const AVCodecContext *avctx,
- const AVDXVAContext *,
+ const DXVAContext *,
const AVFrame *frame);
-int ff_dxva2_commit_buffer(AVCodecContext *, AVDXVAContext *,
+int ff_dxva2_commit_buffer(AVCodecContext *, DXVAContext *,
DECODER_BUFFER_DESC *,
unsigned type, const void *data, unsigned size,
unsigned mb_count);
diff --git a/libavcodec/dxva2_mpeg2.c b/libavcodec/dxva2_mpeg2.c
index 136f5f9e06..d2935b3620 100644
--- a/libavcodec/dxva2_mpeg2.c
+++ b/libavcodec/dxva2_mpeg2.c
@@ -38,7 +38,7 @@ struct dxva2_picture_context {
};
static void fill_picture_parameters(AVCodecContext *avctx,
- AVDXVAContext *ctx,
+ DXVAContext *ctx,
const struct MpegEncContext *s,
DXVA_PictureParameters *pp)
{
@@ -104,7 +104,7 @@ static void fill_picture_parameters(AVCodecContext *avctx,
}
static void fill_quantization_matrices(AVCodecContext *avctx,
- AVDXVAContext *ctx,
+ DXVAContext *ctx,
const struct MpegEncContext *s,
DXVA_QmatrixData *qm)
{
@@ -152,7 +152,7 @@ static int commit_bitstream_and_slice_buffer(AVCodecContext
*avctx,
DECODER_BUFFER_DESC *sc)
{
const struct MpegEncContext *s = avctx->priv_data;
- AVDXVAContext *ctx = DXVA_CONTEXT(avctx);
+ DXVAContext *ctx = DXVA_CONTEXT(avctx);
struct dxva2_picture_context *ctx_pic =
s->current_picture_ptr->hwaccel_picture_private;
const int is_field = s->picture_structure != PICT_FRAME;
@@ -255,7 +255,7 @@ static int dxva2_mpeg2_start_frame(AVCodecContext *avctx,
av_unused uint32_t size)
{
const struct MpegEncContext *s = avctx->priv_data;
- AVDXVAContext *ctx = DXVA_CONTEXT(avctx);
+ DXVAContext *ctx = DXVA_CONTEXT(avctx);
struct dxva2_picture_context *ctx_pic =
s->current_picture_ptr->hwaccel_picture_private;
diff --git a/libavcodec/dxva2_vc1.c b/libavcodec/dxva2_vc1.c
index 5fd6957d0c..5be6272855 100644
--- a/libavcodec/dxva2_vc1.c
+++ b/libavcodec/dxva2_vc1.c
@@ -38,7 +38,7 @@ struct dxva2_picture_context {
};
static void fill_picture_parameters(AVCodecContext *avctx,
- AVDXVAContext *ctx, const VC1Context *v,
+ DXVAContext *ctx, const VC1Context *v,
DXVA_PictureParameters *pp)
{
const MpegEncContext *s = &v->s;
@@ -185,7 +185,7 @@ static int commit_bitstream_and_slice_buffer(AVCodecContext
*avctx,
DECODER_BUFFER_DESC *sc)
{
const VC1Context *v = avctx->priv_data;
- AVDXVAContext *ctx = DXVA_CONTEXT(avctx);
+ DXVAContext *ctx = DXVA_CONTEXT(avctx);
const MpegEncContext *s = &v->s;
struct dxva2_picture_context *ctx_pic =
s->current_picture_ptr->hwaccel_picture_private;
@@ -312,7 +312,7 @@ static int dxva2_vc1_start_frame(AVCodecContext *avctx,
av_unused uint32_t size)
{
const VC1Context *v = avctx->priv_data;
- AVDXVAContext *ctx = DXVA_CONTEXT(avctx);
+ DXVAContext *ctx = DXVA_CONTEXT(avctx);
struct dxva2_picture_context *ctx_pic =
v->s.current_picture_ptr->hwaccel_picture_private;
if (!DXVA_CONTEXT_VALID(avctx, ctx))
diff --git a/libavcodec/dxva2_vp9.c b/libavcodec/dxva2_vp9.c
index eaeab3af7a..f7762b9e06 100644
--- a/libavcodec/dxva2_vp9.c
+++ b/libavcodec/dxva2_vp9.c
@@ -40,7 +40,7 @@ static void fill_picture_entry(DXVA_PicEntry_VPx *pic,
pic->bPicEntry = index | (flag << 7);
}
-static int fill_picture_parameters(const AVCodecContext *avctx, AVDXVAContext
*ctx, const VP9SharedContext *h,
+static int fill_picture_parameters(const AVCodecContext *avctx, DXVAContext
*ctx, const VP9SharedContext *h,
DXVA_PicParams_VP9 *pp)
{
int i;
@@ -166,7 +166,7 @@ static int commit_bitstream_and_slice_buffer(AVCodecContext
*avctx,
DECODER_BUFFER_DESC *sc)
{
const VP9SharedContext *h = avctx->priv_data;
- AVDXVAContext *ctx = DXVA_CONTEXT(avctx);
+ DXVAContext *ctx = DXVA_CONTEXT(avctx);
struct vp9_dxva2_picture_context *ctx_pic =
h->frames[CUR_FRAME].hwaccel_picture_private;
void *dxva_data_ptr;
uint8_t *dxva_data;
@@ -254,7 +254,7 @@ static int dxva2_vp9_start_frame(AVCodecContext *avctx,
av_unused uint32_t size)
{
const VP9SharedContext *h = avctx->priv_data;
- AVDXVAContext *ctx = DXVA_CONTEXT(avctx);
+ DXVAContext *ctx = DXVA_CONTEXT(avctx);
struct vp9_dxva2_picture_context *ctx_pic =
h->frames[CUR_FRAME].hwaccel_picture_private;
if (!DXVA_CONTEXT_VALID(avctx, ctx))
--
2.34.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
