68 files changed, 777 insertions, 2927 deletions
diff --git a/recipes-multimedia/alsa/alsa-lib/0001-add-conf-for-multichannel-support-in-imx.patch b/recipes-multimedia/alsa/alsa-lib/0001-add-conf-for-multichannel-support-in-imx.patch
index 7d20c6782..7ae8b8fef 100644
--- a/recipes-multimedia/alsa/alsa-lib/0001-add-conf-for-multichannel-support-in-imx.patch
+++ b/recipes-multimedia/alsa/alsa-lib/0001-add-conf-for-multichannel-support-in-imx.patch
@@ -1,4 +1,4 @@
-From 49a7eac8e02c33cae8a168e6d22d9ff8aaf86d44 Mon Sep 17 00:00:00 2001
+From 3fa81ebaf8bac6b167776888ae26c6c140d8aebc Mon Sep 17 00:00:00 2001
 From: Shengjiu Wang <b02247@freescale.com>
 Date: Thu, 5 Jun 2014 17:37:47 +0800
 Subject: [PATCH] add conf for multichannel support in imx
@@ -6,19 +6,18 @@ Subject: [PATCH] add conf for multichannel support in imx
 Upstream-Status: Inappropriate [platform specific]
 Signed-off-by: Shengjiu Wang <b02247@freescale.com>
 ---
 src/conf/cards/CS42888.conf  | 94 ++++++++++++++++++++++++++++++++++++
 src/conf/cards/IMX-HDMI.conf | 67 +++++++++++++++++++++++++
- src/conf/cards/Makefile.am   |  4 +-
+ src/conf/cards/Makefile.am   |  2 +
 src/conf/cards/aliases.conf  |  2 +
- 4 files changed, 166 insertions(+), 1 deletion(-)
+ 4 files changed, 165 insertions(+)
 create mode 100644 src/conf/cards/CS42888.conf
 create mode 100644 src/conf/cards/IMX-HDMI.conf
 diff --git a/src/conf/cards/CS42888.conf b/src/conf/cards/CS42888.conf
 new file mode 100644
-index 0000000..671a284
+index 000000000000..671a2845894b
 --- /dev/null
 +++ b/src/conf/cards/CS42888.conf
 @@ -0,0 +1,94 @@
@@ -118,7 +117,7 @@ index 0000000..671a284
 +# vim: ft=alsaconf
 diff --git a/src/conf/cards/IMX-HDMI.conf b/src/conf/cards/IMX-HDMI.conf
 new file mode 100644
-index 0000000..a51509e
+index 000000000000..a51509e8ad5a
 --- /dev/null
 +++ b/src/conf/cards/IMX-HDMI.conf
 @@ -0,0 +1,67 @@
@@ -190,22 +189,20 @@ index 0000000..a51509e
 +
 +# vim: ft=alsaconf
 diff --git a/src/conf/cards/Makefile.am b/src/conf/cards/Makefile.am
-index 00999f0..fbf0697 100644
+index f387cf4197da..cbd2cd04227d 100644
 --- a/src/conf/cards/Makefile.am
 +++ b/src/conf/cards/Makefile.am
-@@ -58,7 +58,9 @@ cfg_files = aliases.conf \
+@@ -1,6 +1,8 @@
-        VIA8237.conf \
+ alsaconfigdir = @ALSA_CONFIG_DIR@
-        VX222.conf \
+ alsadir = $(alsaconfigdir)/cards
-        VXPocket.conf \
+ cfg_files = aliases.conf \
-       VXPocket440.conf
-+       VXPocket440.conf \
 +       CS42888.conf \
-+       IMX-HDMI.conf
+       IMX-HDMI.conf \
- 
+        AACI.conf \
- if BUILD_ALISP
+        ATIIXP.conf \
- cfg_files += aliases.alisp
+        ATIIXP-SPDMA.conf \
 diff --git a/src/conf/cards/aliases.conf b/src/conf/cards/aliases.conf
-index 7e352f7..a9e6d76 100644
+index a54824ae636b..0aa874d7434f 100644
 --- a/src/conf/cards/aliases.conf
 +++ b/src/conf/cards/aliases.conf
 @@ -57,6 +57,8 @@ CMI8786 cards.CMI8788
@@ -217,3 +214,6 @@ index 7e352f7..a9e6d76 100644
 
 <confdir:ctl/default.conf>
 <confdir:pcm/default.conf>
+-- 
+2.42.0
diff --git a/recipes-multimedia/alsa/alsa-lib/0001-pcm-rate-fix-the-crash-in-snd_pcm_rate_may_wait_for_.patch b/recipes-multimedia/alsa/alsa-lib/0001-pcm-rate-fix-the-crash-in-snd_pcm_rate_may_wait_for_.patch
index 5ec0d2e99..193d507eb 100644
--- a/recipes-multimedia/alsa/alsa-lib/0001-pcm-rate-fix-the-crash-in-snd_pcm_rate_may_wait_for_.patch
+++ b/recipes-multimedia/alsa/alsa-lib/0001-pcm-rate-fix-the-crash-in-snd_pcm_rate_may_wait_for_.patch
@@ -1,4 +1,4 @@
-From aa4f56c3c952269c36464cc0da9db5a1381648fa Mon Sep 17 00:00:00 2001
+From 3950e1ae36ca53a67b7248137e6033e7e99f79a3 Mon Sep 17 00:00:00 2001
 From: Jaroslav Kysela <perex@perex.cz>
 Date: Wed, 9 Nov 2022 08:11:42 +0100
 Subject: [PATCH] pcm: rate - fix the crash in
@@ -24,10 +24,10 @@ Signed-off-by: Jaroslav Kysela <perex@perex.cz>
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/src/pcm/pcm_plugin.c b/src/pcm/pcm_plugin.c
-index 6bb90b8b..ec64604c 100644
+index 9d7e233e8437..d58789eca73b 100644
 --- a/src/pcm/pcm_plugin.c
 +++ b/src/pcm/pcm_plugin.c
