ffmpeg: update rpi patch

Patch created using revisions f719f86..d2b6a63
from branch test/4.3.2/rpi_main of https://github.com/jc-kynesim/rpi-ffmpeg
This commit is contained in:
Matthias Reichl 2021-08-26 12:00:09 +02:00
parent 2add0ac0d6
commit 8596d9d6df

View File

@ -49884,10 +49884,10 @@ index 0000000000..42af98e156
+ +
diff --git a/libavcodec/v4l2_req_hevc_vx.c b/libavcodec/v4l2_req_hevc_vx.c diff --git a/libavcodec/v4l2_req_hevc_vx.c b/libavcodec/v4l2_req_hevc_vx.c
new file mode 100644 new file mode 100644
index 0000000000..4320cb4b65 index 0000000000..3c109bcca9
--- /dev/null --- /dev/null
+++ b/libavcodec/v4l2_req_hevc_vx.c +++ b/libavcodec/v4l2_req_hevc_vx.c
@@ -0,0 +1,1180 @@ @@ -0,0 +1,1182 @@
+// File included by v4l2_req_hevc_v* - not compiled on its own +// File included by v4l2_req_hevc_v* - not compiled on its own
+ +
+#include "decode.h" +#include "decode.h"
@ -50717,13 +50717,15 @@ index 0000000000..4320cb4b65
+static void v4l2_request_hevc_abort_frame(AVCodecContext * const avctx) +static void v4l2_request_hevc_abort_frame(AVCodecContext * const avctx)
+{ +{
+ const HEVCContext * const h = avctx->priv_data; + const HEVCContext * const h = avctx->priv_data;
+ V4L2MediaReqDescriptor * const rd = (V4L2MediaReqDescriptor*)h->ref->frame->data[0]; + if (h->ref != NULL) {
+ V4L2RequestContextHEVC * const ctx = avctx->internal->hwaccel_priv_data; + V4L2MediaReqDescriptor *const rd = (V4L2MediaReqDescriptor *)h->ref->frame->data[0];
+ V4L2RequestContextHEVC * const ctx = avctx->internal->hwaccel_priv_data;
+ +
+ media_request_abort(&rd->req); + media_request_abort(&rd->req);
+ mediabufs_src_qent_abort(ctx->mbufs, &rd->qe_src); + mediabufs_src_qent_abort(ctx->mbufs, &rd->qe_src);
+ +
+ decode_q_remove(&ctx->decode_q, &rd->decode_ent); + decode_q_remove(&ctx->decode_q, &rd->decode_ent);
+ }
+} +}
+ +
+static int send_slice(AVCodecContext * const avctx, +static int send_slice(AVCodecContext * const avctx,