mediasync: CF2 add audio codec switch api [2/2]
PD#SWPL-151010
Problem:
1.audio codec switch will pause and destroy mediasync. it causes
mediasync can't resume playing after audio codec switch done.
2.FRAC calculates realtime error, it causes frame
dropped
3.av delta too large causes NTS case of audio track
switch failed
Solution:
1.add a audio codec switch api
2.reset FRAC if mediasync reset ref clock
3.drop audio data those audio pts less than PCR
when doing audio track switch
Verify:
ah212
Build Tag:
Buildroot_DRM_PatchBuild-3165
Commits:
buildroot/package/amlogic/linuxdrm/media_hal:
version: 3.13.25-gaeb7d7f(build:3165)
aeb7d7f mediasync: CF2 add audio codec switch api [2/2]
Git Hash-Object:
f06b5a85720045aab1eb17356420df13016e1425
prebuilt/aarch64.lp64./libmediahal_mediasync.so
91ce977e673eabf0b54b502ec21e69ad91e29e7d
prebuilt/aarch64.lp64./libmediahal_tsplayer.so
1cd02384db0ae07c8c5373c84f78d980ea69ea21
prebuilt/aarch64.lp64./libmediahal_videodec.so
d30e401c8b935a18f3ec5ea3083c13753346d27e
prebuilt/aarch64.lp64./libmediahal_videorender.so
a0944a6c12b904cbbaa7d65a45064820d3fa6d4d
prebuilt/arm.aapcs-linux.hard/libmediahal_mediasync.so
35e78f2a6acb04d8cc771af9f388097c0d8fad33
prebuilt/arm.aapcs-linux.hard/libmediahal_tsplayer.so
be7aa81cbadfe3622ac886dc3e8c421b20406b6f
prebuilt/arm.aapcs-linux.hard/libmediahal_videodec.so
e17b20b9a51ab7b7614963fa6d9c4f1e40730e0e
prebuilt/arm.aapcs-linux.hard/libmediahal_videorender.so
2c7882e884fc3588d0873d26d5fbc753b8d12fe7
prebuilt/noarch/include/MediaSyncInterface.h
21b278b3a1f3e30366a4248c3cf710face3c63fe
version.txt
Change-Id: I5c39307b4d1582f99b2054867108f365c2862ff7
Signed-off-by: DRM Auto Build <tao.guo@amlogic.com>
diff --git a/prebuilt/aarch64.lp64./libmediahal_mediasync.so b/prebuilt/aarch64.lp64./libmediahal_mediasync.so
index 752ffc6..f06b5a8 100644
--- a/prebuilt/aarch64.lp64./libmediahal_mediasync.so
+++ b/prebuilt/aarch64.lp64./libmediahal_mediasync.so
Binary files differ
diff --git a/prebuilt/aarch64.lp64./libmediahal_tsplayer.so b/prebuilt/aarch64.lp64./libmediahal_tsplayer.so
index 735ebb0..91ce977 100644
--- a/prebuilt/aarch64.lp64./libmediahal_tsplayer.so
+++ b/prebuilt/aarch64.lp64./libmediahal_tsplayer.so
Binary files differ
diff --git a/prebuilt/aarch64.lp64./libmediahal_videodec.so b/prebuilt/aarch64.lp64./libmediahal_videodec.so
index 2f50737..1cd0238 100644
--- a/prebuilt/aarch64.lp64./libmediahal_videodec.so
+++ b/prebuilt/aarch64.lp64./libmediahal_videodec.so
Binary files differ
diff --git a/prebuilt/aarch64.lp64./libmediahal_videorender.so b/prebuilt/aarch64.lp64./libmediahal_videorender.so
index 8e0d623..d30e401 100644
--- a/prebuilt/aarch64.lp64./libmediahal_videorender.so
+++ b/prebuilt/aarch64.lp64./libmediahal_videorender.so
Binary files differ
diff --git a/prebuilt/arm.aapcs-linux.hard/libmediahal_mediasync.so b/prebuilt/arm.aapcs-linux.hard/libmediahal_mediasync.so
index d1f8477..a0944a6 100644
--- a/prebuilt/arm.aapcs-linux.hard/libmediahal_mediasync.so
+++ b/prebuilt/arm.aapcs-linux.hard/libmediahal_mediasync.so
Binary files differ
diff --git a/prebuilt/arm.aapcs-linux.hard/libmediahal_tsplayer.so b/prebuilt/arm.aapcs-linux.hard/libmediahal_tsplayer.so
index f0df349..35e78f2 100644
--- a/prebuilt/arm.aapcs-linux.hard/libmediahal_tsplayer.so
+++ b/prebuilt/arm.aapcs-linux.hard/libmediahal_tsplayer.so
Binary files differ
diff --git a/prebuilt/arm.aapcs-linux.hard/libmediahal_videodec.so b/prebuilt/arm.aapcs-linux.hard/libmediahal_videodec.so
index 7013382..be7aa81 100644
--- a/prebuilt/arm.aapcs-linux.hard/libmediahal_videodec.so
+++ b/prebuilt/arm.aapcs-linux.hard/libmediahal_videodec.so
Binary files differ
diff --git a/prebuilt/arm.aapcs-linux.hard/libmediahal_videorender.so b/prebuilt/arm.aapcs-linux.hard/libmediahal_videorender.so
index f816c1e..e17b20b 100644
--- a/prebuilt/arm.aapcs-linux.hard/libmediahal_videorender.so
+++ b/prebuilt/arm.aapcs-linux.hard/libmediahal_videorender.so
Binary files differ
diff --git a/prebuilt/noarch/include/MediaSyncInterface.h b/prebuilt/noarch/include/MediaSyncInterface.h
index f5c59d5..2c7882e 100644
--- a/prebuilt/noarch/include/MediaSyncInterface.h
+++ b/prebuilt/noarch/include/MediaSyncInterface.h
@@ -207,6 +207,7 @@
extern mediasync_result MediaSync_RegisterCb(void* handle,int type,void* pfunc,void *cbHandle);
extern mediasync_result MediaSync_setPcrAndDmxId(void* handle, int32_t DemuxId, int32_t PcrPid);
extern mediasync_result MediaSync_reset(void* handle);
+extern mediasync_result MediaSync_audioSwitch(void* handle, bool start, int64_t pts);
extern void MediaSync_destroy(void* handle);
diff --git a/version.txt b/version.txt
index c884e87..21b278b 100644
--- a/version.txt
+++ b/version.txt
@@ -1,11 +1,39 @@
=========RELEALSE NOTE=================
-Version: V3.13.24-ga0bf6ac
+Version: V3.13.25-gaeb7d7f
========================================
Git commit:
-commit a0bf6ac3cb863956927de58ad069801502cbb09a
+commit aeb7d7f0009b670bbed41a8d4e853ad3e49d51ba
+Author: fei.deng <fei.deng@amlogic.com>
+Date: Fri Dec 29 02:52:31 2023 +0000
+
+ mediasync: CF2 add audio codec switch api [2/2]
+
+ PD#SWPL-151010
+
+ Problem:
+ 1.audio codec switch will pause and destroy mediasync. it causes
+ mediasync can't resume playing after audio codec switch done.
+ 2.FRAC calculates realtime error, it causes frame
+ dropped
+ 3.av delta too large causes NTS case of audio track
+ switch failed
+
+ Solution:
+ 1.add a audio codec switch api
+ 2.reset FRAC if mediasync reset ref clock
+ 3.drop audio data those audio pts less than PCR
+ when doing audio track switch
+
+ Verify:
+ ah212
+
+ Change-Id: I14619518b89b3009ddfd44211d640df7b690ee0e
+ Signed-off-by: fei.deng <fei.deng@amlogic.com>
+
+commit fff6abb0b50bf8b50e174ccf6cfab3d040d3b253
Author: fei.deng <fei.deng@amlogic.com>
Date: Mon Feb 26 08:29:19 2024 +0000
@@ -25,7 +53,7 @@
Change-Id: I18191b1914772c9942baadd8e26dca550ef4416d
Signed-off-by: fei.deng <fei.deng@amlogic.com>
-commit 0eec3fb27a59043bb2f57484f8f7f8a42a20a240
+commit 89d036ec30d7fac3302fead40633485170543b46
Author: le.han <le.han@amlogic.com>
Date: Wed Feb 28 04:25:48 2024 +0000
@@ -189,29 +217,9 @@
Change-Id: I3514c4df6cdbf3e63adfe6be9ec596d66f88318d
Signed-off-by: zhipeng.he <zhipeng.he@amlogic.com>
-commit da99b512098058e79ff222ece7808022e3d0d505
-Author: dehong.chen <dehong.chen@amlogic.com>
-Date: Fri Dec 29 08:47:27 2023 +0000
-
- mediasync: CB2 calculation of delayms is incorrect. [1/1]
-
- PD#SWPL-147777
-
- Problem:
- no reset firstQueueInfo when reset mediasync.
-
- Solution:
- reset firstQueueInfo when reset mediasync.
-
- Verify:
- T5D
-
- Change-Id: I04caae504429b2f2ae577ae49854079d5127cf76
- Signed-off-by: dehong.chen <dehong.chen@amlogic.com>
-
========================================
-Release time: 2024-03-01-16-40
+Release time: 2024-03-08-18-50
========================================