openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File mpv_PR6832.patch of Package mpv (Revision b0401fb9dc3b672d421afa6029874fe2)

Currently displaying revision b0401fb9dc3b672d421afa6029874fe2 , Show latest

From 8f3da059414d5724a4133808d5ec993781406291 Mon Sep 17 00:00:00 2001
From: sfan5 <sfan5@live.de>
Date: Tue, 30 Jul 2019 23:32:04 +0200
Subject: [PATCH 1/4] image_writer: add colorspace parameter to convert_image()

Previously assumptions specific to FFmpeg's jpeg encoder were hardcoded there.
---
 player/screenshot.c  |  2 +-
 video/image_loader.c |  2 +-
 video/image_writer.c | 24 ++++++++++++++++--------
 video/image_writer.h |  5 ++++-
 4 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/player/screenshot.c b/player/screenshot.c
index e24ca051f1..fad5c70e42 100644
--- a/player/screenshot.c
+++ b/player/screenshot.c
@@ -393,7 +393,7 @@ static struct mp_image *screenshot_get_rgb(struct MPContext *mpctx, int mode)
     struct mp_image *mpi = screenshot_get(mpctx, mode, false);
     if (!mpi)
         return NULL;
-    struct mp_image *res = convert_image(mpi, IMGFMT_BGR0, mpctx->log);
+    struct mp_image *res = convert_image(mpi, IMGFMT_BGR0, NULL, mpctx->log);
     talloc_free(mpi);
     return res;
 }
