mediasync: CB2 fix frame dropped on 2x rate [1/1]

PD#SWPL-194841

Problem:
frame dropped happened on westeros compositor

Solution:
1.ahead 5 vsync count to calculate realtime on
2x playback rate
2.ahead 2 vsync count to calculate realtime when
playback rate < 2x
3.set frame rate with mediasync_fraction

Verify:
bp201

Build Tag:
Buildroot_DRM_PatchBuild-3787

Commits:
buildroot/package/amlogic/linuxdrm/media_hal:
version: 3.15.4-gc32a6e5(build:3787)
c32a6e5 mediasync: CB2 fix frame dropped on 2x rate [1/1]

Git Hash-Object:
e02642de689171f03c165d48cb0fdf58f8141e1f
prebuilt/aarch64.lp64./libmediahal_mediasync.so
fc3243cbef27f0a2984f00cac90e271a02ed963a
prebuilt/aarch64.lp64./libmediahal_tsplayer.so
aea72901c9a40bac5827e3928fe6bdceafb07c83
prebuilt/aarch64.lp64./libmediahal_videodec.so
3db44ad56ee503e7de3dd5281d8f2f9d70a8093f
prebuilt/aarch64.lp64./libmediahal_videorender.so
68d8981e3f92b7283e00f49ca81b0b9d48a66801
prebuilt/arm.aapcs-linux.hard/libmediahal_mediasync.so
83afce54899cb26a819e0d3f42d28c89ae094d2f
prebuilt/arm.aapcs-linux.hard/libmediahal_tsplayer.so
711b6011be201030c7a2a217d22b11e74b3eca73
prebuilt/arm.aapcs-linux.hard/libmediahal_videodec.so
eb2916ea8a6e967d1c5e71205e9bbcac93065e3e
prebuilt/arm.aapcs-linux.hard/libmediahal_videorender.so
367722ad4022f8fa1cd134991e8a412a57544955
prebuilt/noarch/include/MediaSyncInterface.h
aedf979f37db2880fa20a2e3fbdf27afde201bc8
version.txt

Change-Id: I964acaf626c357564aff027d6786949473e531cf
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 76df273..e02642d 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 45d9664..fc3243c 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 0e139db..aea7290 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 6a7f90b..3db44ad 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 0dc6ced..68d8981 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 619d868..83afce5 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 32d62d3..711b601 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 9bb531a..eb2916e 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 117a514..367722a 100644
--- a/prebuilt/noarch/include/MediaSyncInterface.h
+++ b/prebuilt/noarch/include/MediaSyncInterface.h
@@ -60,7 +60,7 @@
     MEDIASYNC_KEY_SOURCETYPE,
     MEDIASYNC_KEY_ALSAREADY,
     MEDIASYNC_KEY_VSYNC_INTERVAL_MS,
-    MEDIASYNC_KEY_VIDEOFRAME,
+    MEDIASYNC_KEY_VIDEOFRAME, //set video frame rate with mediasync_fraction point
     MEDIASYNC_KEY_VIDEOTRICKMODE,
     MEDIASYNC_KEY_VIDEO_FREERUN,
     MEDIASYNC_KEY_AUDIO_FREERUN,
@@ -166,6 +166,11 @@
     int64_t frameSystemTime;
 }mediasync_frameinfo;
 
