diff -Nur ffmpeg-orig/libavcodec/cuviddec.c ffmpeg/libavcodec/cuviddec.c
|
old
|
new
|
|
| 547 | 547 | .Height = height, |
| 548 | 548 | }; |
| 549 | 549 | |
| 550 | | ret = CHECK_CU(ctx->cudl->cuMemcpy2DAsync(&cpy, device_hwctx->stream)); |
| | 550 | ret = CHECK_CU(ctx->cudl->cuMemcpy2D(&cpy)); |
| 551 | 551 | if (ret < 0) |
| 552 | 552 | goto error; |
| 553 | 553 | |
| 554 | 554 | offset += height; |
| 555 | 555 | } |
| 556 | 556 | |
| 557 | | ret = CHECK_CU(ctx->cudl->cuStreamSynchronize(device_hwctx->stream)); |
| 558 | | if (ret < 0) |
| 559 | | goto error; |
| 560 | 557 | } else if (avctx->pix_fmt == AV_PIX_FMT_NV12 || |
| 561 | 558 | avctx->pix_fmt == AV_PIX_FMT_P010 || |
| 562 | 559 | avctx->pix_fmt == AV_PIX_FMT_P016 || |
diff -Nur ffmpeg-orig/libavfilter/vf_yadif_cuda.c ffmpeg/libavfilter/vf_yadif_cuda.c
|
old
|
new
|
|
| 180 | 180 | parity, tff); |
| 181 | 181 | } |
| 182 | 182 | |
| 183 | | CHECK_CU(cu->cuStreamSynchronize(s->stream)); |
| 184 | | |
| 185 | 183 | exit: |
| 186 | 184 | CHECK_CU(cu->cuCtxPopCurrent(&dummy)); |
| 187 | 185 | return; |
diff -Nur ffmpeg-orig/libavutil/hwcontext_cuda.c ffmpeg/libavutil/hwcontext_cuda.c
|
old
|
new
|
|
| 221 | 221 | .Height = src->height >> (i ? priv->shift_height : 0), |
| 222 | 222 | }; |
| 223 | 223 | |
| 224 | | ret = CHECK_CU(cu->cuMemcpy2DAsync(&cpy, hwctx->stream)); |
| | 224 | ret = CHECK_CU(cu->cuMemcpy2D(&cpy)); |
| 225 | 225 | if (ret < 0) |
| 226 | 226 | goto exit; |
| 227 | 227 | } |
| 228 | 228 | |
| 229 | | ret = CHECK_CU(cu->cuStreamSynchronize(hwctx->stream)); |
| 230 | | if (ret < 0) |
| 231 | | goto exit; |
| 232 | | |
| 233 | 229 | exit: |
| 234 | 230 | CHECK_CU(cu->cuCtxPopCurrent(&dummy)); |
| 235 | 231 | |
| … |
… |
|
| 263 | 259 | .Height = src->height >> (i ? priv->shift_height : 0), |
| 264 | 260 | }; |
| 265 | 261 | |
| 266 | | ret = CHECK_CU(cu->cuMemcpy2DAsync(&cpy, hwctx->stream)); |
| | 262 | ret = CHECK_CU(cu->cuMemcpy2D(&cpy)); |
| 267 | 263 | if (ret < 0) |
| 268 | 264 | goto exit; |
| 269 | 265 | } |
| 270 | 266 | |
| 271 | | ret = CHECK_CU(cu->cuStreamSynchronize(hwctx->stream)); |
| 272 | | if (ret < 0) |
| 273 | | goto exit; |
| 274 | | |
| 275 | 267 | exit: |
| 276 | 268 | CHECK_CU(cu->cuCtxPopCurrent(&dummy)); |
| 277 | 269 | |