[gnome-software/1131-featured-carousel: 4/21] plugins: Move key-colors plugin into GsApp code
- From: Phaedrus Leeds <mwleeds src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-software/1131-featured-carousel: 4/21] plugins: Move key-colors plugin into GsApp code
- Date: Thu, 18 Feb 2021 07:24:44 +0000 (UTC)
commit bc58d53e1753e83f94c9818b3965f4dd746e176f
Author: Philip Withnall <pwithnall endlessos org>
Date: Fri Feb 12 17:22:29 2021 +0000
plugins: Move key-colors plugin into GsApp code
There’s no need for alternate implementations of the key-colors plugin,
or for it to be disabled conditionally, so it’s more performant to move
the plugin into the main library. That reduces the number of plugins to
iterate over for each vfunc call.
The key-colors code itself is unchanged, just plumbed in to
`gs_app_get_key_colors()` to be calculated on demand. The `key_colors`
array is now created lazily.
Signed-off-by: Philip Withnall <pwithnall endlessos org>
contrib/gnome-software.spec.in | 1 -
lib/gs-app.c | 167 ++++++++++++++++++++++-
plugins/core/gs-plugin-key-colors-metadata.c | 1 -
plugins/core/gs-plugin-key-colors.c | 195 ---------------------------
plugins/core/meson.build | 13 --
plugins/dummy/gs-self-test.c | 1 -
6 files changed, 162 insertions(+), 216 deletions(-)
---
diff --git a/contrib/gnome-software.spec.in b/contrib/gnome-software.spec.in
index 97d8e9282..b98ce1bd8 100644
--- a/contrib/gnome-software.spec.in
+++ b/contrib/gnome-software.spec.in
@@ -162,7 +162,6 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_hardcoded-popular.so
%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_icons.so
%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_key-colors-metadata.so
-%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_key-colors.so
%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_modalias.so
%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_odrs.so
%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_os-release.so
diff --git a/lib/gs-app.c b/lib/gs-app.c
index d3cd67546..9fd6bb701 100644
--- a/lib/gs-app.c
+++ b/lib/gs-app.c
@@ -75,7 +75,7 @@ typedef struct
GsAppQuality description_quality;
GPtrArray *screenshots;
GPtrArray *categories;
- GPtrArray *key_colors;
+ GPtrArray *key_colors; /* (nullable) (element-type GdkRGBA) */
GHashTable *urls;
GHashTable *launchables;
gchar *url_missing;
@@ -684,7 +684,7 @@ gs_app_to_string_append (GsApp *app, GString *str)
tmp = g_ptr_array_index (priv->categories, i);
gs_app_kv_lpad (str, "category", tmp);
}
- for (i = 0; i < priv->key_colors->len; i++) {
+ for (i = 0; priv->key_colors != NULL && i < priv->key_colors->len; i++) {
GdkRGBA *color = g_ptr_array_index (priv->key_colors, i);
g_autofree gchar *key = NULL;
key = g_strdup_printf ("key-color-%02u", i);
@@ -3986,6 +3986,155 @@ gs_app_get_is_update_downloaded (GsApp *app)
return priv->is_update_downloaded;
}
+typedef struct {
+ guint8 R;
+ guint8 G;
+ guint8 B;
+} CdColorRGB8;
+
+static guint32
+cd_color_rgb8_to_uint32 (CdColorRGB8 *rgb)
+{
+ return (guint32) rgb->R |
+ (guint32) rgb->G << 8 |
+ (guint32) rgb->B << 16;
+}
+
+typedef struct {
+ GdkRGBA color;
+ guint cnt;
+} GsColorBin;
+
+static gint
+gs_color_bin_sort_cb (gconstpointer a, gconstpointer b)
+{
+ GsColorBin *s1 = (GsColorBin *) a;
+ GsColorBin *s2 = (GsColorBin *) b;
+ if (s1->cnt < s2->cnt)
+ return 1;
+ if (s1->cnt > s2->cnt)
+ return -1;
+ return 0;
+}
+
+/* convert range of 0..255 to 0..1 */
+static inline gdouble
+_convert_from_rgb8 (guchar val)
+{
+ return (gdouble) val / 255.f;
+}
+
+static void
+key_colors_set_for_pixbuf (GsApp *app, GdkPixbuf *pb, guint number)
+{
+ gint rowstride, n_channels;
+ gint x, y, width, height;
+ guchar *pixels, *p;
+ guint bin_size = 200;
+ guint i;
+ guint number_of_bins;
+
+ /* go through each pixel */
+ n_channels = gdk_pixbuf_get_n_channels (pb);
+ rowstride = gdk_pixbuf_get_rowstride (pb);
+ pixels = gdk_pixbuf_get_pixels (pb);
+ width = gdk_pixbuf_get_width (pb);
+ height = gdk_pixbuf_get_height (pb);
+
+ for (bin_size = 250; bin_size > 0; bin_size -= 2) {
+ g_autoptr(GHashTable) hash = NULL;
+ hash = g_hash_table_new_full (g_direct_hash, g_direct_equal,
+ NULL, g_free);
+ for (y = 0; y < height; y++) {
+ for (x = 0; x < width; x++) {
+ CdColorRGB8 tmp;
+ GsColorBin *s;
+ gpointer key;
+
+ /* disregard any with alpha */
+ p = pixels + y * rowstride + x * n_channels;
+ if (p[3] != 255)
+ continue;
+
+ /* find in cache */
+ tmp.R = (guint8) (p[0] / bin_size);
+ tmp.G = (guint8) (p[1] / bin_size);
+ tmp.B = (guint8) (p[2] / bin_size);
+ key = GUINT_TO_POINTER (cd_color_rgb8_to_uint32 (&tmp));
+ s = g_hash_table_lookup (hash, key);
+ if (s != NULL) {
+ s->color.red += _convert_from_rgb8 (p[0]);
+ s->color.green += _convert_from_rgb8 (p[1]);
+ s->color.blue += _convert_from_rgb8 (p[2]);
+ s->cnt++;
+ continue;
+ }
+
+ /* add to hash table */
+ s = g_new0 (GsColorBin, 1);
+ s->color.red = _convert_from_rgb8 (p[0]);
+ s->color.green = _convert_from_rgb8 (p[1]);
+ s->color.blue = _convert_from_rgb8 (p[2]);
+ s->color.alpha = 1.0;
+ s->cnt = 1;
+ g_hash_table_insert (hash, key, s);
+ }
+ }
+
+ number_of_bins = g_hash_table_size (hash);
+// g_debug ("number of colors: %i", number_of_bins);
+ if (number_of_bins >= number) {
+ g_autoptr(GList) values = NULL;
+
+ /* order by most popular */
+ values = g_hash_table_get_values (hash);
+ values = g_list_sort (values, gs_color_bin_sort_cb);
+ for (GList *l = values; l != NULL; l = l->next) {
+ GsColorBin *s = l->data;
+ g_autofree GdkRGBA *color = g_new0 (GdkRGBA, 1);
+ color->red = s->color.red / s->cnt;
+ color->green = s->color.green / s->cnt;
+ color->blue = s->color.blue / s->cnt;
+ gs_app_add_key_color (app, color);
+ }
+ return;
+ }
+ }
+
+ /* the algorithm failed, so just return a monochrome ramp */
+ for (i = 0; i < 3; i++) {
+ g_autofree GdkRGBA *color = g_new0 (GdkRGBA, 1);
+ color->red = (gdouble) i / 3.f;
+ color->green = color->red;
+ color->blue = color->red;
+ color->alpha = 1.0f;
+ gs_app_add_key_color (app, color);
+ }
+}
+
+static void
+calculate_key_colors (GsApp *app)
+{
+ GsAppPrivate *priv = gs_app_get_instance_private (app);
+ GdkPixbuf *pb;
+ g_autoptr(GdkPixbuf) pb_small = NULL;
+
+ /* Lazily create the array */
+ if (priv->key_colors == NULL)
+ priv->key_colors = g_ptr_array_new_with_free_func ((GDestroyNotify) gdk_rgba_free);
+
+ /* no pixbuf */
+ pb = gs_app_get_pixbuf (app);
+ if (pb == NULL) {
+ g_debug ("no pixbuf, so no key colors");
+ return;
+ }
+
+ /* get a list of key colors */
+ pb_small = gdk_pixbuf_scale_simple (pb, 32, 32, GDK_INTERP_BILINEAR);
+ key_colors_set_for_pixbuf (app, pb_small, 10);
+}
+
/**
* gs_app_get_key_colors:
* @app: a #GsApp
@@ -4001,6 +4150,10 @@ gs_app_get_key_colors (GsApp *app)
{
GsAppPrivate *priv = gs_app_get_instance_private (app);
g_return_val_if_fail (GS_IS_APP (app), NULL);
+
+ if (priv->key_colors == NULL)
+ calculate_key_colors (app);
+
return priv->key_colors;
}
@@ -4040,6 +4193,11 @@ gs_app_add_key_color (GsApp *app, GdkRGBA *key_color)
GsAppPrivate *priv = gs_app_get_instance_private (app);
g_return_if_fail (GS_IS_APP (app));
g_return_if_fail (key_color != NULL);
+
+ /* Lazily create the array */
+ if (priv->key_colors == NULL)
+ priv->key_colors = g_ptr_array_new_with_free_func ((GDestroyNotify) gdk_rgba_free);
+
g_ptr_array_add (priv->key_colors, gdk_rgba_copy (key_color));
gs_app_queue_notify (app, obj_props[PROP_KEY_COLORS]);
}
@@ -4481,7 +4639,7 @@ gs_app_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *
g_value_set_enum (value, priv->pending_action);
break;
case PROP_KEY_COLORS:
- g_value_set_boxed (value, priv->key_colors);
+ g_value_set_boxed (value, gs_app_get_key_colors (app));
break;
case PROP_IS_UPDATE_DOWNLOADED:
g_value_set_boolean (value, priv->is_update_downloaded);
@@ -4627,7 +4785,7 @@ gs_app_finalize (GObject *object)
g_free (priv->management_plugin);
g_hash_table_unref (priv->metadata);
g_ptr_array_unref (priv->categories);
- g_ptr_array_unref (priv->key_colors);
+ g_clear_pointer (&priv->key_colors, g_ptr_array_unref);
g_clear_object (&priv->cancellable);
if (priv->local_file != NULL)
g_object_unref (priv->local_file);
@@ -4811,7 +4969,6 @@ gs_app_init (GsApp *app)
priv->sources = g_ptr_array_new_with_free_func (g_free);
priv->source_ids = g_ptr_array_new_with_free_func (g_free);
priv->categories = g_ptr_array_new_with_free_func (g_free);
- priv->key_colors = g_ptr_array_new_with_free_func ((GDestroyNotify) gdk_rgba_free);
priv->addons = gs_app_list_new ();
priv->related = gs_app_list_new ();
priv->history = gs_app_list_new ();
diff --git a/plugins/core/gs-plugin-key-colors-metadata.c b/plugins/core/gs-plugin-key-colors-metadata.c
index 7e31e5ae8..b63840dd3 100644
--- a/plugins/core/gs-plugin-key-colors-metadata.c
+++ b/plugins/core/gs-plugin-key-colors-metadata.c
@@ -13,7 +13,6 @@
void
gs_plugin_initialize (GsPlugin *plugin)
{
- gs_plugin_add_rule (plugin, GS_PLUGIN_RULE_RUN_AFTER, "key-colors");
}
static gboolean
diff --git a/plugins/core/meson.build b/plugins/core/meson.build
index ced459f2b..193181851 100644
--- a/plugins/core/meson.build
+++ b/plugins/core/meson.build
@@ -13,19 +13,6 @@ shared_module(
dependencies : plugin_libs,
)
-shared_module(
- 'gs_plugin_key-colors',
- sources : 'gs-plugin-key-colors.c',
- include_directories : [
- include_directories('../..'),
- include_directories('../../lib'),
- ],
- install : true,
- install_dir: plugin_dir,
- c_args : cargs,
- dependencies : plugin_libs,
-)
-
shared_module(
'gs_plugin_key-colors-metadata',
sources : 'gs-plugin-key-colors-metadata.c',
diff --git a/plugins/dummy/gs-self-test.c b/plugins/dummy/gs-self-test.c
index 8e7e7ca87..dbf1452ec 100644
--- a/plugins/dummy/gs-self-test.c
+++ b/plugins/dummy/gs-self-test.c
@@ -725,7 +725,6 @@ main (int argc, char **argv)
"generic-updates",
"hardcoded-blocklist",
"icons",
- "key-colors",
"provenance",
"provenance-license",
NULL
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
