videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

Merge commit 'f01f7a7846529b7c3ef343f117eaa2c0a1457af0' 

* commit 'f01f7a7846529b7c3ef343f117eaa2c0a1457af0':
  hwcontext_dxva2: use the special UC copy for downloading frames

Merged-by: Clément Bœsch <u@pkh.me>
This commit is contained in:
Clément Bœsch 2017-03-20 08:37:40 +01:00
parent 8200b16a9c f01f7a7846
commit a5cf6628d6
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavutil/hwcontext_dxva2.c
View File

@ -293,8 +293,13 @@ static int dxva2_transfer_data(AVHWFramesContext *ctx, AVFrame *dst,
(uint8_t*)LockedRect.pBits, surf_linesize);
if (download) {
av_image_copy(dst->data, dst->linesize, surf_data, surf_linesize,
ctx->sw_format, src->width, src->height);
ptrdiff_t src_linesize1[4], dst_linesize1[4];
for (i = 0; i < 4; i++) {
dst_linesize1[i] = dst->linesize[i];
src_linesize1[i] = surf_linesize[i];
}
av_image_copy_uc_from(dst->data, dst_linesize1, surf_data, src_linesize1,
ctx->sw_format, src->width, src->height);
} else {
av_image_copy(surf_data, surf_linesize, src->data, src->linesize,
ctx->sw_format, src->width, src->height);