mirror of
https://github.com/LibreELEC/LibreELEC.tv
synced 2025-09-24 19:46:01 +07:00
b669ea5ea3
Patch created using revisions b08d796..74d85ef from branch libreelec-misc-n7.1 of https://github.com/LibreELEC/FFmpeg
74 lines
2.5 KiB
Diff
74 lines
2.5 KiB
Diff
From f3b90efacf67fb8e8ed07654a6c3f1bd807002a3 Mon Sep 17 00:00:00 2001
|
|
From: Lukas Rusak <lorusak@gmail.com>
|
|
Date: Wed, 10 Apr 2019 13:39:21 -0700
|
|
Subject: [PATCH 1/2] libavcodec/libdav1d: add libdav1d_get_format method to
|
|
call ff_get_format
|
|
|
|
This will allow applications to properly init the decoder in
|
|
cases where a hardware decoder is tried first and and software
|
|
decoder is tried after by calling the get_format callback.
|
|
|
|
Even though there is no hardware pixel formats available
|
|
we still need to return the software pixel format.
|
|
|
|
Tested with Kodi by checking if multithreaded software
|
|
decoding is properly activated.
|
|
---
|
|
libavcodec/libdav1d.c | 11 +++++++++++
|
|
1 file changed, 11 insertions(+)
|
|
|
|
diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c
|
|
index 546b42e9c622..378231485900 100644
|
|
--- a/libavcodec/libdav1d.c
|
|
+++ b/libavcodec/libdav1d.c
|
|
@@ -69,6 +69,16 @@ static const enum AVPixelFormat pix_fmt_rgb[3] = {
|
|
AV_PIX_FMT_GBRP, AV_PIX_FMT_GBRP10, AV_PIX_FMT_GBRP12,
|
|
};
|
|
|
|
+static enum AVPixelFormat libdav1d_get_format(AVCodecContext *avctx, const Dav1dPicture *p)
|
|
+{
|
|
+ enum AVPixelFormat pix_fmts[2], *fmt = pix_fmts;
|
|
+
|
|
+ *fmt++ = pix_fmt[p->p.layout][p->seq_hdr->hbd];
|
|
+ *fmt = AV_PIX_FMT_NONE;
|
|
+
|
|
+ return ff_get_format(avctx, pix_fmts);
|
|
+}
|
|
+
|
|
static void libdav1d_log_callback(void *opaque, const char *fmt, va_list vl)
|
|
{
|
|
AVCodecContext *c = opaque;
|
|
@@ -424,6 +434,7 @@ static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame)
|
|
if (res < 0)
|
|
goto fail;
|
|
|
|
+ frame->format = c->pix_fmt = libdav1d_get_format(c, p);
|
|
frame->width = p->p.w;
|
|
frame->height = p->p.h;
|
|
if (c->width != p->p.w || c->height != p->p.h) {
|
|
|
|
From 74d85efbbd5c9e92e7967d0a0200c41d8ce8a88e Mon Sep 17 00:00:00 2001
|
|
From: chewitt <github@chrishewitt.net>
|
|
Date: Sun, 11 Aug 2019 07:08:19 +0000
|
|
Subject: [PATCH 2/2] add long-term yuv2rgb logging patch
|
|
|
|
---
|
|
libswscale/yuv2rgb.c | 4 ----
|
|
1 file changed, 4 deletions(-)
|
|
|
|
diff --git a/libswscale/yuv2rgb.c b/libswscale/yuv2rgb.c
|
|
index 52fe2093e7b1..b04934071542 100644
|
|
--- a/libswscale/yuv2rgb.c
|
|
+++ b/libswscale/yuv2rgb.c
|
|
@@ -573,10 +573,6 @@ SwsFunc ff_yuv2rgb_get_func_ptr(SwsContext *c)
|
|
if (t)
|
|
return t;
|
|
|
|
- av_log(c, AV_LOG_WARNING,
|
|
- "No accelerated colorspace conversion found from %s to %s.\n",
|
|
- av_get_pix_fmt_name(c->srcFormat), av_get_pix_fmt_name(c->dstFormat));
|
|
-
|
|
if (c->srcFormat == AV_PIX_FMT_YUV422P) {
|
|
switch (c->dstFormat) {
|
|
case AV_PIX_FMT_BGR48BE:
|