+typedef struct {
+   int num; //numerator
+   int denom; //denominator
+} mediasync_fraction;
+
 extern void* MediaSync_create();
 
 extern mediasync_result MediaSync_allocInstance(void* handle, int32_t DemuxId,
diff --git a/version.txt b/version.txt
index a692d69..aedf979 100644
--- a/version.txt
+++ b/version.txt
@@ -1,10 +1,120 @@
 =========RELEALSE NOTE=================
 
-Version: V3.13.105-g1477696
+Version: V3.15.4-gc32a6e5
 
 ========================================
 
 Git commit:
+commit c32a6e5ce5633063e6b9bd2a9efaf42e99ebd3ce
+Author: fei.deng <fei.deng@amlogic.com>
+Date:   Mon Jan 6 19:37:05 2025 +0800
+
+    mediasync: CB2 fix frame dropped on 2x rate [1/1]
+    
+    PD#SWPL-194841
+    
+    Problem:
+    frame dropped happened on westeros compositor
+    
+    Solution:
+    1.ahead 5 vsync count to calculate realtime on
+    2x playback rate
+    2.ahead 2 vsync count to calculate realtime when
+    playback rate < 2x
+    3.set frame rate with mediasync_fraction
+    
+    Verify:
+    bp201
+    
+    Change-Id: I0a92a665c98f0030226f5f7c1a382b8d5a33f852
+    Signed-off-by: fei.deng <fei.deng@amlogic.com>
+
+commit e227cf4614406a577ce9f8d32339b222d23b68d3
+Author: dehong.chen <dehong.chen@amlogic.com>
+Date:   Tue Dec 24 07:44:26 2024 +0000
+
+    mediasync: CB1 Optimize the playback effect. [1/1]
+    
+    PD#SWPL-196437
+    PD#SWPL-197623
+    
+    Problem:
+    Optimize the playback effect.
+    
+    Solution:
+    1.Optimized slow sync
+    2.Optimized discontinue mechanisms
+    
+    Verify:
+    SC2
+    
+    Change-Id: I0ab2d3a939839a8adafe18412198cddd955169f9
+    Signed-off-by: dehong.chen <dehong.chen@amlogic.com>
+
+commit f9ae605110985a2f2293c92a95d00ad2875828f5
+Author: fei.deng <fei.deng@amlogic.com>
+Date:   Fri Jan 3 13:39:46 2025 +0800
+
+    mediasync: CB2 fix youtube frame dropped on 60FPS [1/1]
+    
+    PD#SWPL-197779
+    
+    Problem:
+    FRAC can not select 60HZ mode because vsync peirod
+    is 16667 us
+    
+    Solution:
+    libdrm output 16667 or 16666 us on 60HZ. mediasync
+    need to be compatible with such cases
+    
+    Verify:
+    ah212
+    
+    Change-Id: I705f146235aedc84acc5ff3cdcb8c3674d39e948
+    Signed-off-by: fei.deng <fei.deng@amlogic.com>
+
+commit 6d77125ee8230879cf99a844fc7f80ea81e97bf9
+Author: dehong.chen <dehong.chen@amlogic.com>
+Date:   Tue Dec 31 03:31:49 2024 +0000
+
+    tsplayer: CB1 blank screen when switch channel. [1/1]
+    
+    PD#OTT-72986
+    
+    Problem:
+    1.set audio pid error.
+    2.no set stop video flag if start video fail.
+    
+    Solution:
+    1.fixed set audio pid.
+    2.set stop video flag if start video fail.
+    
+    Verify:
+    s1a
+    
+    Change-Id: I4e91e29ef6c832a350fdaf929838570a7a867303
+    Signed-off-by: dehong.chen <dehong.chen@amlogic.com>
+
+commit 47e251e16df7643329ce14bb3b0f49160b04bfee
+Author: yunmin.chen <yunmin.chen@amlogic.com>
+Date:   Tue Dec 31 13:34:18 2024 +0800
+
+    mediahal: CF2 mediahal update version [1/1]
+    
+    PD#SWPL-195948
+    
+    Problem:
+    mediahal update version
+    
+    Solution:
+    update V3.15
+    
+    Verify:
+    SC2
+    
+    Change-Id: Ib0dc8aed00ec9950ea6d9705ef572624906c8f55
+    Signed-off-by: yunmin.chen <yunmin.chen@amlogic.com>
+
 commit 147769695b41a8bb5748d8a25c7cc541aba1af6f
 Author: yunmin.chen <yunmin.chen@amlogic.com>
 Date:   Fri Dec 27 20:03:49 2024 +0800
@@ -108,120 +218,9 @@
     Change-Id: Ibb384710eba986cf8adfca7f34db6b2d1c993f72
     Signed-off-by: dehong.chen <dehong.chen@amlogic.com>
 
-commit 4573fc074cb3f4bf6251a23784bff56371a0829d
-Author: fei.deng <fei.deng@amlogic.com>
-Date:   Fri Dec 13 13:47:10 2024 +0800
-
-    mediasync: CB2 fix YTS frame dropped [1/1]
-    
-    PD#SWPL-194841
-    
-    Problem:
-    VSP feature cause YTS frame dropped
-    
-    Solution:
-    1.VSP is for 0.9 - 1.1 playback rate.
-    other playback rate will resync again.
-    2.set frame rate to FRAC
-    3.do not drop audio when work on amaster in doAVAlign
-    
-    Verify:
-    ah212
-    
-    Change-Id: If2dd1a1301330caa6163db2520d614c807dd8e00
-    Signed-off-by: fei.deng <fei.deng@amlogic.com>
-
-commit b95bb9e25a42e6de0681d826a52adcb0290ee3d6
-Author: dehong.chen <dehong.chen@amlogic.com>
-Date:   Mon Dec 9 08:24:30 2024 +0000
-
-    tsplayer: CB2 no open ad in audio start. [1/1]
-    
-    PD#SWPL-195596
-    
-    Problem:
-    no open ad in audio start.
-    
-    Solution:
-    if enable ad, open ad in audio start.
-    
-    Verify:
-    t6d
-    
-    Change-Id: I8c9a4ddaa030804fd713a6208abf8d5c5de5d9a1
-    Signed-off-by: dehong.chen <dehong.chen@amlogic.com>
-
-commit e3632ef4c843b2569de5c4f044b1c03f7338bacd
-Author: fei.deng <fei.deng@amlogic.com>
-Date:   Wed Dec 11 16:40:18 2024 +0800
-
-    mediasync: CB2 drop frame 60fps on 1.05 rate [1/1]
-    
-    PD#SWPL-195802
-    
-    Problem:
-    force drop frame when 60fps on 1.05 rate
-    
-    Solution:
-    force drop frame if mediasync detected two
-    frames in same vsync
-    
-    Verify:
-    ah212
-    
-    Change-Id: I30f74392b97db6fbbf290c467e5e4df45afe9dbb
-    Signed-off-by: fei.deng <fei.deng@amlogic.com>
-
-commit f7fa1c43f0e6de13df6214e1a87a37666a069dad
-Author: dehong.chen <dehong.chen@amlogic.com>
-Date:   Thu Dec 5 09:37:03 2024 +0000
-
-    videodec: CB2 can't find tsync's node. [1/1]
-    
-    PD#SWPL-195375
-    
-    Problem:
-    nontunnel pipeline no use tsync,
-    but access tsync node.
-    
-    Solution:
-    not access tsync node if demux type is single demux.
-    
-    Verify:
-    s1a
-    
-    Change-Id: I34f8c2f4cedf08df9f0ad4cdc6e8384c9881a89a
-    Signed-off-by: dehong.chen <dehong.chen@amlogic.com>
-
-commit ca5ae84b42547eb586e8923234ba15673db30b37
-Author: fei.deng <fei.deng@amlogic.com>
-Date:   Thu Nov 28 11:19:04 2024 +0800
-
-    mediasync: CB2 VSP unexpect freeze [2/2]
-    
-    PD#SWPL-194725
-    
-    Problem:
-    now display buffer realtime is vsync+4ms in VSP case.
-    but weston do not send buffer to drm in time
-    
-    Solution:
-    1.set vsync+7ms is better
-    2.netflix adjust pts to 16666 on 60 fps case
-    3.dropped one frame if two frames will display in
-    one vsync period in 60fps on 59.94 HZ
-    4.remove show first frame no sync with property
-    5.adjust hwc latency when enable pattern
-    
-    Verify:
-    ah212
-    
-    Change-Id: I0b01e4479d543bbb3d11793fcb0210f4f5895486
-    Signed-off-by: fei.deng <fei.deng@amlogic.com>
-
 ========================================
 
-Release time: 2024-12-31-10-16
+Release time: 2025-01-09-15-34
 
 ========================================