Add domain override to video_anim_cached()

Author: GrieferAtWork

kos/include/libvideo/gfx/anim.h

@@ -179,15 +179,19 @@ video_anim_fromframe(struct video_buffer *__restrict __frame);
 
 /* Return a wrapper for `__self'  that caches animation frames  during
  * the first loop, and simply replays them during any subsequent loop.
+ * @param: __domain: When non-null, animation  frames are  cached in  this
+ *                   domain, rather than being kept in `__self->va_domain'
  * @param: __format: When non-null,  animation frames  are converted  into
- *                   this pixel format, rather than being copied verbatim.
- * @param: __type:   The type of video buffer to use for cached images. */
-typedef __ATTR_WUNUSED_T __ATTR_INOUT_T(1) __ATTR_IN_OPT_T(2) __REF struct video_anim *
+ *                   this pixel format, rather than being copied verbatim. */
+typedef __ATTR_WUNUSED_T __ATTR_INOUT_T(1) __ATTR_IN_OPT_T(2) __ATTR_IN_OPT_T(3) __REF struct video_anim *
 (LIBVIDEO_GFX_CC *PVIDEO_ANIM_CACHED)(struct video_anim *__restrict __self,
+                                      struct video_domain const *__domain,
                                       struct video_format const *__format);
 #ifdef LIBVIDEO_GFX_WANT_PROTOTYPES
-LIBVIDEO_GFX_DECL __ATTR_WUNUSED __ATTR_INOUT(1) __ATTR_IN_OPT(2) __REF struct video_anim *LIBVIDEO_GFX_CC
-video_anim_cached(struct video_anim *__restrict __self, struct video_format const *__format);
+LIBVIDEO_GFX_DECL __ATTR_WUNUSED __ATTR_INOUT(1) __ATTR_IN_OPT(2) __ATTR_IN_OPT(3) __REF struct video_anim *LIBVIDEO_GFX_CC
+video_anim_cached(struct video_anim *__restrict __self,
+                  struct video_domain const *__domain,
+                  struct video_format const *__format);
 #endif /* LIBVIDEO_GFX_WANT_PROTOTYPES */
 
 

kos/src/apps/showpic/main.c

@@ -651,9 +651,9 @@ int main(int argc, char *argv[]) {
 	 * - src format caching: ~95% spent sleeping  (=> x20 pixel output possible)
 	 * - dst format caching: ~97% spent sleeping  (=> x30 pixel output possible) */
 #if 0
-	anim = video_anim_cached(anim, NULL);
+	anim = video_anim_cached(anim, NULL, NULL);
 #elif 1
-	anim = video_anim_cached(anim, &bscreen->vb_format);
+	anim = video_anim_cached(anim, bscreen->vb_domain, &bscreen->vb_format);
 #endif
 	if unlikely(!anim)
 		err(EXIT_FAILURE, "Failed to cache animation");

kos/src/libvideo/gfx/anim.c

@@ -404,18 +404,26 @@ PRIVATE ATTR_RETNONNULL WUNUSED struct video_anim_ops *CC _cached_anim_ops(void)
 
 /* Return  a wrapper  for `self'  that caches  animation frames during
  * the first loop, and simply replays them during any subsequent loop.
+ * @param: domain: When  non-null, animation frames are cached in this
+ *                 domain, rather than being kept in `self->va_domain'
  * @param: format: When non-null,  animation frames  are converted  into
- *                 this pixel format, rather than being copied verbatim.
- * @param: type:   The type of video buffer to use for cached images. */
+ *                 this pixel format, rather than being copied verbatim. */
 DEFINE_PUBLIC_ALIAS(video_anim_cached, libvideo_anim_cached);
-INTERN WUNUSED ATTR_INOUT(1) ATTR_IN_OPT(2) REF struct video_anim *CC
+INTERN WUNUSED ATTR_INOUT(1) ATTR_IN_OPT(2) ATTR_IN_OPT(3) REF struct video_anim *CC
 libvideo_anim_cached(struct video_anim *__restrict self,
+                     struct video_domain const *domain,
                      struct video_format const *format) {
 	REF struct cached_anim *result;
+	if (domain == NULL)
+		domain = self->va_domain;
 	if (self->va_ops == &cached_anim_ops) {
 		/* Check for special case: `self' is already cached and uses a compatible format */
 		struct cached_anim *me = (struct cached_anim *)self;
-		if (!format) {
+		if (format == NULL)
+			format = &me->ca_fmt;
+		if (format->vf_codec == me->ca_fmt.vf_codec &&
+		    format->vf_pal == me->ca_fmt.vf_pal &&
+		    me->va_domain == domain) {
 			video_anim_incref(me);
 			return me;
 		}
@@ -428,11 +436,12 @@ libvideo_anim_cached(struct video_anim *__restrict self,
 		if (format == NULL)
 			format = &frame->vb_format;
 		if (frame->vb_format.vf_codec == format->vf_codec &&
-		    frame->vb_format.vf_pal == format->vf_pal) {
+		    frame->vb_format.vf_pal == format->vf_pal &&
+		    frame->vb_domain == domain) {
 			video_anim_incref(me);
 			return me;
 		}
-		converted = libvideo_buffer_convert(frame, me->va_domain, format);
+		converted = libvideo_buffer_convert(frame, domain, format);
 		if unlikely(!converted)
 			goto err;
 		oneframe_result = libvideo_anim_fromframe(converted);
@@ -443,7 +452,7 @@ libvideo_anim_cached(struct video_anim *__restrict self,
 	result = (REF struct cached_anim *)malloc(sizeof(struct cached_anim));
 	if unlikely(!result)
 		goto err;
-	result->va_domain = self->va_domain;
+	result->va_domain = domain ? domain : self->va_domain;
 	result->va_ops    = _cached_anim_ops();
 	result->va_xdim   = self->va_xdim;
 	result->va_ydim   = self->va_ydim;

kos/src/libvideo/gfx/anim.h

@@ -43,11 +43,13 @@ libvideo_anim_fromframe(struct video_buffer *__restrict frame);
 
 /* Return  a wrapper  for `self'  that caches  animation frames during
  * the first loop, and simply replays them during any subsequent loop.
+ * @param: domain: When  non-null, animation frames are cached in this
+ *                 domain, rather than being kept in `self->va_domain'
  * @param: format: When non-null,  animation frames  are converted  into
- *                 this pixel format, rather than being copied verbatim.
- * @param: type:   The type of video buffer to use for cached images. */
-INTDEF WUNUSED ATTR_INOUT(1) ATTR_IN_OPT(2) REF struct video_anim *CC
+ *                 this pixel format, rather than being copied verbatim. */
+INTDEF WUNUSED ATTR_INOUT(1) ATTR_IN_OPT(2) ATTR_IN_OPT(3) REF struct video_anim *CC
 libvideo_anim_cached(struct video_anim *__restrict self,
+                     struct video_domain const *domain,
                      struct video_format const *format);
 
 DECL_END