[vlc-commits] [Git][videolan/vlc][master] 2 commits: contrib: libaribcaption: Update to libaribcaption 1.1.1 tarball

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
c458d290 by xqq at 2023-10-05T06:10:47+00:00
contrib: libaribcaption: Update to libaribcaption 1.1.1 tarball

- - - - -
0fadbab6 by xqq at 2023-10-05T06:10:47+00:00
codec/libaribcaption: Skip rendering if images not changed for avoiding unnecessary memory copy

- - - - -


3 changed files:

- + contrib/src/libaribcaption/SHA512SUMS
- contrib/src/libaribcaption/rules.mak
- modules/codec/arib/libaribcaption.c


Changes:

=====================================
contrib/src/libaribcaption/SHA512SUMS
=====================================
@@ -0,0 +1 @@
+3f3c802ae68734126d9b4a0525b3353af4c1a3807cd21bfa04b89f2092fe565cb2413bcdd0b762313d40b7e0ab75c7e8066bf4a1879c16637f35ee164f6ef6a4  libaribcaption-1.1.1.tar.gz


=====================================
contrib/src/libaribcaption/rules.mak
=====================================
@@ -1,6 +1,5 @@
-LIBARIBCC_HASH := fab6e2a857dbda2eabca5c9b53d7a67e5c00c626
-LIBARIBCC_VERSION := git-$(LIBARIBCC_HASH)
-LIBARIBCC_GITURL := $(GITHUB)/xqq/libaribcaption.git
+LIBARIBCC_VERSION := 1.1.1
+LIBARIBCC_URL := $(GITHUB)/xqq/libaribcaption/archive/refs/tags/v$(LIBARIBCC_VERSION).tar.gz
 
 PKGS += libaribcaption
 ifeq ($(call need_pkg,"libaribcaption"),)
@@ -27,14 +26,12 @@ ifeq ($(LIBARIBCC_WITH_FONTCONFIG), 1)
 DEPS_libaribcaption += fontconfig $(DEPS_fontconfig)
 endif
 
-$(TARBALLS)/libaribcaption-$(LIBARIBCC_VERSION).tar.xz:
-	$(call download_git,$(LIBARIBCC_GITURL),,$(LIBARIBCC_HASH))
+$(TARBALLS)/libaribcaption-$(LIBARIBCC_VERSION).tar.gz:
+	${call download_pkg,$(LIBARIBCC_URL),libaribcaption}
 
-.sum-libaribcaption: libaribcaption-$(LIBARIBCC_VERSION).tar.xz
-	$(call check_githash,$(LIBARIBCC_HASH))
-	touch $@
+.sum-libaribcaption: libaribcaption-$(LIBARIBCC_VERSION).tar.gz
 
-libaribcaption: libaribcaption-$(LIBARIBCC_VERSION).tar.xz .sum-libaribcaption
+libaribcaption: libaribcaption-$(LIBARIBCC_VERSION).tar.gz .sum-libaribcaption
 	$(UNPACK)
 	$(MOVE)
 


=====================================
modules/codec/arib/libaribcaption.c
=====================================
@@ -119,18 +119,20 @@ static int SubpictureValidate(subpicture_t *p_subpic,
 
     const vlc_tick_t i_stream_date = p_spusys->i_pts + (i_ts - p_subpic->i_start);
 
-    aribcc_render_status_t status = aribcc_renderer_render(p_sys->p_renderer,
-                                                           MS_FROM_VLC_TICK(i_stream_date),
-                                                           &p_spusys->render_result);
-    if (status == ARIBCC_RENDER_STATUS_ERROR) {
-        return VLC_SUCCESS;
+    /* Retrieve the expected render status for detecting whether the subtitle image changed */
+    aribcc_render_status_t status = aribcc_renderer_try_render(p_sys->p_renderer,
+                                                               MS_FROM_VLC_TICK(i_stream_date));
+    if (status == ARIBCC_RENDER_STATUS_GOT_IMAGE_UNCHANGED) {
+        /* Skip rendering since images were not changed */
+        if (!b_src_changed && !b_dst_changed) {
+            return VLC_SUCCESS;
+        }
     }
 
-    bool b_changed = (status != ARIBCC_RENDER_STATUS_GOT_IMAGE_UNCHANGED);
-
-    if (!b_changed && !b_src_changed && !b_dst_changed &&
-        (p_spusys->render_result.images != NULL) == (p_subpic->p_region != NULL)) {
-        aribcc_render_result_cleanup(&p_spusys->render_result);
+    status = aribcc_renderer_render(p_sys->p_renderer,
+                                    MS_FROM_VLC_TICK(i_stream_date),
+                                    &p_spusys->render_result);
+    if (status == ARIBCC_RENDER_STATUS_ERROR) {
         return VLC_SUCCESS;
     }
 



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/8a261aac6b16a3771361e55b1f5d41227f7e6e9d...0fadbab6a6084ad9df19015dfce8efaba8fd3013

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/8a261aac6b16a3771361e55b1f5d41227f7e6e9d...0fadbab6a6084ad9df19015dfce8efaba8fd3013
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance