jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-31 14:37:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6280 from HiassofT/le11-ffmpeg-4

Browse Source 
ffmpeg: update rpi patch
This commit is contained in:
CvH 2022-03-05 13:37:50 +01:00 committed by GitHub
commit 7ba47515cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 156 additions and 205 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46342,7 +46342,7 @@ index 0000000000..85c5b46d75
+}; +};
+ +
diff --git a/libavcodec/v4l2_buffers.c b/libavcodec/v4l2_buffers.c diff --git a/libavcodec/v4l2_buffers.c b/libavcodec/v4l2_buffers.c
index 4b2679eb38..6c02417dc4 100644 index 4b2679eb38..6ee6ad8642 100644
--- a/libavcodec/v4l2_buffers.c --- a/libavcodec/v4l2_buffers.c
+++ b/libavcodec/v4l2_buffers.c +++ b/libavcodec/v4l2_buffers.c
@@ -21,6 +21,7 @@ @@ -21,6 +21,7 @@
@ -47026,11 +47026,13 @@ index 4b2679eb38..6c02417dc4 100644
return 0; return 0;
} }
@@ -411,7 +681,14 @@ static int v4l2_buffer_swframe_to_buf(const AVFrame *frame, V4L2Buffer *out) @@ -411,7 +681,16 @@ static int v4l2_buffer_swframe_to_buf(const AVFrame *frame, V4L2Buffer *out)
int ff_v4l2_buffer_avframe_to_buf(const AVFrame *frame, V4L2Buffer *out) int ff_v4l2_buffer_avframe_to_buf(const AVFrame *frame, V4L2Buffer *out)
{ {
+ out->buf.flags = frame->key_frame ? (out->buf.flags & ~V4L2_BUF_FLAG_KEYFRAME) : (out->buf.flags | V4L2_BUF_FLAG_KEYFRAME); + out->buf.flags = frame->key_frame ?
+ (out->buf.flags | V4L2_BUF_FLAG_KEYFRAME) :
+ (out->buf.flags & ~V4L2_BUF_FLAG_KEYFRAME);
+ // Beware that colour info is held in format rather than the actual + // Beware that colour info is held in format rather than the actual
+ // v4l2 buffer struct so this may not be as useful as you might hope + // v4l2 buffer struct so this may not be as useful as you might hope
+ v4l2_set_color(out, frame->color_primaries, frame->colorspace, frame->color_trc); + v4l2_set_color(out, frame->color_primaries, frame->colorspace, frame->color_trc);
@ -47041,7 +47043,7 @@ index 4b2679eb38..6c02417dc4 100644
return v4l2_buffer_swframe_to_buf(frame, out); return v4l2_buffer_swframe_to_buf(frame, out);
} }
@@ -419,6 +696,7 @@ int ff_v4l2_buffer_avframe_to_buf(const AVFrame *frame, V4L2Buffer *out) @@ -419,6 +698,7 @@ int ff_v4l2_buffer_avframe_to_buf(const AVFrame *frame, V4L2Buffer *out)
int ff_v4l2_buffer_buf_to_avframe(AVFrame *frame, V4L2Buffer *avbuf) int ff_v4l2_buffer_buf_to_avframe(AVFrame *frame, V4L2Buffer *avbuf)
{ {
int ret; int ret;
@ -47049,7 +47051,17 @@ index 4b2679eb38..6c02417dc4 100644
av_frame_unref(frame); av_frame_unref(frame);
@@ -435,11 +713,22 @@ int ff_v4l2_buffer_buf_to_avframe(AVFrame *frame, V4L2Buffer *avbuf) @@ -429,17 +709,32 @@ int ff_v4l2_buffer_buf_to_avframe(AVFrame *frame, V4L2Buffer *avbuf)
/* 2. get frame information */
frame->key_frame = !!(avbuf->buf.flags & V4L2_BUF_FLAG_KEYFRAME);
+ frame->pict_type = frame->key_frame ? AV_PICTURE_TYPE_I :
+ (avbuf->buf.flags & V4L2_BUF_FLAG_PFRAME) != 0 ? AV_PICTURE_TYPE_P :
+ (avbuf->buf.flags & V4L2_BUF_FLAG_BFRAME) != 0 ? AV_PICTURE_TYPE_B :
+ AV_PICTURE_TYPE_NONE;
frame->color_primaries = v4l2_get_color_primaries(avbuf);
frame->colorspace = v4l2_get_color_space(avbuf);
frame->color_range = v4l2_get_color_range(avbuf);
frame->color_trc = v4l2_get_color_trc(avbuf); frame->color_trc = v4l2_get_color_trc(avbuf);
frame->pts = v4l2_get_pts(avbuf); frame->pts = v4l2_get_pts(avbuf);
frame->pkt_dts = AV_NOPTS_VALUE; frame->pkt_dts = AV_NOPTS_VALUE;
@ -47075,13 +47087,12 @@ index 4b2679eb38..6c02417dc4 100644
/* 3. report errors upstream */ /* 3. report errors upstream */
if (avbuf->buf.flags & V4L2_BUF_FLAG_ERROR) { if (avbuf->buf.flags & V4L2_BUF_FLAG_ERROR) {
@@ -452,15 +741,16 @@ int ff_v4l2_buffer_buf_to_avframe(AVFrame *frame, V4L2Buffer *avbuf) @@ -452,15 +747,14 @@ int ff_v4l2_buffer_buf_to_avframe(AVFrame *frame, V4L2Buffer *avbuf)
int ff_v4l2_buffer_buf_to_avpkt(AVPacket *pkt, V4L2Buffer *avbuf) int ff_v4l2_buffer_buf_to_avpkt(AVPacket *pkt, V4L2Buffer *avbuf)
{ {
- int ret; - int ret;
+ av_log(logger(avbuf), AV_LOG_INFO, "%s\n", __func__); -
av_packet_unref(pkt); av_packet_unref(pkt);
- ret = v4l2_buf_to_bufref(avbuf, 0, &pkt->buf); - ret = v4l2_buf_to_bufref(avbuf, 0, &pkt->buf);
- if (ret) - if (ret)
@ -47097,7 +47108,7 @@ index 4b2679eb38..6c02417dc4 100644
if (avbuf->buf.flags & V4L2_BUF_FLAG_KEYFRAME) if (avbuf->buf.flags & V4L2_BUF_FLAG_KEYFRAME)
pkt->flags |= AV_PKT_FLAG_KEY; pkt->flags |= AV_PKT_FLAG_KEY;
@@ -475,12 +765,19 @@ int ff_v4l2_buffer_buf_to_avpkt(AVPacket *pkt, V4L2Buffer *avbuf) @@ -475,31 +769,85 @@ int ff_v4l2_buffer_buf_to_avpkt(AVPacket *pkt, V4L2Buffer *avbuf)
return 0; return 0;
} }
@ -47120,9 +47131,12 @@ index 4b2679eb38..6c02417dc4 100644
return ret; return ret;
v4l2_set_pts(out, pkt->pts); v4l2_set_pts(out, pkt->pts);
@@ -488,18 +785,64 @@ int ff_v4l2_buffer_avpkt_to_buf(const AVPacket *pkt, V4L2Buffer *out)
if (pkt->flags & AV_PKT_FLAG_KEY) - if (pkt->flags & AV_PKT_FLAG_KEY)
out->flags = V4L2_BUF_FLAG_KEYFRAME; - out->flags = V4L2_BUF_FLAG_KEYFRAME;
+ out->buf.flags = (pkt->flags & AV_PKT_FLAG_KEY) != 0 ?
+ (out->buf.flags | V4L2_BUF_FLAG_KEYFRAME) :
+ (out->buf.flags & ~V4L2_BUF_FLAG_KEYFRAME);
- return 0; - return 0;
+ return ret; + return ret;
@ -47167,13 +47181,13 @@ index 4b2679eb38..6c02417dc4 100644
+ *pbufref = NULL; + *pbufref = NULL;
+ if (avbuf == NULL) + if (avbuf == NULL)
+ return AVERROR(ENOMEM); + return AVERROR(ENOMEM);
+
+ bufref = av_buffer_create((uint8_t*)avbuf, sizeof(*avbuf), v4l2_buffer_buffer_free, NULL, 0); + bufref = av_buffer_create((uint8_t*)avbuf, sizeof(*avbuf), v4l2_buffer_buffer_free, NULL, 0);
+ if (bufref == NULL) { + if (bufref == NULL) {
+ av_free(avbuf); + av_free(avbuf);
+ return AVERROR(ENOMEM); + return AVERROR(ENOMEM);
+ } + }
+
+ avbuf->context = ctx; + avbuf->context = ctx;
avbuf->buf.memory = V4L2_MEMORY_MMAP; avbuf->buf.memory = V4L2_MEMORY_MMAP;
avbuf->buf.type = ctx->type; avbuf->buf.type = ctx->type;
@ -47188,7 +47202,7 @@ index 4b2679eb38..6c02417dc4 100644
if (V4L2_TYPE_IS_MULTIPLANAR(ctx->type)) { if (V4L2_TYPE_IS_MULTIPLANAR(ctx->type)) {
avbuf->buf.length = VIDEO_MAX_PLANES; avbuf->buf.length = VIDEO_MAX_PLANES;
avbuf->buf.m.planes = avbuf->planes; avbuf->buf.m.planes = avbuf->planes;
@@ -507,7 +850,7 @@ int ff_v4l2_buffer_initialize(V4L2Buffer* avbuf, int index) @@ -507,7 +855,7 @@ int ff_v4l2_buffer_initialize(V4L2Buffer* avbuf, int index)
ret = ioctl(buf_to_m2mctx(avbuf)->fd, VIDIOC_QUERYBUF, &avbuf->buf); ret = ioctl(buf_to_m2mctx(avbuf)->fd, VIDIOC_QUERYBUF, &avbuf->buf);
if (ret < 0) if (ret < 0)
@ -47197,7 +47211,7 @@ index 4b2679eb38..6c02417dc4 100644
if (V4L2_TYPE_IS_MULTIPLANAR(ctx->type)) { if (V4L2_TYPE_IS_MULTIPLANAR(ctx->type)) {
avbuf->num_planes = 0; avbuf->num_planes = 0;
@@ -527,25 +870,33 @@ int ff_v4l2_buffer_initialize(V4L2Buffer* avbuf, int index) @@ -527,25 +875,33 @@ int ff_v4l2_buffer_initialize(V4L2Buffer* avbuf, int index)
if (V4L2_TYPE_IS_MULTIPLANAR(ctx->type)) { if (V4L2_TYPE_IS_MULTIPLANAR(ctx->type)) {
avbuf->plane_info[i].length = avbuf->buf.m.planes[i].length; avbuf->plane_info[i].length = avbuf->buf.m.planes[i].length;
@ -47242,7 +47256,7 @@ index 4b2679eb38..6c02417dc4 100644
if (V4L2_TYPE_IS_MULTIPLANAR(ctx->type)) { if (V4L2_TYPE_IS_MULTIPLANAR(ctx->type)) {
avbuf->buf.m.planes = avbuf->planes; avbuf->buf.m.planes = avbuf->planes;
avbuf->buf.length = avbuf->num_planes; avbuf->buf.length = avbuf->num_planes;
@@ -555,18 +906,49 @@ int ff_v4l2_buffer_initialize(V4L2Buffer* avbuf, int index) @@ -555,18 +911,47 @@ int ff_v4l2_buffer_initialize(V4L2Buffer* avbuf, int index)
avbuf->buf.length = avbuf->planes[0].length; avbuf->buf.length = avbuf->planes[0].length;
} }
@ -47268,15 +47282,14 @@ index 4b2679eb38..6c02417dc4 100644
int ret; int ret;
+ int qc; + int qc;
avbuf->buf.flags = avbuf->flags; - avbuf->buf.flags = avbuf->flags;
+ if (avbuf->buf.timestamp.tv_sec || avbuf->buf.timestamp.tv_usec) { + if (avbuf->buf.timestamp.tv_sec || avbuf->buf.timestamp.tv_usec) {
+ av_log(logger(avbuf), AV_LOG_DEBUG, "--- %s pre VIDIOC_QBUF: index %d, ts=%ld.%06ld count=%d\n", + av_log(logger(avbuf), AV_LOG_DEBUG, "--- %s pre VIDIOC_QBUF: index %d, ts=%ld.%06ld count=%d\n",
+ avbuf->context->name, avbuf->buf.index, + avbuf->context->name, avbuf->buf.index,
+ avbuf->buf.timestamp.tv_sec, avbuf->buf.timestamp.tv_usec, + avbuf->buf.timestamp.tv_sec, avbuf->buf.timestamp.tv_usec,
+ avbuf->context->q_count); + avbuf->context->q_count);
+ } + }
+
ret = ioctl(buf_to_m2mctx(avbuf)->fd, VIDIOC_QBUF, &avbuf->buf); ret = ioctl(buf_to_m2mctx(avbuf)->fd, VIDIOC_QBUF, &avbuf->buf);
- if (ret < 0) - if (ret < 0)
- return AVERROR(errno); - return AVERROR(errno);
@ -47296,7 +47309,7 @@ index 4b2679eb38..6c02417dc4 100644
avbuf->status = V4L2BUF_IN_DRIVER; avbuf->status = V4L2BUF_IN_DRIVER;
diff --git a/libavcodec/v4l2_buffers.h b/libavcodec/v4l2_buffers.h diff --git a/libavcodec/v4l2_buffers.h b/libavcodec/v4l2_buffers.h
index 8dbc7fc104..52fab26c6d 100644 index 8dbc7fc104..7d5fadcd3d 100644
--- a/libavcodec/v4l2_buffers.h --- a/libavcodec/v4l2_buffers.h
+++ b/libavcodec/v4l2_buffers.h +++ b/libavcodec/v4l2_buffers.h
@@ -27,25 +27,34 @@ @@ -27,25 +27,34 @@
@ -47339,7 +47352,15 @@ index 8dbc7fc104..52fab26c6d 100644
/* keep track of the mmap address and mmap length */ /* keep track of the mmap address and mmap length */
struct V4L2Plane_info { struct V4L2Plane_info {
@@ -98,6 +107,9 @@ int ff_v4l2_buffer_buf_to_avpkt(AVPacket *pkt, V4L2Buffer *buf); @@ -60,7 +69,6 @@ typedef struct V4L2Buffer {
struct v4l2_buffer buf;
struct v4l2_plane planes[VIDEO_MAX_PLANES];
- int flags;
enum V4L2Buffer_status status;
} V4L2Buffer;
@@ -98,6 +106,9 @@ int ff_v4l2_buffer_buf_to_avpkt(AVPacket *pkt, V4L2Buffer *buf);
*/ */
int ff_v4l2_buffer_avpkt_to_buf(const AVPacket *pkt, V4L2Buffer *out); int ff_v4l2_buffer_avpkt_to_buf(const AVPacket *pkt, V4L2Buffer *out);
@ -47349,7 +47370,7 @@ index 8dbc7fc104..52fab26c6d 100644
/** /**
* Extracts the data from an AVFrame to a V4L2Buffer * Extracts the data from an AVFrame to a V4L2Buffer
* *
@@ -116,7 +128,7 @@ int ff_v4l2_buffer_avframe_to_buf(const AVFrame *frame, V4L2Buffer *out); @@ -116,7 +127,7 @@ int ff_v4l2_buffer_avframe_to_buf(const AVFrame *frame, V4L2Buffer *out);
* *
* @returns 0 in case of success, a negative AVERROR code otherwise * @returns 0 in case of success, a negative AVERROR code otherwise
*/ */
@ -47359,7 +47380,7 @@ index 8dbc7fc104..52fab26c6d 100644
/** /**
* Enqueues a V4L2Buffer * Enqueues a V4L2Buffer
diff --git a/libavcodec/v4l2_context.c b/libavcodec/v4l2_context.c diff --git a/libavcodec/v4l2_context.c b/libavcodec/v4l2_context.c
index ff1ea8e57b..3274e24430 100644 index ff1ea8e57b..b2c40636a2 100644
--- a/libavcodec/v4l2_context.c --- a/libavcodec/v4l2_context.c
+++ b/libavcodec/v4l2_context.c +++ b/libavcodec/v4l2_context.c
@@ -27,11 +27,13 @@ @@ -27,11 +27,13 @@
@ -47413,6 +47434,12 @@ index ff1ea8e57b..3274e24430 100644
-static inline unsigned int v4l2_resolution_changed(V4L2Context *ctx, struct v4l2_format *fmt2) -static inline unsigned int v4l2_resolution_changed(V4L2Context *ctx, struct v4l2_format *fmt2)
+static inline int ctx_buffers_alloced(const V4L2Context * const ctx) +static inline int ctx_buffers_alloced(const V4L2Context * const ctx)
+{
+ return ctx->bufrefs != NULL;
+}
+
+// Width/Height changed or we don't have an alloc in the first place?
+static int ctx_resolution_changed(const V4L2Context *ctx, const struct v4l2_format *fmt2)
{ {
- struct v4l2_format *fmt1 = &ctx->format; - struct v4l2_format *fmt1 = &ctx->format;
- int ret = V4L2_TYPE_IS_MULTIPLANAR(ctx->type) ? - int ret = V4L2_TYPE_IS_MULTIPLANAR(ctx->type) ?
@ -47421,12 +47448,6 @@ index ff1ea8e57b..3274e24430 100644
- : - :
- fmt1->fmt.pix.width != fmt2->fmt.pix.width || - fmt1->fmt.pix.width != fmt2->fmt.pix.width ||
- fmt1->fmt.pix.height != fmt2->fmt.pix.height; - fmt1->fmt.pix.height != fmt2->fmt.pix.height;
+ return ctx->bufrefs != NULL;
+}
+
+// Width/Height changed or we don't have an alloc in the first place?
+static int ctx_resolution_changed(const V4L2Context *ctx, const struct v4l2_format *fmt2)
+{
+ const struct v4l2_format *fmt1 = &ctx->format; + const struct v4l2_format *fmt1 = &ctx->format;
+ int ret = !ctx_buffers_alloced(ctx) || + int ret = !ctx_buffers_alloced(ctx) ||
+ (V4L2_TYPE_IS_MULTIPLANAR(ctx->type) ? + (V4L2_TYPE_IS_MULTIPLANAR(ctx->type) ?
@ -47519,12 +47540,12 @@ index ff1ea8e57b..3274e24430 100644
- s->output.sample_aspect_ratio = v4l2_get_sar(&s->output); - s->output.sample_aspect_ratio = v4l2_get_sar(&s->output);
- } - }
+ get_default_selection(&s->capture, &s->capture.selection); + get_default_selection(&s->capture, &s->capture.selection);
+
- reinit = v4l2_resolution_changed(&s->capture, &cap_fmt);
+ reinit = ctx_resolution_changed(&s->capture, &cap_fmt); + reinit = ctx_resolution_changed(&s->capture, &cap_fmt);
+ if ((s->quirks & FF_V4L2_QUIRK_REINIT_ALWAYS) != 0) + if ((s->quirks & FF_V4L2_QUIRK_REINIT_ALWAYS) != 0)
+ reinit = 1; + reinit = 1;
+
- reinit = v4l2_resolution_changed(&s->capture, &cap_fmt);
+ s->capture.format = cap_fmt; + s->capture.format = cap_fmt;
if (reinit) { if (reinit) {
- s->capture.height = v4l2_get_height(&cap_fmt); - s->capture.height = v4l2_get_height(&cap_fmt);
@ -47604,7 +47625,7 @@ index ff1ea8e57b..3274e24430 100644
return 1; return 1;
} }
@@ -280,171 +291,251 @@ static int v4l2_stop_encode(V4L2Context *ctx) @@ -280,171 +291,267 @@ static int v4l2_stop_encode(V4L2Context *ctx)
return 0; return 0;
} }
@ -47943,16 +47964,31 @@ index ff1ea8e57b..3274e24430 100644
+ return ret; + return ret;
} }
- return avbuf; - return avbuf;
- } +
- return NULL;
+ if ((pfd.revents & poll_out) != 0) { + if ((pfd.revents & poll_out) != 0) {
+ return is_cap ? 0 : dq_buf(ctx, ppavbuf); + return is_cap ? 0 : dq_buf(ctx, ppavbuf);
+ } + }
+ +
+ av_log(avctx, AV_LOG_ERROR, "V4L2 poll unexpected events=%#x, revents=%#x\n", pfd.events, pfd.revents); + av_log(avctx, AV_LOG_ERROR, "V4L2 poll unexpected events=%#x, revents=%#x\n", pfd.events, pfd.revents);
+ return AVERROR_UNKNOWN; + return AVERROR_UNKNOWN;
+ } }
+}
- return NULL;
+// Clear out flags and timestamps that should should be set by the user
+// Returns the passed avbuf
+static V4L2Buffer *
+clean_v4l2_buffer(V4L2Buffer * const avbuf)
+{
+ struct v4l2_buffer *const buf = &avbuf->buf;
+
+ buf->flags = 0;
+ buf->field = V4L2_FIELD_ANY;
+ buf->timestamp = (struct timeval){0};
+ buf->timecode = (struct v4l2_timecode){0};
+ buf->sequence = 0;
+
+ return avbuf;
} }
static V4L2Buffer* v4l2_getfree_v4l2buf(V4L2Context *ctx) static V4L2Buffer* v4l2_getfree_v4l2buf(V4L2Context *ctx)
@ -47975,11 +48011,11 @@ index ff1ea8e57b..3274e24430 100644
- return &ctx->buffers[i]; - return &ctx->buffers[i];
+ V4L2Buffer * const avbuf = (V4L2Buffer *)ctx->bufrefs[i]->data; + V4L2Buffer * const avbuf = (V4L2Buffer *)ctx->bufrefs[i]->data;
+ if (avbuf->status == V4L2BUF_AVAILABLE) + if (avbuf->status == V4L2BUF_AVAILABLE)
+ return avbuf; + return clean_v4l2_buffer(avbuf);
} }
return NULL; return NULL;
@@ -452,25 +543,45 @@ static V4L2Buffer* v4l2_getfree_v4l2buf(V4L2Context *ctx) @@ -452,25 +559,45 @@ static V4L2Buffer* v4l2_getfree_v4l2buf(V4L2Context *ctx)
static int v4l2_release_buffers(V4L2Context* ctx) static int v4l2_release_buffers(V4L2Context* ctx)
{ {
@ -47997,12 +48033,7 @@ index ff1ea8e57b..3274e24430 100644
- V4L2Buffer *buffer = &ctx->buffers[i]; - V4L2Buffer *buffer = &ctx->buffers[i];
+ // Orphan any buffers in the wild + // Orphan any buffers in the wild
+ ff_weak_link_break(&ctx->wl_master); + ff_weak_link_break(&ctx->wl_master);
+
- for (j = 0; j < buffer->num_planes; j++) {
- struct V4L2Plane_info *p = &buffer->plane_info[j];
- if (p->mm_addr && p->length)
- if (munmap(p->mm_addr, p->length) < 0)
- av_log(logger(ctx), AV_LOG_ERROR, "%s unmap plane (%s))\n", ctx->name, av_err2str(AVERROR(errno)));
+ if (ctx->bufrefs) { + if (ctx->bufrefs) {
+ for (i = 0; i < ctx->num_buffers; i++) + for (i = 0; i < ctx->num_buffers; i++)
+ av_buffer_unref(ctx->bufrefs + i); + av_buffer_unref(ctx->bufrefs + i);
@ -48014,7 +48045,12 @@ index ff1ea8e57b..3274e24430 100644
+ .type = ctx->type, + .type = ctx->type,
+ .count = 0, /* 0 -> unmap all buffers from the driver */ + .count = 0, /* 0 -> unmap all buffers from the driver */
+ }; + };
+
- for (j = 0; j < buffer->num_planes; j++) {
- struct V4L2Plane_info *p = &buffer->plane_info[j];
- if (p->mm_addr && p->length)
- if (munmap(p->mm_addr, p->length) < 0)
- av_log(logger(ctx), AV_LOG_ERROR, "%s unmap plane (%s))\n", ctx->name, av_err2str(AVERROR(errno)));
+ while ((ret = ioctl(fd, VIDIOC_REQBUFS, &req)) == -1) { + while ((ret = ioctl(fd, VIDIOC_REQBUFS, &req)) == -1) {
+ if (errno == EINTR) + if (errno == EINTR)
+ continue; + continue;
@ -48039,7 +48075,7 @@ index ff1ea8e57b..3274e24430 100644
} }
static inline int v4l2_try_raw_format(V4L2Context* ctx, enum AVPixelFormat pixfmt) static inline int v4l2_try_raw_format(V4L2Context* ctx, enum AVPixelFormat pixfmt)
@@ -499,6 +610,8 @@ static inline int v4l2_try_raw_format(V4L2Context* ctx, enum AVPixelFormat pixfm @@ -499,6 +626,8 @@ static inline int v4l2_try_raw_format(V4L2Context* ctx, enum AVPixelFormat pixfm
static int v4l2_get_raw_format(V4L2Context* ctx, enum AVPixelFormat *p) static int v4l2_get_raw_format(V4L2Context* ctx, enum AVPixelFormat *p)
{ {
@ -48048,7 +48084,7 @@ index ff1ea8e57b..3274e24430 100644
enum AVPixelFormat pixfmt = ctx->av_pix_fmt; enum AVPixelFormat pixfmt = ctx->av_pix_fmt;
struct v4l2_fmtdesc fdesc; struct v4l2_fmtdesc fdesc;
int ret; int ret;
@@ -517,6 +630,13 @@ static int v4l2_get_raw_format(V4L2Context* ctx, enum AVPixelFormat *p) @@ -517,6 +646,13 @@ static int v4l2_get_raw_format(V4L2Context* ctx, enum AVPixelFormat *p)
if (ret) if (ret)
return AVERROR(EINVAL); return AVERROR(EINVAL);
@ -48062,7 +48098,7 @@ index ff1ea8e57b..3274e24430 100644
pixfmt = ff_v4l2_format_v4l2_to_avfmt(fdesc.pixelformat, AV_CODEC_ID_RAWVIDEO); pixfmt = ff_v4l2_format_v4l2_to_avfmt(fdesc.pixelformat, AV_CODEC_ID_RAWVIDEO);
ret = v4l2_try_raw_format(ctx, pixfmt); ret = v4l2_try_raw_format(ctx, pixfmt);
if (ret){ if (ret){
@@ -569,18 +689,84 @@ static int v4l2_get_coded_format(V4L2Context* ctx, uint32_t *p) @@ -569,18 +705,84 @@ static int v4l2_get_coded_format(V4L2Context* ctx, uint32_t *p)
* *
*****************************************************************************/ *****************************************************************************/
@ -48151,7 +48187,7 @@ index ff1ea8e57b..3274e24430 100644
} }
int ff_v4l2_context_enqueue_frame(V4L2Context* ctx, const AVFrame* frame) int ff_v4l2_context_enqueue_frame(V4L2Context* ctx, const AVFrame* frame)
@@ -608,7 +794,8 @@ int ff_v4l2_context_enqueue_frame(V4L2Context* ctx, const AVFrame* frame) @@ -608,7 +810,8 @@ int ff_v4l2_context_enqueue_frame(V4L2Context* ctx, const AVFrame* frame)
return ff_v4l2_buffer_enqueue(avbuf); return ff_v4l2_buffer_enqueue(avbuf);
} }
@ -48161,7 +48197,7 @@ index ff1ea8e57b..3274e24430 100644
{ {
V4L2m2mContext *s = ctx_to_m2mctx(ctx); V4L2m2mContext *s = ctx_to_m2mctx(ctx);
V4L2Buffer* avbuf; V4L2Buffer* avbuf;
@@ -616,8 +803,9 @@ int ff_v4l2_context_enqueue_packet(V4L2Context* ctx, const AVPacket* pkt) @@ -616,8 +819,9 @@ int ff_v4l2_context_enqueue_packet(V4L2Context* ctx, const AVPacket* pkt)
if (!pkt->size) { if (!pkt->size) {
ret = v4l2_stop_decode(ctx); ret = v4l2_stop_decode(ctx);
@ -48172,7 +48208,7 @@ index ff1ea8e57b..3274e24430 100644
s->draining = 1; s->draining = 1;
return 0; return 0;
} }
@@ -626,8 +814,11 @@ int ff_v4l2_context_enqueue_packet(V4L2Context* ctx, const AVPacket* pkt) @@ -626,8 +830,11 @@ int ff_v4l2_context_enqueue_packet(V4L2Context* ctx, const AVPacket* pkt)
if (!avbuf) if (!avbuf)
return AVERROR(EAGAIN); return AVERROR(EAGAIN);
@ -48186,7 +48222,7 @@ index ff1ea8e57b..3274e24430 100644
return ret; return ret;
return ff_v4l2_buffer_enqueue(avbuf); return ff_v4l2_buffer_enqueue(avbuf);
@@ -636,19 +827,10 @@ int ff_v4l2_context_enqueue_packet(V4L2Context* ctx, const AVPacket* pkt) @@ -636,19 +843,10 @@ int ff_v4l2_context_enqueue_packet(V4L2Context* ctx, const AVPacket* pkt)
int ff_v4l2_context_dequeue_frame(V4L2Context* ctx, AVFrame* frame, int timeout) int ff_v4l2_context_dequeue_frame(V4L2Context* ctx, AVFrame* frame, int timeout)
{ {
V4L2Buffer *avbuf; V4L2Buffer *avbuf;
@ -48209,7 +48245,7 @@ index ff1ea8e57b..3274e24430 100644
return ff_v4l2_buffer_buf_to_avframe(frame, avbuf); return ff_v4l2_buffer_buf_to_avframe(frame, avbuf);
} }
@@ -656,19 +838,10 @@ int ff_v4l2_context_dequeue_frame(V4L2Context* ctx, AVFrame* frame, int timeout) @@ -656,19 +854,10 @@ int ff_v4l2_context_dequeue_frame(V4L2Context* ctx, AVFrame* frame, int timeout)
int ff_v4l2_context_dequeue_packet(V4L2Context* ctx, AVPacket* pkt) int ff_v4l2_context_dequeue_packet(V4L2Context* ctx, AVPacket* pkt)
{ {
V4L2Buffer *avbuf; V4L2Buffer *avbuf;
@ -48232,7 +48268,7 @@ index ff1ea8e57b..3274e24430 100644
return ff_v4l2_buffer_buf_to_avpkt(pkt, avbuf); return ff_v4l2_buffer_buf_to_avpkt(pkt, avbuf);
} }
@@ -702,78 +875,158 @@ int ff_v4l2_context_get_format(V4L2Context* ctx, int probe) @@ -702,78 +891,158 @@ int ff_v4l2_context_get_format(V4L2Context* ctx, int probe)
int ff_v4l2_context_set_format(V4L2Context* ctx) int ff_v4l2_context_set_format(V4L2Context* ctx)
{ {
@ -48694,7 +48730,7 @@ index b67b216331..f1923bb26d 100644
+ +
#endif /* AVCODEC_V4L2_M2M_H */ #endif /* AVCODEC_V4L2_M2M_H */
diff --git a/libavcodec/v4l2_m2m_dec.c b/libavcodec/v4l2_m2m_dec.c diff --git a/libavcodec/v4l2_m2m_dec.c b/libavcodec/v4l2_m2m_dec.c
index ab07c0a24a..e7055c7a18 100644 index ab07c0a24a..3dd462362c 100644
--- a/libavcodec/v4l2_m2m_dec.c --- a/libavcodec/v4l2_m2m_dec.c
+++ b/libavcodec/v4l2_m2m_dec.c +++ b/libavcodec/v4l2_m2m_dec.c
@@ -23,6 +23,10 @@ @@ -23,6 +23,10 @@
@ -49094,7 +49130,7 @@ index ab07c0a24a..e7055c7a18 100644
+ } + }
+ +
+ if (s->draining) { + if (s->draining) {
+ if (!s->buf_pkt.size) { + if (s->buf_pkt.size) {
+ av_log(avctx, AV_LOG_WARNING, "Unexpected input whilst draining\n"); + av_log(avctx, AV_LOG_WARNING, "Unexpected input whilst draining\n");
+ av_packet_unref(&s->buf_pkt); + av_packet_unref(&s->buf_pkt);
+ } + }
@ -55065,10 +55101,10 @@ index 0000000000..4b25ec4344
+ +
diff --git a/libavdevice/egl_vout.c b/libavdevice/egl_vout.c diff --git a/libavdevice/egl_vout.c b/libavdevice/egl_vout.c
new file mode 100644 new file mode 100644
index 0000000000..b1b1f7bb60 index 0000000000..0539282733
--- /dev/null --- /dev/null
+++ b/libavdevice/egl_vout.c +++ b/libavdevice/egl_vout.c
@@ -0,0 +1,825 @@ @@ -0,0 +1,815 @@
+/* +/*
+ * Copyright (c) 2020 John Cox for Raspberry Pi Trading + * Copyright (c) 2020 John Cox for Raspberry Pi Trading
+ * + *
@ -55111,16 +55147,7 @@ index 0000000000..b1b1f7bb60
+#include <stdatomic.h> +#include <stdatomic.h>
+#include <unistd.h> +#include <unistd.h>
+ +
+#include "drm_fourcc.h"
+#include <drm.h>
+#include <drm_mode.h>
+#include <xf86drm.h>
+#include <xf86drmMode.h>
+#include <X11/Xlib.h> +#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/Xlib-xcb.h>
+#include <xcb/xcb.h>
+#include <xcb/dri3.h>
+ +
+#include "libavutil/rpi_sand_fns.h" +#include "libavutil/rpi_sand_fns.h"
+ +
@ -55332,8 +55359,7 @@ index 0000000000..b1b1f7bb60
+ XMapWindow(dpy, win); + XMapWindow(dpy, win);
+ +
+ { + {
+ EGLSurface surf = eglCreateWindowSurface(egl_dpy, config, + EGLSurface surf = eglCreateWindowSurface(egl_dpy, config, (uintptr_t)win, NULL);
+ (void *)(uintptr_t)win, NULL);
+ if (!surf) { + if (!surf) {
+ av_log(s, AV_LOG_ERROR, "Error: eglCreateWindowSurface failed\n"); + av_log(s, AV_LOG_ERROR, "Error: eglCreateWindowSurface failed\n");
+ return -1; + return -1;
@ -61000,37 +61026,67 @@ index 0000000000..634b55e800
+ +
diff --git a/pi-util/BUILD.txt b/pi-util/BUILD.txt diff --git a/pi-util/BUILD.txt b/pi-util/BUILD.txt
new file mode 100644 new file mode 100644
index 0000000000..7f16dff6a2 index 0000000000..b050971f63
--- /dev/null --- /dev/null
+++ b/pi-util/BUILD.txt +++ b/pi-util/BUILD.txt
@@ -0,0 +1,29 @@ @@ -0,0 +1,59 @@
+Building Pi FFmpeg +Building Pi FFmpeg
+================== +==================
+ +
+Configuration: +Current only building on a Pi is supported.
+============= +This builds ffmpeg the way I've tested it
+ +
+These instructions work for cross compiles from Ubuntu 16.04 & Ubuntu +Get all dependencies - the current package dependencies are good enough
+18.04. I would expect most other linux environments to work but I haven't
+tried them.
+ +
+pi-util/conf_pi2.sh +$ sudo apt-get build-dep ffmpeg
+ +
+contains suitable options to build the code for Pi2/3. It expects to find +Configure using the pi-util/conf_native.sh script
+git clones of +-------------------------------------------------
+ +
+https://github.com/raspberrypi/tools +This sets the normal release options and creates an ouutput dir to build into
+https://github.com/raspberrypi/firmware +The directory name will depend on system and options but will be under out/
+ +
+in the parent of the FFmpeg directory. I recommend using --depth 1 to avoid a +There are a few choices here
+lot of history you don't want. + --mmal build including the legacy mmal-based decoders and zero-copy code
+ this requires appropriate libraries which currently will exist for
+ armv7 but not arm64
+ --noshared
+ Build a static image rather than a shared library one. Static is
+ easier for testing as there is no need to worry about library
+ paths being confused and therefore running the wrong code, Shared
+ is what is needed, in most cases, when building for use by other
+ programs.
+ +
+If you have a copy of qasm.py in ../local/bin then the .qasm sources will be +So for a static build
+rebuilt. Otherwise the prebuilt .c & .h files will be used. +---------------------
+Likewise ../local/bin/vasmvidcore_std will enable VPU code rebuild
+ +
+pi-util/conf_p1.sh should configure for Pi1. Beware that as of this time +$ pi-util/conf_native.sh --noshared
+H265 QPU acceleration is broken on Pi1 and so it is disabled. +
+$ make -j8 -C out/<wherever the script said it was building to>
+
+You can now run ffmpeg directly from where it was built
+
+For a shared build
+------------------
+
+$ pi-util/conf_native.sh
+
+You will normally want an install target if shared. Note that the script has
+set this up to be generated in out/<builddir>/install, you don't have to worry
+about overwriting your system libs.
+
+$ make -j8 -C out/<builddir> install
+
+You can now set LD_LIBRARY_PATH appropriately and run ffmpeg from where it was
+built or install the image on the system - you have to be careful to get rid
+of all other ffmpeg libs or confusion may result. There is a little script
+that wipes all other versions - obviously use with care!
+
+$ sudo pi-util/clean_usr_libs.sh
+
+Then simply copying from the install to /usr works
+
+$ sudo cp -r out/<builddir>/install/* /usr
+ +
+ +
diff --git a/pi-util/NOTES.txt b/pi-util/NOTES.txt diff --git a/pi-util/NOTES.txt b/pi-util/NOTES.txt
@ -61782,14 +61838,15 @@ index 0000000000..fc14f2a3c2
+1,WPP_F_ericsson_MAIN_2,WPP_F_ericsson_MAIN_2.bit,WPP_F_ericsson_MAIN_2_yuv.md5 +1,WPP_F_ericsson_MAIN_2,WPP_F_ericsson_MAIN_2.bit,WPP_F_ericsson_MAIN_2_yuv.md5
diff --git a/pi-util/conf_native.sh b/pi-util/conf_native.sh diff --git a/pi-util/conf_native.sh b/pi-util/conf_native.sh
new file mode 100755 new file mode 100755
index 0000000000..f51b81d713 index 0000000000..65576846e8
--- /dev/null --- /dev/null
+++ b/pi-util/conf_native.sh +++ b/pi-util/conf_native.sh
@@ -0,0 +1,105 @@ @@ -0,0 +1,108 @@
+echo "Configure for native build" +echo "Configure for native build"
+ +
+FFSRC=`pwd` +FFSRC=`pwd`
+MC=`dpkg --print-architecture` +MC=`dpkg --print-architecture`
+BUILDBASE=$FFSRC/out
+ +
+#RPI_KEEPS="-save-temps=obj" +#RPI_KEEPS="-save-temps=obj"
+RPI_KEEPS="" +RPI_KEEPS=""
@ -61852,20 +61909,22 @@ index 0000000000..f51b81d713
+SHARED_LIBS="--enable-shared" +SHARED_LIBS="--enable-shared"
+if [ $NOSHARED ]; then +if [ $NOSHARED ]; then
+ SHARED_LIBS="--disable-shared" + SHARED_LIBS="--disable-shared"
+ OUT=out/$B-$C-$V-static-rel + OUT=$BUILDBASE/$B-$C-$V-static-rel
+ echo Static libs + echo Static libs
+else +else
+ echo Shared libs + echo Shared libs
+ OUT=out/$B-$C-$V-shared-rel + OUT=$BUILDBASE/$B-$C-$V-shared-rel
+fi +fi
+ +
+USR_PREFIX=$FFSRC/$OUT/install +USR_PREFIX=$OUT/install
+LIB_PREFIX=$USR_PREFIX/lib/$A +LIB_PREFIX=$USR_PREFIX/lib/$A
+INC_PREFIX=$USR_PREFIX/include/$A +INC_PREFIX=$USR_PREFIX/include/$A
+ +
+echo Destination directory: $OUT +echo Destination directory: $OUT
+mkdir -p $FFSRC/$OUT +mkdir -p $OUT
+cd $FFSRC/$OUT +# Nothing under here need worry git - including this .gitignore!
+echo "**" > $BUILDBASE/.gitignore
+cd $OUT
+ +
+$FFSRC/configure \ +$FFSRC/configure \
+ --prefix=$USR_PREFIX\ + --prefix=$USR_PREFIX\
@ -61891,114 +61950,6 @@ index 0000000000..f51b81d713
+ +
+# gcc option for getting asm listing +# gcc option for getting asm listing
+# -Wa,-ahls +# -Wa,-ahls
diff --git a/pi-util/conf_pi1.sh b/pi-util/conf_pi1.sh
new file mode 100755
index 0000000000..29fa9fa68d
--- /dev/null
+++ b/pi-util/conf_pi1.sh
@@ -0,0 +1,39 @@
+echo "Configure for Pi1"
+
+RPI_TOOLROOT=`pwd`/../tools/arm-bcm2708/arm-rpi-4.9.3-linux-gnueabihf
+RPI_OPT_VC=`pwd`/../firmware/hardfp/opt/vc
+
+RPI_INCLUDES="-I$RPI_OPT_VC/include -I$RPI_OPT_VC/include/interface/vcos/pthreads -I$RPI_OPT_VC/include/interface/vmcs_host/linux"
+RPI_LIBDIRS="-L$RPI_TOOLROOT/lib -L$RPI_OPT_VC/lib"
+#RPI_KEEPS="-save-temps=obj"
+RPI_KEEPS=""
+
+SHARED_LIBS="--enable-shared"
+if [ "$1" == "--noshared" ]; then
+ SHARED_LIBS="--disable-shared"
+ echo Static libs
+else
+ echo Shared libs
+fi
+
+./configure --enable-cross-compile\
+ --cpu=arm1176jzf-s\
+ --arch=arm\
+ --disable-neon\
+ --target-os=linux\
+ --disable-stripping\
+ --enable-mmal\
+ $SHARED_LIBS\
+ --extra-cflags="-g $RPI_KEEPS $RPI_INCLUDES"\
+ --extra-cxxflags="$RPI_INCLUDES"\
+ --extra-ldflags="$RPI_LIBDIRS -Wl,-rpath=/opt/vc/lib,-rpath-link=$RPI_OPT_VC/lib,-rpath=/lib,-rpath=/usr/lib,-rpath-link=$RPI_TOOLROOT/lib,-rpath-link=$RPI_TOOLROOT/lib"\
+ --extra-libs="-Wl,--start-group -lbcm_host -lmmal -lmmal_util -lmmal_core -lvcos -lvcsm -lvchostif -lvchiq_arm"\
+ --cross-prefix=$RPI_TOOLROOT/bin/arm-linux-gnueabihf-
+
+
+# --enable-extra-warnings\
+# --arch=armv71\
+# --enable-shared\
+
+# gcc option for getting asm listing
+# -Wa,-ahls
diff --git a/pi-util/conf_pi2.sh b/pi-util/conf_pi2.sh
new file mode 100755
index 0000000000..92cd9e7cfd
--- /dev/null
+++ b/pi-util/conf_pi2.sh
@@ -0,0 +1,57 @@
+echo "Configure for Pi2/3"
+
+FFSRC=`pwd`
+
+RPI_TOOLROOT=$FFSRC/../tools/arm-bcm2708/arm-rpi-4.9.3-linux-gnueabihf
+RPI_OPT_VC=$FFSRC/../firmware/hardfp/opt/vc
+
+RPI_INCLUDES="-I$RPI_OPT_VC/include -I$RPI_OPT_VC/include/interface/vcos/pthreads -I$RPI_OPT_VC/include/interface/vmcs_host/linux"
+RPI_LIBDIRS="-L$RPI_TOOLROOT/lib -L$RPI_OPT_VC/lib"
+RPI_DEFINES="-D__VCCOREVER__=0x4000000 -mfpu=neon-vfpv4"
+#RPI_KEEPS="-save-temps=obj"
+RPI_KEEPS=""
+
+SHARED_LIBS="--enable-shared"
+if [ "$1" == "--noshared" ]; then
+ SHARED_LIBS="--disable-shared"
+ OUT=out/x-armv7-static-rel
+ echo Static libs
+else
+ echo Shared libs
+ OUT=out/x-armv7-shared-rel
+fi
+
+USR_PREFIX=$FFSRC/$OUT/install
+LIB_PREFIX=$USR_PREFIX/lib/arm-linux-gnueabihf
+INC_PREFIX=$USR_PREFIX/include/arm-linux-gnueabihf
+
+mkdir -p $FFSRC/$OUT
+cd $FFSRC/$OUT
+
+$FFSRC/configure --enable-cross-compile\
+ --prefix=$USR_PREFIX\
+ --libdir=$LIB_PREFIX\
+ --incdir=$INC_PREFIX\
+ --arch=armv6t2\
+ --cpu=cortex-a7\
+ --target-os=linux\
+ --disable-stripping\
+ --disable-thumb\
+ --enable-mmal\
+ --enable-rpi\
+ $SHARED_LIBS\
+ --extra-cflags="-ggdb $RPI_KEEPS $RPI_DEFINES $RPI_INCLUDES"\
+ --extra-cxxflags="$RPI_DEFINES $RPI_INCLUDES"\
+ --extra-ldflags="$RPI_LIBDIRS -Wl,-rpath=/opt/vc/lib,-rpath-link=$RPI_OPT_VC/lib,-rpath=/lib,-rpath=/usr/lib,-rpath-link=$RPI_TOOLROOT/lib,-rpath-link=$RPI_TOOLROOT/lib"\
+ --extra-libs="-Wl,--start-group -lbcm_host -lmmal -lmmal_util -lmmal_core -lvcos -lvcsm -lvchostif -lvchiq_arm"\
+ --cross-prefix=$RPI_TOOLROOT/bin/arm-linux-gnueabihf-
+
+# --enable-shared\
+
+# --enable-decoder=hevc_rpi\
+# --enable-extra-warnings\
+# --arch=armv71\
+# --enable-shared\
+
+# gcc option for getting asm listing
+# -Wa,-ahls
diff --git a/pi-util/ffconf.py b/pi-util/ffconf.py diff --git a/pi-util/ffconf.py b/pi-util/ffconf.py
new file mode 100755 new file mode 100755
index 0000000000..657568014e index 0000000000..657568014e