D3DLOCKED_RECT LockedRect;
HRESULT hr;
int i, err, nb_planes;
+ int lock_flags = 0;
nb_planes = av_pix_fmt_count_planes(dst->format);
return AVERROR_UNKNOWN;
}
- hr = IDirect3DSurface9_LockRect(surface, &LockedRect, NULL,
- flags & AV_HWFRAME_MAP_READ ? D3DLOCK_READONLY : D3DLOCK_DISCARD);
+ if (!(flags & AV_HWFRAME_MAP_WRITE))
+ lock_flags |= D3DLOCK_READONLY;
+ if (flags & AV_HWFRAME_MAP_OVERWRITE)
+ lock_flags |= D3DLOCK_DISCARD;
+
+ hr = IDirect3DSurface9_LockRect(surface, &LockedRect, NULL, lock_flags);
if (FAILED(hr)) {
av_log(ctx, AV_LOG_ERROR, "Unable to lock DXVA2 surface\n");
return AVERROR_UNKNOWN;
return err;
}
-static int dxva2_transfer_data(AVHWFramesContext *ctx, AVFrame *dst,
- const AVFrame *src)
+static int dxva2_transfer_data_to(AVHWFramesContext *ctx, AVFrame *dst,
+ const AVFrame *src)
{
- int download = !!src->hw_frames_ctx;
+ AVFrame *map;
+ int ret;
+
+ if (src->format != ctx->sw_format)
+ return AVERROR(ENOSYS);
+
+ map = av_frame_alloc();
+ if (!map)
+ return AVERROR(ENOMEM);
+ map->format = dst->format;
+
+ ret = dxva2_map_frame(ctx, map, dst, AV_HWFRAME_MAP_WRITE | AV_HWFRAME_MAP_OVERWRITE);
+ if (ret < 0)
+ goto fail;
+ av_image_copy(map->data, map->linesize, src->data, src->linesize,
+ ctx->sw_format, src->width, src->height);
+
+fail:
+ av_frame_free(&map);
+ return ret;
+}
+
+static int dxva2_transfer_data_from(AVHWFramesContext *ctx, AVFrame *dst,
+ const AVFrame *src)
+{
AVFrame *map;
+ ptrdiff_t src_linesize[4], dst_linesize[4];
int ret, i;
+ if (dst->format != ctx->sw_format)
+ return AVERROR(ENOSYS);
+
map = av_frame_alloc();
if (!map)
return AVERROR(ENOMEM);
map->format = dst->format;
- ret = dxva2_map_frame(ctx, map, download ? src : dst,
- download ? AV_HWFRAME_MAP_READ : AV_HWFRAME_MAP_WRITE);
+ ret = dxva2_map_frame(ctx, map, src, AV_HWFRAME_MAP_READ);
if (ret < 0)
goto fail;
- if (download) {
- ptrdiff_t src_linesize[4], dst_linesize[4];
- for (i = 0; i < 4; i++) {
- dst_linesize[i] = dst->linesize[i];
- src_linesize[i] = map->linesize[i];
- }
- av_image_copy_uc_from(dst->data, dst_linesize, map->data, src_linesize,
- ctx->sw_format, src->width, src->height);
- } else {
- av_image_copy(map->data, map->linesize, src->data, src->linesize,
- ctx->sw_format, src->width, src->height);
+ for (i = 0; i < 4; i++) {
+ dst_linesize[i] = dst->linesize[i];
+ src_linesize[i] = map->linesize[i];
}
-
+ av_image_copy_uc_from(dst->data, dst_linesize, map->data, src_linesize,
+ ctx->sw_format, src->width, src->height);
fail:
av_frame_free(&map);
return ret;
{
int err;
+ if (dst->format != AV_PIX_FMT_NONE && dst->format != ctx->sw_format)
+ return AVERROR(ENOSYS);
+ dst->format = ctx->sw_format;
+
err = dxva2_map_frame(ctx, dst, src, flags);
if (err < 0)
return err;
.frames_uninit = dxva2_frames_uninit,
.frames_get_buffer = dxva2_get_buffer,
.transfer_get_formats = dxva2_transfer_get_formats,
- .transfer_data_to = dxva2_transfer_data,
- .transfer_data_from = dxva2_transfer_data,
+ .transfer_data_to = dxva2_transfer_data_to,
+ .transfer_data_from = dxva2_transfer_data_from,
.map_from = dxva2_map_from,
.pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_DXVA2_VLD, AV_PIX_FMT_NONE },