jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-08-02 15:37:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

ffmpeg: update rpi patch

Browse Source 
Patch created using revisions f719f86..4044f5f
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 18:24:26 +02:00
parent 8596d9d6df
commit cdb499a414
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
packages/multimedia/ffmpeg/patches/rpi/ffmpeg-001-rpi.patch
View File

@ -48973,16 +48973,21 @@ index 3e17e0fcac..b9f28220a8 100644
diff --git a/libavcodec/v4l2_req_decode_q.c b/libavcodec/v4l2_req_decode_q.c diff --git a/libavcodec/v4l2_req_decode_q.c b/libavcodec/v4l2_req_decode_q.c
new file mode 100644 new file mode 100644
index 0000000000..d14f3d6cf6 index 0000000000..2adbd5999b
--- /dev/null --- /dev/null
+++ b/libavcodec/v4l2_req_decode_q.c +++ b/libavcodec/v4l2_req_decode_q.c
@@ -0,0 +1,81 @@ @@ -0,0 +1,86 @@
+#include <memory.h> +#include <memory.h>
+#include <semaphore.h> +#include <semaphore.h>
+#include <pthread.h> +#include <pthread.h>
+ +
+#include "v4l2_req_decode_q.h" +#include "v4l2_req_decode_q.h"
+ +
+int decode_q_in_q(const req_decode_ent * const d)
+{
+ return d->in_q;
+}
+
+void decode_q_add(req_decode_q * const q, req_decode_ent * const d) +void decode_q_add(req_decode_q * const q, req_decode_ent * const d)
+{ +{
+ pthread_mutex_lock(&q->q_lock); + pthread_mutex_lock(&q->q_lock);
@ -49060,10 +49065,10 @@ index 0000000000..d14f3d6cf6
+ +
diff --git a/libavcodec/v4l2_req_decode_q.h b/libavcodec/v4l2_req_decode_q.h diff --git a/libavcodec/v4l2_req_decode_q.h b/libavcodec/v4l2_req_decode_q.h
new file mode 100644 new file mode 100644
index 0000000000..d6c9f34ddb index 0000000000..af7bbe1de4
--- /dev/null --- /dev/null
+++ b/libavcodec/v4l2_req_decode_q.h +++ b/libavcodec/v4l2_req_decode_q.h
@@ -0,0 +1,24 @@ @@ -0,0 +1,25 @@
+#ifndef AVCODEC_V4L2_REQ_DECODE_Q_H +#ifndef AVCODEC_V4L2_REQ_DECODE_Q_H
+#define AVCODEC_V4L2_REQ_DECODE_Q_H +#define AVCODEC_V4L2_REQ_DECODE_Q_H
+ +
@ -49080,6 +49085,7 @@ index 0000000000..d6c9f34ddb
+ req_decode_ent * tail; + req_decode_ent * tail;
+} req_decode_q; +} req_decode_q;
+ +
+int decode_q_in_q(const req_decode_ent * const d);
+void decode_q_add(req_decode_q * const q, req_decode_ent * const d); +void decode_q_add(req_decode_q * const q, req_decode_ent * const d);
+void decode_q_remove(req_decode_q * const q, req_decode_ent * const d); +void decode_q_remove(req_decode_q * const q, req_decode_ent * const d);
+void decode_q_wait(req_decode_q * const q, req_decode_ent * const d); +void decode_q_wait(req_decode_q * const q, req_decode_ent * const d);
@ -49884,10 +49890,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..3c109bcca9 index 0000000000..c628bd5ab4
--- /dev/null --- /dev/null
+++ b/libavcodec/v4l2_req_hevc_vx.c +++ b/libavcodec/v4l2_req_hevc_vx.c
@@ -0,0 +1,1182 @@ @@ -0,0 +1,1189 @@
+// 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"
@ -50801,6 +50807,13 @@ index 0000000000..3c109bcca9
+ unsigned int i; + unsigned int i;
+ int rv; + int rv;
+ +
+ // It is possible, though maybe a bug, to get an end_frame without
+ // a previous start_frame. If we do then give up.
+ if (!decode_q_in_q(&rd->decode_ent)) {
+ av_log(avctx, AV_LOG_DEBUG, "%s: Frame not in decode Q\n", __func__);
+ return AVERROR_INVALIDDATA;
+ }
+
+ { + {
+ const ScalingList *sl = h->ps.pps->scaling_list_data_present_flag ? + const ScalingList *sl = h->ps.pps->scaling_list_data_present_flag ?
+ &h->ps.pps->scaling_list : + &h->ps.pps->scaling_list :