diff --git a/video/image_loader.c b/video/image_loader.c
index 9efc8b7310..62f85829b6 100644
--- a/video/image_loader.c
+++ b/video/image_loader.c
@@ -38,7 +38,7 @@ struct mp_image *load_image_png_buf(void *buffer, size_t buffer_size, int imgfmt
     if (frame && avcodec_receive_frame(avctx, frame) >= 0) {
         struct mp_image *r = mp_image_from_av_frame(frame);
         if (r)
-            res = convert_image(r, imgfmt, mp_null_log);
+            res = convert_image(r, imgfmt, NULL, mp_null_log);
         talloc_free(r);
     }
     av_frame_free(&frame);
diff --git a/video/image_writer.c b/video/image_writer.c
index 6a092aa17f..c37e45ea62 100644
--- a/video/image_writer.c
+++ b/video/image_writer.c
@@ -292,6 +292,7 @@ int image_writer_format_from_ext(const char *ext)
 }
 
 struct mp_image *convert_image(struct mp_image *image, int destfmt,
+                               const struct mp_image_params *destp,
                                struct mp_log *log)
 {
     int d_w, d_h;
@@ -306,13 +307,9 @@ struct mp_image *convert_image(struct mp_image *image, int destfmt,
     };
     mp_image_params_guess_csp(&p);
 
-    // If RGB, just assume everything is correct.
-    if (p.color.space != MP_CSP_RGB) {
-        // Currently, assume what FFmpeg's jpg encoder needs.
-        // Of course this works only for non-HDR (no HDR support in libswscale).
-        p.color.levels = MP_CSP_LEVELS_PC;
-        p.color.space = MP_CSP_BT_601;
-        p.chroma_location = MP_CHROMA_CENTER;
+    if (destp) {
+        p.color = destp->color;
+        p.chroma_location = destp->chroma_location;
         mp_image_params_guess_csp(&p);
     }
 
@@ -358,7 +355,18 @@ bool write_image(struct mp_image *image, const struct image_writer_opts *opts,
     if (!destfmt)
         destfmt = get_target_format(&ctx);
 
-    struct mp_image *dst = convert_image(image, destfmt, log);
+    struct mp_image_params p = {0}, *destp = NULL;
+    // If RGB, just assume everything is correct.
+    if (mp_imgfmt_get_desc(destfmt).flags & MP_IMGFLAG_YUV) {
+        // Currently, assume what FFmpeg's jpg encoder needs.
+        // Of course this works only for non-HDR (no HDR support in libswscale).
+        p.color.levels = MP_CSP_LEVELS_PC;
+        p.color.space = MP_CSP_BT_601;
+        p.chroma_location = MP_CHROMA_CENTER;
+        destp = &p;
+    }
+
+    struct mp_image *dst = convert_image(image, destfmt, destp, log);
     if (!dst)
         return false;
 
diff --git a/video/image_writer.h b/video/image_writer.h
index 98cb95a898..6313b6f48a 100644
--- a/video/image_writer.h
+++ b/video/image_writer.h
@@ -16,6 +16,7 @@
  */
 
 #include "options/m_option.h"
+#include "video/mp_image.h"
 
 struct mp_image;
 struct mp_log;
@@ -62,9 +63,11 @@ bool write_image(struct mp_image *image, const struct image_writer_opts *opts,
                  const char *filename, struct mp_log *log);
 
 /* Return the image converted to the given format. If the pixel aspect ratio is
- * not 1:1, the image is scaled as well. Returns NULL on failure.
+ * not 1:1, the image is scaled as well. If destp is given, colorspace and
+ * chroma location are copied from there. Returns NULL on failure.
  */
 struct mp_image *convert_image(struct mp_image *image, int destfmt,
+                               const struct mp_image_params *destp,
                                struct mp_log *log);
 
 // Debugging helper.

From 36fec1a1854b7c81196895541a6a681ab3ee11fa Mon Sep 17 00:00:00 2001
From: sfan5 <sfan5@live.de>
Date: Tue, 30 Jul 2019 23:55:32 +0200
Subject: [PATCH 2/4] image_writer: add WebP support (lossy or lossless)

---
 video/image_writer.c | 43 ++++++++++++++++++++++++++++++++++++-------
 video/image_writer.h |  2 ++
 2 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/video/image_writer.c b/video/image_writer.c
index c37e45ea62..84b1edead0 100644
--- a/video/image_writer.c
+++ b/video/image_writer.c
@@ -18,7 +18,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <setjmp.h>
 
 #include <libavcodec/avcodec.h>
 #include <libavutil/mem.h>
@@ -27,6 +26,7 @@
 #include "config.h"
 
 #if HAVE_JPEG
+#include <setjmp.h>
 #include <jpeglib.h>
 #endif
 
@@ -48,6 +48,8 @@ const struct image_writer_opts image_writer_opts_defaults = {
     .png_filter = 5,
     .jpeg_quality = 90,
     .jpeg_source_chroma = 1,
+    .webp_lossless = 0,
+    .webp_quality = 75,
     .tag_csp = 0,
 };
 
@@ -55,6 +57,7 @@ const struct m_opt_choice_alternatives mp_image_writer_formats[] = {
     {"jpg",  AV_CODEC_ID_MJPEG},
     {"jpeg", AV_CODEC_ID_MJPEG},
     {"png",  AV_CODEC_ID_PNG},
+    {"webp", AV_CODEC_ID_WEBP},
     {0}
 };
 
@@ -66,6 +69,8 @@ const struct m_option image_writer_opts[] = {
     OPT_FLAG("jpeg-source-chroma", jpeg_source_chroma, 0),
     OPT_INTRANGE("png-compression", png_compression, 0, 0, 9),
     OPT_INTRANGE("png-filter", png_filter, 0, 0, 5),
+    OPT_FLAG("webp-lossless", webp_lossless, 0),
+    OPT_INTRANGE("webp-quality", webp_quality, 0, 0, 100),
     OPT_FLAG("high-bit-depth", high_bit_depth, 0),
     OPT_FLAG("tag-colorspace", tag_csp, 0),
     {0},
@@ -96,7 +101,12 @@ static bool write_lavc(struct image_writer_ctx *ctx, mp_image_t *image, FILE *fp
 
     av_init_packet(&pkt);
 
-    struct AVCodec *codec = avcodec_find_encoder(ctx->opts->format);
+    struct AVCodec *codec;
+    if (ctx->opts->format == AV_CODEC_ID_WEBP)
+        codec = avcodec_find_encoder_by_name("libwebp"); // non-animated encoder
+    else
+        codec = avcodec_find_encoder(ctx->opts->format);
+
     AVCodecContext *avctx = NULL;
     if (!codec)
         goto print_open_fail;
@@ -109,9 +119,11 @@ static bool write_lavc(struct image_writer_ctx *ctx, mp_image_t *image, FILE *fp
     avctx->height = image->h;
     avctx->color_range = mp_csp_levels_to_avcol_range(image->params.color.levels);
     avctx->pix_fmt = imgfmt2pixfmt(image->imgfmt);
-    // Annoying deprecated garbage for the jpg encoder.
-    if (image->params.color.levels == MP_CSP_LEVELS_PC)
-        avctx->pix_fmt = replace_j_format(avctx->pix_fmt);
+    if (codec->id == AV_CODEC_ID_MJPEG) {
+        // Annoying deprecated garbage for the jpg encoder.
+        if (image->params.color.levels == MP_CSP_LEVELS_PC)
+            avctx->pix_fmt = replace_j_format(avctx->pix_fmt);
+    }
     if (avctx->pix_fmt == AV_PIX_FMT_NONE) {
         MP_ERR(ctx, "Image format %s not supported by lavc.\n",
                mp_imgfmt_to_name(image->imgfmt));
@@ -121,6 +133,11 @@ static bool write_lavc(struct image_writer_ctx *ctx, mp_image_t *image, FILE *fp
         avctx->compression_level = ctx->opts->png_compression;
         av_opt_set_int(avctx, "pred", ctx->opts->png_filter,
                        AV_OPT_SEARCH_CHILDREN);
+    } else if (codec->id == AV_CODEC_ID_WEBP) {
+        av_opt_set_int(avctx, "lossless", ctx->opts->webp_lossless,
+                       AV_OPT_SEARCH_CHILDREN);
+        av_opt_set_int(avctx, "quality", ctx->opts->webp_quality,
+                       AV_OPT_SEARCH_CHILDREN);
     }
 
     if (avcodec_open2(avctx, codec, NULL) < 0) {
@@ -351,19 +368,31 @@ bool write_image(struct mp_image *image, const struct image_writer_opts *opts,
         destfmt = IMGFMT_RGB24;
     }
 #endif
+    if (opts->format == AV_CODEC_ID_WEBP && !opts->webp_lossless) {
+        // For lossy images, libwebp has its own RGB->YUV conversion.
+        // We don't want that, so force YUV/YUVA here.
+        int alpha = image->fmt.flags & MP_IMGFLAG_ALPHA;
+        destfmt = alpha ? pixfmt2imgfmt(AV_PIX_FMT_YUVA420P) : IMGFMT_420P;
+    }
 
     if (!destfmt)
         destfmt = get_target_format(&ctx);
 
     struct mp_image_params p = {0}, *destp = NULL;
-    // If RGB, just assume everything is correct.
-    if (mp_imgfmt_get_desc(destfmt).flags & MP_IMGFLAG_YUV) {
+    if (opts->format == AV_CODEC_ID_MJPEG &&
+        (mp_imgfmt_get_desc(destfmt).flags & MP_IMGFLAG_YUV)) {
         // Currently, assume what FFmpeg's jpg encoder needs.
         // Of course this works only for non-HDR (no HDR support in libswscale).
         p.color.levels = MP_CSP_LEVELS_PC;
         p.color.space = MP_CSP_BT_601;
         p.chroma_location = MP_CHROMA_CENTER;
         destp = &p;
+    } else if (opts->format == AV_CODEC_ID_WEBP &&
+               (mp_imgfmt_get_desc(destfmt).flags & MP_IMGFLAG_YUV)) {
+        p.color.levels = MP_CSP_LEVELS_TV;
+        p.color.space = MP_CSP_BT_601;
+        p.chroma_location = MP_CHROMA_CENTER;
+        destp = &p;
     }
 
     struct mp_image *dst = convert_image(image, destfmt, destp, log);
diff --git a/video/image_writer.h b/video/image_writer.h
index 6313b6f48a..69e9cc218b 100644
--- a/video/image_writer.h
+++ b/video/image_writer.h
@@ -33,6 +33,8 @@ struct image_writer_opts {
     int jpeg_progressive;
     int jpeg_baseline;
     int jpeg_source_chroma;
+    int webp_lossless;
+    int webp_quality;
     int tag_csp;
 };

From 75437908b3d48014a54a1c004644d81593659c46 Mon Sep 17 00:00:00 2001
From: sfan5 <sfan5@live.de>
Date: Wed, 31 Jul 2019 00:03:44 +0200
Subject: [PATCH 3/4] DOCS/man: update with new webp options

---
 DOCS/man/options.rst | 8 ++++++++
 DOCS/man/vo.rst      | 6 ++++++
 2 files changed, 14 insertions(+)

diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst
index b7ffda9a8c..a2d06b5b56 100644
--- a/DOCS/man/options.rst
+++ b/DOCS/man/options.rst
@@ -3335,6 +3335,7 @@ Screenshot
     :png:       PNG
     :jpg:       JPEG (default)
     :jpeg:      JPEG (alias for jpg)
+    :webp:      WebP
 
 ``--screenshot-tag-colorspace=<yes|no>``
     Tag screenshots with the appropriate colorspace.
@@ -3468,6 +3469,13 @@ Screenshot
     of compression that can be achieved. For most images, "mixed" achieves the
     best compression ratio, hence it is the default.
 
+``--screenshot-webp-lossless=<yes|no>``
+    Write lossless WebP files. ``--screenshot-webp-quality`` is ignored if this
+    is set. The default is no.
+
+``--screenshot-webp-quality=<0-100>``
+    Set the WebP quality level. Higher means better quality. The default is 75.
+
 
 Software Scaler
 ---------------
diff --git a/DOCS/man/vo.rst b/DOCS/man/vo.rst
index 8ed7a47893..d164ef835f 100644
--- a/DOCS/man/vo.rst
+++ b/DOCS/man/vo.rst
@@ -415,6 +415,8 @@ Available video output drivers are:
             JPEG files, extension .jpeg.
         png
             PNG files.
+        webp
+            WebP files.
 
     ``--vo-image-png-compression=<0-9>``
         PNG compression factor (speed vs. file size tradeoff) (default: 7)
@@ -425,6 +427,10 @@ Available video output drivers are:
         JPEG quality factor (default: 90)
     ``--vo-image-jpeg-optimize=<0-100>``
         JPEG optimization factor (default: 100)
+    ``--vo-image-webp-lossless=<yes|no>``
+        Enable writing lossless WebP files (default: no)
+    ``--vo-image-webp-quality=<0-100>``
+        WebP quality (default: 75)
     ``--vo-image-outdir=<dirname>``
         Specify the directory to save the image files to (default: ``./``).

From 84f82f25b5bc462481ef84e2c907c935160e80ba Mon Sep 17 00:00:00 2001
From: sfan5 <sfan5@live.de>
Date: Fri, 2 Aug 2019 16:04:54 +0200
Subject: [PATCH 4/4] image_writer: add webp-compression option

---
 DOCS/man/options.rst | 4 ++++
 DOCS/man/vo.rst      | 2 ++
 video/image_writer.c | 3 +++
 video/image_writer.h | 1 +
 4 files changed, 10 insertions(+)

diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst
index a2d06b5b56..3d0a3e2cba 100644
--- a/DOCS/man/options.rst
+++ b/DOCS/man/options.rst
@@ -3476,6 +3476,10 @@ Screenshot
 ``--screenshot-webp-quality=<0-100>``
     Set the WebP quality level. Higher means better quality. The default is 75.
 
+``--screenshot-webp-compression=<0-6>``
+    Set the WebP compression level. Higher means better compression, but takes
+    more CPU time. Note that this also affects the screenshot quality when used
+    with lossy WebP files. The default is 4.
 
 Software Scaler
 ---------------
diff --git a/DOCS/man/vo.rst b/DOCS/man/vo.rst
index d164ef835f..2afc0c1397 100644
--- a/DOCS/man/vo.rst
+++ b/DOCS/man/vo.rst
@@ -431,6 +431,8 @@ Available video output drivers are:
         Enable writing lossless WebP files (default: no)
     ``--vo-image-webp-quality=<0-100>``
         WebP quality (default: 75)
+    ``--vo-image-webp-compression=<0-6>``
+        WebP compression factor (default: 4)
     ``--vo-image-outdir=<dirname>``
         Specify the directory to save the image files to (default: ``./``).
 
diff --git a/video/image_writer.c b/video/image_writer.c
index 84b1edead0..5bc554ef63 100644
--- a/video/image_writer.c
+++ b/video/image_writer.c
@@ -50,6 +50,7 @@ const struct image_writer_opts image_writer_opts_defaults = {
     .jpeg_source_chroma = 1,
     .webp_lossless = 0,
     .webp_quality = 75,
+    .webp_compression = 4,
     .tag_csp = 0,
 };
 
@@ -71,6 +72,7 @@ const struct m_option image_writer_opts[] = {
     OPT_INTRANGE("png-filter", png_filter, 0, 0, 5),
     OPT_FLAG("webp-lossless", webp_lossless, 0),
     OPT_INTRANGE("webp-quality", webp_quality, 0, 0, 100),
+    OPT_INTRANGE("webp-compression", webp_compression, 0, 0, 6),
     OPT_FLAG("high-bit-depth", high_bit_depth, 0),
     OPT_FLAG("tag-colorspace", tag_csp, 0),
     {0},
@@ -134,6 +136,7 @@ static bool write_lavc(struct image_writer_ctx *ctx, mp_image_t *image, FILE *fp
         av_opt_set_int(avctx, "pred", ctx->opts->png_filter,
                        AV_OPT_SEARCH_CHILDREN);
     } else if (codec->id == AV_CODEC_ID_WEBP) {
+        avctx->compression_level = ctx->opts->webp_compression;
         av_opt_set_int(avctx, "lossless", ctx->opts->webp_lossless,
                        AV_OPT_SEARCH_CHILDREN);
         av_opt_set_int(avctx, "quality", ctx->opts->webp_quality,
diff --git a/video/image_writer.h b/video/image_writer.h
index 69e9cc218b..64265dba97 100644
--- a/video/image_writer.h
+++ b/video/image_writer.h
@@ -35,6 +35,7 @@ struct image_writer_opts {
     int jpeg_source_chroma;
     int webp_lossless;
     int webp_quality;
+    int webp_compression;
     int tag_csp;
 };

Places

File mpv_PR6832.patch of Package mpv (Revision b0401fb9dc3b672d421afa6029874fe2)

Places