Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update d3d12va #313

Merged
merged 2 commits into from
Apr 7, 2024
Merged

Update d3d12va #313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a64b75
d3d12va: manually add mem.h to fix the regression
tong1wu Apr 3, 2024
4283660
d3d11: add opencl mapping flag
tong1wu Apr 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ffmpeg
Open in desktop
Submodule ffmpeg updated 141 files
12 changes: 6 additions & 6 deletions patches/0119-avcodec-vaapi_encode-move-pic-input_surface-initiali.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 77a7132c29e0473acfeade068466c6f9076f7648 Mon Sep 17 00:00:00 2001
From 061eeda3b0f7808480b9ae6a89536dc9045aaff0 Mon Sep 17 00:00:00 2001
From: Tong Wu <tong1.wu@intel.com>
Date: Tue, 2 Jan 2024 11:08:46 +0800
Subject: [PATCH 01/11] avcodec/vaapi_encode: move pic->input_surface
Expand All @@ -14,10 +14,10 @@ Signed-off-by: Tong Wu <tong1.wu@intel.com>
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c
index 940f0678a5..bd8c624d7f 100644
index f54b2579ec..d4d885ed2f 100644
--- a/libavcodec/vaapi_encode.c
+++ b/libavcodec/vaapi_encode.c
@@ -878,7 +878,8 @@ static int vaapi_encode_discard(AVCodecContext *avctx,
@@ -879,7 +879,8 @@ static int vaapi_encode_discard(AVCodecContext *avctx,
return 0;
}

Expand All @@ -27,7 +27,7 @@ index 940f0678a5..bd8c624d7f 100644
{
VAAPIEncodeContext *ctx = avctx->priv_data;
VAAPIEncodePicture *pic;
@@ -895,7 +896,7 @@ static VAAPIEncodePicture *vaapi_encode_alloc(AVCodecContext *avctx)
@@ -896,7 +897,7 @@ static VAAPIEncodePicture *vaapi_encode_alloc(AVCodecContext *avctx)
}
}

Expand All @@ -36,7 +36,7 @@ index 940f0678a5..bd8c624d7f 100644
pic->recon_surface = VA_INVALID_ID;
pic->output_buffer = VA_INVALID_ID;

@@ -1331,7 +1332,7 @@ static int vaapi_encode_send_frame(AVCodecContext *avctx, AVFrame *frame)
@@ -1332,7 +1333,7 @@ static int vaapi_encode_send_frame(AVCodecContext *avctx, AVFrame *frame)
if (err < 0)
return err;

Expand All @@ -45,7 +45,7 @@ index 940f0678a5..bd8c624d7f 100644
if (!pic)
return AVERROR(ENOMEM);

@@ -1344,7 +1345,6 @@ static int vaapi_encode_send_frame(AVCodecContext *avctx, AVFrame *frame)
@@ -1345,7 +1346,6 @@ static int vaapi_encode_send_frame(AVCodecContext *avctx, AVFrame *frame)
if (ctx->input_order == 0 || frame->pict_type == AV_PICTURE_TYPE_I)
pic->force_idr = 1;

Expand Down
Loading