mirror of
https://github.com/librempeg/librempeg
synced 2024-11-22 18:49:58 +00:00
avutil/hwcontext_d3d12va: Use av_image_copy() wrapper
Avoids casts all over the place; in this case, it also replaces the unsafe cast uint8_t**->const uint8_t ** by the safe cast uint8_t**->const uint8_t * const*. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
parent
9a600e42eb
commit
34355c0343
@ -469,8 +469,8 @@ static int d3d12va_transfer_data(AVHWFramesContext *ctx, AVFrame *dst,
|
|||||||
DX_CHECK(ID3D12Resource_Map(s->staging_download_buffer, 0, NULL, (void **)&mapped_data));
|
DX_CHECK(ID3D12Resource_Map(s->staging_download_buffer, 0, NULL, (void **)&mapped_data));
|
||||||
av_image_fill_pointers(data, ctx->sw_format, ctx->height, mapped_data, linesizes);
|
av_image_fill_pointers(data, ctx->sw_format, ctx->height, mapped_data, linesizes);
|
||||||
|
|
||||||
av_image_copy(dst->data, dst->linesize, (const uint8_t **)data, linesizes,
|
av_image_copy2(dst->data, dst->linesize, data, linesizes,
|
||||||
ctx->sw_format, ctx->width, ctx->height);
|
ctx->sw_format, ctx->width, ctx->height);
|
||||||
|
|
||||||
ID3D12Resource_Unmap(s->staging_download_buffer, 0, NULL);
|
ID3D12Resource_Unmap(s->staging_download_buffer, 0, NULL);
|
||||||
} else {
|
} else {
|
||||||
@ -487,8 +487,8 @@ static int d3d12va_transfer_data(AVHWFramesContext *ctx, AVFrame *dst,
|
|||||||
DX_CHECK(ID3D12Resource_Map(s->staging_upload_buffer, 0, NULL, (void **)&mapped_data));
|
DX_CHECK(ID3D12Resource_Map(s->staging_upload_buffer, 0, NULL, (void **)&mapped_data));
|
||||||
av_image_fill_pointers(data, ctx->sw_format, ctx->height, mapped_data, linesizes);
|
av_image_fill_pointers(data, ctx->sw_format, ctx->height, mapped_data, linesizes);
|
||||||
|
|
||||||
av_image_copy(data, linesizes, (const uint8_t **)src->data, src->linesize,
|
av_image_copy2(data, linesizes, src->data, src->linesize,
|
||||||
ctx->sw_format, ctx->width, ctx->height);
|
ctx->sw_format, ctx->width, ctx->height);
|
||||||
|
|
||||||
ID3D12Resource_Unmap(s->staging_upload_buffer, 0, NULL);
|
ID3D12Resource_Unmap(s->staging_upload_buffer, 0, NULL);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user