-@@ -622,7 +622,7 @@ int snd_pcm_plugin_may_wait_for_avail_min_conv(
+@@ -626,7 +626,7 @@ int snd_pcm_plugin_may_wait_for_avail_min_conv(
                 * This code is also used by extplug, but extplug does not allow to alter the sampling rate.
                 */
                if (conv)
@@ -37,5 +37,5 @@ index 6bb90b8b..ec64604c 100644
                if (slave->avail_min != needed_slave_avail_min) {
                        snd_pcm_sw_params_t *swparams;
 -- 
-2.34.1
+2.42.0
diff --git a/recipes-multimedia/alsa/alsa-lib/0005-add-ak4458-conf-for-multichannel-support.patch b/recipes-multimedia/alsa/alsa-lib/0005-add-ak4458-conf-for-multichannel-support.patch
index b25aa910e..51e199821 100644
--- a/recipes-multimedia/alsa/alsa-lib/0005-add-ak4458-conf-for-multichannel-support.patch
+++ b/recipes-multimedia/alsa/alsa-lib/0005-add-ak4458-conf-for-multichannel-support.patch
@@ -1,4 +1,4 @@
-From d78b7e2b964c9713c2e9889f4ec85922528ba971 Mon Sep 17 00:00:00 2001
+From 92d2b7d91bc1ec4068ee9371753bb24ad1108827 Mon Sep 17 00:00:00 2001
 From: Shengjiu Wang <shengjiu.wang@nxp.com>
 Date: Wed, 31 Jan 2018 15:06:53 +0800
 Subject: [PATCH] add ak4458 conf for multichannel support
@@ -12,17 +12,16 @@ maximum 8 channels, but ak4458 may support 16 channels
 Upstream-Status: Inappropriate [i.MX specific]
 Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
 ---
 src/conf/cards/AK4458.conf  | 74 +++++++++++++++++++++++++++++++++++++
- src/conf/cards/Makefile.am  |  3 +-
+ src/conf/cards/Makefile.am  |  1 +
 src/conf/cards/aliases.conf |  1 +
- 3 files changed, 77 insertions(+), 1 deletion(-)
+ 3 files changed, 76 insertions(+)
 create mode 100644 src/conf/cards/AK4458.conf
 diff --git a/src/conf/cards/AK4458.conf b/src/conf/cards/AK4458.conf
 new file mode 100644
-index 0000000..3b5b195
+index 000000000000..3b5b195f2ca0
 --- /dev/null
 +++ b/src/conf/cards/AK4458.conf
 @@ -0,0 +1,74 @@
@@ -101,21 +100,19 @@ index 0000000..3b5b195
 +       slave.channels 8
 +}
 diff --git a/src/conf/cards/Makefile.am b/src/conf/cards/Makefile.am
-index fbf0697..34fa5a3 100644
+index cbd2cd04227d..3c29bd65d341 100644
 --- a/src/conf/cards/Makefile.am
 +++ b/src/conf/cards/Makefile.am
-@@ -60,7 +60,8 @@ cfg_files = aliases.conf \
+@@ -3,6 +3,7 @@ alsadir = $(alsaconfigdir)/cards
-        VXPocket.conf \
+ cfg_files = aliases.conf \
-        VXPocket440.conf \
        CS42888.conf \
-       IMX-HDMI.conf
+        IMX-HDMI.conf \
-+       IMX-HDMI.conf \
+       AK4458.conf \
-+       AK4458.conf
+        AACI.conf \
- 
+        ATIIXP.conf \
- if BUILD_ALISP
+        ATIIXP-SPDMA.conf \
- cfg_files += aliases.alisp
 diff --git a/src/conf/cards/aliases.conf b/src/conf/cards/aliases.conf
-index a9e6d76..2f0a22a 100644
+index 0aa874d7434f..dda71d99916e 100644
 --- a/src/conf/cards/aliases.conf
 +++ b/src/conf/cards/aliases.conf
 @@ -59,6 +59,7 @@ pistachio cards.pistachio-card
@@ -126,3 +123,6 @@ index a9e6d76..2f0a22a 100644
 
 <confdir:ctl/default.conf>
 <confdir:pcm/default.conf>
+-- 
+2.42.0
diff --git a/recipes-multimedia/alsa/alsa-lib/0006-add-conf-for-iMX-XCVR-sound-card.patch b/recipes-multimedia/alsa/alsa-lib/0006-add-conf-for-iMX-XCVR-sound-card.patch
index 1f558185d..db76eb749 100644
--- a/recipes-multimedia/alsa/alsa-lib/0006-add-conf-for-iMX-XCVR-sound-card.patch
+++ b/recipes-multimedia/alsa/alsa-lib/0006-add-conf-for-iMX-XCVR-sound-card.patch
@@ -1,4 +1,4 @@
-From 36aae65dc913e1ebe72366d7ae361897d465e88d Mon Sep 17 00:00:00 2001
+From faa9791070520f8d5e7060e5668efd1302c86c66 Mon Sep 17 00:00:00 2001
 From: Viorel Suman <viorel.suman@nxp.com>
 Date: Mon, 9 Mar 2020 14:25:46 +0200
 Subject: [PATCH] add conf for iMX XCVR sound card
@@ -6,17 +6,16 @@ Subject: [PATCH] add conf for iMX XCVR sound card
 Upstream-Status: Pending
 Signed-off-by: Viorel Suman <viorel.suman@nxp.com>
 ---
 src/conf/cards/IMX-XCVR.conf | 39 ++++++++++++++++++++++++++++++++++++
- src/conf/cards/Makefile.am   |  3 ++-
+ src/conf/cards/Makefile.am   |  1 +
 src/conf/cards/aliases.conf  |  1 +
- 3 files changed, 42 insertions(+), 1 deletion(-)
+ 3 files changed, 41 insertions(+)
 create mode 100755 src/conf/cards/IMX-XCVR.conf
 diff --git a/src/conf/cards/IMX-XCVR.conf b/src/conf/cards/IMX-XCVR.conf
 new file mode 100755
-index 0000000..009000c
+index 000000000000..009000c63a19
 --- /dev/null
 +++ b/src/conf/cards/IMX-XCVR.conf
 @@ -0,0 +1,39 @@
@@ -60,21 +59,19 @@ index 0000000..009000c
 +       preamble.y 0x3
 +}
 diff --git a/src/conf/cards/Makefile.am b/src/conf/cards/Makefile.am
-index 34fa5a3..70b9bab 100644
+index 3c29bd65d341..4502919e3bec 100644
 --- a/src/conf/cards/Makefile.am
 +++ b/src/conf/cards/Makefile.am
-@@ -61,7 +61,8 @@ cfg_files = aliases.conf \
+@@ -4,6 +4,7 @@ cfg_files = aliases.conf \
-        VXPocket440.conf \
        CS42888.conf \
        IMX-HDMI.conf \
-       AK4458.conf
+        AK4458.conf \
-+       AK4458.conf \
+       IMX-XCVR.conf \
-+       IMX-XCVR.conf
+        AACI.conf \
- 
+        ATIIXP.conf \
- if BUILD_ALISP
+        ATIIXP-SPDMA.conf \
- cfg_files += aliases.alisp
 diff --git a/src/conf/cards/aliases.conf b/src/conf/cards/aliases.conf
-index 2f0a22a..e824145 100644
+index dda71d99916e..6dab14855f25 100644
 --- a/src/conf/cards/aliases.conf
 +++ b/src/conf/cards/aliases.conf
 @@ -60,6 +60,7 @@ VC4-HDMI cards.vc4-hdmi
@@ -85,3 +82,6 @@ index 2f0a22a..e824145 100644
 
 <confdir:ctl/default.conf>
 <confdir:pcm/default.conf>
+-- 
+2.42.0
diff --git a/recipes-multimedia/alsa/alsa-lib/0007-add-conf-for-imx-cs42448-sound-card.patch b/recipes-multimedia/alsa/alsa-lib/0007-add-conf-for-imx-cs42448-sound-card.patch
index 64e15be4a..fa71078e4 100644
--- a/recipes-multimedia/alsa/alsa-lib/0007-add-conf-for-imx-cs42448-sound-card.patch
+++ b/recipes-multimedia/alsa/alsa-lib/0007-add-conf-for-imx-cs42448-sound-card.patch
@@ -1,107 +1,109 @@
-From 97d5e09a4166b45c567026e51b8a25ef5d7d587d Mon Sep 17 00:00:00 2001
+From 38d84440a7bec9e26380f08f050b2ada772b822e Mon Sep 17 00:00:00 2001
-From: Chancel Liu <chancel.liu@nxp.com>
+From: Chancel Liu <chancel.liu@nxp.com>
-Date: Fri, 29 Jul 2022 16:12:37 +0800
+Date: Fri, 29 Jul 2022 16:12:37 +0800
-Subject: [PATCH] add conf for imx-cs42448 sound card
+Subject: [PATCH] add conf for imx-cs42448 sound card
+MIME-Version: 1.0
-Upstream-Status: Inappropriate [i.MX specific]
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
-Signed-off-by: Chancel Liu <chancel.liu@nxp.com>
---
+Upstream-Status: Inappropriate [i.MX specific]
- src/conf/cards/CS42448.conf | 58 +++++++++++++++++++++++++++++++++++++
- src/conf/cards/Makefile.am  |  3 +-
+Signed-off-by: Chancel Liu <chancel.liu@nxp.com>
- src/conf/cards/aliases.conf |  1 +
+---
- 3 files changed, 61 insertions(+), 1 deletion(-)
+ src/conf/cards/CS42448.conf | 58 +++++++++++++++++++++++++++++++++++++
- create mode 100644 src/conf/cards/CS42448.conf
+ src/conf/cards/Makefile.am  |  1 +
+ src/conf/cards/aliases.conf |  1 +
-diff --git a/src/conf/cards/CS42448.conf b/src/conf/cards/CS42448.conf
+ 3 files changed, 60 insertions(+)
-new file mode 100644
+ create mode 100644 src/conf/cards/CS42448.conf
-index 00000000..28ba5c48
--- /dev/null
+diff --git a/src/conf/cards/CS42448.conf b/src/conf/cards/CS42448.conf
-+++ b/src/conf/cards/CS42448.conf
+new file mode 100644
-@@ -0,0 +1,58 @@
+index 000000000000..28ba5c485837
-+#
+--- /dev/null
-+# Configuration for the CS42448 chip
+++ b/src/conf/cards/CS42448.conf
-+#
+@@ -0,0 +1,58 @@
-+
+#
-+# default with dmix & dsnoop
+# Configuration for the CS42448 chip
-+CS42448.pcm.default {
+#
-+       @args [ CARD ]
+
-+       @args.CARD {
+# default with dmix & dsnoop
-+               type string
+CS42448.pcm.default {
-+       }
+       @args [ CARD ]
-+       type asym
+       @args.CARD {
-+       playback.pcm {
+               type string
-+               type plug
+       }
-+               slave.pcm {
+       type asym
-+                       @func concat
+       playback.pcm {
-+                       strings [ "dmix:" $CARD ",FORMAT=S32_LE" ]
+               type plug
-+               }
+               slave.pcm {
-+       }
+                       @func concat
-+       capture.pcm {
+                       strings [ "dmix:" $CARD ",FORMAT=S32_LE" ]
-+               type plug
+               }
-+               slave.pcm {
+       }
-+                       @func concat
+       capture.pcm {
-+                       strings [ "dsnoop:" $CARD ",FORMAT=S32_LE" ]
+               type plug
-+               }
+               slave.pcm {
-+       }
+                       @func concat
-+}
+                       strings [ "dsnoop:" $CARD ",FORMAT=S32_LE" ]
-+
+               }
-+<confdir:pcm/surround51.conf>
+       }
-+
+}
-+CS42448.pcm.surround51.0 {
+
-+       @args [ CARD ]
+<confdir:pcm/surround51.conf>
-+       @args.CARD {
+
-+               type string
+CS42448.pcm.surround51.0 {
-+       }
+       @args [ CARD ]
-+       type plug
+       @args.CARD {
-+       slave.pcm {
+               type string
-+               type hw
+       }
-+               card $CARD
+       type plug
-+       }
+       slave.pcm {
-+       slave.channels 6
+               type hw
-+}
+               card $CARD
-+
+       }
-+<confdir:pcm/surround71.conf>
+       slave.channels 6
-+
+}
-+CS42448.pcm.surround71.0 {
+
-+       @args [ CARD ]
+<confdir:pcm/surround71.conf>
-+       @args.CARD {
+
-+               type string
+CS42448.pcm.surround71.0 {
-+       }
+       @args [ CARD ]
-+       type plug
+       @args.CARD {
-+       slave.pcm {
+               type string
-+               type hw
+       }
-+               card $CARD
+       type plug
-+       }
+       slave.pcm {
-+       slave.channels 8
+               type hw
-+}
+               card $CARD
-+
+       }
-+# vim: ft=alsaconf
+       slave.channels 8
-diff --git a/src/conf/cards/Makefile.am b/src/conf/cards/Makefile.am
+}
-index 70b9bab3..6aba20b4 100644
+
--- a/src/conf/cards/Makefile.am
+# vim: ft=alsaconf
-+++ b/src/conf/cards/Makefile.am
+diff --git a/src/conf/cards/Makefile.am b/src/conf/cards/Makefile.am
-@@ -62,7 +62,8 @@ cfg_files = aliases.conf \
+index 4502919e3bec..da2def3a9498 100644
-        CS42888.conf \
+--- a/src/conf/cards/Makefile.am
-        IMX-HDMI.conf \
+++ b/src/conf/cards/Makefile.am
-        AK4458.conf \
+@@ -5,6 +5,7 @@ cfg_files = aliases.conf \
-       IMX-XCVR.conf
+        IMX-HDMI.conf \
-+       IMX-XCVR.conf \
+        AK4458.conf \
-+       CS42448.conf
+        IMX-XCVR.conf \
- 
+       CS42448.conf \
- if BUILD_ALISP
+        AACI.conf \
- cfg_files += aliases.alisp
+        ATIIXP.conf \
-diff --git a/src/conf/cards/aliases.conf b/src/conf/cards/aliases.conf
+        ATIIXP-SPDMA.conf \
-index e824145d..a40d3731 100644
+diff --git a/src/conf/cards/aliases.conf b/src/conf/cards/aliases.conf
--- a/src/conf/cards/aliases.conf
+index 6dab14855f25..554db846f8e5 100644
-+++ b/src/conf/cards/aliases.conf
+--- a/src/conf/cards/aliases.conf
-@@ -61,6 +61,7 @@ imx-cs42888 cards.CS42888
+++ b/src/conf/cards/aliases.conf
- imx-hdmi-soc cards.IMX-HDMI
+@@ -61,6 +61,7 @@ imx-cs42888 cards.CS42888
- ak4458-audio cards.AK4458
+ imx-hdmi-soc cards.IMX-HDMI
- imx-audio-xcvr cards.IMX-XCVR
+ ak4458-audio cards.AK4458
-+imx-cs42448 cards.CS42448
+ imx-audio-xcvr cards.IMX-XCVR
- 
+imx-cs42448 cards.CS42448
- <confdir:ctl/default.conf>
+ 
- <confdir:pcm/default.conf>
+ <confdir:ctl/default.conf>
-- 
+ <confdir:pcm/default.conf>
-2.17.1
+-- 
+2.42.0
diff --git a/recipes-multimedia/alsa/alsa-lib_%.bbappend b/recipes-multimedia/alsa/alsa-lib_%.bbappend
index 65498aed1..230cf0957 100644
--- a/recipes-multimedia/alsa/alsa-lib_%.bbappend
+++ b/recipes-multimedia/alsa/alsa-lib_%.bbappend
@@ -10,6 +10,3 @@ IMX_PATCH = " \
 SRC_URI:append:imx-nxp-bsp = "${IMX_PATCH}"
 PACKAGE_ARCH:imx-nxp-bsp = "${MACHINE_SOCARCH}"
-GLIBC_64BIT_TIME_FLAGS = ""
-INSANE_SKIP:append = " 32bit-time"
diff --git a/recipes-multimedia/alsa/imx-alsa-plugins_git.bb b/recipes-multimedia/alsa/imx-alsa-plugins_git.bb
index e2acf7676..d38e97e8f 100644
--- a/recipes-multimedia/alsa/imx-alsa-plugins_git.bb
+++ b/recipes-multimedia/alsa/imx-alsa-plugins_git.bb
@@ -1,5 +1,5 @@
 # Copyright 2013-2016 Freescale Semiconductor
-# Copyright 2017-2023 NXP
+# Copyright 2017-2025 NXP
 # Released under the MIT license (see COPYING.MIT for the terms)
 DESCRIPTION = "Freescale alsa-lib plugins"
@@ -20,14 +20,10 @@ inherit autotools pkgconfig use-imx-headers
 PV = "1.0.26+${SRCPV}"
 SRC_URI = "git://github.com/nxp-imx/imx-alsa-plugins.git;protocol=https;branch=${SRCBRANCH}"
-SRCBRANCH = "MM_04.08.03_2312_L6.6.y"
+SRCBRANCH = "MM_04.10.0_2505_L6.12.20"
-SRCREV = "b2ba082e70333f187972ee4e85f63f9d2f608331"
+SRCREV = "40e45c8023f95c06c4ea10185ca85db7eb2dfcd8"
-S = "${WORKDIR}/git"
+CFLAGS:append = " -I${STAGING_INCDIR_IMX}"
-INCLUDE_DIR = "-I${STAGING_INCDIR_IMX}"
-EXTRA_OECONF = "CFLAGS="${INCLUDE_DIR}""
 PACKAGECONFIG ??= "${PACKAGECONFIG_SWPDM}"
 PACKAGECONFIG_SWPDM             = ""
diff --git a/recipes-multimedia/gstreamer/gst-devtools/0001-connect-has-a-different-signature-on-musl.patch b/recipes-multimedia/gstreamer/gst-devtools/0001-connect-has-a-different-signature-on-musl.patch
index c0e458135..b596f2ef9 100644
--- a/recipes-multimedia/gstreamer/gst-devtools/0001-connect-has-a-different-signature-on-musl.patch
+++ b/recipes-multimedia/gstreamer/gst-devtools/0001-connect-has-a-different-signature-on-musl.patch
@@ -1,4 +1,4 @@
-From 73b1002eda17451db1f58431b42c25203f1d3097 Mon Sep 17 00:00:00 2001
+From 67809420230cd4fcc63069f78efdc90c7b4c4ee1 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sun, 9 Sep 2018 17:38:10 -0700
 Subject: [PATCH] connect has a different signature on musl
diff --git a/recipes-multimedia/gstreamer/gst-devtools_1.26.0.imx.bb b/recipes-multimedia/gstreamer/gst-devtools_1.26.0.imx.bb
new file mode 100644
index 000000000..9a619f5a0
--- /dev/null
+++ b/recipes-multimedia/gstreamer/gst-devtools_1.26.0.imx.bb
@@ -0,0 +1,55 @@
+SUMMARY = "Gstreamer validation tool"
+DESCRIPTION = "A Tool to test GStreamer components"
+HOMEPAGE = "https://gstreamer.freedesktop.org/documentation/gst-devtools/index.html"
+SECTION = "multimedia"
+LICENSE = "LGPL-2.1-or-later"
+LIC_FILES_CHKSUM = "file://validate/COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343"
+SRC_URI = "https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-${@get_gst_ver("${PV}")}.tar.xz \
+           file://0001-connect-has-a-different-signature-on-musl.patch \
+           "
+S = "${UNPACKDIR}/gst-devtools-${@get_gst_ver("${PV}")}"
+SRC_URI[sha256sum] = "eff33d7dc292bb074a2788ea887b6283398ffdefafa49fb7d08efe6658a65648"
+DEPENDS = "json-glib glib-2.0 glib-2.0-native gstreamer1.0 gstreamer1.0-plugins-base"
+RRECOMMENDS:${PN} = "git"
+FILES:${PN} += "${datadir}/gstreamer-1.0/* ${libdir}/gst-validate-launcher/* ${libdir}/gstreamer-1.0/*"
+inherit meson pkgconfig gettext upstream-version-is-even gobject-introspection
+# TODO: put this in a gettext.bbclass patch
+def gettext_oemeson(d):
+    if d.getVar('USE_NLS') == 'no':
+        return '-Dnls=disabled'
+    # Remove the NLS bits if USE_NLS is no or INHIBIT_DEFAULT_DEPS is set
+    if d.getVar('INHIBIT_DEFAULT_DEPS') and not oe.utils.inherits(d, 'cross-canadian'):
+        return '-Dnls=disabled'
+    return '-Dnls=enabled'
+# Build GstValidateVideo
+PACKAGECONFIG[cairo] = "-Dcairo=enabled,-Dcairo=disabled,cairo"
+EXTRA_OEMESON += " \
+    -Ddoc=disabled \
+    -Ddebug_viewer=disabled \
+    -Dtests=disabled \
+    -Dvalidate=enabled \
+    ${@gettext_oemeson(d)} \
+"
+# Drop .imx from PV
+def get_gst_ver(v):
+    return oe.utils.trim_version(v, 3)
+do_install:append () {
+     for fn in ${bindir}/gst-validate-launcher \
+         ${libdir}/gst-validate-launcher/python/launcher/config.py; do
+             sed -i -e 's,${B},/usr/src/debug/${PN},g' -e 's,${S},/usr/src/debug/${PN},g' ${D}$fn
+     done
+}
+GIR_MESON_ENABLE_FLAG = "enabled"
+GIR_MESON_DISABLE_FLAG = "disabled"
diff --git a/recipes-multimedia/gstreamer/gst-examples/0001-Make-player-examples-installable.patch b/recipes-multimedia/gstreamer/gst-examples/0001-Make-player-examples-installable.patch
new file mode 100644
index 000000000..828c87dc9
--- /dev/null
+++ b/recipes-multimedia/gstreamer/gst-examples/0001-Make-player-examples-installable.patch
@@ -0,0 +1,37 @@
+From 7924016fce2d0b435891a335cdae52fc939c7e3b Mon Sep 17 00:00:00 2001
+From: Jussi Kukkonen <jussi.kukkonen@intel.com>
+Date: Thu, 17 Aug 2017 11:07:02 +0300
+Subject: [PATCH] Make player examples installable
+Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
+Upstream-Status: Denied [Upstream considers these code examples, for now a least]
+https://bugzilla.gnome.org/show_bug.cgi?id=777827
+---
+ playback/player/gst-play/meson.build | 1 +
+ playback/player/gtk/meson.build      | 1 +
+ 2 files changed, 2 insertions(+)
+Index: gst-examples/playback/player/gst-play/meson.build
+===================================================================
+--- gst-examples.orig/playback/player/gst-play/meson.build
+++ gst-examples/playback/player/gst-play/meson.build
+@@ -2,5 +2,6 @@ executable('gst-play',
+     ['gst-play.c',
+      'gst-play-kb.c',
+      'gst-play-kb.h'],
+    install: true,
+     dependencies : [gst_dep, dependency('gstreamer-play-1.0'), m_dep])
+ 
+Index: gst-examples/playback/player/gtk/meson.build
+===================================================================
+--- gst-examples.orig/playback/player/gtk/meson.build
+++ gst-examples/playback/player/gtk/meson.build
+@@ -20,5 +20,6 @@ if gtk_dep.found()
+        'gtk-video-renderer.h',
+        'gtk-video-renderer.c'],
+       c_args :  extra_c_args,
+      install: true,
+       dependencies : [gst_dep, gsttag_dep, gstplay_dep, gtk_dep, x11_dep])
+ endif
diff --git a/recipes-multimedia/gstreamer/gst-examples/gst-player.desktop b/recipes-multimedia/gstreamer/gst-examples/gst-player.desktop
new file mode 100644
index 000000000..d165e5d91
--- /dev/null
+++ b/recipes-multimedia/gstreamer/gst-examples/gst-player.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Media Player
+Comment=Basic media player
+Icon=video-player
+TryExec=gtk-play
+Exec=gtk-play
+StartupNotify=true
+Terminal=false
+Type=Application
+Categories=GTK;AudioVideo;
diff --git a/recipes-multimedia/gstreamer/gst-examples_1.24.7.imx.bb b/recipes-multimedia/gstreamer/gst-examples_1.24.7.imx.bb
new file mode 100644
index 000000000..9db0051a1
--- /dev/null
+++ b/recipes-multimedia/gstreamer/gst-examples_1.24.7.imx.bb
@@ -0,0 +1,38 @@
+# This builds an older version which is compatible with the gstreamer NXP fork 1.24.7.imx,
+# thus the version is appended with '.imx'
+SUMMARY = "GStreamer examples (including gtk-play, gst-play)"
+DESCRIPTION = "GStreamer example applications."
+HOMEPAGE = "https://gitlab.freedesktop.org/gstreamer/gst-examples"
+BUGTRACKER = "https://gitlab.freedesktop.org/gstreamer/gst-examples/-/issues"
+LICENSE = "LGPL-2.0-or-later"
+LIC_FILES_CHKSUM = "file://playback/player/gtk/gtk-play.c;beginline=1;endline=20;md5=f8c72dae3d36823ec716a9ebcae593b9"
+DEPENDS = "glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad gtk+3 json-glib glib-2.0-native"
+SRC_URI = "git://gitlab.freedesktop.org/gstreamer/gstreamer.git;protocol=https;branch=1.24 \
+           file://0001-Make-player-examples-installable.patch \
+           file://gst-player.desktop \
+           "
+SRCREV = "0f1e984e41ce8d6d0758265d35e8b10d5815fde2"
+S = "${UNPACKDIR}/${BP}/subprojects/gst-examples"
+inherit meson pkgconfig features_check
+UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.(\d*[02468])+(\.\d+)+)"
+ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
+do_install:append() {
+        install -m 0644 -D ${UNPACKDIR}/gst-player.desktop ${D}${datadir}/applications/gst-player.desktop
+}
+RDEPENDS:${PN} = "gstreamer1.0-plugins-base-playback"
+RRECOMMENDS:${PN} = "gstreamer1.0-plugins-base-meta \
+                     gstreamer1.0-plugins-good-meta \
+                     gstreamer1.0-plugins-bad-meta \
+                      ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "gstreamer1.0-libav", "", d)} \
+                     ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "gstreamer1.0-plugins-ugly-meta", "", d)}"
+RPROVIDES:${PN} += "gst-player gst-player-bin"
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-libav/ffmpeg-6.0.patch b/recipes-multimedia/gstreamer/gstreamer1.0-libav/ffmpeg-6.0.patch
deleted file mode 100644
index 0a06540fb..000000000
--- a/recipes-multimedia/gstreamer/gstreamer1.0-libav/ffmpeg-6.0.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From cde31d23c071ee93fae96331805f696856084254 Mon Sep 17 00:00:00 2001
-From: "U. Artie Eoff" <ullysses.a.eoff@intel.com>
-Date: Mon, 13 Feb 2023 17:02:01 -0500
-Subject: [PATCH] avviddec: change
- AV_CODEC_CAP_AUTO_THREADS->AV_CODEC_CAP_OTHER_THREADS
-This fixes a compile error with recent upstream FFmpeg.
-The AV_CODEC_CAP_AUTO_THREADS was deprecated and renamed to
-AV_CODEC_CAP_OTHER_THREADS in FFmpeg upstream commit
-7d09579190de (lavc 58.132.100).
-The AV_CODEC_CAP_AUTO_THREADS was finally removed in FFmpeg upstream
-commit 10c9a0874cb3 (lavc 59.63.100).
-Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3964>
-Upstream-Status: Backport [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/cde31d23c071ee93fae96331805f696856084254?merge_request_iid=3964]
-Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
- ext/libav/gstavviddec.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-diff --git a/ext/libav/gstavviddec.c b/ext/libav/gstavviddec.c
-index 43cea456ae8..6d7c4cd0de8 100644
--- a/ext/libav/gstavviddec.c
-+++ b/ext/libav/gstavviddec.c
-@@ -35,6 +35,10 @@
- 
- GST_DEBUG_CATEGORY_STATIC (GST_CAT_PERFORMANCE);
- 
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58,132,100)
-+#define AV_CODEC_CAP_OTHER_THREADS AV_CODEC_CAP_AUTO_THREADS
-+#endif
-+
- #define GST_FFMPEG_VIDEO_CODEC_FRAME_FLAG_ALLOCATED (1<<15)
- 
- #define MAX_TS_MASK 0xff
-@@ -615,7 +619,7 @@ gst_ffmpegviddec_set_format (GstVideoDecoder * decoder,
-   if (ffmpegdec->max_threads == 0) {
-     /* When thread type is FF_THREAD_FRAME, extra latency is introduced equal
-      * to one frame per thread. We thus need to calculate the thread count ourselves */
-    if ((!(oclass->in_plugin->capabilities & AV_CODEC_CAP_AUTO_THREADS)) ||
-+    if ((!(oclass->in_plugin->capabilities & AV_CODEC_CAP_OTHER_THREADS)) ||
-         (ffmpegdec->context->thread_type & FF_THREAD_FRAME))
-       ffmpegdec->context->thread_count =
-           MIN (gst_ffmpeg_auto_max_threads (), 16);
-- 
-GitLab
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.26.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.26.0.imx.bb
new file mode 100644
index 000000000..138398d85
--- /dev/null
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.26.0.imx.bb
@@ -0,0 +1,34 @@
+SUMMARY = "Libav-based GStreamer 1.x plugin"
+DESCRIPTION = "Contains a GStreamer plugin for using the encoders, decoders, \
+muxers, and demuxers provided by FFmpeg."
+HOMEPAGE = "http://gstreamer.freedesktop.org/"
+SECTION = "multimedia"
+# ffmpeg has comercial license flags so add it as we need ffmpeg as a dependency
+LICENSE_FLAGS = "commercial"
+LICENSE = "LGPL-2.1-or-later"
+LIC_FILES_CHKSUM = "file://COPYING;md5=69333daa044cb77e486cc36129f7a770 \
+                    file://ext/libav/gstav.h;beginline=1;endline=18;md5=a752c35267d8276fd9ca3db6994fca9c \
+                    "
+SRC_URI = "https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${@get_gst_ver('${PV}')}.tar.xz"
+SRC_URI[sha256sum] = "707a8b687ff5fddcee5b02415e2ec9b71b4ac44d0b7aec3b477364ceecbf1ecf"
+S = "${UNPACKDIR}/gst-libav-${@get_gst_ver('${PV}')}"
+DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base ffmpeg"
+inherit meson pkgconfig upstream-version-is-even
+EXTRA_OEMESON += " \
+    -Dtests=disabled \
+"
+# Drop .imx from PV
+def get_gst_ver(v):
+    return oe.utils.trim_version(v, 3)
+FILES:${PN} += "${libdir}/gstreamer-1.0/*.so"
+FILES:${PN}-staticdev += "${libdir}/gstreamer-1.0/*.a"
+COMPATIBLE_MACHINE = "(imx-nxp-bsp)"
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-omx_%.bbappend b/recipes-multimedia/gstreamer/gstreamer1.0-omx_%.bbappend
deleted file mode 100644
index 188476035..000000000
--- a/recipes-multimedia/gstreamer/gstreamer1.0-omx_%.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-EXTRA_OEMESON:append:imx-nxp-bsp = " -Dtests=disabled -Dexamples=disabled"
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch
deleted file mode 100644
index 029b80e17..000000000
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 3bc5d48257032b6bbee532aad15062fbbcc43bfe Mon Sep 17 00:00:00 2001
-From: Andrey Zhizhikin <andrey.z@gmail.com>
-Date: Mon, 27 Jan 2020 10:22:35 +0000
-Subject: [PATCH] opencv: resolve missing opencv data dir in yocto build
-When Yocto build is performed, opencv searches for data dir using simple
-'test' command, this fails because pkg-config provides an absolute
-path on the target which needs to be prepended by PKG_CONFIG_SYSROOT_DIR
-in order for the 'test' utility to pick up the absolute path.
-Upstream-Status: Inappropriate [OE-specific]
-Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
-Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
---
- ext/opencv/meson.build | 3 +++
- 1 file changed, 3 insertions(+)
-diff --git a/ext/opencv/meson.build b/ext/opencv/meson.build
-index 1d86b90..b5c8b95 100644
--- a/ext/opencv/meson.build
-+++ b/ext/opencv/meson.build
-@@ -87,6 +87,9 @@ if opencv_found
-   opencv_prefix = opencv_dep.get_variable('prefix')
-   gstopencv_cargs += ['-DOPENCV_PREFIX="' + opencv_prefix + '"']
- 
-+  pkgconf_sysroot = run_command(python3, '-c', 'import os; print(os.environ.get("PKG_CONFIG_SYSROOT_DIR"))').stdout().strip()
-+  opencv_prefix = pkgconf_sysroot + opencv_prefix
-+
-   # Check the data dir used by opencv for its xml data files
-   # Use prefix from pkg-config to be compatible with cross-compilation
-   r = run_command('test', '-d', opencv_prefix + '/share/opencv', check: false)
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.22.5.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.26.0.imx.bb
index 3366a6274..1c4ee72d0 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.22.5.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.26.0.imx.bb
@@ -178,19 +178,19 @@ FILES:${PN}-voamrwbenc += "${datadir}/gstreamer-1.0/presets/GstVoAmrwbEnc.prs"
 DEFAULT_PREFERENCE = "-1"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4fbd65380cdd255951079008b364516c"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=69333daa044cb77e486cc36129f7a770"
-DEPENDS:append:imxgpu2d = " virtual/libg2d"
 SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-${PV}.tar.xz \
                   file://0001-fix-maybe-uninitialized-warnings-when-compiling-with.patch \
-                   file://0002-avoid-including-sys-poll.h-directly.patch"
+                   file://0002-avoid-including-sys-poll.h-directly.patch \
+                   file://0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch \
+                   "
 SRC_URI:prepend = "${GST1.0-PLUGINS-BAD_SRC};branch=${SRCBRANCH} "
 GST1.0-PLUGINS-BAD_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-bad.git;protocol=https"
-SRCBRANCH = "MM_04.08.03_2312_L6.6.y"
+SRCBRANCH = "MM_04.10.0_2505_L6.12.20"
-SRCREV = "9de821c50b4dd7af2407d9c3d078020704510a20"
+SRCREV = "4320364e6be53cae81ac2bca3ce0e09cf8707590"
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/${BP}"
 inherit use-imx-headers
@@ -215,9 +215,9 @@ EXTRA_OEMESON += " \
    -Dc_args="${CFLAGS} -I${STAGING_INCDIR_IMX}" \
 "
-COMPATIBLE_MACHINE = "(imx-nxp-bsp)"
+EXTRA_OEMESON:remove = " \
+    -Dkate=disabled \
+"
-# it uses nested functions sadly, in ext/wayland/gstwaylandsink.c for GST_ELEMENT_REGISTER_DEFINE
+COMPATIBLE_MACHINE = "(imx-nxp-bsp)"
-#
-TOOLCHAIN = "gcc"
 ########### End of i.MX overrides #########
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-gstallocator-Fix-typcasts.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-gstallocator-Fix-typcasts.patch
deleted file mode 100644
index 3ab4bab45..000000000
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-gstallocator-Fix-typcasts.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 90b94ff95c72487054fd283fb7cb5ebd13822b3f Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 7 Aug 2023 18:56:05 -0700
-Subject: [PATCH] gstallocator: Fix typcasts
-These are found when building with clang+musl
-| ../git/gst-libs/gst/allocators/gstallocatorphymem.c:228:10: error: incompatible pointer to integer conversion returning 'gpointer' (aka 'void *') from a function with result type 'guintptr
-' (aka 'unsigned long') [-Wint-conversion]
-|   228 |   return gst_phymem_get_phy (mem);
-|       |          ^~~~~~~~~~~~~~~~~~~~~~~~
-Upstream-Status: Submitted [https://github.com/nxp-imx/gst-plugins-base/pull/4]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- gst-libs/gst/allocators/gstallocatorphymem.c | 2 +-
- gst-libs/gst/gl/gstglphymemory.c             | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-diff --git a/gst-libs/gst/allocators/gstallocatorphymem.c b/gst-libs/gst/allocators/gstallocatorphymem.c
-index f3c3306c7..f8a4511ab 100755
--- a/gst-libs/gst/allocators/gstallocatorphymem.c
-+++ b/gst-libs/gst/allocators/gstallocatorphymem.c
-@@ -225,7 +225,7 @@ static guintptr
- gst_allocator_phymem_get_phys_addr (GstPhysMemoryAllocator * allocator,
-     GstMemory * mem)
- {
-  return gst_phymem_get_phy (mem);
-+  return (guintptr)gst_phymem_get_phy (mem);
- }
- 
- static void
-diff --git a/gst-libs/gst/gl/gstglphymemory.c b/gst-libs/gst/gl/gstglphymemory.c
-index d82c9a66a..1d8be0a5d 100644
--- a/gst-libs/gst/gl/gstglphymemory.c
-+++ b/gst-libs/gst/gl/gstglphymemory.c
-@@ -337,7 +337,7 @@ gst_gl_physical_memory_setup_buffer (GstAllocator * allocator,
-     GST_VIDEO_INFO_HEIGHT (info),
-     viv_fmt,
-     memblk->vaddr,
-    memblk->paddr,
-+    (guint)memblk->paddr,
-     FALSE
-   };
- 
-- 
-2.41.0
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.5.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.26.0.imx.bb
index dd7869a9b..5c2492638 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.5.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.26.0.imx.bb
@@ -116,12 +116,12 @@ SRC_URI:remove = " \
    file://0003-viv-fb-Make-sure-config.h-is-included.patch \
    file://0002-ssaparse-enhance-SSA-text-lines-parsing.patch"
 SRC_URI:prepend = "${GST1.0-PLUGINS-BASE_SRC};branch=${SRCBRANCH} "
-SRC_URI:append = " file://0001-gstallocator-Fix-typcasts.patch"
 GST1.0-PLUGINS-BASE_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-base.git;protocol=https"
-SRCBRANCH = "MM_04.08.03_2312_L6.6.y"
+SRCBRANCH = "MM_04.10.0_2505_L6.12.20"
-SRCREV = "c4333767ea122c182ba4e14cababe8dbe2a1b882"
+SRCREV = "bbe6aa6f5b666fda0b172c3e1f417c7eadb16549"
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/${BP}"
 inherit use-imx-headers
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.%.bbappend b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.26.0.imx.bbappend
index ca6636b83..528d7e1a3 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.%.bbappend
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.26.0.imx.bbappend
@@ -13,5 +13,5 @@ PACKAGECONFIG_GL:use-mainline-bsp = \
 # does not depend on the viv-fb feature. It used to, but that was actually a bug
 # which was fixed in GStreamer 1.22.5. Since then, the direct texture support is
 # detected by Meson by checking for direct texture symbols like "glTexDirectVIV".)
-PACKAGECONFIG_GL:append:mx6-nxp-bsp = " viv-fb "
+PACKAGECONFIG_GL:imxgpu2d:append:mx6-nxp-bsp = " viv-fb"
-PACKAGECONFIG_GL:append:mx7ulp-nxp-bsp = " viv-fb "
+PACKAGECONFIG_GL:imxgpu2d:append:mx7-nxp-bsp = " viv-fb"
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.5.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.26.0.imx.bb
index 9e09ef930..7c921d97c 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.5.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.26.0.imx.bb
@@ -94,11 +94,11 @@ FILES:${PN}-equalizer += "${datadir}/gstreamer-1.0/presets/*.prs"
 DEFAULT_PREFERENCE = "-1"
 LIC_FILES_CHKSUM = " \
-    file://LICENSE.txt;md5=a6f89e2100d9b6cdffcea4f398e37343 \
+    file://LICENSE.txt;md5=69333daa044cb77e486cc36129f7a770 \
    file://gst/replaygain/rganalysis.c;beginline=1;endline=23;md5=b60ebefd5b2f5a8e0cab6bfee391a5fe \
 "
 # Enable pulsesink in gstreamer
-PACKAGECONFIG:append = "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}"
+PACKAGECONFIG:append = "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', ' pulseaudio', '', d)}"
 # fb implementation of v4l2 uses libdrm
 DEPENDS += "${@bb.utils.contains('PACKAGECONFIG', 'v4l2', '${DEPENDS_V4L2}', '', d)}"
@@ -111,16 +111,10 @@ SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plu
 SRC_URI:prepend = "${GST1.0-PLUGINS-GOOD_SRC};branch=${SRCBRANCH} "
 GST1.0-PLUGINS-GOOD_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-good.git;protocol=https"
-SRCBRANCH = "MM_04.08.03_2312_L6.6.y"
+SRCBRANCH = "MM_04.10.0_2505_L6.12.20"
-SRCREV = "d361360510c97dc23abbfcdd22dff8214890527d"
+SRCREV = "6a0df1aee0ef2477dbacedd79df08c5bcb648e55"
-# set 32bit compile timer for 32-bit platform
+S = "${UNPACKDIR}/${BP}"
-GLIBC_64BIT_TIME_FLAGS:mx6-nxp-bsp = ""
-GLIBC_64BIT_TIME_FLAGS:mx7-nxp-bsp = ""
-INSANE_SKIP:mx6-nxp-bsp:append = " 32bit-time"
-INSANE_SKIP:mx7-nxp-bsp:append = " 32bit-time"
-S = "${WORKDIR}/git"
 COMPATIBLE_MACHINE = "(imx-nxp-bsp)"
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_2.2.0.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_2.2.0.bb
index 5bf60e623..cc2cedfd5 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_2.2.0.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_2.2.0.bb
@@ -15,11 +15,9 @@ RDEPENDS:gstreamer1.0-plugins-imx-imxvpu = "gstreamer1.0-plugins-bad-videoparser
 PV .= "+git${SRCPV}"
 SRCBRANCH ?= "master"
-SRCREV = "cb3cd45676e808b222ac573e8a118f44fd70c288"
+SRCREV = "ce4f86e60f12c56574f727f3317fa8aa30a11387"
 SRC_URI = "git://github.com/Freescale/gstreamer-imx.git;branch=${SRCBRANCH};protocol=https"
-S = "${WORKDIR}/git"
 inherit pkgconfig meson use-imx-headers
 # libg2d on i.MX8 SoCs with a DPU is emulated via the DPU.
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.26.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.26.0.imx.bb
new file mode 100644
index 000000000..1f5956ab4
--- /dev/null
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.26.0.imx.bb
@@ -0,0 +1,49 @@
+require gstreamer1.0-plugins-common.inc
+require gstreamer1.0-plugins-license.inc
+SUMMARY = "'Ugly GStreamer plugins"
+HOMEPAGE = "https://gstreamer.freedesktop.org/"
+BUGTRACKER = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-ugly/-/issues"
+LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
+                   "
+LICENSE = "LGPL-2.1-or-later & GPL-2.0-or-later"
+LICENSE_FLAGS = "commercial"
+SRC_URI = " \
+            https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-${@get_gst_ver("${PV}")}.tar.xz \
+            "
+SRC_URI[sha256sum] = "a86b51c8454a813120848c803421f327d8c07aabcae461e0597cc49398c0fcde"
+S = "${UNPACKDIR}/gst-plugins-ugly-${@get_gst_ver("${PV}")}"
+DEPENDS += "gstreamer1.0-plugins-base"
+GST_PLUGIN_SET_HAS_EXAMPLES = "0"
+PACKAGECONFIG ??= " \
+    ${GSTREAMER_ORC} \
+"
+PACKAGECONFIG[a52dec]   = "-Da52dec=enabled,-Da52dec=disabled,liba52"
+PACKAGECONFIG[cdio]     = "-Dcdio=enabled,-Dcdio=disabled,libcdio"
+PACKAGECONFIG[dvdread]  = "-Ddvdread=enabled,-Ddvdread=disabled,libdvdread"
+PACKAGECONFIG[mpeg2dec] = "-Dmpeg2dec=enabled,-Dmpeg2dec=disabled,mpeg2dec"
+PACKAGECONFIG[x264]     = "-Dx264=enabled,-Dx264=disabled,x264"
+GSTREAMER_GPL = "${@bb.utils.filter('PACKAGECONFIG', 'a52dec cdio dvdread mpeg2dec x264', d)}"
+EXTRA_OEMESON += " \
+    -Ddoc=disabled \
+    -Dsidplay=disabled \
+"
+# Drop .imx from PV
+def get_gst_ver(v):
+    return oe.utils.trim_version(v, 3)
+FILES:${PN}-amrnb += "${datadir}/gstreamer-1.0/presets/GstAmrnbEnc.prs"
+FILES:${PN}-x264 += "${datadir}/gstreamer-1.0/presets/GstX264Enc.prs"
+COMPATIBLE_MACHINE = "(imx-nxp-bsp)"
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.26.0.imx.bbappend b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.26.0.imx.bbappend
new file mode 100644
index 000000000..ea144b396
--- /dev/null
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.26.0.imx.bbappend
@@ -0,0 +1 @@
+PACKAGECONFIG:remove = "a52dec mpeg2dec"
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-python_1.26.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-python_1.26.0.imx.bb
new file mode 100644
index 000000000..388ee81e6
--- /dev/null
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-python_1.26.0.imx.bb
@@ -0,0 +1,36 @@
+SUMMARY = "Python bindings for GStreamer 1.0"
+DESCRIPTION = "GStreamer Python binding overrides (complementing the bindings \
+provided by python-gi) "
+HOMEPAGE = "http://cgit.freedesktop.org/gstreamer/gst-python/"
+SECTION = "multimedia"
+LICENSE = "LGPL-2.1-or-later"
+LIC_FILES_CHKSUM = "file://COPYING;md5=c34deae4e395ca07e725ab0076a5f740"
+SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${@get_gst_ver("${PV}")}.tar.xz"
+SRC_URI[sha256sum] = "e5046a05d77abb15671ad01cd1908d17d62e5a06f5d7841be4342ade2a3fb8db"
+DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base python3-pygobject"
+DEPENDS:append = " gstreamer1.0-plugins-bad"
+RDEPENDS:${PN} += "gstreamer1.0 gstreamer1.0-plugins-base python3-pygobject"
+PNREAL = "gst-python"
+S = "${UNPACKDIR}/${PNREAL}-${@get_gst_ver('${PV}')}"
+EXTRA_OEMESON += "\
+    -Dtests=disabled \
+    -Dplugin=enabled \
+    -Dlibpython-dir=${libdir} \
+"
+inherit meson pkgconfig setuptools3-base upstream-version-is-even features_check
+# Drop .imx from PV
+def get_gst_ver(v):
+    return oe.utils.trim_version(v, 3)
+FILES:${PN} += "${libdir}/gstreamer-1.0"
+REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.26.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.26.0.imx.bb
new file mode 100644
index 000000000..b5dd9a322
--- /dev/null
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.26.0.imx.bb
@@ -0,0 +1,38 @@
+SUMMARY = "A library on top of GStreamer for building an RTSP server"
+HOMEPAGE = "http://cgit.freedesktop.org/gstreamer/gst-rtsp-server/"
+SECTION = "multimedia"
+LICENSE = "LGPL-2.1-or-later"
+LIC_FILES_CHKSUM = "file://COPYING;md5=69333daa044cb77e486cc36129f7a770"
+DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base"
+PNREAL = "gst-rtsp-server"
+SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${@get_gst_ver("${PV}")}.tar.xz"
+SRC_URI[sha256sum] = "e983c039496e3f75e39696554ce74db4120e2465de17aa1cc37160568e9b40bc"
+S = "${UNPACKDIR}/${PNREAL}-${@get_gst_ver("${PV}")}"
+inherit meson pkgconfig upstream-version-is-even gobject-introspection
+EXTRA_OEMESON += " \
+    -Ddoc=disabled \
+    -Dexamples=disabled \
+    -Dtests=disabled \
+"
+GIR_MESON_ENABLE_FLAG = "enabled"
+GIR_MESON_DISABLE_FLAG = "disabled"
+# Drop .imx from PV
+def get_gst_ver(v):
+    return oe.utils.trim_version(v, 3)
+# Starting with 1.8.0 gst-rtsp-server includes dependency-less plugins as well
+require gstreamer1.0-plugins-packaging.inc
+CVE_PRODUCT += "gst-rtsp-server"
+COMPATIBLE_MACHINE = "(imx-nxp-bsp)"
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.26.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.26.0.imx.bb
new file mode 100644
index 000000000..1d83ca031
--- /dev/null
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.26.0.imx.bb
@@ -0,0 +1,57 @@
+SUMMARY = "VA-API support to GStreamer"
+HOMEPAGE = "https://gstreamer.freedesktop.org/"
+DESCRIPTION = "gstreamer-vaapi consists of a collection of VA-API \
+based plugins for GStreamer and helper libraries: `vaapidecode', \
+`vaapiconvert', and `vaapisink'."
+REALPN = "gstreamer-vaapi"
+LICENSE = "LGPL-2.1-or-later"
+LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c"
+SRC_URI = "https://gstreamer.freedesktop.org/src/${REALPN}/${REALPN}-${@get_gst_ver("${PV}")}.tar.xz"
+SRC_URI[sha256sum] = "573931d455f5a96f63db7c8d35d51322b8d287816e8c6a77d84cfbb9fa1351f1"
+S = "${UNPACKDIR}/${REALPN}-${@get_gst_ver('${PV}')}"
+DEPENDS = "libva gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad"
+inherit meson pkgconfig features_check upstream-version-is-even
+# Drop .imx from PV
+def get_gst_ver(v):
+    return oe.utils.trim_version(v, 3)
+REQUIRED_DISTRO_FEATURES ?= "opengl"
+EXTRA_OEMESON += " \
+    -Ddoc=disabled \
+    -Dexamples=disabled \
+    -Dtests=enabled \
+"
+PACKAGES =+ "${PN}-tests"
+# OpenGL packageconfig factored out to make it easy for distros
+# and BSP layers to pick either glx, egl, or no GL. By default,
+# try detecting X11 first, and if found (with OpenGL), use GLX,
+# otherwise try to check if EGL can be used.
+PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'glx', \
+                        bb.utils.contains('DISTRO_FEATURES',     'opengl', 'egl', \
+                                                                       '', d), d)}"
+PACKAGECONFIG ??= "drm encoders \
+                   ${PACKAGECONFIG_GL} \
+                   ${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)}"
+PACKAGECONFIG[drm] = "-Ddrm=enabled,-Ddrm=disabled,udev libdrm"
+PACKAGECONFIG[egl] = "-Degl=enabled,-Degl=disabled,virtual/egl"
+PACKAGECONFIG[encoders] = "-Dencoders=enabled,-Dencoders=disabled"
+PACKAGECONFIG[glx] = "-Dglx=enabled,-Dglx=disabled,virtual/libgl"
+PACKAGECONFIG[wayland] = "-Dwayland=enabled,-Dwayland=disabled,wayland-native wayland wayland-protocols"
+PACKAGECONFIG[x11] = "-Dx11=enabled,-Dx11=disabled,virtual/libx11 libxrandr libxrender"
+FILES:${PN} += "${libdir}/gstreamer-*/*.so"
+FILES:${PN}-dbg += "${libdir}/gstreamer-*/.debug"
+FILES:${PN}-dev += "${libdir}/gstreamer-*/*.a"
+FILES:${PN}-tests = "${bindir}/*"
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0/0001-tests-respect-the-idententaion-used-in-meson.patch b/recipes-multimedia/gstreamer/gstreamer1.0/0001-tests-respect-the-idententaion-used-in-meson.patch
deleted file mode 100644
index 1b9278db0..000000000
--- a/recipes-multimedia/gstreamer/gstreamer1.0/0001-tests-respect-the-idententaion-used-in-meson.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 559e1dd850b2b9eb3a415aa43e932e5e48f605cd Mon Sep 17 00:00:00 2001
-From: Jose Quaresma <quaresma.jose@gmail.com>
-Date: Sun, 11 Apr 2021 19:48:13 +0100
-Subject: [PATCH] tests: respect the idententaion used in meson
-Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/789]
-Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
---
- tests/check/meson.build | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-diff --git a/tests/check/meson.build b/tests/check/meson.build
-index 9787b0a..16caac7 100644
--- a/tests/check/meson.build
-+++ b/tests/check/meson.build
-@@ -145,11 +145,11 @@ foreach t : core_tests
- 
-   if not skip_test
-     exe = executable(test_name, fname,
-        c_args : gst_c_args + test_defines,
-        cpp_args : gst_c_args + test_defines,
-        include_directories : [configinc],
-        link_with : link_with_libs,
-        dependencies : gst_deps + test_deps,
-+      c_args : gst_c_args + test_defines,
-+      cpp_args : gst_c_args + test_defines,
-+      include_directories : [configinc],
-+      link_with : link_with_libs,
-+      dependencies : gst_deps + test_deps,
-     )
- 
-     env = environment()
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch b/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch
deleted file mode 100644
index 568e38cbf..000000000
--- a/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-From 08b1aaff972a7f6349373fc1ad4cc23081adb52c Mon Sep 17 00:00:00 2001
-From: Jose Quaresma <quaresma.jose@gmail.com>
-Date: Sun, 11 Apr 2021 19:48:13 +0100
-Subject: [PATCH] tests: add support for install the tests
-This will provide to run the tests using the gnome-desktop-testing [1]
-[1] https://wiki.gnome.org/Initiatives/GnomeGoals/InstalledTests
-Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/789]
-Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
---
- meson.build                  |  4 ++++
- meson_options.txt            |  1 +
- tests/check/meson.build      | 22 +++++++++++++++++++++-
- tests/check/template.test.in |  3 +++
- 4 files changed, 29 insertions(+), 1 deletion(-)
- create mode 100644 tests/check/template.test.in
-diff --git a/meson.build b/meson.build
-index f9f591d..3906fb3 100644
--- a/meson.build
-+++ b/meson.build
-@@ -606,6 +606,10 @@ if bashcomp_dep.found()
-   endif
- endif
- 
-+installed_tests_enabled = get_option('installed_tests')
-+installed_tests_metadir = join_paths(datadir, 'installed-tests', meson.project_name())
-+installed_tests_execdir = join_paths(libexecdir, 'installed-tests', meson.project_name())
-+
- plugins_install_dir = join_paths(get_option('libdir'), 'gstreamer-1.0')
- 
- pkgconfig = import('pkgconfig')
-diff --git a/meson_options.txt b/meson_options.txt
-index 7363bdb..a34ba37 100644
--- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -15,6 +15,7 @@ option('poisoning', type : 'boolean', value : false, description : 'Enable poiso
- option('memory-alignment', type: 'combo',
-        choices : ['1', '2', '4', '8', '16', '32', '64', '128', '256', '512', '1024', '2048', '4096', '8192', 'malloc', 'pagesize'],
-        value: 'malloc')
-+option('installed_tests', type : 'boolean', value : false, description : 'Enable installed tests')
- 
- # Feature options
- option('check', type : 'feature', value : 'auto', description : 'Build unit test libraries')
-diff --git a/tests/check/meson.build b/tests/check/meson.build
-index 16caac7..f2d400f 100644
--- a/tests/check/meson.build
-+++ b/tests/check/meson.build
-@@ -124,10 +124,16 @@ test_defines = [
-   '-UG_DISABLE_ASSERT',
-   '-UG_DISABLE_CAST_CHECKS',
-   '-DGST_CHECK_TEST_ENVIRONMENT_BEACON="GST_STATE_IGNORE_ELEMENTS"',
-  '-DTESTFILE="' + meson.current_source_dir() + '/meson.build"',
-   '-DGST_DISABLE_DEPRECATED',
- ]
- 
-+testfile = meson.current_source_dir() + '/meson.build'
-+if installed_tests_enabled
-+  install_data(testfile, install_dir : installed_tests_metadir, rename : 'testfile')
-+  testfile = installed_tests_metadir + '/testfile'
-+endif
-+test_defines += '-DTESTFILE="@0@"'.format(testfile)
-+
- # sanity checking
- if get_option('check').disabled()
-   if get_option('tests').enabled()
-@@ -150,6 +156,8 @@ foreach t : core_tests
-       include_directories : [configinc],
-       link_with : link_with_libs,
-       dependencies : gst_deps + test_deps,
-+      install_dir: installed_tests_execdir,
-+      install: installed_tests_enabled,
-     )
- 
-     env = environment()
-@@ -161,6 +169,18 @@ foreach t : core_tests
-     env.set('GST_PLUGIN_SCANNER_1_0', gst_scanner_dir + '/gst-plugin-scanner')
-     env.set('GST_PLUGIN_LOADING_WHITELIST', 'gstreamer')
- 
-+    if installed_tests_enabled
-+      test_conf = configuration_data()
-+      test_conf.set('installed_tests_dir', join_paths(prefix, installed_tests_execdir))
-+      test_conf.set('program', test_name)
-+      configure_file(
-+        input: 'template.test.in',
-+        output: test_name + '.test',
-+        install_dir: installed_tests_metadir,
-+        configuration: test_conf
-+      )
-+    endif
-+
-     test(test_name, exe, env: env, timeout : 3 * 60)
-   endif
- endforeach
-diff --git a/tests/check/template.test.in b/tests/check/template.test.in
-new file mode 100644
-index 0000000..f701627
--- /dev/null
-+++ b/tests/check/template.test.in
-@@ -0,0 +1,3 @@
-+[Test]
-+Type=session
-+Exec=@installed_tests_dir@/@program@
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-use-a-dictionaries-for-environment.patch b/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-use-a-dictionaries-for-environment.patch
deleted file mode 100644
index 10a6dcc61..000000000
--- a/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-use-a-dictionaries-for-environment.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From fe830f0f75f3b4b41e3dbef8d4cf6ee4103c9e06 Mon Sep 17 00:00:00 2001
-From: Jose Quaresma <quaresma.jose@gmail.com>
-Date: Sat, 24 Apr 2021 10:34:47 +0100
-Subject: [PATCH 3/4] tests: use a dictionaries for environment
-meson environment() can't be passed to configure_file and it is needed for installed_tests,
-use a dictionary as this is simplest solution to install the environment.
-Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/789]
-Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
---
- subprojects/gstreamer/tests/check/meson.build | 21 ++++++++++++-------
- 1 file changed, 13 insertions(+), 8 deletions(-)
-diff --git a/subprojects/gstreamer/tests/check/meson.build b/subprojects/gstreamer/tests/check/meson.build
-index 00a138a568..48ec2532f8 100644
--- a/subprojects/gstreamer/tests/check/meson.build
-+++ b/subprojects/gstreamer/tests/check/meson.build
-@@ -161,14 +161,19 @@ foreach t : core_tests
-       install: installed_tests_enabled,
-     )
- 
-    env = environment()
-    env.set('GST_PLUGIN_PATH_1_0', meson.project_build_root())
-    env.set('GST_PLUGIN_SYSTEM_PATH_1_0', '')
-    env.set('GST_STATE_IGNORE_ELEMENTS', '')
-    env.set('CK_DEFAULT_TIMEOUT', '20')
-    env.set('GST_REGISTRY', '@0@/@1@.registry'.format(meson.current_build_dir(), test_name))
-    env.set('GST_PLUGIN_SCANNER_1_0', gst_scanner_dir + '/gst-plugin-scanner')
-    env.set('GST_PLUGIN_LOADING_WHITELIST', 'gstreamer')
-+    # meson environment object can't be passed to configure_file and
-+    # installed tests uses configure_file to install the environment.
-+    # use a dictionary as this is the simplest solution
-+    # to install the environment.
-+    env = {
-+      'GST_PLUGIN_PATH_1_0': meson.project_build_root(),
-+      'GST_PLUGIN_SYSTEM_PATH_1_0': '',
-+      'GST_STATE_IGNORE_ELEMENTS': '',
-+      'CK_DEFAULT_TIMEOUT': '20',
-+      'GST_REGISTRY': '@0@/@1@.registry'.format(meson.current_build_dir(), test_name),
-+      'GST_PLUGIN_SCANNER_1_0': gst_scanner_dir + '/gst-plugin-scanner',
-+      'GST_PLUGIN_LOADING_WHITELIST': 'gstreamer',
-+    }
- 
-     if installed_tests_enabled
-       test_conf = configuration_data()
-- 
-2.33.1
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch b/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch
deleted file mode 100644
index efa004f8c..000000000
--- a/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 4dcbabebca2ad6f1fdd59ee35a858082e87db7b6 Mon Sep 17 00:00:00 2001
-From: Jose Quaresma <quaresma.jose@gmail.com>
-Date: Sun, 2 May 2021 01:58:01 +0100
-Subject: [PATCH 4/4] tests: add helper script to run the installed_tests
- this is a bash script that will run the installed_tests
-with some of the environment variables used in the meson
-testing framework.
-Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/789]
-Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
---
- subprojects/gstreamer/tests/check/meson.build   | 17 +++++++++++++++++
- .../gstreamer/tests/check/template.sh.in        |  9 +++++++++
- .../gstreamer/tests/check/template.test.in      |  2 +-
- 3 files changed, 27 insertions(+), 1 deletion(-)
- create mode 100755 subprojects/gstreamer/tests/check/template.sh.in
-diff --git a/subprojects/gstreamer/tests/check/meson.build b/subprojects/gstreamer/tests/check/meson.build
-index 48ec2532f8..7dc4990d4e 100644
--- a/subprojects/gstreamer/tests/check/meson.build
-+++ b/subprojects/gstreamer/tests/check/meson.build
-@@ -185,6 +185,23 @@ foreach t : core_tests
-         install_dir: installed_tests_metadir,
-         configuration: test_conf
-       )
-+
-+      # All the tests will be deployed on the target machine and
-+      # we use the home folder ~ for the registry which will then expand at runtime.
-+      # Using the /tmp/gstreamer-1.0/@0@.registry can be problematic as it mostly
-+      # is mounted using tmpfs and if the machine crash from some reason we can lost the registry
-+      # that is useful for debug propose of the tests itself.
-+      env += {'GST_REGISTRY': '~/.cache/gstreamer-1.0/@0@.registry'.format(test_name)}
-+
-+      # Set the full path for the test it self.
-+      env += {'TEST': '@0@/@1@'.format(join_paths(prefix, installed_tests_execdir), test_name)}
-+
-+      configure_file(
-+        input : 'template.sh.in',
-+        output: test_name + '.sh',
-+        install_dir: installed_tests_execdir,
-+        configuration : env,
-+      )
-     endif
- 
-     test(test_name, exe, env: env, timeout : 3 * 60)
-diff --git a/subprojects/gstreamer/tests/check/template.sh.in b/subprojects/gstreamer/tests/check/template.sh.in
-new file mode 100755
-index 0000000000..cf7d31b0ea
--- /dev/null
-+++ b/subprojects/gstreamer/tests/check/template.sh.in
-@@ -0,0 +1,9 @@
-+#!/bin/sh
-+
-+set -ax
-+
-+CK_DEFAULT_TIMEOUT="@CK_DEFAULT_TIMEOUT@"
-+GST_PLUGIN_LOADING_WHITELIST="@GST_PLUGIN_LOADING_WHITELIST@"
-+GST_REGISTRY=@GST_REGISTRY@
-+GST_STATE_IGNORE_ELEMENTS="@GST_STATE_IGNORE_ELEMENTS@"
-+exec @TEST@
-diff --git a/subprojects/gstreamer/tests/check/template.test.in b/subprojects/gstreamer/tests/check/template.test.in
-index f701627f87..b74ef6ad73 100644
--- a/subprojects/gstreamer/tests/check/template.test.in
-+++ b/subprojects/gstreamer/tests/check/template.test.in
-@@ -1,3 +1,3 @@
- [Test]
- Type=session
-Exec=@installed_tests_dir@/@program@
-+Exec=@installed_tests_dir@/@program@.sh
-- 
-2.33.1
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0/0005-tests-remove-gstbin-test_watch_for_state_change-test.patch b/recipes-multimedia/gstreamer/gstreamer1.0/0005-tests-remove-gstbin-test_watch_for_state_change-test.patch
deleted file mode 100644
index f51df6d20..000000000
--- a/recipes-multimedia/gstreamer/gstreamer1.0/0005-tests-remove-gstbin-test_watch_for_state_change-test.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-From b935abba3d8fa3ea1ce384c08e650afd8c20b78a Mon Sep 17 00:00:00 2001
-From: Claudius Heine <ch@denx.de>
-Date: Wed, 2 Feb 2022 13:47:02 +0100
-Subject: [PATCH] tests: remove gstbin:test_watch_for_state_change testcase
-This testcase seems to be flaky, and upstream marked it as such:
-https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/778
-This patch removes the testcase to avoid it interfering with out ptest.
-Signed-off-by: Claudius Heine <ch@denx.de>
-Upstream-Status: Inappropriate [needs proper upstream fix]
---
- tests/check/gst/gstbin.c        | 69 -------------------
- 1 file changed, 69 deletions(-)
-diff --git a/tests/check/gst/gstbin.c b/tests/check/gst/gstbin.c
-index e366d5fe20..ac29d81474 100644
--- a/tests/check/gst/gstbin.c
-+++ b/tests/check/gst/gstbin.c
-@@ -691,74 +691,6 @@ GST_START_TEST (test_message_state_changed_children)
- 
- GST_END_TEST;
- 
-GST_START_TEST (test_watch_for_state_change)
-{
-  GstElement *src, *sink, *bin;
-  GstBus *bus;
-  GstStateChangeReturn ret;
-
-  bin = gst_element_factory_make ("bin", NULL);
-  fail_unless (bin != NULL, "Could not create bin");
-
-  bus = g_object_new (gst_bus_get_type (), NULL);
-  gst_object_ref_sink (bus);
-  gst_element_set_bus (GST_ELEMENT_CAST (bin), bus);
-
-  src = gst_element_factory_make ("fakesrc", NULL);
-  fail_if (src == NULL, "Could not create fakesrc");
-  sink = gst_element_factory_make ("fakesink", NULL);
-  fail_if (sink == NULL, "Could not create fakesink");
-
-  gst_bin_add (GST_BIN (bin), sink);
-  gst_bin_add (GST_BIN (bin), src);
-
-  fail_unless (gst_element_link (src, sink), "could not link src and sink");
-
-  /* change state, spawning two times three messages */
-  ret = gst_element_set_state (GST_ELEMENT (bin), GST_STATE_PAUSED);
-  fail_unless (ret == GST_STATE_CHANGE_ASYNC);
-  ret =
-      gst_element_get_state (GST_ELEMENT (bin), NULL, NULL,
-      GST_CLOCK_TIME_NONE);
-  fail_unless (ret == GST_STATE_CHANGE_SUCCESS);
-
-  pop_state_changed (bus, 6);
-  pop_async_done (bus);
-  pop_latency (bus);
-
-  fail_unless (gst_bus_have_pending (bus) == FALSE,
-      "Unexpected messages on bus");
-
-  ret = gst_element_set_state (GST_ELEMENT (bin), GST_STATE_PLAYING);
-  fail_unless (ret == GST_STATE_CHANGE_SUCCESS);
-
-  pop_state_changed (bus, 3);
-
-  /* this one might return either SUCCESS or ASYNC, likely SUCCESS */
-  ret = gst_element_set_state (GST_ELEMENT (bin), GST_STATE_PAUSED);
-  gst_element_get_state (GST_ELEMENT (bin), NULL, NULL, GST_CLOCK_TIME_NONE);
-
-  pop_state_changed (bus, 3);
-  if (ret == GST_STATE_CHANGE_ASYNC) {
-    pop_async_done (bus);
-    pop_latency (bus);
-  }
-
-  fail_unless (gst_bus_have_pending (bus) == FALSE,
-      "Unexpected messages on bus");
-
-  gst_bus_set_flushing (bus, TRUE);
-
-  ret = gst_element_set_state (GST_ELEMENT (bin), GST_STATE_NULL);
-  fail_unless (ret == GST_STATE_CHANGE_SUCCESS);
-
-  /* clean up */
-  gst_object_unref (bus);
-  gst_object_unref (bin);
-}
-
-GST_END_TEST;
-
- GST_START_TEST (test_state_change_error_message)
- {
-   GstElement *src, *sink, *bin;
-@@ -1956,7 +1888,6 @@ gst_bin_suite (void)
-   tcase_add_test (tc_chain, test_message_state_changed);
-   tcase_add_test (tc_chain, test_message_state_changed_child);
-   tcase_add_test (tc_chain, test_message_state_changed_children);
-  tcase_add_test (tc_chain, test_watch_for_state_change);
-   tcase_add_test (tc_chain, test_state_change_error_message);
-   tcase_add_test (tc_chain, test_add_linked);
-   tcase_add_test (tc_chain, test_add_self);
-- 
-2.33.1
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0_1.22.5.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0_1.26.0.imx.bb
index ce7b3f1d4..5b315ed7f 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0_1.22.5.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0_1.26.0.imx.bb
@@ -87,18 +87,25 @@ PTEST_BUILD_HOST_FILES = ""
 DEFAULT_PREFERENCE = "-1"
 LIC_FILES_CHKSUM = " \
-    file://LICENSE.txt;md5=69333daa044cb77e486cc36129f7a770 \
+    file://COPYING;md5=69333daa044cb77e486cc36129f7a770 \
    file://gst/gst.h;beginline=1;endline=21;md5=e059138481205ee2c6fc1c079c016d0d \
 "
 # Use i.MX fork of GST for customizations
-SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz"
+SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz \
+                  file://0001-tests-respect-the-idententaion-used-in-meson.patch \
+                  file://0002-tests-add-support-for-install-the-tests.patch \
+                  file://0003-tests-use-a-dictionaries-for-environment.patch;striplevel=3 \
+                  file://0004-tests-add-helper-script-to-run-the-installed_tests.patch;striplevel=3 \
+"
 SRC_URI:prepend = "${GST1.0_SRC};branch=${SRCBRANCH} "
 GST1.0_SRC ?= "gitsm://github.com/nxp-imx/gstreamer.git;protocol=https"
-SRCBRANCH = "MM_04.08.03_2312_L6.6.y"
+SRCBRANCH = "MM_04.10.0_2505_L6.12.20"
-SRCREV = "1a43c16272a7f4274eb8260e03206a57f317d823"
+SRCREV = "dba94b66ed28cc6537608a68c31c8be52f6f53a5"
+S = "${UNPACKDIR}/${BP}"
-S = "${WORKDIR}/git"
+PACKAGECONFIG[tests] = "-Dtests=enabled,-Dtests=disabled"
 COMPATIBLE_MACHINE = "(imx-nxp-bsp)"
diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0001-aiurdemux-Fix-type-of-USER_DATA_LOCATION.patch b/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0001-aiurdemux-Fix-type-of-USER_DATA_LOCATION.patch
deleted file mode 100644
index bdcb3f48e..000000000
--- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0001-aiurdemux-Fix-type-of-USER_DATA_LOCATION.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 090fb758a63b7d362d9bee8b8a665d1346c83f83 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 13 Mar 2023 20:15:22 -0700
-Subject: [PATCH 01/10] aiurdemux: Fix type of USER_DATA_LOCATION
-It should be char pointer not integer
-Fixe
-plugins/aiurdemux/aiurdemux.c:198:47: error: incompatible integer to pointer conversion initializin
-g 'const gchar *' (aka 'const char *') with an expression of type 'int' [-Wint-conversion]
-  {USER_DATA_LOCATION, USER_DATA_FORMAT_UTF8, -1,
-                                              ^~
-Upstream-Status: Submitted [https://github.com/nxp-imx/imx-gst1.0-plugin/pull/4]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- plugins/aiurdemux/aiurdemux.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/plugins/aiurdemux/aiurdemux.c b/plugins/aiurdemux/aiurdemux.c
-index 532b439..39c50ea 100755
--- a/plugins/aiurdemux/aiurdemux.c
-+++ b/plugins/aiurdemux/aiurdemux.c
-@@ -195,7 +195,7 @@ static AiurDemuxTagEntry g_user_data_entry[] = {
-       "Track Number : %s\n"},
-   {USER_DATA_TOTALTRACKNUMBER, USER_DATA_FORMAT_UTF8, GST_TAG_TRACK_COUNT,
-       "Track Count : %s\n"},
-  {USER_DATA_LOCATION, USER_DATA_FORMAT_UTF8, -1,
-+  {USER_DATA_LOCATION, USER_DATA_FORMAT_UTF8, (const gchar*)-1,
-       "Location : %s\n"},
-   {USER_DATA_KEYWORDS, USER_DATA_FORMAT_UTF8, GST_TAG_KEYWORDS,
-       "Keywords : %s\n"},
-- 
-2.39.2
diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0001-gplay2-fix-termio.h-no-longer-existing.patch b/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0001-gplay2-fix-termio.h-no-longer-existing.patch
new file mode 100644
index 000000000..cb314b38d
--- /dev/null
+++ b/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0001-gplay2-fix-termio.h-no-longer-existing.patch
@@ -0,0 +1,35 @@
+From b88aec4d7a8c8993c8c75f002a1f2af1635337d1 Mon Sep 17 00:00:00 2001
+From: Max Krummenacher <max.krummenacher@toradex.com>
+Date: Sat, 9 Aug 2025 08:20:50 +0000
+Subject: [PATCH] gplay2: fix termio.h no longer existing
+glibc 2.42 removed the long deprecated termio.h header which
+in 2.41 only included termios.h and sys/ioctl.h. [1]
+Replacing it with sys/ioctl.h seems to provide all the needed
+declaration for successfully compiling.
+[1] https://sourceware.org/git/?p=glibc.git;a=blob;f=NEWS#l91
+Upstream-Status: Pending
+Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
+---
+ tools/gplay2/gplay2.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/tools/gplay2/gplay2.c b/tools/gplay2/gplay2.c
+index 9e406b9ea8c7..98b3ee5cf666 100755
+--- a/tools/gplay2/gplay2.c
+++ b/tools/gplay2/gplay2.c
+@@ -26,7 +26,7 @@
+  */
+ 
+ 
+-#include <termio.h>
+#include <sys/ioctl.h>
+ #include <unistd.h>
+ #include <pthread.h>
+ #include <stdio.h>
+-- 
+2.42.0
diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0002-aiurdemux.h-Include-glib-gprintf.h-for-g_printf-prot.patch b/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0002-aiurdemux.h-Include-glib-gprintf.h-for-g_printf-prot.patch
deleted file mode 100644
index d3fdf924b..000000000
--- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0002-aiurdemux.h-Include-glib-gprintf.h-for-g_printf-prot.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From f8b8322cd4c3a69e5cb47b5cb33abe860e89d6ed Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 12 Mar 2023 20:33:54 -0700
-Subject: [PATCH 02/10] aiurdemux.h: Include glib/gprintf.h for g_printf
- prototype
-Upstream-Status: Submitted [https://github.com/nxp-imx/imx-gst1.0-plugin/pull/4]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- plugins/aiurdemux/aiurdemux.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/plugins/aiurdemux/aiurdemux.h b/plugins/aiurdemux/aiurdemux.h
-index 1d7d0a0..f7fcb2e 100755
--- a/plugins/aiurdemux/aiurdemux.h
-+++ b/plugins/aiurdemux/aiurdemux.h
-@@ -39,7 +39,7 @@
- #include <gst/gst.h>
- #include <gst/base/gstadapter.h>
- #include <gst/tag/tag.h>
-
-+#include <glib/gprintf.h>
- //#include "mfw_gst_utils.h"
- 
- #include "fsl_parser.h"
-- 
-2.39.2
diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0003-grecorder-Fix-build-with-clang.patch b/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0003-grecorder-Fix-build-with-clang.patch
deleted file mode 100644
index a690b4975..000000000
--- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0003-grecorder-Fix-build-with-clang.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 19e6a541d2026386c9cfdeca0eebd269fef2536c Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 13 Mar 2023 20:29:01 -0700
-Subject: [PATCH 03/10] grecorder: Fix build with clang
-Add missing includes for APIs from libc and glib
-Add prototype declaration for post_message before
-using it in macros later in the same source file
-Upstream-Status: Submitted [https://github.com/nxp-imx/imx-gst1.0-plugin/pull/4]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- tools/grecorder/grecorder.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-diff --git a/tools/grecorder/grecorder.c b/tools/grecorder/grecorder.c
-index c8eff2f..89aa801 100644
--- a/tools/grecorder/grecorder.c
-+++ b/tools/grecorder/grecorder.c
-@@ -23,10 +23,11 @@
- #include <semaphore.h>
- #include <pthread.h>
- #include <signal.h>
-+#include <unistd.h> /* sleep */
- #include <getopt.h>
- #define __USE_LARGEFILE64
- #include <sys/statvfs.h>
-
-+#include <glib/gprintf.h> /* g_print */
- #include "recorder_engine.h"
- 
- #define LOG_ERROR printf
-@@ -168,6 +169,8 @@ static RecorderMessage latest_message = MESSAGE_NULL;
- 
- static volatile sig_atomic_t quit_flag = 0;
- 
-+static void post_message (RecorderMessage message);
-+
- static void signal_handler(int signum)
- {
-   quit_flag = 1;
-- 
-2.39.2
diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0004-gstimxcommon-Return-0-instead-of-NULL-for-a-function.patch b/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0004-gstimxcommon-Return-0-instead-of-NULL-for-a-function.patch
deleted file mode 100644
index 292ab63f5..000000000
--- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0004-gstimxcommon-Return-0-instead-of-NULL-for-a-function.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 141f8f692ae2c7e6d41a2d78113c806602122ad5 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 12 Mar 2023 19:51:27 -0700
-Subject: [PATCH 04/10] gstimxcommon: Return 0 instead of NULL for a functions
- returning unsigned long
-Fixes
-gstimxcommon.c:113:10: error: incompatible pointer to integer conversion returning 'void *' from a function with result type 'unsigned long' [-Wint-conversion]
-  return NULL;
-Upstream-Status: Submitted [https://github.com/nxp-imx/imx-gst1.0-plugin/pull/4]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- libs/gstimxcommon.c | 18 +++++++++---------
- 1 file changed, 9 insertions(+), 9 deletions(-)
-diff --git a/libs/gstimxcommon.c b/libs/gstimxcommon.c
-index 27fd913..803c6e5 100644
--- a/libs/gstimxcommon.c
-+++ b/libs/gstimxcommon.c
-@@ -35,13 +35,13 @@ unsigned long phy_addr_from_fd(int dmafd)
-   int ret, fd;
- 
-   if (dmafd < 0)
-    return NULL;
-+    return 0;
-   
- #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)
- #ifdef USE_ION
-   fd = open(dev_ion, O_RDWR);
-   if(fd < 0) {
-    return NULL;
-+    return 0;
-   }
- 
-   struct ion_phys_dma_data data = {
-@@ -58,18 +58,18 @@ unsigned long phy_addr_from_fd(int dmafd)
-   ret = ioctl(fd, ION_IOC_CUSTOM, &custom);
-   close(fd);
-   if (ret < 0)
-    return NULL;
-+    return 0;
- 
-   return data.phys;
- #else
-  return NULL;
-+  return 0;
- #endif /* USE_ION */
- #else
-   struct dma_buf_phys dma_phys;
- 
-   ret = ioctl(dmafd, DMA_BUF_IOCTL_PHYS, &dma_phys);
-   if (ret < 0)
-    return NULL;
-+    return 0;
- 
-   return dma_phys.phys;
- #endif
-@@ -86,7 +86,7 @@ unsigned long phy_addr_from_vaddr(void *vaddr, int size)
- #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)
-   fd = open(dev_ion, O_RDWR);
-   if(fd < 0) {
-    return NULL;
-+    return 0;
-   }
- 
-   struct ion_phys_virt_data data = {
-@@ -103,13 +103,13 @@ unsigned long phy_addr_from_vaddr(void *vaddr, int size)
-   ret = ioctl(fd, ION_IOC_CUSTOM, &custom);
-   close(fd);
-   if (ret < 0)
-    return NULL;
-+    return 0;
- 
-   return data.phys;
- #else
-  return NULL;
-+  return 0;
- #endif
- #else
-  return NULL;
-+  return 0;
- #endif
- }
-- 
-2.39.2
diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0005-aiurstreamcache-Include-gst-gstinfo.h.patch b/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0005-aiurstreamcache-Include-gst-gstinfo.h.patch
deleted file mode 100644
index 5f67ba1b0..000000000
--- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0005-aiurstreamcache-Include-gst-gstinfo.h.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 379b0492a4b53fd8fd42c734d04fd62df2e0465f Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 13 Mar 2023 20:16:48 -0700
-Subject: [PATCH 05/10] aiurstreamcache: Include gst/gstinfo.h
-Its needed for various GST_* defines
-Upstream-Status: Submitted [https://github.com/nxp-imx/imx-gst1.0-plugin/pull/4]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- plugins/aiurdemux/aiurstreamcache.c | 1 +
- 1 file changed, 1 insertion(+)
-diff --git a/plugins/aiurdemux/aiurstreamcache.c b/plugins/aiurdemux/aiurstreamcache.c
-index d566268..e114a9d 100755
--- a/plugins/aiurdemux/aiurstreamcache.c
-+++ b/plugins/aiurdemux/aiurstreamcache.c
-@@ -33,6 +33,7 @@
-  * Changelog:
-  *
-  */
-+ #include <gst/gstinfo.h>
- 
- GST_DEBUG_CATEGORY_EXTERN (aiurdemux_debug);
- #define GST_CAT_DEFAULT aiurdemux_debug
-- 
-2.39.2
diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0006-Fix-typecast-warnings-found-with-clang.patch b/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0006-Fix-typecast-warnings-found-with-clang.patch
deleted file mode 100644
index ae3d10618..000000000
--- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0006-Fix-typecast-warnings-found-with-clang.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 02e16c4de3f138f0ebabf699e840bb86c98be599 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 12 Mar 2023 20:45:23 -0700
-Subject: [PATCH 06/10] Fix typecast warnings found with clang
-Upstream-Status: Submitted [https://github.com/nxp-imx/imx-gst1.0-plugin/pull/4]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- libs/device-2d/imx_2d_device_g2d.c | 15 ++++++++-------
- 1 file changed, 8 insertions(+), 7 deletions(-)
-diff --git a/libs/device-2d/imx_2d_device_g2d.c b/libs/device-2d/imx_2d_device_g2d.c
-index 2672e0b..6a36f6a 100755
--- a/libs/device-2d/imx_2d_device_g2d.c
-+++ b/libs/device-2d/imx_2d_device_g2d.c
-@@ -425,7 +425,7 @@ static gint imx_g2d_blit(Imx2DDevice *device,
-       goto err;
-     }
-     if (paddr) {
-      src->mem->paddr = paddr;
-+      src->mem->paddr = (guint8*)paddr;
-     } else {
-       GST_ERROR ("Can't get physical address.");
-       ret = -1;
-@@ -435,7 +435,7 @@ static gint imx_g2d_blit(Imx2DDevice *device,
-   if (!dst->mem->paddr) {
-     paddr = phy_addr_from_fd (dst->fd[0]);
-     if (paddr) {
-      dst->mem->paddr = paddr;
-+      dst->mem->paddr = (guint8*)paddr;
-     } else {
-       GST_ERROR ("Can't get physical address.");
-       ret = -1;
-@@ -474,10 +474,11 @@ static gint imx_g2d_blit(Imx2DDevice *device,
- 
-   if (src->fd[1] >= 0)
-   {
-    if (!src->mem->user_data)
-      src->mem->user_data = g2d->src.base.planes[1] = phy_addr_from_fd (src->fd[1]);
-    else
-      g2d->src.base.planes[1] = src->mem->user_data;
-+    if (!src->mem->user_data) {
-+      g2d->src.base.planes[1] = (gint)phy_addr_from_fd (src->fd[1]);
-+      src->mem->user_data = (gpointer *)g2d->src.base.planes[1];
-+    } else
-+      g2d->src.base.planes[1] = (unsigned long)src->mem->user_data;
-   }
-   switch (src->interlace_type) {
-     case IMX_2D_INTERLACE_INTERLEAVED:
-@@ -693,7 +694,7 @@ static gint imx_g2d_fill_color(Imx2DDevice *device, Imx2DFrame *dst,
-   if (!dst->mem->paddr) {
-     paddr = phy_addr_from_fd (dst->fd[0]);
-     if (paddr) {
-      dst->mem->paddr = paddr;
-+      dst->mem->paddr = (guint8*)paddr;
-     } else {
-       GST_ERROR ("Can't get physical address.");
-       return -1;
-- 
-2.39.2
diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0007-gstimxv4l2-Fix-typecasting-errors.patch b/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0007-gstimxv4l2-Fix-typecasting-errors.patch
deleted file mode 100644
index 1983838af..000000000
--- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0007-gstimxv4l2-Fix-typecasting-errors.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From a1a2069403e227d4d40fc99257d1be077f65bdc8 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 12 Mar 2023 19:54:18 -0700
-Subject: [PATCH 07/10] gstimxv4l2: Fix typecasting errors
-Fixes
-gstimxv4l2.c:1702:22: error: incompatible pointer to integer conversion assigning to 'unsigned long' from 'guint8 *' (aka 'unsigned char *') [-Wint-conversion]
-Upstream-Status: Submitted [https://github.com/nxp-imx/imx-gst1.0-plugin/pull/4]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- libs/v4l2_core/gstimxv4l2.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/libs/v4l2_core/gstimxv4l2.c b/libs/v4l2_core/gstimxv4l2.c
-index 1dc826b..bf2620a 100755
--- a/libs/v4l2_core/gstimxv4l2.c
-+++ b/libs/v4l2_core/gstimxv4l2.c
-@@ -1699,7 +1699,7 @@ gint gst_imx_v4l2_register_buffer (gpointer v4l2handle, PhyMemBlock *memblk)
-   v4l2buf->type = handle->type;
-   v4l2buf->memory = handle->memory_mode;
-   v4l2buf->index = handle->allocated;
-  v4l2buf->m.userptr = memblk->paddr;
-+  v4l2buf->m.userptr = (unsigned long)memblk->paddr;
-   v4l2buf->length = memblk->size;
-   handle->buffer_pair[handle->allocated].vaddr = memblk->vaddr;
- 
-- 
-2.39.2
diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0008-beepdec-Declare-beep_register_external_typefinders.patch b/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0008-beepdec-Declare-beep_register_external_typefinders.patch
deleted file mode 100644
index 211bade10..000000000
--- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0008-beepdec-Declare-beep_register_external_typefinders.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From e86c20fee52f79a270a1913c5f0be98fb3f5cb77 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 13 Mar 2023 20:18:18 -0700
-Subject: [PATCH 08/10] beepdec: Declare beep_register_external_typefinders
-Fixes
-plugins/beepdec/beep.c:45:3: error: call to undeclared function 'beep_register_external_typefinders'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
-  beep_register_external_typefinders (plugin);
-  ^
-Upstream-Status: Submitted [https://github.com/nxp-imx/imx-gst1.0-plugin/pull/4]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- plugins/beepdec/beep.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/plugins/beepdec/beep.c b/plugins/beepdec/beep.c
-index 3543352..e174bb3 100755
--- a/plugins/beepdec/beep.c
-+++ b/plugins/beepdec/beep.c
-@@ -37,7 +37,7 @@
- #endif
- #include "beepdec.h"
- #include "gstimxcommon.h"
-
-+extern gboolean beep_register_external_typefinders (GstPlugin * plugin);
- static gboolean
- plugin_init (GstPlugin * plugin)
- {
-- 
-2.39.2
diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0009-gstimxv4l2.c-Fix-incompatible-integer-to-pointer-con.patch b/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0009-gstimxv4l2.c-Fix-incompatible-integer-to-pointer-con.patch
deleted file mode 100644
index 567d10267..000000000
--- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0009-gstimxv4l2.c-Fix-incompatible-integer-to-pointer-con.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 8a3d7f26c73bdfe050d3331b30ae2f5917dc6723 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 12 Mar 2023 19:59:22 -0700
-Subject: [PATCH 09/10] gstimxv4l2.c: Fix incompatible integer to pointer
- conversion returning
-Fixes
-gstimxv4l2.c:1587:24: error: incompatible pointer to integer conversion assigning to 'unsigned long' from 'guint8 *' (aka 'unsigned char *') [-Wint-c
-onversion]
-Upstream-Status: Submitted [https://github.com/nxp-imx/imx-gst1.0-plugin/pull/4]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- libs/v4l2_core/gstimxv4l2.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-diff --git a/libs/v4l2_core/gstimxv4l2.c b/libs/v4l2_core/gstimxv4l2.c
-index bf2620a..0fd7452 100755
--- a/libs/v4l2_core/gstimxv4l2.c
-+++ b/libs/v4l2_core/gstimxv4l2.c
-@@ -1576,7 +1576,7 @@ static void * gst_imx_v4l2_find_buffer(gpointer v4l2handle, PhyMemBlock *memblk)
- 
-     if (handle->allocated >= MAX_BUFFER) {
-       GST_ERROR ("No more v4l2 buffer for allocating.\n");
-      return -1;
-+      return NULL;
-     }
- 
-     v4l2buf = &handle->buffer_pair[handle->allocated].v4l2buffer;
-@@ -1584,7 +1584,7 @@ static void * gst_imx_v4l2_find_buffer(gpointer v4l2handle, PhyMemBlock *memblk)
-     v4l2buf->type = handle->type;
-     v4l2buf->memory = handle->memory_mode;
-     v4l2buf->index = handle->allocated;
-    v4l2buf->m.userptr = memblk->paddr;
-+    v4l2buf->m.userptr = (unsigned long)memblk->paddr;
-     v4l2buf->length = memblk->size;
-     handle->buffer_pair[handle->allocated].vaddr = memblk->vaddr;
- 
-- 
-2.39.2
diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0010-provide-declaration-for-aiur_register_external_typef.patch b/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0010-provide-declaration-for-aiur_register_external_typef.patch
deleted file mode 100644
index e9b1a0938..000000000
--- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0010-provide-declaration-for-aiur_register_external_typef.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From c2144da90e64547d9e346f8e721a0d2155ed610b Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 12 Mar 2023 21:09:49 -0700
-Subject: [PATCH 10/10] provide declaration for
- aiur_register_external_typefinders
-Upstream-Status: Submitted [https://github.com/nxp-imx/imx-gst1.0-plugin/pull/4]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- plugins/aiurdemux/aiur.c | 2 ++
- 1 file changed, 2 insertions(+)
-diff --git a/plugins/aiurdemux/aiur.c b/plugins/aiurdemux/aiur.c
-index 2a52465..681ae2e 100755
--- a/plugins/aiurdemux/aiur.c
-+++ b/plugins/aiurdemux/aiur.c
-@@ -41,6 +41,8 @@
- #include "aiurdemux.h"
- #include "gstimxcommon.h"
- 
-+extern gboolean aiur_register_external_typefinders (GstPlugin * plugin);
-+
- static gboolean
- plugin_init (GstPlugin * plugin)
- {
-- 
-2.39.2
diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0011-meson-Undef-_TIME_BITS-along-with-_FILE_OFFSET_BITS.patch b/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0011-meson-Undef-_TIME_BITS-along-with-_FILE_OFFSET_BITS.patch
deleted file mode 100644
index 5a58a5a67..000000000
--- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0011-meson-Undef-_TIME_BITS-along-with-_FILE_OFFSET_BITS.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From bda3461b0b6493f3e04910e82e6e530a64af26b1 Mon Sep 17 00:00:00 2001
-From: Tom Hochstein <tom.hochstein@nxp.com>
-Date: Mon, 24 Jul 2023 12:09:34 -0700
-Subject: [PATCH] meson: Undef _TIME_BITS along with _FILE_OFFSET_BITS
-On gcc 13, _TIME_BITS is set to 64 and causes failure with the undef of
-_FILE_OFFSET_BITS:
-```
-/usr/include/features-time64.h:26:5: error: #error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64"
-   26 | #   error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64"
-      |     ^~~~~
-```
-Upstream-Status: Pending
-Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
---
- meson.build | 1 +
- 1 file changed, 1 insertion(+)
-diff --git a/meson.build b/meson.build
-index 7ec5c70..64b2930 100644
--- a/meson.build
-+++ b/meson.build
-@@ -24,6 +24,7 @@ gst_dep = dependency('gstreamer-' + api_version, version : gst_req)
- #meson automaticaly add _FILE_OFFSET_BITS=64 to gcc, this will make ipu test
- #case fail when do mmap on 6q, autoconf didn't add this define, so undef it
- add_project_arguments('-U_FILE_OFFSET_BITS', language: 'c')
-+add_project_arguments('-U_TIME_BITS', language: 'c')
- 
- #below two marcos are defined in autoconf
- add_project_arguments ('-DARM', language: 'c')
-- 
-2.25.1
diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb b/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb
index a13cf30ab..2ba8fdd1d 100644
--- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb
+++ b/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb
@@ -24,35 +24,24 @@ DEPENDS:append:imxvpu = " imx-vpuwrap"
 DEPENDS:append:imxfbdev:imxgpu = " libdrm"
 DEPENDS_IMXGPU        = ""
 DEPENDS_IMXGPU:imxgpu = "${DEPENDS_IMX_OPENCL_CONVERTER}"
-DEPENDS_IMX_OPENCL_CONVERTER               = ""
+DEPENDS_IMX_OPENCL_CONVERTER               = "imx-opencl-converter"
-DEPENDS_IMX_OPENCL_CONVERTER:mx8-nxp-bsp   = "imx-opencl-converter"
+DEPENDS_IMX_OPENCL_CONVERTER:mx6-nxp-bsp   = ""
+DEPENDS_IMX_OPENCL_CONVERTER:mx7-nxp-bsp   = ""
 DEPENDS_IMX_OPENCL_CONVERTER:mx8mm-nxp-bsp = ""
-DEPENDS_IMX_OPENCL_CONVERTER:mx95-nxp-bsp   = "imx-opencl-converter"
 # For backwards compatibility
 RREPLACES:${PN}  = "gst1.0-fsl-plugin"
 RPROVIDES:${PN}  = "gst1.0-fsl-plugin"
 RCONFLICTS:${PN} = "gst1.0-fsl-plugin"
-PV = "4.8.3+git${SRCPV}"
+PV = "4.10.0+git${SRCPV}"
-SRC_URI = "git://github.com/nxp-imx/imx-gst1.0-plugin.git;protocol=https;branch=${SRCBRANCH} \
+SRC_URI = " \
-           file://0001-aiurdemux-Fix-type-of-USER_DATA_LOCATION.patch \
+    git://github.com/nxp-imx/imx-gst1.0-plugin.git;protocol=https;branch=${SRCBRANCH} \
-           file://0002-aiurdemux.h-Include-glib-gprintf.h-for-g_printf-prot.patch \
+    file://0001-gplay2-fix-termio.h-no-longer-existing.patch \
-           file://0003-grecorder-Fix-build-with-clang.patch \
+"
-           file://0004-gstimxcommon-Return-0-instead-of-NULL-for-a-function.patch \
+SRCBRANCH = "MM_04.10.0_2505_L6.12.20"
-           file://0005-aiurstreamcache-Include-gst-gstinfo.h.patch \
+SRCREV = "6861aec99901375f5ebcd5170ce1f5232cd38fd6"
-           file://0006-Fix-typecast-warnings-found-with-clang.patch \
-           file://0007-gstimxv4l2-Fix-typecasting-errors.patch \
-           file://0008-beepdec-Declare-beep_register_external_typefinders.patch \
-           file://0009-gstimxv4l2.c-Fix-incompatible-integer-to-pointer-con.patch \
-           file://0010-provide-declaration-for-aiur_register_external_typef.patch \
-           file://0011-meson-Undef-_TIME_BITS-along-with-_FILE_OFFSET_BITS.patch \
-           "
-SRCBRANCH = "MM_04.08.03_2312_L6.6.y"
-SRCREV = "91c7fec888cf8932c91e354331aad94975cae3ff"
-S = "${WORKDIR}/git"
 inherit meson pkgconfig use-imx-headers
@@ -61,13 +50,11 @@ PLATFORM:mx6sl-nxp-bsp = "MX6SL"
 PLATFORM:mx6sx-nxp-bsp = "MX6SX"
 PLATFORM:mx6ul-nxp-bsp = "MX6UL"
 PLATFORM:mx6sll-nxp-bsp = "MX6SLL"
-PLATFORM:mx7-nxp-bsp= "MX7D"
+PLATFORM:mx7-nxp-bsp = "MX7D"
-PLATFORM:mx7ulp-nxp-bsp= "MX7ULP"
+PLATFORM:mx7ulp-nxp-bsp = "MX7ULP"
 PLATFORM:mx8-nxp-bsp = "MX8"
 PLATFORM:mx9-nxp-bsp = "MX9"
-CFLAGS:append:toolchain-clang = " -Wno-implicit-int -Wno-int-conversion -Wno-incompatible-function-pointer-types"
 # Todo add a mechanism to map possible build targets
 EXTRA_OEMESON = "-Dplatform=${PLATFORM} \
                 -Dc_args="${CFLAGS} -I${STAGING_INCDIR_IMX}" \
diff --git a/recipes-multimedia/imx-codec/imx-codec_4.8.3.bb b/recipes-multimedia/imx-codec/imx-codec_4.10.0.bb
index 0a2c71e76..6a5c2c32c 100644
--- a/recipes-multimedia/imx-codec/imx-codec_4.8.3.bb
+++ b/recipes-multimedia/imx-codec/imx-codec_4.10.0.bb
@@ -1,21 +1,24 @@
 # Copyright (C) 2012-2016 Freescale Semiconductor
-# Copyright 2017 NXP-2023
+# Copyright (C) 2017-2025 NXP
 # Copyright 2018 (C) O.S. Systems Software LTDA.
 # Released under the MIT license (see COPYING.MIT for the terms)
 DESCRIPTION = "Freescale Multimedia codec libs"
 LICENSE = "Proprietary"
 SECTION = "multimedia"
-LIC_FILES_CHKSUM = "file://COPYING;md5=44a8052c384584ba09077e85a3d1654f"
+LIC_FILES_CHKSUM = "file://COPYING;md5=a93b654673e1bc8398ed1f30e0813359"
 # Backward compatibility
 PROVIDES += "libfslcodec"
-SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true"
+SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true"
-SRC_URI[md5sum] = "7ae1615aad2c0456b9be2ab804a6267e"
+SRC_URI[sha256sum] = "82242219e0d3536aeff31d9c215543bfe5541540bdb4fa8d61e83067b015e31f"
-SRC_URI[sha256sum] = "9facb3541903b4a6c6baa906f8c2c6cc01fc8c7b82a726c8da6d3681d4ed720b"
+IMX_SRCREV_ABBREV = "464e9d8"
 inherit fsl-eula-unpack autotools pkgconfig
+S = "${UNPACKDIR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}"
 PACKAGECONFIG ??= "${PACKAGECONFIG_VPU}"
 # Support Chips&Media VPU only
 PACKAGECONFIG_VPU               = ""
@@ -60,7 +63,7 @@ do_package_qa[prefuncs] += "__set_insane_skip"
 python __split_libfslcodec_plugins() {
    codecdir = bb.data.expand('${libdir}', d)
-    do_split_packages(d, codecdir, '^lib_([^_]*).*_arm.*_elinux\.so\..*',
+    do_split_packages(d, codecdir, r'^lib_([^_]*).*_arm.*_elinux\.so\..*',
                      aux_files_pattern='${libdir}/imx-mm/audio-codec/wrap/lib_%sd_wrap_arm*_elinux.so.*',
                      output_pattern='imx-codec-%s',
                      description='Freescale i.MX Codec (%s)',
diff --git a/recipes-multimedia/imx-dsp/imx-dsp-codec-ext_2.1.7.bb b/recipes-multimedia/imx-dsp/imx-dsp-codec-ext_2.1.8.bb
index bc73bd9f9..d9986456a 100644
--- a/recipes-multimedia/imx-dsp/imx-dsp-codec-ext_2.1.7.bb
+++ b/recipes-multimedia/imx-dsp/imx-dsp-codec-ext_2.1.8.bb
@@ -2,14 +2,13 @@
 DESCRIPTION = "i.MX DSP Codec Wrapper and Lib owned by NXP"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=44a8052c384584ba09077e85a3d1654f"
+LIC_FILES_CHKSUM = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a"
 inherit fsl-eula-unpack autotools pkgconfig
 SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true"
-SRC_URI[md5sum] = "32251bc952ca7b9a4b12fadb9328a8c1"
+SRC_URI[sha256sum] = "fa30f3e1b13e570d7c6f0a5f335c11fc3c6336a266fd3a4941e27c4c2a5b13d3"
-SRC_URI[sha256sum] = "0baa82410a77c68e39aaa987d91b41c94255d62294fa2f5a399169f3068862cc"
 EXTRA_OECONF:append:mx8qm-nxp-bsp = " --enable-imx8qmqxp"
 EXTRA_OECONF:append:mx8qxp-nxp-bsp = " --enable-imx8qmqxp"
diff --git a/recipes-multimedia/imx-dsp/imx-dsp_2.1.7.bb b/recipes-multimedia/imx-dsp/imx-dsp_2.1.10.bb
index 60761e6e1..96656f85b 100644
--- a/recipes-multimedia/imx-dsp/imx-dsp_2.1.7.bb
+++ b/recipes-multimedia/imx-dsp/imx-dsp_2.1.10.bb
@@ -1,16 +1,17 @@
-# Copyright 2017-2023 NXP
+# Copyright 2017-2022,2024 NXP
 DESCRIPTION = "i.MX DSP Wrapper, Firmware Binary, Codec Libraries"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=44a8052c384584ba09077e85a3d1654f"
+LIC_FILES_CHKSUM = "file://COPYING;md5=c0fb372b5d7f12181de23ef480f225f3"
 inherit fsl-eula-unpack autotools pkgconfig
-SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true"
+IMX_SRCREV_ABBREV = "ea4fe3f"
+SRC_URI = "${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true"
+S = "${UNPACKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
-SRC_URI[md5sum] = "199f88716f289e93e0954fa6475a3cbc"
+SRC_URI[sha256sum] = "fc6e6a7c2417730b39eeddc26606c3d58a8f5d0a1521f44bbbd505657046858b"
-SRC_URI[sha256sum] = "83eaef592de33b4d5e8fae63d798cc955bf3c414911c87afeb65a20af01fb0b6"
 EXTRA_OECONF = " \
    -datadir=${base_libdir}/firmware \
diff --git a/recipes-multimedia/imx-dspc-asrc/imx-dspc-asrc_1.0.1.bb b/recipes-multimedia/imx-dspc-asrc/imx-dspc-asrc_1.0.1.bb
deleted file mode 100644
index 48be837a9..000000000
--- a/recipes-multimedia/imx-dspc-asrc/imx-dspc-asrc_1.0.1.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 2019 NXP
-DESCRIPTION = "NXP Asynchronous Sample Rate Converter"
-LICENSE = "Proprietary"
-SECTION = "multimedia"
-LIC_FILES_CHKSUM = "file://COPYING;md5=72c0f70181bb6e83eee6aab8de12a9f3"
-SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true"
-SRC_URI[md5sum] = "d46005ee29ca603caa2e1b1e82953ff1"
-SRC_URI[sha256sum] = "e79cbf4788a86a0068bbe80c37317e3332ae76e3d5c3ff2eabd71f03121fab6a"
-inherit fsl-eula-unpack autotools pkgconfig
-EXTRA_OECONF = "--enable-armv8 --libdir=${libdir} --bindir=/unit_tests"
-INHIBIT_PACKAGE_STRIP = "1"
-INHIBIT_SYSROOT_STRIP = "1"
-INHIBIT_PACKAGE_DEBUG_SPLIT  = "1"
-FILES:${PN} += "/unit_tests ${datadir}/imx-mm"
-COMPATIBLE_MACHINE = "(mx8-nxp-bsp)"
diff --git a/recipes-multimedia/imx-dspc-asrc/imx-dspc-asrc_1.0.2.bb b/recipes-multimedia/imx-dspc-asrc/imx-dspc-asrc_1.0.2.bb
new file mode 100644
index 000000000..9cf4fa968
--- /dev/null
+++ b/recipes-multimedia/imx-dspc-asrc/imx-dspc-asrc_1.0.2.bb
@@ -0,0 +1,25 @@
+# Copyright 2019, 2025 NXP
+DESCRIPTION = "NXP Asynchronous Sample Rate Converter"
+LICENSE = "Proprietary"
+SECTION = "multimedia"
+LIC_FILES_CHKSUM = "file://COPYING;md5=a93b654673e1bc8398ed1f30e0813359"
+SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true"
+IMX_SRCREV_ABBREV = "ce4ae5a"
+SRC_URI[sha256sum] = "6382e46e5c60c844fc6a7a05876e19eed690c587300337624c66fa9cb20a3b7c"
+S = "${UNPACKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
+inherit fsl-eula-unpack autotools pkgconfig
+EXTRA_OECONF = "--enable-armv8 --libdir=${libdir} --bindir=/unit_tests"
+INHIBIT_PACKAGE_STRIP = "1"
+INHIBIT_SYSROOT_STRIP = "1"
+INHIBIT_PACKAGE_DEBUG_SPLIT  = "1"
+FILES:${PN} += "/unit_tests ${datadir}/imx-mm"
+COMPATIBLE_MACHINE = "(mx8-nxp-bsp|mx9-nxp-bsp)"
diff --git a/recipes-multimedia/imx-opencl-converter/imx-opencl-converter_0.2.0.bb b/recipes-multimedia/imx-opencl-converter/imx-opencl-converter_0.2.0.bb
deleted file mode 100644
index 3dc0a7ea5..000000000
--- a/recipes-multimedia/imx-opencl-converter/imx-opencl-converter_0.2.0.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2023 NXP
-DESCRIPTION = "NXP Multimedia opencl converter lib"
-LICENSE = "Proprietary"
-SECTION = "multimedia"
-LIC_FILES_CHKSUM = "file://COPYING;md5=44a8052c384584ba09077e85a3d1654f"
-DEPENDS = "opencl-headers"
-SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true"
-SRC_URI[md5sum] = "dc668682189ce740fb46073e62f58066"
-SRC_URI[sha256sum] = "9f283df500c57421b87d96d9af7022ab490bc241aa28d00755beaadabbcd754b"
-inherit fsl-eula-unpack autotools pkgconfig meson
-FILES:${PN} += "${datadir}/"
-COMPATIBLE_MACHINE               = "(^$)"
-COMPATIBLE_MACHINE:imxgpu        = "(mx8-nxp-bsp|mx95-nxp-bsp)"
-COMPATIBLE_MACHINE:mx8mm-nxp-bsp = "(^$)"
diff --git a/recipes-multimedia/imx-opencl-converter/imx-opencl-converter_0.8.0.bb b/recipes-multimedia/imx-opencl-converter/imx-opencl-converter_0.8.0.bb
new file mode 100644
index 000000000..cf4e4d182
--- /dev/null
+++ b/recipes-multimedia/imx-opencl-converter/imx-opencl-converter_0.8.0.bb
@@ -0,0 +1,20 @@
+# Copyright 2023-2025 NXP
+DESCRIPTION = "NXP Multimedia opencl converter lib"
+LICENSE = "Proprietary"
+SECTION = "multimedia"
+LIC_FILES_CHKSUM = "file://COPYING;md5=a93b654673e1bc8398ed1f30e0813359"
+DEPENDS = "virtual/libopencl1"
+SRC_URI = "${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true"
+IMX_SRCREV_ABBREV = "b81b785"
+SRC_URI[sha256sum] = "a4dee08d5949d41cb9c61d44ce0b5a055b9416129216f9d36d0bc6d9e512ab64"
+S = "${UNPACKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
+inherit fsl-eula-unpack autotools pkgconfig meson
+FILES:${PN} += "${datadir}/"
+COMPATIBLE_MACHINE               = "(^$)"
+COMPATIBLE_MACHINE:imxgpu        = "(mx8-nxp-bsp|mx95-nxp-bsp)"
+COMPATIBLE_MACHINE:mx8mm-nxp-bsp = "(^$)"
diff --git a/recipes-multimedia/imx-parser/imx-parser_4.8.3.bb b/recipes-multimedia/imx-parser/imx-parser_4.10.0.bb
index 4e580085f..60add6e33 100644
--- a/recipes-multimedia/imx-parser/imx-parser_4.8.3.bb
+++ b/recipes-multimedia/imx-parser/imx-parser_4.10.0.bb
@@ -5,7 +5,7 @@
 DESCRIPTION = "Freescale Multimedia parser libs"
 LICENSE = "Proprietary"
 SECTION = "multimedia"
-LIC_FILES_CHKSUM = "file://COPYING;md5=44a8052c384584ba09077e85a3d1654f"
+LIC_FILES_CHKSUM = "file://COPYING;md5=a93b654673e1bc8398ed1f30e0813359"
 # For backwards compatibility
 PROVIDES += "libfslparser"
@@ -13,9 +13,11 @@ RREPLACES:${PN} = "libfslparser"
 RPROVIDES:${PN} = "libfslparser"
 RCONFLICTS:${PN} = "libfslparser"
-SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true"
+SRC_URI = "${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true"
-SRC_URI[md5sum] = "9bca484287f5592b86ed10c1761a3fcc"
+IMX_SRCREV_ABBREV = "e8a7ec7"
-SRC_URI[sha256sum] = "b25267eefb4618b2ba8d6aba46a5b4e09621a44115036fc896e0777006472043"
+S = "${UNPACKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
+SRC_URI[sha256sum] = "90b4b7f7c3cffc9d57774dbb06e37d810a2618e059f30244e1b4155fb9bc82d5"
 inherit fsl-eula-unpack autotools pkgconfig
diff --git a/recipes-multimedia/imx-sw-pdm/imx-sw-pdm_1.0.3.bb b/recipes-multimedia/imx-sw-pdm/imx-sw-pdm_1.0.3.bb
index 2b62b2443..68919ac83 100644
--- a/recipes-multimedia/imx-sw-pdm/imx-sw-pdm_1.0.3.bb
+++ b/recipes-multimedia/imx-sw-pdm/imx-sw-pdm_1.0.3.bb
@@ -6,7 +6,6 @@ SECTION = "multimedia"
 LIC_FILES_CHKSUM = "file://COPYING;md5=63a38e9f392d8813d6f1f4d0d6fbe657"
 SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true"
-SRC_URI[md5sum] = "cbd5af6e9019db789c03c2d05a8bb444"
 SRC_URI[sha256sum] = "f778a7b785fc500df5573f5b810a190ddc561267b47ca54b9ddf4ae12571cfe3"
 inherit fsl-eula-unpack autotools pkgconfig
diff --git a/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_git.bb b/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_git.bb
index af15e7b1b..1ad735152 100644
--- a/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_git.bb
+++ b/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_git.bb
@@ -1,23 +1,23 @@
 # Copyright (C) 2013-2016 Freescale Semiconductor
-# Copyright 2017-2023 NXP
+# Copyright (C) 2017-2023,2025 NXP
 # Released under the MIT license (see COPYING.MIT for the terms)
 DESCRIPTION = "Freescale Multimedia VPU wrapper"
 LICENSE = "Proprietary"
 SECTION = "multimedia"
-LIC_FILES_CHKSUM = "file://COPYING;md5=2827219e81f28aba7c6a569f7c437fa7"
+LIC_FILES_CHKSUM = "file://COPYING;md5=a93b654673e1bc8398ed1f30e0813359"
 DEPENDS = "virtual/imxvpu"
 DEPENDS:append:mx8mp-nxp-bsp = " imx-vpu-hantro-vc"
 SRC_URI = "git://github.com/NXP/imx-vpuwrap.git;protocol=https;branch=${SRCBRANCH}"
-SRCBRANCH = "MM_04.08.03_2312_L6.6.y"
+SRCBRANCH = "MM_04.10.0_2505_L6.12.20"
-SRCREV = "f974cecdb00b4a214e4b5229f2279e772ee43306"
+SRCREV = "feeb9109a027d3a0f040b0bddb5f79a1daad3587"
-S = "${WORKDIR}/git"
 inherit autotools pkgconfig
+CFLAGS += " -Wno-error=implicit-function-declaration"
 do_install:append() {
    # FIXME: Drop examples for now
    rm -r ${D}${datadir}
diff --git a/recipes-multimedia/libimxvpuapi/libimxvpuapi2_2.3.0.bb b/recipes-multimedia/libimxvpuapi/libimxvpuapi2_2.3.1.bb
index 1e7d8252c..cce4e56ad 100644
--- a/recipes-multimedia/libimxvpuapi/libimxvpuapi2_2.3.0.bb
+++ b/recipes-multimedia/libimxvpuapi/libimxvpuapi2_2.3.1.bb
@@ -11,12 +11,10 @@ DEPENDS:append:mx8mp-nxp-bsp = " imx-vpu-hantro-vc"
 PV .= "+git${SRCPV}"
 SRCBRANCH ?= "master"
-SRCREV = "6f803f46d6b53a08cf02fc3d440072e01e2f3a09"
+SRCREV = "37095a854aa176bb763a25ce98ceb6a787501271"
 SRC_URI = "git://github.com/Freescale/libimxvpuapi.git;branch=${SRCBRANCH};protocol=https"
-S = "${WORKDIR}/git"
+inherit waf pkgconfig use-imx-headers python3native
-inherit waf pkgconfig use-imx-headers
 IMX_PLATFORM:mx6-nxp-bsp = "imx6"
 IMX_PLATFORM:mx8mq-nxp-bsp = "imx8m"
diff --git a/recipes-multimedia/libimxvpuapi/libimxvpuapi_git.bb b/recipes-multimedia/libimxvpuapi/libimxvpuapi_git.bb
index e3a051937..55063db18 100644
--- a/recipes-multimedia/libimxvpuapi/libimxvpuapi_git.bb
+++ b/recipes-multimedia/libimxvpuapi/libimxvpuapi_git.bb
@@ -12,9 +12,7 @@ SRCBRANCH ?= "v1"
 SRCREV = "3a1ee3a54fe93813868d38c3d32ea065b59e227e"
 SRC_URI = "git://github.com/Freescale/libimxvpuapi.git;branch=${SRCBRANCH};protocol=https"
-S = "${WORKDIR}/git"
+inherit waf pkgconfig python3native
-inherit waf pkgconfig
 COMPATIBLE_MACHINE = "(mx6q-nxp-bsp|mx6dl-nxp-bsp)"
diff --git a/recipes-multimedia/nxp-afe/nxp-afe-voiceseeker_git.bb b/recipes-multimedia/nxp-afe/nxp-afe-voiceseeker_git.bb
new file mode 100644
index 000000000..7afa44cb1
--- /dev/null
+++ b/recipes-multimedia/nxp-afe/nxp-afe-voiceseeker_git.bb
@@ -0,0 +1,41 @@
+# Copyright 2025 NXP
+DESCRIPTION = "NXP RetuneDSP Voice Seeker Libraries"
+SECTION = "multimedia"
+LICENSE = "Proprietary"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=ca53281cc0caa7e320d4945a896fb837"
+inherit pkgconfig
+DEPENDS += "alsa-lib nxp-afe"
+PV = "2.0+git"
+SRCBRANCH = "MM_04.10.0_2505_L6.12.20"
+SRC_URI = "git://github.com/nxp-imx/imx-voiceui.git;protocol=https;branch=${SRCBRANCH}"
+SRCREV = "737c156469eeede28fe1a0777c968becf6fea886" 
+EXTRA_CONF = "--enable-armv8 --bindir=/unit_tests/ --libdir=${libdir}"
+EXTRA_OEMAKE:mx8-nxp-bsp = "BUILD_ARCH=CortexA53"
+EXTRA_OEMAKE:mx8ulp-nxp-bsp = "BUILD_ARCH=CortexA35"
+EXTRA_OEMAKE:mx9-nxp-bsp = "BUILD_ARCH=CortexA55"
+do_install() {
+    install -d ${D}${libdir}/nxp-afe
+    install -d ${D}/unit_tests/nxp-afe
+    install -m 0644 ${S}/release/*.so.2.0    ${D}${libdir}/nxp-afe/
+    ln -sf -r ${D}${libdir}/nxp-afe/libvoiceseekerlight.so.2.0 ${D}${libdir}/nxp-afe/libvoiceseekerlight.so
+    install -m 0755  ${S}/release/voice_ui_app    ${D}/unit_tests/nxp-afe
+    install -m 0644  ${S}/release/Config.ini    ${D}/unit_tests/nxp-afe
+}
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+FILES:${PN} += "${libdir}/nxp-afe/* \
+                /unit_tests/* \
+"
+INSANE_SKIP:${PN} += "dev-so"
+COMPATIBLE_MACHINE = "(mx8-nxp-bsp|mx9-nxp-bsp)"
diff --git a/recipes-multimedia/nxp-afe/nxp-afe_git.bb b/recipes-multimedia/nxp-afe/nxp-afe_git.bb
new file mode 100644
index 000000000..a401bedeb
--- /dev/null
+++ b/recipes-multimedia/nxp-afe/nxp-afe_git.bb
@@ -0,0 +1,35 @@
+# Copyright 2025 NXP
+DESCRIPTION = "NXP Audio Front End (AFE) for incorporating Voice Assistants"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=7bdef19938f3503cfc4c586461f99012"
+PV = "1.0+git"
+SRCBRANCH = "MM_04.10.0_2505_L6.12.20"
+SRC_URI = " git://github.com/nxp-imx/nxp-afe.git;protocol=https;branch=${SRCBRANCH}"
+SRCREV = "c6b8fee21376e724b8441f3cf6c04dee69b5242e"
+DEPENDS += "alsa-lib"
+TARGET_CC_ARCH += "${LDFLAGS}"
+do_compile() {
+        oe_runmake clean
+        oe_runmake all
+}
+do_install() {
+        install -d ${D}${libdir}/nxp-afe
+        install -d ${D}/unit_tests/nxp-afe
+        install -m 0644 ${UNPACKDIR}/deploy_afe/*.so.1.0 ${D}${libdir}/nxp-afe
+        ln -sf -r ${D}${libdir}/nxp-afe/libdummyimpl.so.1.0 ${D}${libdir}/nxp-afe/libdummyimpl.so
+        install -m 0755 ${UNPACKDIR}/deploy_afe/afe ${D}/unit_tests/nxp-afe
+        install -m 0644 ${UNPACKDIR}/deploy_afe/asound.conf*    ${D}/unit_tests/nxp-afe
+        install -m 0644 ${UNPACKDIR}/deploy_afe/TODO.md    ${D}/unit_tests/nxp-afe
+        install -m 0755 ${UNPACKDIR}/deploy_afe/UAC_VCOM_composite.sh    ${D}/unit_tests/nxp-afe
+}
+FILES:${PN} += "/unit_tests"
+INSANE_SKIP:${PN} += "dev-so"
diff --git a/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend b/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend
index 93f71e8f6..6e4db9110 100644
--- a/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend
+++ b/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend
@@ -17,9 +17,9 @@ SRC_URI_IMX:mx9-nxp-bsp = " \
 CACHED_CONFIGUREVARS:append:mx6-nxp-bsp = " ax_cv_PTHREAD_PRIO_INHERIT=no"
 do_install:append() {
-    if [ -e "${WORKDIR}/daemon.conf" ] && [ -e "${WORKDIR}/default.pa" ]; then
+    if [ -e "${UNPACKDIR}/daemon.conf" ] && [ -e "${UNPACKDIR}/default.pa" ]; then
-        install -m 0644 ${WORKDIR}/daemon.conf ${D}${sysconfdir}/pulse/daemon.conf
+        install -m 0644 ${UNPACKDIR}/daemon.conf ${D}${sysconfdir}/pulse/daemon.conf
-        install -m 0644 ${WORKDIR}/default.pa ${D}${sysconfdir}/pulse/default.pa
+        install -m 0644 ${UNPACKDIR}/default.pa ${D}${sysconfdir}/pulse/default.pa
    fi
 }
diff --git a/recipes-multimedia/tinycompress/tinycompress/0001-tinycompress-Add-id3-decoding.patch b/recipes-multimedia/tinycompress/tinycompress/0001-tinycompress-Add-id3-decoding.patch
deleted file mode 100755
index 78ff6989c..000000000
--- a/recipes-multimedia/tinycompress/tinycompress/0001-tinycompress-Add-id3-decoding.patch
+++ /dev/null
@@ -1,1002 +0,0 @@
-From 16f6b7a5baec41f18fde75fd311fb988e3c31810 Mon Sep 17 00:00:00 2001
-From: Shengjiu Wang <shengjiu.wang@nxp.com>
-Date: Fri, 13 Jul 2018 18:13:24 +0800
-Subject: [PATCH] tinycompress: Add id3 decoding
-Upstream-Status: Pending
-Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
---
- include/tinycompress/id3_tag_decode.h | 198 +++++++++++
- src/utils/Makefile.am                 |   2 +-
- src/utils/cplay.c                     |  88 +++++
- src/utils/id3_tag_decode.c            | 642 ++++++++++++++++++++++++++++++++++
- 4 files changed, 929 insertions(+), 1 deletion(-)
- create mode 100644 include/tinycompress/id3_tag_decode.h
- create mode 100644 src/utils/id3_tag_decode.c
-diff --git a/include/tinycompress/id3_tag_decode.h b/include/tinycompress/id3_tag_decode.h
-new file mode 100644
-index 0000000..1a911d7
--- /dev/null
-+++ b/include/tinycompress/id3_tag_decode.h
-@@ -0,0 +1,198 @@
-+/*
-+ * Copyright (c) 2006-2017 Cadence Design Systems, Inc.
-+ * Copyright 2018 NXP
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining
-+ * a copy of this software and associated documentation files (the
-+ * "Software"), to deal in the Software without restriction, including
-+ * without limitation the rights to use, copy, modify, merge, publish,
-+ * distribute, sublicense, and/or sell copies of the Software, and to
-+ * permit persons to whom the Software is furnished to do so, subject to
-+ * the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be included
-+ * in all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+ */
-+
-+/******************************************************************
-+ *  file name       : id3_tag_decode.h
-+ *
-+ *  description     : stores typedefs of structures specific to MP3 tag
-+ *
-+ *  revision history:
-+ *       29 04 2004       DK     creation
-+ *****************************************************************/
-+
-+#ifndef ID3_TAG_DECODE_H
-+#define ID3_TAG_DECODE_H
-+
-+typedef signed char             WORD8;
-+typedef signed char *           pWORD8;
-+typedef unsigned char           UWORD8;
-+typedef unsigned char *         pUWORD8;
-+
-+typedef signed short            WORD16;
-+typedef signed short *          pWORD16;
-+typedef unsigned short          UWORD16;
-+typedef unsigned short *        pUWORD16;
-+
-+typedef signed int              WORD24;
-+typedef signed int *            pWORD24;
-+typedef unsigned int            UWORD24;
-+typedef unsigned int *          pUWORD24;
-+
-+typedef signed int              WORD32;
-+typedef signed int *            pWORD32;
-+typedef unsigned int            UWORD32;
-+typedef unsigned int *          pUWORD32;
-+
-+typedef void                    VOID;
-+typedef void *                  pVOID;
-+
-+typedef signed int              BOOL;
-+typedef unsigned int            UBOOL;
-+typedef signed int              FLAG;
-+typedef unsigned int            UFLAG;
-+typedef signed int              LOOPIDX;
-+typedef unsigned int            ULOOPIDX;
-+typedef signed int              WORD;
-+typedef unsigned int            UWORD;
-+
-+#define MAX_TAG_FRAME_SIZE             100
-+
-+#define ID3V1          (0x544147)      /* 0x544147 is TAG in WORD8 */
-+
-+#define ID3V2          (0x494433)      /* 0x494433 is ID3 in WORD8 */
-+
-+/*
-+ * structure corresponding to ID3 tag v1 header.
-+ * this structure has all the field corresponding to ID3 tag v1 header.
-+ */
-+
-+typedef struct {
-+       WORD32 tag;                             // 3 bytes
-+
-+       WORD16 version;                 // 2 bytes
-+
-+       WORD8 flag;                             //1 byte
-+
-+       WORD32  size;           //4 bytes
-+
-+} id3_v2_header_struct;
-+
-+/* structure which will store the frame data and
-+ * also put a limit max data to be stored
-+ */
-+typedef struct {
-+       WORD8 frame_data[MAX_TAG_FRAME_SIZE];
-+
-+       WORD32  max_size;               //4 bytes
-+
-+       WORD16 tag_present;
-+
-+       WORD16 exceeds_buffer_size;
-+
-+} id3_v2_frame_struct;
-+
-+/*
-+ * structure corresponding to ID3 tag v2.
-+ * this structure has some of the  field corresponding to ID3 tag v2.
-+ * if user wants to read some more tag information from
-+ * the MP3 file, he can add that field in this structure and pass address
-+ * of that element to get_inf function in id3_tag_decode.c under the
-+ * corresponding field frame header. few fields which are needed are already
-+ * populated by reading from the TAG header.
-+ */
-+typedef struct {
-+       id3_v2_frame_struct  album_movie_show_title;
-+
-+       id3_v2_frame_struct  composer_name;
-+
-+       id3_v2_frame_struct  content_type;
-+
-+       id3_v2_frame_struct  encoded_by;
-+
-+       id3_v2_frame_struct  lyricist_text_writer;
-+
-+       id3_v2_frame_struct  content_group_description;
-+
-+       id3_v2_frame_struct  title_songname_content_description;
-+
-+       id3_v2_frame_struct  medxa_type;
-+
-+       id3_v2_frame_struct  original_album_movie_show_title;
-+
-+       id3_v2_frame_struct  original_filename;
-+
-+       id3_v2_frame_struct  original_lyricist_text_writer;
-+
-+       id3_v2_frame_struct  original_artist_performer;
-+
-+       id3_v2_frame_struct  file_owner_licensee;
-+
-+       id3_v2_frame_struct  lead_performer_soloist;
-+
-+       id3_v2_frame_struct  publisher;
-+
-+       id3_v2_frame_struct  private_frame;
-+
-+       id3_v2_frame_struct  other_info;
-+
-+       id3_v2_header_struct id3_v2_header;
-+
-+       WORD32 header_end;
-+
-+       WORD32 bytes_consumed;
-+
-+} id3v2_struct;
-+
-+/*
-+ * structure corresponding to ID3 tag v1.
-+ * this structure has all the field corresponding to ID3 tag v1.
-+ */
-+typedef struct {
-+       WORD8 song_title[30]; //30 word8acters
-+
-+       WORD8 artist[30]; //30 word8acters
-+
-+       WORD8 album[30]; //30 word8acters
-+
-+       WORD8 year[4]; //4 word8acters
-+
-+       WORD8 comment[30]; //30 word8acters
-+
-+       WORD8 genre[1]; //1 byte
-+
-+} id3v1_struct;
-+
-+WORD32 get_info(const char *inp_buffer,
-+               unsigned int         avail_inp,
-+               WORD32               tag_size,
-+               id3_v2_frame_struct *dest);
-+
-+WORD32 search_id3_v2(UWORD8 *buffer);
-+
-+WORD32 decode_id3_v2(const char *const buffer,
-+                    id3v2_struct *id3v2,
-+                    WORD32        continue_flag,
-+                    WORD32        insize);
-+
-+WORD32 get_id3_v2_bytes(UWORD8 *buffer);
-+
-+WORD32 get_v1_info(UWORD8 *buffer, id3v1_struct *id3v1);
-+
-+WORD32 search_id3_v1(UWORD8 *buffer);
-+
-+WORD32 decode_id3_v1(UWORD8 *buffer, id3v1_struct *id3v1);
-+
-+void init_id3v2_field(id3v2_struct *id3v2);
-+
-+#endif
-diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am
-index 1b996d4..e813689 100644
--- a/src/utils/Makefile.am
-+++ b/src/utils/Makefile.am
-@@ -1,6 +1,6 @@
- bin_PROGRAMS = cplay crecord
- 
-cplay_SOURCES = cplay.c
-+cplay_SOURCES = cplay.c id3_tag_decode.c
- crecord_SOURCES = crecord.c
- 
- cplay_CFLAGS = -I$(top_srcdir)/include
-diff --git a/src/utils/cplay.c b/src/utils/cplay.c
-index 87863a3..2a52b52 100644
--- a/src/utils/cplay.c
-+++ b/src/utils/cplay.c
-@@ -72,6 +72,7 @@
- #include "sound/compress_params.h"
- #include "tinycompress/tinycompress.h"
- #include "tinycompress/tinymp3.h"
-+#include "tinycompress/id3_tag_decode.h"
- 
- static int verbose;
- static const unsigned int DEFAULT_CODEC_ID = SND_AUDIOCODEC_PCM;
-@@ -245,12 +246,97 @@ int main(int argc, char **argv)
-        exit(EXIT_SUCCESS);
- }
- 
-+void shift_buffer(char *buf, int buf_size, int bytes_consumed)
-+{
-+       int i;
-+
-+       if (bytes_consumed <= 0)
-+               return;
-+
-+       for (i = 0; i < buf_size - bytes_consumed; i++)
-+               buf[i] = buf[i + bytes_consumed];
-+}
-+
-+void parse_id3(FILE *file, int *offset) {
-+       /* ID3 tag specific declarations */
-+       unsigned char id3_buf[128];
-+       unsigned char id3v2_buf[4096];
-+       signed int id3_v1_found = 0, id3_v1_decoded = 0;
-+       signed int id3_v2_found = 0, id3_v2_complete = 0;
-+       signed int i_bytes_consumed = 0;
-+       signed int i_fread_bytes;
-+       id3v1_struct id3v1;
-+       id3v2_struct id3v2;
-+
-+       {
-+               fseek(file, -128, SEEK_END);
-+               fread(id3_buf, 1, 128, file);
-+
-+               /* search for ID3V1 */
-+               id3_v1_found = search_id3_v1(id3_buf + 0);
-+               if (id3_v1_found) {
-+                       /* if ID3V1 is found, decode ID3V1 */
-+                       decode_id3_v1(id3_buf + 3, &id3v1);
-+                       id3_v1_decoded = 1;
-+               }
-+               fseek(file, 0, SEEK_SET);
-+       }
-+
-+       {
-+               signed int flag = 0;
-+               signed int continue_flag = 0;
-+
-+               i_fread_bytes = fread(id3v2_buf,
-+                               sizeof(char), 0x1000, file);
-+
-+               /* search for ID3V2 */
-+               id3_v2_found =
-+                       search_id3_v2(id3v2_buf);
-+
-+               if (id3_v2_found) {
-+                       /* initialise the max fields */
-+                       init_id3v2_field(&id3v2);
-+
-+                       while (!id3_v2_complete && id3_v2_found) {
-+                               /* if ID3V2 is found, decode ID3V2 */
-+                               id3_v2_complete = decode_id3_v2((const char *const)id3v2_buf,
-+                                                       &id3v2, continue_flag, i_fread_bytes);
-+
-+                               if (!id3_v2_complete) {
-+                                       continue_flag = 1;
-+                                       i_bytes_consumed = id3v2.bytes_consumed;
-+
-+                                       fseek(file, i_bytes_consumed, SEEK_SET);
-+
-+                                        i_fread_bytes = fread(id3v2_buf,
-+                                                              sizeof(unsigned char), 0x1000, file);
-+                                        if (i_fread_bytes <= 0) {
-+                                               return;
-+                                        }
-+                               }
-+                       }
-+
-+                       if (id3_v2_complete) {
-+                               i_bytes_consumed = id3v2.bytes_consumed;
-+                               fseek(file, i_bytes_consumed, SEEK_SET);
-+                        }
-+                }
-+       }
-+
-+       *offset = i_bytes_consumed;
-+}
-+
- void get_codec_mp3(FILE *file, struct compr_config *config,
-                struct snd_codec *codec)
- {
-        size_t read;
-        struct mp3_header header;
-        unsigned int channels, rate, bits;
-+       int offset = 0;
-+
-+       parse_id3(file, &offset);
-+
-+       fseek(file, offset, SEEK_SET);
- 
-        read = fread(&header, 1, sizeof(header), file);
-        if (read != sizeof(header)) {
-@@ -279,6 +365,8 @@ void get_codec_mp3(FILE *file, struct compr_config *config,
-        codec->level = 0;
-        codec->ch_mode = 0;
-        codec->format = 0;
-+
-+       fseek(file, offset, SEEK_SET);
- }
- 
- void get_codec_iec(FILE *file, struct compr_config *config,
-diff --git a/src/utils/id3_tag_decode.c b/src/utils/id3_tag_decode.c
-new file mode 100644
-index 0000000..393967a
--- /dev/null
-+++ b/src/utils/id3_tag_decode.c
-@@ -0,0 +1,642 @@
-+/*
-+ * Copyright (c) 2006-2017 Cadence Design Systems, Inc.
-+ * Copyright 2018 NXP
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining
-+ * a copy of this software and associated documentation files (the
-+ * "Software"), to deal in the Software without restriction, including
-+ * without limitation the rights to use, copy, modify, merge, publish,
-+ * distribute, sublicense, and/or sell copies of the Software, and to
-+ * permit persons to whom the Software is furnished to do so, subject to
-+ * the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be included
-+ * in all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+ */
-+#include <ctype.h>
-+#include "tinycompress/id3_tag_decode.h"
-+
-+#define CHAR4(c1, c2, c3, c4) \
-+       (int)(((unsigned char)(c1) << 24) | \
-+               ((unsigned char)(c2) << 16) | \
-+               ((unsigned char)(c3) << 8) | \
-+               ((unsigned char)c4))
-+
-+#ifndef MSVC_BUILD
-+unsigned int umin(unsigned int a, unsigned int b)
-+{
-+       return (a < b ? a : b);
-+}
-+
-+#else
-+unsigned int umin(unsigned int a, unsigned int b)
-+{
-+       return (a < b ? a : b);
-+}
-+#endif
-+
-+/***********************************************************
-+ *  function name   : display
-+ *
-+ *  description     : display ID3 tag contents.
-+ *
-+ *  arguments       : input parameters
-+ *
-+ *  values returned : 0
-+ ***********************************************************/
-+
-+static void display2(const id3_v2_frame_struct * const src,
-+                    int size,
-+                    const char * const disp)
-+{
-+       int j;
-+
-+
-+       for (j = 0; j < size; j++) {
-+               int c = src->frame_data[j];
-+
-+               if (c) {
-+                       if (!isprint(c))
-+                               break;
-+               }
-+       }
-+}
-+
-+static VOID display1(WORD8 src[], WORD32 size, WORD8 disp[])
-+{
-+       WORD32 j;
-+
-+       for (j = 0; j < size ; j++) {
-+               int c = src[j];
-+
-+               if (c) {
-+                       if (!isprint(c))
-+                               break;
-+               }
-+       }
-+}
-+
-+/*****************************************************************
-+ *  function name   : init_id3_header
-+ *
-+ *  description     : initialise the max filed size of teh farem.
-+ *
-+ *  arguments       : input parameters
-+ *
-+ *  values returned : 0
-+ ****************************************************************/
-+
-+VOID init_id3v2_field(id3v2_struct *id3v2)
-+{
-+       id3v2->album_movie_show_title.max_size = MAX_TAG_FRAME_SIZE;
-+       id3v2->composer_name.max_size = MAX_TAG_FRAME_SIZE;
-+       id3v2->content_type.max_size = MAX_TAG_FRAME_SIZE;
-+       id3v2->encoded_by.max_size = MAX_TAG_FRAME_SIZE;
-+       id3v2->lyricist_text_writer.max_size = MAX_TAG_FRAME_SIZE;
-+       id3v2->content_group_description.max_size = MAX_TAG_FRAME_SIZE;
-+       id3v2->title_songname_content_description.max_size = MAX_TAG_FRAME_SIZE;
-+       id3v2->medxa_type.max_size = MAX_TAG_FRAME_SIZE;
-+       id3v2->original_album_movie_show_title.max_size = MAX_TAG_FRAME_SIZE;
-+       id3v2->original_filename.max_size = MAX_TAG_FRAME_SIZE;
-+       id3v2->original_lyricist_text_writer.max_size = MAX_TAG_FRAME_SIZE;
-+       id3v2->original_artist_performer.max_size = MAX_TAG_FRAME_SIZE;
-+       id3v2->file_owner_licensee.max_size = MAX_TAG_FRAME_SIZE;
-+       id3v2->lead_performer_soloist.max_size = MAX_TAG_FRAME_SIZE;
-+       id3v2->publisher.max_size = MAX_TAG_FRAME_SIZE;
-+       id3v2->private_frame.max_size = MAX_TAG_FRAME_SIZE;
-+       id3v2->other_info.max_size = MAX_TAG_FRAME_SIZE;
-+
-+       /* resetting the flag to indicate presese of frame */
-+       id3v2->album_movie_show_title.tag_present = 0;
-+       id3v2->composer_name.tag_present = 0;
-+       id3v2->content_type.tag_present = 0;
-+       id3v2->encoded_by.tag_present = 0;
-+       id3v2->lyricist_text_writer.tag_present = 0;
-+       id3v2->content_group_description.tag_present = 0;
-+       id3v2->title_songname_content_description.tag_present = 0;
-+       id3v2->medxa_type.tag_present = 0;
-+       id3v2->original_album_movie_show_title.tag_present = 0;
-+       id3v2->original_filename.tag_present = 0;
-+       id3v2->original_lyricist_text_writer.tag_present = 0;
-+       id3v2->original_artist_performer.tag_present = 0;
-+       id3v2->file_owner_licensee.tag_present = 0;
-+       id3v2->lead_performer_soloist.tag_present = 0;
-+       id3v2->publisher.tag_present = 0;
-+       id3v2->private_frame.tag_present = 0;
-+       id3v2->other_info.tag_present = 0;
-+
-+       /* resetting the flag which indicates that size of the frame has
-+        * exceeded the max buffer size
-+        */
-+       id3v2->album_movie_show_title.exceeds_buffer_size = 0;
-+       id3v2->composer_name.exceeds_buffer_size = 0;
-+       id3v2->content_type.exceeds_buffer_size = 0;
-+       id3v2->encoded_by.exceeds_buffer_size = 0;
-+       id3v2->lyricist_text_writer.exceeds_buffer_size = 0;
-+       id3v2->content_group_description.exceeds_buffer_size = 0;
-+       id3v2->title_songname_content_description.exceeds_buffer_size = 0;
-+       id3v2->medxa_type.exceeds_buffer_size = 0;
-+       id3v2->original_album_movie_show_title.exceeds_buffer_size = 0;
-+       id3v2->original_filename.exceeds_buffer_size = 0;
-+       id3v2->original_lyricist_text_writer.exceeds_buffer_size = 0;
-+       id3v2->original_artist_performer.exceeds_buffer_size = 0;
-+       id3v2->file_owner_licensee.exceeds_buffer_size = 0;
-+       id3v2->lead_performer_soloist.exceeds_buffer_size = 0;
-+       id3v2->publisher.exceeds_buffer_size = 0;
-+       id3v2->private_frame.exceeds_buffer_size = 0;
-+       id3v2->other_info.exceeds_buffer_size = 0;
-+
-+       id3v2->bytes_consumed = 0;
-+       id3v2->header_end = 0;
-+}
-+
-+/***************************************************************
-+ *  function name   : search_id3_v2
-+ *
-+ *  description     : finds if ID3V2 starts at the start of given buffer.
-+ *
-+ *  arguments       : input parameters
-+ *                   buffer          input buffer
-+ *
-+ *  values returned : FLAG   1: ID3 found   0: ID3 not found
-+ ***************************************************************/
-+WORD32 search_id3_v2(UWORD8 *buffer)
-+{
-+       UWORD32 temp;
-+
-+       temp  = buffer[0] << 16;
-+       temp |= buffer[1] <<  8;
-+       temp |= buffer[2];
-+
-+       if (temp == ID3V2)
-+               return 1;   /* ID3 found */
-+
-+       return 0;       /* ID3 not found */
-+}
-+
-+/**************************************************************
-+ *  function name   : search_id3_v1
-+ *
-+ *  description     : finds if ID3V1 starts at the start of given buffer.
-+ *
-+ *  arguments       : input parameters
-+ *                   buffer          input buffer
-+ *
-+ *  values returned : FLAG   1: ID3 found   0: ID3 not found
-+ **************************************************************/
-+WORD32 search_id3_v1(UWORD8 *buffer)
-+{
-+       UWORD32 temp;
-+
-+       temp  = buffer[0] << 16;
-+       temp |= buffer[1] <<  8;
-+       temp |= buffer[2];
-+
-+       if (temp == ID3V1)
-+               return 1;   /* ID3 found */
-+
-+       return 0;       /* ID3 not found */
-+}
-+
-+/***************************************************************
-+ *  function name   : decode_id3_v1
-+ *
-+ *  description     : decodes ID3V1 tag.
-+ *
-+ *  arguments       : input parameters
-+ *                   buffer              input buffer
-+ *                   id3v1               structure
-+ *
-+ *  values returned : bytes consumed
-+ **************************************************************/
-+WORD32 decode_id3_v1(UWORD8 *buffer, id3v1_struct *id3v1)
-+{
-+       WORD32 bytes_consumed = 0;
-+       short tag_type;
-+
-+       /* setting the tag type */
-+       tag_type = 1;
-+
-+       bytes_consumed = get_v1_info(buffer, id3v1);
-+
-+       return bytes_consumed;
-+}
-+
-+/***********************************************************
-+ *  function name   : get_v1_info
-+ *
-+ *  description     : gets ID3V1 information fields.
-+ *
-+ *  arguments       : input parameters
-+ *                   buffer              input buffer
-+ *                   id3v1               structure
-+ *
-+ *  values returned : bytes consumed
-+ ***********************************************************/
-+WORD32 get_v1_info(UWORD8 *buffer, id3v1_struct *id3v1)
-+{
-+       WORD32 i;
-+       WORD32 bytes_consumed = 0;
-+
-+       /* get song_title */
-+       for (i = 0; i < 30; i++)
-+               id3v1->song_title[i] = buffer[i];
-+
-+       buffer += 30;
-+       bytes_consumed += 30;
-+       display1(id3v1->song_title, 30, (WORD8 *)"song_title : ");
-+
-+       /* get artist */
-+       for (i = 0; i < 30; i++)
-+               id3v1->artist[i] = buffer[i];
-+
-+       buffer += 30;
-+       bytes_consumed += 30;
-+       display1(id3v1->artist, 30, (WORD8 *)"artist : ");
-+
-+       /* get album */
-+       for (i = 0; i < 30; i++)
-+               id3v1->album[i] = buffer[i];
-+
-+       buffer += 30;
-+       bytes_consumed += 30;
-+       display1(id3v1->album, 30, (WORD8 *)"album : ");
-+
-+       /* get year */
-+       for (i = 0; i < 4; i++)
-+               id3v1->year[i] = buffer[i];
-+
-+       buffer += 4;
-+       bytes_consumed += 4;
-+       display1(id3v1->year, 4, (WORD8 *)"year : ");
-+
-+       /* get comment */
-+       for (i = 0; i < 30; i++)
-+               id3v1->comment[i] = buffer[i];
-+
-+       buffer += 30;
-+       bytes_consumed += 30;
-+       display1(id3v1->comment, 30, (WORD8 *)"comment : ");
-+
-+       /* get genre */
-+       for (i = 0; i < 1; i++)
-+               id3v1->genre[i] = buffer[i];
-+
-+       buffer += 1;
-+       bytes_consumed += 1;
-+
-+       return bytes_consumed;
-+}
-+
-+/*****************************************************
-+ *  function name   : decode_id3_v2
-+ *
-+ *  description     : decodes ID3V2 tag.
-+ *
-+ *  arguments       : input parameters
-+ *                   buffer              input buffer
-+ *                   id3v2               structure
-+ *                   continue_flag       FLAG to indicate whether
-+ *                                       it is first call or not
-+ *                   insize              input buffer size
-+ *
-+ *  values returned : bytes consumed
-+ ******************************************************/
-+WORD32 decode_id3_v2(const char *const buffer,
-+                    id3v2_struct *const id3v2,
-+                    WORD32  continue_flag,
-+                    WORD32  insize)
-+{
-+       UWORD32 size = 0, flag;
-+       WORD32 i, buf_update_val;
-+       UWORD8 buf[4], frame_header[10], id3_buffer[10];
-+       WORD8 *bitstream_ptr;
-+       short tag_type;
-+
-+       WORD32 bytes_consumed = 0;
-+
-+       if (id3v2->header_end == 1) {
-+               id3v2->bytes_consumed += insize;
-+               if (id3v2->bytes_consumed < id3v2->id3_v2_header.size)
-+                       return 0;
-+
-+               id3v2->bytes_consumed = (id3v2->id3_v2_header.size + 10);
-+               return 1;
-+       }
-+
-+       bitstream_ptr = (WORD8 *)id3_buffer;
-+
-+       if (!continue_flag) {
-+               bytes_consumed += 3;
-+               /* setting the tag type */
-+               tag_type = 2;
-+               id3v2->id3_v2_header.version  = buffer[bytes_consumed + 0] << 8;
-+               id3v2->id3_v2_header.version |= buffer[bytes_consumed + 1];
-+               id3v2->id3_v2_header.flag = buffer[bytes_consumed + 2];
-+
-+               /* making the msb of each byte zero */
-+               buf[0] = buffer[bytes_consumed + 6] & 0x7f;
-+               buf[1] = buffer[bytes_consumed + 5] & 0x7f;
-+               buf[2] = buffer[bytes_consumed + 4] & 0x7f;
-+               buf[3] = buffer[bytes_consumed + 3] & 0x7f;
-+
-+               bytes_consumed += 7;
-+
-+               /* concatenation the bytes after making
-+                * 7th bit zero to get 28 bits size
-+                */
-+               size  = buf[0];
-+               size |= (buf[1] << 7);
-+               size |= (buf[2] << 14);
-+               size |= (buf[3] << 21);
-+               /* storing the size */
-+               id3v2->id3_v2_header.size = size;
-+
-+               /* check for extended header */
-+               if (id3v2->id3_v2_header.flag & 0x20) {
-+                       for (i = 0; i < 10; i++)
-+                               bitstream_ptr[i] = buffer[bytes_consumed + i];
-+
-+                       i = 0;
-+                       bytes_consumed += 10;
-+
-+                       size = bitstream_ptr[i++]  << 24;
-+                       size |= bitstream_ptr[i++] << 16;
-+                       size |= bitstream_ptr[i++] << 8;
-+                       size |= bitstream_ptr[i++];
-+
-+                       /* two bytes for flag */
-+                       i += 2;
-+                       {
-+                               UWORD32 padding_size;
-+
-+                               padding_size   = bitstream_ptr[i++]  << 24;
-+                               padding_size   |= bitstream_ptr[i++] << 16;
-+                               padding_size   |= bitstream_ptr[i++] << 8;
-+                               padding_size   |= bitstream_ptr[i++];
-+
-+                               /* skipping the padding and frame size
-+                                * number of bytes
-+                                */
-+                               bytes_consumed += (padding_size + size);
-+                       }
-+               }
-+       }
-+
-+       while (id3v2->header_end != 1) {
-+               char *key;
-+               id3_v2_frame_struct *value;
-+               unsigned int avail_inp;
-+
-+               /* reading the 10 bytes to get the frame header */
-+
-+               for (i = 0; i < 10; i++)
-+                       frame_header[i] = buffer[bytes_consumed + i];
-+               bytes_consumed += 10;
-+
-+               /* getting the size from the header */
-+               size = frame_header[4]  << 24;
-+               size |= frame_header[5] << 16;
-+               size |= frame_header[6] << 8;
-+               size |= frame_header[7];
-+
-+               /* decoding the flag, currently not used */
-+               flag = frame_header[8] << 8;
-+               flag |= frame_header[9];
-+
-+               avail_inp = insize - bytes_consumed;
-+
-+               /* switching to the frame type */
-+               switch (CHAR4(frame_header[0],
-+                             frame_header[1],
-+                             frame_header[2],
-+                             frame_header[3])) {
-+               case CHAR4('A', 'E', 'N', 'C'):
-+               case CHAR4('A', 'P', 'I', 'C'):
-+               case CHAR4('C', 'O', 'M', 'M'):
-+               case CHAR4('C', 'O', 'M', 'R'):
-+               case CHAR4('E', 'N', 'C', 'R'):
-+               case CHAR4('E', 'Q', 'U', 'A'):
-+               case CHAR4('E', 'T', 'C', 'O'):
-+               case CHAR4('G', 'E', 'O', 'B'):
-+               case CHAR4('G', 'R', 'I', 'D'):
-+               case CHAR4('I', 'P', 'L', 'S'):
-+               case CHAR4('L', 'I', 'N', 'K'):
-+               case CHAR4('M', 'C', 'D', 'I'):
-+               case CHAR4('M', 'L', 'L', 'T'):
-+               case CHAR4('O', 'W', 'N', 'E'):
-+               case CHAR4('P', 'C', 'N', 'T'):
-+               case CHAR4('P', 'O', 'P', 'M'):
-+               case CHAR4('P', 'O', 'S', 'S'):
-+               case CHAR4('R', 'B', 'U', 'F'):
-+               case CHAR4('R', 'V', 'A', 'D'):
-+               case CHAR4('R', 'V', 'R', 'B'):
-+               case CHAR4('S', 'Y', 'L', 'T'):
-+               case CHAR4('S', 'Y', 'T', 'C'):
-+               case CHAR4('T', 'B', 'P', 'M'):
-+               case CHAR4('T', 'C', 'O', 'P'):
-+               case CHAR4('T', 'D', 'A', 'T'):
-+               case CHAR4('T', 'D', 'L', 'Y'):
-+               case CHAR4('T', 'F', 'L', 'T'):
-+               case CHAR4('T', 'I', 'M', 'E'):
-+               case CHAR4('T', 'K', 'E', 'Y'):
-+               case CHAR4('T', 'L', 'A', 'N'):
-+               case CHAR4('T', 'L', 'E', 'N'):
-+               case CHAR4('T', 'M', 'E', 'D'):
-+               case CHAR4('T', 'O', 'F', 'N'):
-+               case CHAR4('T', 'O', 'L', 'Y'):
-+               case CHAR4('T', 'O', 'R', 'Y'):
-+               case CHAR4('T', 'P', 'E', '2'):
-+               case CHAR4('T', 'P', 'E', '3'):
-+               case CHAR4('T', 'P', 'E', '4'):
-+               case CHAR4('T', 'P', 'O', 'S'):
-+               case CHAR4('T', 'R', 'C', 'K'):
-+               case CHAR4('T', 'R', 'D', 'A'):
-+               case CHAR4('T', 'R', 'S', 'N'):
-+               case CHAR4('T', 'R', 'S', 'O'):
-+               case CHAR4('T', 'S', 'I', 'Z'):
-+               case CHAR4('T', 'S', 'R', 'C'):
-+               case CHAR4('T', 'S', 'S', 'E'):
-+               case CHAR4('T', 'Y', 'E', 'R'):
-+               case CHAR4('T', 'X', 'X', 'X'):
-+               case CHAR4('U', 'F', 'I', 'D'):
-+               case CHAR4('U', 'S', 'E', 'R'):
-+               case CHAR4('U', 'S', 'L', 'T'):
-+               case CHAR4('W', 'C', 'O', 'M'):
-+               case CHAR4('W', 'C', 'O', 'P'):
-+               case CHAR4('W', 'O', 'A', 'F'):
-+               case CHAR4('W', 'O', 'A', 'R'):
-+               case CHAR4('W', 'O', 'A', 'S'):
-+               case CHAR4('W', 'O', 'R', 'S'):
-+               case CHAR4('W', 'P', 'A', 'Y'):
-+               case CHAR4('W', 'P', 'U', 'B'):
-+               case CHAR4('W', 'X', 'X', 'X'):
-+               case CHAR4('T', 'I', 'T', '3'):
-+                       key = "other_info : ";
-+                       value = &id3v2->other_info;
-+                       break;
-+               case CHAR4('P', 'R', 'I', 'V'):
-+                       key = "private_frame : ";
-+                       value = &id3v2->private_frame;
-+                       break;
-+               case CHAR4('T', 'A', 'L', 'B'):
-+                       key = "album_movie_show_title : ";
-+                       value = &id3v2->album_movie_show_title;
-+                       break;
-+               case CHAR4('T', 'C', 'O', 'M'):
-+                       key = "composer_name : ";
-+                       value = &id3v2->composer_name;
-+                       break;
-+               case CHAR4('T', 'C', 'O', 'N'):
-+                       key = "content_type : ";
-+                       value = &id3v2->content_type;
-+                       break;
-+               case CHAR4('T', 'E', 'N', 'C'):
-+                       key = "encoded_by : ";
-+                       value = &id3v2->encoded_by;
-+                       break;
-+               case CHAR4('T', 'E', 'X', 'T'):
-+                       key = "lyricist_text_writer : ";
-+                       value = &id3v2->lyricist_text_writer;
-+                       break;
-+               case CHAR4('T', 'I', 'T', '1'):
-+                       key = "content_group_description : ";
-+                       value = &id3v2->content_group_description;
-+                       break;
-+               case CHAR4('T', 'I', 'T', '2'):
-+                       key = "title_songname_content_description : ";
-+                       value = &id3v2->title_songname_content_description;
-+                       break;
-+               case CHAR4('T', 'O', 'A', 'L'):
-+                       key = "original_album_movie_show_title : ";
-+                       value = &id3v2->original_album_movie_show_title;
-+                       break;
-+               case CHAR4('T', 'O', 'P', 'E'):
-+                       key = "original_artist_performer : ";
-+                       value = &id3v2->original_artist_performer;
-+                       break;
-+               case CHAR4('T', 'O', 'W', 'N'):
-+                       key = "file_owner_licensee : ";
-+                       value = &id3v2->file_owner_licensee;
-+                       break;
-+               case CHAR4('T', 'P', 'E', '1'):
-+                       key = "lead_performer_soloist : ";
-+                       value = &id3v2->lead_performer_soloist;
-+                       break;
-+               case CHAR4('T', 'P', 'U', 'B'):
-+                       key =  "publisher : ";
-+                       value = &id3v2->publisher;
-+                       break;
-+               default:
-+                       /* skipping the read 10 bytes */
-+                       buf_update_val = -10;
-+                       id3v2->header_end = 1;
-+                       value = 0;
-+                       key = 0;
-+                       break;
-+               }
-+
-+               if (value != 0)
-+                       buf_update_val = get_info(&buffer[bytes_consumed],
-+                                                 avail_inp, size, value);
-+
-+               /* Negative value for buf_update_val means one of two things:
-+                * 1. The default case happened and we're done with ID3V2 tag
-+                *    frames, or
-+                * 2. get_info() returned -1 to indicate that more input is
-+                *    required to decode this frame of the tag.
-+                */
-+               if (buf_update_val >= 0)
-+                       display2(value,
-+                                umin(value->max_size, buf_update_val), key);
-+
-+               if (buf_update_val == -1) {
-+                       id3v2->bytes_consumed += bytes_consumed;
-+                       return 1;
-+               }
-+
-+               bytes_consumed += buf_update_val;
-+
-+               /* Is there enough input left (10 bytes) to begin
-+                * decoding another frame? If not, bag out temporarily
-+                * now. The caller will refill our input buffer and
-+                * call us again with continue_flag == 1.
-+                */
-+               if (insize - bytes_consumed < 10) {
-+                       id3v2->bytes_consumed += bytes_consumed;
-+                       return 0; /* not completely decoded */
-+               }
-+       }
-+
-+       id3v2->bytes_consumed += bytes_consumed;
-+       if ((id3v2->bytes_consumed + 10) < id3v2->id3_v2_header.size)
-+               return 0; /* not completely decoded */
-+
-+       return 1; /* completely decoded */
-+}
-+
-+/*******************************************************
-+ *  function name   : get_id3_v2_bytes
-+ *
-+ *  description     : tells the size of ID3V2 tag.
-+ *
-+ *  arguments       : input parameters
-+ *                   buffer          input buffer
-+ *
-+ *  values returned : bytes consumed
-+ ********************************************************/
-+WORD32 get_id3_v2_bytes(UWORD8 *buffer)
-+{
-+       WORD32 size;
-+
-+       /* making the msb of each byte zero */
-+       size  =  (buffer[9] & 0x7f);
-+       size |= ((buffer[8] & 0x7f) << 7);
-+       size |= ((buffer[7] & 0x7f) << 14);
-+       size |= ((buffer[6] & 0x7f) << 21);
-+
-+       return (size + 10);
-+}
-+
-+/****************************************************
-+ *  function name   : get_info
-+ *
-+ *  description     : read the frame information from the input buffer.
-+ *
-+ *  arguments       : input parameters
-+ *
-+ *  values returned : update value for buffer
-+ ****************************************************/
-+WORD32 get_info(const char *inp_buffer,
-+               unsigned int         avail_inp,
-+               WORD32               tag_size,
-+               id3_v2_frame_struct *dest)
-+{
-+       WORD32 j;
-+
-+       /* setting the tag to indicate the presence of frame */
-+       dest->tag_present = 1;
-+       /* If there isn't enough input available, we punt back to the top
-+        * level and ask for more.
-+        */
-+       if (avail_inp < umin(tag_size, dest->max_size))
-+               return -1;
-+
-+       if (dest->max_size >= tag_size) {
-+               for (j = 0; j < tag_size ; j++)
-+                       dest->frame_data[j] = inp_buffer[j];
-+       } else {
-+               dest->exceeds_buffer_size = 1;
-+               for (j = 0; j < dest->max_size ; j++)
-+                       dest->frame_data[j] = inp_buffer[j];
-+       }
-+       return tag_size;
-+}
-- 
-2.7.4
diff --git a/recipes-multimedia/tinycompress/tinycompress/0002-cplay-Support-wave-file.patch b/recipes-multimedia/tinycompress/tinycompress/0002-cplay-Support-wave-file.patch
deleted file mode 100755
index 795447118..000000000
--- a/recipes-multimedia/tinycompress/tinycompress/0002-cplay-Support-wave-file.patch
+++ /dev/null
@@ -1,215 +0,0 @@
-From 4d4bc0a958fe254531920095fbabc241aad88113 Mon Sep 17 00:00:00 2001
-From: Shengjiu Wang <shengjiu.wang@nxp.com>
-Date: Tue, 28 Jul 2020 13:00:36 +0800
-Subject: [PATCH] cplay: Support wave file
-The supported format is mono/stereo, S16_LE/S32_LE, 8kHz-192kHz.
-Command is:
-cplay  -c x -I PCM test.wav
-Upstream-Status: Inappropriate [i.MX specific]
-Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
---
- include/tinycompress/wave_formats.h |  51 +++++++++++++
- src/utils/cplay.c                   | 107 ++++++++++++++++++++++++++++
- 2 files changed, 158 insertions(+)
- create mode 100644 include/tinycompress/wave_formats.h
--- /dev/null
-+++ b/include/tinycompress/wave_formats.h
-@@ -0,0 +1,53 @@
-+#ifndef WAVE_FORMATS_H
-+#define WAVE_FORMATS_H         1
-+
-+#include <sys/types.h>
-+
-+#define COMPOSE_ID(a,b,c,d)    ((a) | ((b)<<8) | ((c)<<16) | ((d)<<24))
-+
-+#define WAV_RIFF               COMPOSE_ID('R','I','F','F')
-+#define WAV_RIFX               COMPOSE_ID('R','I','F','X')
-+#define WAV_WAVE               COMPOSE_ID('W','A','V','E')
-+#define WAV_FMT                        COMPOSE_ID('f','m','t',' ')
-+#define WAV_DATA               COMPOSE_ID('d','a','t','a')
-+
-+/* WAVE fmt block constants from Microsoft mmreg.h header */
-+#define WAV_FMT_PCM             0x0001
-+#define WAV_FMT_IEEE_FLOAT      0x0003
-+#define WAV_FMT_DOLBY_AC3_SPDIF 0x0092
-+#define WAV_FMT_EXTENSIBLE      0xfffe
-+
-+/* Used with WAV_FMT_EXTENSIBLE format */
-+#define WAV_GUID_TAG           "\x00\x00\x00\x00\x10\x00\x80\x00\x00\xAA\x00\x38\x9B\x71"
-+
-+typedef struct {
-+       u_int magic;            /* 'RIFF' */
-+       u_int length;           /* filelen */
-+       u_int type;             /* 'WAVE' */
-+} WaveHeader;
-+
-+typedef struct {
-+       u_short format;         /* see WAV_FMT_* */
-+       u_short channels;
-+       u_int sample_fq;        /* frequence of sample */
-+       u_int byte_p_sec;
-+       u_short byte_p_spl;     /* samplesize; 1 or 2 bytes */
-+       u_short bit_p_spl;      /* 8, 12 or 16 bit */
-+} WaveFmtBody;
-+
-+typedef struct {
-+       WaveFmtBody format;
-+       u_short ext_size;
-+       u_short bit_p_spl;
-+       u_int channel_mask;
-+       u_short guid_format;    /* WAV_FMT_* */
-+       u_char guid_tag[14];    /* WAV_GUID_TAG */
-+} WaveFmtExtensibleBody;
-+
-+typedef struct {
-+       u_int type;             /* 'data' */
-+       u_int length;           /* samplecount */
-+} WaveChunkHeader;
-+
-+
-+#endif                         /* FORMATS */
--- a/src/utils/cplay.c
-+++ b/src/utils/cplay.c
-@@ -1,4 +1,6 @@
- /*
-+ * Copyright 2020 NXP
-+ *
-  * This file is provided under a dual BSD/LGPLv2.1 license.  When using or
-  * redistributing this file, you may do so under either license.
-  *
-@@ -73,6 +75,8 @@
- #include "tinycompress/tinycompress.h"
- #include "tinycompress/tinymp3.h"
- #include "tinycompress/id3_tag_decode.h"
-+#include "tinycompress/wave_formats.h"
-+#include <alsa/asoundlib.h>
- 
- static int verbose;
- static const unsigned int DEFAULT_CODEC_ID = SND_AUDIOCODEC_PCM;
-@@ -166,6 +170,77 @@ static int parse_mp3_header(struct mp3_h
-        return 0;
- }
- 
-+static int parse_wav_header(FILE *file, unsigned int *num_channels, unsigned int *sample_rate,
-+                     unsigned int *format) {
-+       WaveHeader wave_header;
-+       WaveChunkHeader chunk_header;
-+       WaveFmtBody fmt_body;
-+       int more_chunks = 1;
-+
-+       fread(&wave_header, sizeof(WaveHeader), 1, file);
-+       if ((wave_header.magic != WAV_RIFF) ||
-+           (wave_header.type != WAV_WAVE)) {
-+               fprintf(stderr, "Error: it is not a riff/wave file\n");
-+               return -1;
-+       }
-+
-+       do {
-+               fread(&chunk_header, sizeof(WaveChunkHeader), 1, file);
-+               switch (chunk_header.type) {
-+               case WAV_FMT:
-+                       fread(&fmt_body, sizeof(WaveFmtBody), 1, file);
-+                       /* If the format header is larger, skip the rest */
-+                       if (chunk_header.length > sizeof(WaveFmtBody))
-+                               fseek(file, chunk_header.length - sizeof(WaveFmtBody), SEEK_CUR);
-+
-+                       *num_channels = fmt_body.channels;
-+                       *sample_rate = fmt_body.sample_fq;
-+
-+                       switch (fmt_body.bit_p_spl) {
-+                       case 8:
-+                               *format = SND_PCM_FORMAT_U8;
-+                               break;
-+                       case 16:
-+                               *format = SND_PCM_FORMAT_S16_LE;
-+                               break;
-+                       case 24:
-+                               switch (fmt_body.byte_p_spl / fmt_body.channels) {
-+                               case 3:
-+                                       *format = SND_PCM_FORMAT_S24_3LE;
-+                                       break;
-+                               case 4:
-+                                       *format = SND_PCM_FORMAT_S24_LE;
-+                                       break;
-+                               default:
-+                                       fprintf(stderr, "format error\n");
-+                                       return -1;
-+                               }
-+                               break;
-+                       case 32:
-+                               if (fmt_body.format == WAV_FMT_PCM) {
-+                                       *format = SND_PCM_FORMAT_S32_LE;
-+                               } else if (fmt_body.format == WAV_FMT_IEEE_FLOAT) {
-+                                       *format = SND_PCM_FORMAT_FLOAT_LE;
-+                               }
-+                               break;
-+                       default:
-+                               fprintf(stderr, "format error\n");
-+                               return -1;
-+                       }
-+                       break;
-+               case WAV_DATA:
-+                       /* Stop looking for chunks */
-+                       more_chunks = 0;
-+                       break;
-+               default:
-+                       /* Unknown chunk, skip bytes */
-+                       fseek(file, chunk_header.length, SEEK_CUR);
-+               }
-+       } while (more_chunks);
-+
-+       return 0;
-+}
-+
- static int print_time(struct compress *compress)
- {
-        unsigned int avail;
-@@ -385,6 +460,35 @@ void get_codec_iec(FILE *file, struct co
-        codec->format = 0;
- }
- 
-+void get_codec_pcm(FILE *file, struct compr_config *config,
-+               struct snd_codec *codec)
-+{
-+       unsigned int channels, rate, format;
-+
-+       if (parse_wav_header(file, &channels, &rate, &format) == -1) {
-+               fclose(file);
-+               exit(EXIT_FAILURE);
-+       }
-+
-+       if (channels > 2 || (format != SND_PCM_FORMAT_S16_LE && format != SND_PCM_FORMAT_S32_LE) ||
-+           rate > 192000) {
-+               fprintf(stderr, "unsupported wave file\n");
-+               fclose(file);
-+               exit(EXIT_FAILURE);
-+       }
-+
-+       codec->id = SND_AUDIOCODEC_PCM;
-+       codec->ch_in = channels;
-+       codec->ch_out = channels;
-+       codec->sample_rate = rate;
-+       codec->bit_rate = 0;
-+       codec->rate_control = 0;
-+       codec->profile = SND_AUDIOPROFILE_PCM;
-+       codec->level = 0;
-+       codec->ch_mode = 0;
-+       codec->format = format;
-+}
-+
- void play_samples(char *name, unsigned int card, unsigned int device,
-                unsigned long buffer_size, unsigned int frag,
-                unsigned long codec_id)
-@@ -411,6 +515,9 @@ void play_samples(char *name, unsigned i
-        case SND_AUDIOCODEC_IEC61937:
-                get_codec_iec(file, &config, &codec);
-                break;
-+       case SND_AUDIOCODEC_PCM:
-+               get_codec_pcm(file, &config, &codec);
-+               break;
-        default:
-                fprintf(stderr, "codec ID %ld is not supported\n", codec_id);
-                exit(EXIT_FAILURE);
diff --git a/recipes-multimedia/tinycompress/tinycompress/0003-cplay-Add-pause-feature.patch b/recipes-multimedia/tinycompress/tinycompress/0003-cplay-Add-pause-feature.patch
deleted file mode 100755
index 7d8492b7d..000000000
--- a/recipes-multimedia/tinycompress/tinycompress/0003-cplay-Add-pause-feature.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-From 6f778c21ee357a662cdd758cff578a3e4b85eedf Mon Sep 17 00:00:00 2001
-From: Zhang Peng <peng.zhang_8@nxp.com>
-Date: Tue, 4 Aug 2020 15:29:29 +0800
-Subject: [PATCH] cplay: Add pause feature
-Add option: -p pause
-Upstream-Status: Inappropriate [i.MX specific]
-Signed-off-by: Zhang Peng <peng.zhang_8@nxp.com>
---
- src/utils/cplay.c | 56 +++++++++++++++++++++++++++++++++++++++++++----
- 1 file changed, 52 insertions(+), 4 deletions(-)
-diff --git a/src/utils/cplay.c b/src/utils/cplay.c
-index 8882f4d..8e3dcbb 100644
--- a/src/utils/cplay.c
-+++ b/src/utils/cplay.c
-@@ -117,6 +117,9 @@ static void usage(void)
-                "-f\tfragments\n\n"
-                "-v\tverbose mode\n"
-                "-h\tPrints this help list\n\n"
-+               "-p\tpause\n"
-+               "-m\tpause blocks\n"
-+               "-n\tpause time duration\n"
-                "Example:\n"
-                "\tcplay -c 1 -d 2 test.mp3\n"
-                "\tcplay -f 5 test.mp3\n\n"
-@@ -133,7 +136,8 @@ static void usage(void)
- 
- void play_samples(char *name, unsigned int card, unsigned int device,
-                unsigned long buffer_size, unsigned int frag,
-               unsigned long codec_id);
-+               unsigned long codec_id, int pause_count, int pause_block,
-+               int pause_duration);
- 
- struct mp3_header {
-        uint16_t sync;
-@@ -262,12 +266,15 @@ int main(int argc, char **argv)
-        int c, i;
-        unsigned int card = 0, device = 0, frag = 0;
-        unsigned int codec_id = SND_AUDIOCODEC_MP3;
-+       int pause_count = 0;
-+       int pause_block = 6;
-+       int pause_duration = 10;
- 
-        if (argc < 2)
-                usage();
- 
-        verbose = 0;
-       while ((c = getopt(argc, argv, "hvb:f:c:d:I:")) != -1) {
-+       while ((c = getopt(argc, argv, "hvb:f:c:d:I:p:m:n:")) != -1) {
-                switch (c) {
-                case 'h':
-                        usage();
-@@ -306,6 +313,23 @@ int main(int argc, char **argv)
-                case 'v':
-                        verbose = 1;
-                        break;
-+               case 'p':
-+                       pause_count = strtol(optarg, NULL, 10);
-+                       break;
-+               case 'm':
-+                       pause_block = strtol(optarg, NULL, 10);
-+                       if (pause_duration < 0) {
-+                               printf("Set wrong paramter! Set duration default 6.\n");
-+                               pause_duration = 6;
-+                       }
-+                       break;
-+               case 'n':
-+                       pause_duration = strtol(optarg, NULL, 10);
-+                       if (pause_duration < 0) {
-+                               printf("Set wrong paramter! Set duration default 10.\n");
-+                               pause_duration = 10;
-+                       }
-+                       break;
-                default:
-                        exit(EXIT_FAILURE);
-                }
-@@ -315,7 +339,7 @@ int main(int argc, char **argv)
- 
-        file = argv[optind];
- 
-       play_samples(file, card, device, buffer_size, frag, codec_id);
-+       play_samples(file, card, device, buffer_size, frag, codec_id, pause_count, pause_block, pause_duration);
- 
-        fprintf(stderr, "Finish Playing.... Close Normally\n");
-        exit(EXIT_SUCCESS);
-@@ -491,7 +515,8 @@ void get_codec_pcm(FILE *file, struct compr_config *config,
- 
- void play_samples(char *name, unsigned int card, unsigned int device,
-                unsigned long buffer_size, unsigned int frag,
-               unsigned long codec_id)
-+               unsigned long codec_id, int pause_count, int pause_block,
-+               int pause_duration)
- {
-        struct compr_config config;
-        struct snd_codec codec;
-@@ -499,6 +524,7 @@ void play_samples(char *name, unsigned int card, unsigned int device,
-        FILE *file;
-        char *buffer;
-        int size, num_read, wrote;
-+       int write_count = 0;
- 
-        if (verbose)
-                printf("%s: entry\n", __func__);
-@@ -574,6 +600,13 @@ void play_samples(char *name, unsigned int card, unsigned int device,
-        if (verbose)
-                printf("%s: You should hear audio NOW!!!\n", __func__);
- 
-+       if (pause_count > 0) {
-+               printf("sleep...\n");
-+               compress_pause(compress);
-+               sleep(pause_duration);
-+               compress_resume(compress);
-+       }
-+
-        do {
-                num_read = fread(buffer, 1, size, file);
-                if (num_read > 0) {
-@@ -592,8 +625,23 @@ void play_samples(char *name, unsigned int card, unsigned int device,
-                                printf("%s: wrote %d\n", __func__, wrote);
-                        }
-                }
-+               write_count++;
-+               if ((pause_count > 0) && (write_count % pause_block == 0)) {
-+                               printf("pause...\n");
-+                               compress_pause(compress);
-+                               sleep(pause_duration);
-+                               printf("pause release...\n");
-+                               compress_resume(compress);
-+                               pause_count--;
-+               }
-        } while (num_read > 0);
- 
-+       if (pause_count > 0) {
-+               compress_pause(compress);
-+               sleep(5);
-+               compress_resume(compress);
-+       }
-+
-        if (verbose)
-                printf("%s: exit success\n", __func__);
-        /* issue drain if it supports */
-- 
-2.17.1
diff --git a/recipes-multimedia/tinycompress/tinycompress/0004-tinycompress-pass-NULL-buffer-with-0-size-to-driver.patch b/recipes-multimedia/tinycompress/tinycompress/0004-tinycompress-pass-NULL-buffer-with-0-size-to-driver.patch
deleted file mode 100755
index dfedd186a..000000000
--- a/recipes-multimedia/tinycompress/tinycompress/0004-tinycompress-pass-NULL-buffer-with-0-size-to-driver.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From a2892bf5db7520689fa9cb1d1589fa804bd9dc1a Mon Sep 17 00:00:00 2001
-From: Bing Song <bing.song@nxp.com>
-Date: Tue, 18 Aug 2020 15:26:51 +0800
-Subject: [PATCH] tinycompress: pass NULL buffer with 0 size to driver.
-The NULL buffer with 0 size to indecate driver drain input data with
-non-block mode. The defaul drain is block mode.
-Upstream-Status: Inappropriate [i.MX specific]
-Signed-off-by: Bing Song <bing.song@nxp.com>
---
- src/lib/compress.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-diff --git a/src/lib/compress.c b/src/lib/compress.c
-index bba4fcf..d66df0b 100644
--- a/src/lib/compress.c
-+++ b/src/lib/compress.c
-@@ -315,7 +315,8 @@ int compress_write(struct compress *compress, const void *buf, unsigned int size
-        fds.events = POLLOUT;
- 
-        /*TODO: treat auto start here first */
-       while (size) {
-+       /* NULL buffer with 0 size for non-block drain */
-+       do {
-                if (ioctl(compress->fd, SNDRV_COMPRESS_AVAIL, &avail))
-                        return oops(compress, errno, "cannot get avail");
- 
-@@ -357,7 +358,7 @@ int compress_write(struct compress *compress, const void *buf, unsigned int size
-                size -= written;
-                cbuf += written;
-                total += written;
-       }
-+       } while (size);
-        return total;
- }
- 
-- 
-2.17.1
diff --git a/recipes-multimedia/tinycompress/tinycompress/0005-cplay-Support-aac-streams.patch b/recipes-multimedia/tinycompress/tinycompress/0005-cplay-Support-aac-streams.patch
deleted file mode 100755
index 2f36551ab..000000000
--- a/recipes-multimedia/tinycompress/tinycompress/0005-cplay-Support-aac-streams.patch
+++ /dev/null
@@ -1,251 +0,0 @@
-From 2912f8573cea25fbd38ac7a8b68af2ea6a05e599 Mon Sep 17 00:00:00 2001
-From: Zhang Peng <peng.zhang_8@nxp.com>
-Date: Wed, 28 Oct 2020 19:08:53 +0800
-Subject: [PATCH] cplay: Support aac streams
-Support run aac format streams for cplay.
-Upstream-Status: Inappropriate [i.MX specific]
-Signed-off-by: Zhang Peng <peng.zhang_8@nxp.com>
---
- src/utils/cplay.c | 210 ++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 210 insertions(+)
-diff --git a/src/utils/cplay.c b/src/utils/cplay.c
-index 8e3dcbb..2a1464a 100644
--- a/src/utils/cplay.c
-+++ b/src/utils/cplay.c
-@@ -245,6 +245,190 @@ static int parse_wav_header(FILE *file, unsigned int *num_channels, unsigned int
-        return 0;
- }
- 
-+int find_adts_header(FILE *file, unsigned int *num_channels, unsigned int *sample_rate, unsigned int *format)
-+{
-+       int ret;
-+       unsigned char buf[5];
-+
-+       ret = fread(buf, sizeof(buf), 1, file);
-+       if (ret < 0) {
-+               fprintf(stderr, "open file error: %d\n", ret);
-+               return 0;
-+       }
-+       fseek(file, 0, SEEK_SET);
-+
-+       if ((buf[0] != 0xff) || (buf[1] & 0xf0 != 0xf0))
-+               return 0;
-+       /* mpeg id */
-+       switch (buf[1]>>3 & 0x1) {
-+       case 0x0:
-+               *format = SND_AUDIOSTREAMFORMAT_MP4ADTS;
-+               break;
-+       case 0x1:
-+               *format = SND_AUDIOSTREAMFORMAT_MP2ADTS;
-+               break;
-+       default:
-+               fprintf(stderr, "can't find stream format\n");
-+               break;
-+       }
-+       /* sample_rate */
-+       switch (buf[2]>>2 & 0xf) {
-+       case 0x0:
-+               *sample_rate = 96000;
-+               break;
-+       case 0x1:
-+               *sample_rate = 88200;
-+               break;
-+       case 0x2:
-+               *sample_rate = 64000;
-+               break;
-+       case 0x3:
-+               *sample_rate = 48000;
-+               break;
-+       case 0x4:
-+               *sample_rate = 44100;
-+               break;
-+       case 0x5:
-+               *sample_rate = 32000;
-+               break;
-+       case 0x6:
-+               *sample_rate = 24000;
-+               break;
-+       case 0x7:
-+               *sample_rate = 22050;
-+               break;
-+       case 0x8:
-+               *sample_rate = 16000;
-+               break;
-+       case 0x9:
-+               *sample_rate = 12000;
-+               break;
-+       case 0xa:
-+               *sample_rate = 11025;
-+               break;
-+       case 0xb:
-+               *sample_rate = 8000;
-+               break;
-+       case 0xc:
-+               *sample_rate = 7350;
-+               break;
-+       default:
-+               break;
-+       }
-+       /* channel */
-+       switch (((buf[2]&0x1) << 2) | (buf[3]>>6)) {
-+       case 1:
-+               *num_channels = 1;
-+               break;
-+       case 2:
-+               *num_channels = 2;
-+               break;
-+       case 3:
-+               *num_channels = 3;
-+               break;
-+       case 4:
-+               *num_channels = 4;
-+               break;
-+       case 5:
-+               *num_channels = 5;
-+               break;
-+       case 6:
-+               *num_channels = 6;
-+               break;
-+       case 7:
-+               *num_channels = 7;
-+               break;
-+       default:
-+               break;
-+       }
-+       return 1;
-+}
-+
-+static const int aac_sample_rates[] = { 96000, 88200, 64000, 48000, 44100,
-+  32000, 24000, 22050, 16000, 12000, 11025, 8000, 7350
-+};
-+
-+#define MAX_SR_NUM sizeof(aac_sample_rates)/sizeof(aac_sample_rates[0])
-+
-+static int get_sample_rate_from_index(int sr_index)
-+{
-+       if (sr_index >= 0 && sr_index < MAX_SR_NUM)
-+               return aac_sample_rates[sr_index];
-+
-+       return 0;
-+}
-+
-+int find_adif_header(FILE *file, unsigned int *num_channels, unsigned int *sample_rate, unsigned int *format)
-+{
-+       int ret;
-+       unsigned char adif_id[4];
-+       unsigned char adif_header[20];
-+       int bitstream_type;
-+       int bitrate;
-+       int object_type;
-+       int sr_index;
-+       int skip_size = 0;
-+
-+       ret = fread(adif_id, sizeof(unsigned char), 4, file);
-+       if (ret < 0) {
-+               fprintf(stderr, "read data from file err: %d\n", ret);
-+               return 0;
-+       }
-+       /* adif id */
-+       if ((adif_id[0] != 0x41) || (adif_id[1] != 0x44) ||
-+               (adif_id[2] != 0x49) || (adif_id[3] != 0x46))
-+               return 0;
-+
-+       fread(adif_header, sizeof(unsigned char), 20, file);
-+
-+       /* copyright string */
-+       if (adif_header[0] & 0x80)
-+               skip_size = 9;
-+
-+       bitstream_type = adif_header[0 + skip_size] & 0x10;
-+       bitrate =
-+                ((unsigned int) (adif_header[0 + skip_size] & 0x0f) << 19) |
-+                ((unsigned int) adif_header[1 + skip_size] << 11) |
-+                ((unsigned int) adif_header[2 + skip_size] << 3) |
-+                ((unsigned int) adif_header[3 + skip_size] & 0xe0);
-+
-+       if (bitstream_type == 0) {
-+               object_type = ((adif_header[6 + skip_size] & 0x01) << 1) |
-+                       ((adif_header[7 + skip_size] & 0x80) >> 7);
-+               sr_index = (adif_header[7 + skip_size] & 0x78) >> 3;
-+       }
-+       /* VBR */
-+       else {
-+               object_type = (adif_header[4 + skip_size] & 0x18) >> 3;
-+               sr_index = ((adif_header[4 + skip_size] & 0x07) << 1) |
-+                       ((adif_header[5 + skip_size] & 0x80) >> 7);
-+       }
-+
-+       /* sample rate */
-+       *sample_rate = get_sample_rate_from_index(sr_index);
-+
-+       /* FIXME: assume channels is 2 */
-+       *num_channels = 2;
-+
-+       *format = SND_AUDIOSTREAMFORMAT_ADIF;
-+       fseek(file, 0, SEEK_SET);
-+       return 1;
-+}
-+
-+static int parse_aac_header(FILE *file, unsigned int *num_channels, unsigned int *sample_rate, unsigned int *format)
-+{
-+       if (find_adts_header(file, num_channels, sample_rate, format))
-+               return 1;
-+       else if (find_adif_header(file, num_channels, sample_rate, format))
-+               return 1;
-+       else {
-+               fprintf(stderr, "can't find streams format\n");
-+               return 0;
-+       }
-+
-+       return 1;
-+}
-+
- static int print_time(struct compress *compress)
- {
-        unsigned int avail;
-@@ -513,6 +697,29 @@ void get_codec_pcm(FILE *file, struct compr_config *config,
-        codec->format = format;
- }
- 
-+void get_codec_aac(FILE *file, struct compr_config *config,
-+               struct snd_codec *codec)
-+{
-+       unsigned int channels, rate, format;
-+
-+       if (parse_aac_header(file, &channels, &rate, &format) == 0) {
-+               fclose(file);
-+               exit(EXIT_FAILURE);
-+       };
-+       fseek(file, 0, SEEK_SET);
-+
-+       codec->id = SND_AUDIOCODEC_AAC;
-+       codec->ch_in = channels;
-+       codec->ch_out = channels;
-+       codec->sample_rate = rate;
-+       codec->bit_rate = 0;
-+       codec->rate_control = 0;
-+       codec->profile = SND_AUDIOPROFILE_AAC;
-+       codec->level = 0;
-+       codec->ch_mode = 0;
-+       codec->format = format;
-+
-+}
- void play_samples(char *name, unsigned int card, unsigned int device,
-                unsigned long buffer_size, unsigned int frag,
-                unsigned long codec_id, int pause_count, int pause_block,
-@@ -544,6 +751,9 @@ void play_samples(char *name, unsigned int card, unsigned int device,
-        case SND_AUDIOCODEC_PCM:
-                get_codec_pcm(file, &config, &codec);
-                break;
-+       case SND_AUDIOCODEC_AAC:
-+               get_codec_aac(file, &config, &codec);
-+               break;
-        default:
-                fprintf(stderr, "codec ID %ld is not supported\n", codec_id);
-                exit(EXIT_FAILURE);
-- 
-2.17.1
diff --git a/recipes-multimedia/tinycompress/tinycompress_1.1.6.bb b/recipes-multimedia/tinycompress/tinycompress_1.1.6.bb
deleted file mode 100644
index 803c38dfb..000000000
--- a/recipes-multimedia/tinycompress/tinycompress_1.1.6.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-DESCRIPTION = "A library to handle compressed formats like MP3 etc."
-LICENSE = "LGPL-2.1-only | BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://COPYING;md5=cf9105c1a2d4405cbe04bbe3367373a0"
-DEPENDS = "alsa-lib"
-SRC_URI = "git://git.alsa-project.org/tinycompress.git;protocol=git;branch=master \
-           file://0001-tinycompress-Add-id3-decoding.patch \
-           file://0002-cplay-Support-wave-file.patch \
-           file://0003-cplay-Add-pause-feature.patch \
-           file://0004-tinycompress-pass-NULL-buffer-with-0-size-to-driver.patch \
-           file://0005-cplay-Support-aac-streams.patch \
-"
-SRCREV = "995f2ed91045dad8c20485ab1a64727d22cd92e5"
-S = "${WORKDIR}/git"
-inherit autotools pkgconfig
diff --git a/recipes-multimedia/tinycompress/tinycompress_1.2.5.bb b/recipes-multimedia/tinycompress/tinycompress_1.2.5.bb
new file mode 100644
index 000000000..48edf0769
--- /dev/null
+++ b/recipes-multimedia/tinycompress/tinycompress_1.2.5.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "A library to handle compressed formats like MP3 etc."
+LICENSE = "LGPL-2.1-only | BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://COPYING;md5=cf9105c1a2d4405cbe04bbe3367373a0"
+DEPENDS = "alsa-lib"
+inherit autotools pkgconfig
+PV .= "+git"
+SRC_URI = "git://github.com/alsa-project/tinycompress.git;protocol=https;branch=master \
+"
+SRCREV = "f3ba6e5c2126f2fb07e3d890f990d50c3e204e67"
+EXTRA_OECONF:append = " --enable-pcm"
+inherit autotools pkgconfig