videorenderer: CB2 compile error [1/1]
PD#SWPL-81993
Problem:
media_hal compile error
Solution:
media_hal compile error
Verify:
ah212
Build Tag:
Buildroot_DRM_PatchBuild-635
Commits:
buildroot/package/amlogic/linuxdrm/media_hal:
version: 3.5.21-g2c3507b(build:635)
2c3507b videorenderer: CB2 compile error [1/1]
Git Hash-Object:
e1608cae65a7abb409b4b68f29e96f88e9bc87d5
prebuilt/aarch64.lp64./libmediahal_mediasync.so
ff468d3613f93ecbcd617235e61b485823783521
prebuilt/aarch64.lp64./libmediahal_tsplayer.so
e647893233756db774675ded8d14ddcc047db99a
prebuilt/aarch64.lp64./libmediahal_videodec.so
4d378cbea63dd8b0bc29b3041f2f9c36cb261df9
prebuilt/aarch64.lp64./libmediahal_videorender.so
fb5f9143902df820011a749594e9afed3cc73605
prebuilt/arm.aapcs-linux.hard/libmediahal_mediasync.so
344f8b96af26e5a993770c6d5cdcb5b1869f7d2f
prebuilt/arm.aapcs-linux.hard/libmediahal_tsplayer.so
a5c26776636152bfa3fa573f72a11b05200bcfb0
prebuilt/arm.aapcs-linux.hard/libmediahal_videodec.so
a8be0a60e13a9f50efc6b8497afc6829269c1a91
prebuilt/arm.aapcs-linux.hard/libmediahal_videorender.so
e0f7733744c12bc7e86ed548f39939a7a2c1070a
prebuilt/noarch/include/AmTsPlayer.h
d35cab4d4f49100eb5c8881eef1494e2953150f2
prebuilt/noarch/include/MediaSyncInterface.h
e458f884cd986c5904aaa4b473eac7fb8fb6e641
prebuilt/noarch/include/render_lib.h
c0dee5efd2b0773ffda45e4cd57938d1fbd1d2f8
version.txt
Change-Id: Icd71d322139bf70f4cab6d0485b61db0a17f168e
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 896b8c1..e1608ca 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 2d30b0a..ff468d3 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 7b6e65c..e647893 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 7127b00..4d378cb 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 0e3b76c..fb5f914 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 31470cc..344f8b9 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 ecb8d66..a5c2677 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 639e2a9..a8be0a6 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/AmTsPlayer.h b/prebuilt/noarch/include/AmTsPlayer.h
index 9c7c875..e0f7733 100644
--- a/prebuilt/noarch/include/AmTsPlayer.h
+++ b/prebuilt/noarch/include/AmTsPlayer.h
@@ -131,6 +131,23 @@
TS_STREAM_SUB = 3, // Subtitle
} am_tsplayer_stream_type;
+/*Ts media time type*/
+typedef enum {
+ TS_MEDIA_TIME_VIDEO = 0, //Video
+ TS_MEDIA_TIME_AUDIO = 1, //Audio
+ TS_MEDIA_TIME_PCR = 2, //PCR
+ TS_MEDIA_TIME_STC = 3, //System time clock
+ TS_MEDIA_TIME_MAX,
+} am_tsplayer_media_time_type;
+
+/*Ts time type*/
+typedef enum {
+ TS_UNIT_MS = 0,
+ TS_UNIT_US,
+ TS_UNIT_PTS,
+ TS_UNIT_MAX,
+} am_tsplayer_time_unit;
+
/*Avsync mode*/
typedef enum {
TS_SYNC_VMASTER = 0, // Video Master
@@ -483,6 +500,15 @@
am_tsplayer_result AmTsPlayer_getPts(am_tsplayer_handle Hadl, am_tsplayer_stream_type StrType, uint64_t *pts);
/**
+ *\brief: Get the time of specified AmTsPlayer instance.
+ *\inparam: AmTsPlayer handle.
+ *\inparam: stream type.
+ *\outparam: pts.
+ *\return: The AmTsPlayer result.
+ */
+am_tsplayer_result AmTsPlayer_getMediaTime(am_tsplayer_handle Hadl, am_tsplayer_media_time_type mediaTimeType, am_tsplayer_time_unit tunit, uint64_t *time);
+
+/**
*\brief: Get the first pts of specified AmTsPlayer instance.
*\inparam: AmTsPlayer handle.
*\inparam: stream type.
@@ -897,4 +923,3 @@
#endif
#endif
-
diff --git a/prebuilt/noarch/include/MediaSyncInterface.h b/prebuilt/noarch/include/MediaSyncInterface.h
index 1d879b1..d35cab4 100644
--- a/prebuilt/noarch/include/MediaSyncInterface.h
+++ b/prebuilt/noarch/include/MediaSyncInterface.h
@@ -110,7 +110,13 @@
int format;
};
-
+typedef enum {
+ MEDIA_VIDEO_TIME = 0,
+ MEDIA_AUDIO_TIME = 1,
+ MEDIA_DMXPCR_TIME = 2,
+ MEDIA_STC_TIME = 3,
+ MEDIA_TIME_TYPE_MAX = 255,
+} media_time_type;
typedef struct audioinfo{
int cacheSize;
@@ -170,9 +176,9 @@
extern mediasync_result MediaSync_VideoProcess(void* handle, int64_t vpts, int64_t cur_vpts, mediasync_time_unit tunit, struct mediasync_video_policy* vsyncPolicy);
extern mediasync_result MediaSync_getFirstAudioFrameInfo(void* handle, mediasync_frameinfo* info);
extern mediasync_result MediaSync_getCurAudioFrameInfo(void* handle, mediasync_frameinfo* info);
+extern mediasync_result MediaSync_GetMediaTimeByType(void* handle, media_time_type mediaTimeType,mediasync_time_unit tunit,int64_t* mediaTime);
extern mediasync_result MediaSync_reset(void* handle);
extern void MediaSync_destroy(void* handle);
-
#endif // MEDIA_CLOCK_H_
diff --git a/prebuilt/noarch/include/render_lib.h b/prebuilt/noarch/include/render_lib.h
index 7db6aae..e458f88 100644
--- a/prebuilt/noarch/include/render_lib.h
+++ b/prebuilt/noarch/include/render_lib.h
@@ -393,6 +393,17 @@
int render_mediasync_get_current_audio_pts(void *handle, int64_t *pts);
/**
+ * @brief get current media time
+ *
+ * @param handle a handle of render device that was opened
+ * @param mediaTimeType type of media
+ * @param tunit type of time
+ * @param mediaTime the current time
+ * @return int 0 success, -1 if failed
+ */
+int render_mediasync_get_media_time_by_type(void *handle, int mediaTimeType, int tunit, int64_t *mediaTime);
+
+/**
* @brief get playback rate from mediasync
*
* @param handle a handle of render device that was opened
diff --git a/version.txt b/version.txt
index d8a90fa..c0dee5e 100644
--- a/version.txt
+++ b/version.txt
@@ -1,10 +1,50 @@
=========RELEALSE NOTE=================
-Version: V3.5.19-g33fe699
+Version: V3.5.21-g2c3507b
========================================
Git commit:
+commit 2c3507b7ad391dd643692f250ed3d79fca85ca9a
+Author: fei.deng <fei.deng@amlogic.com>
+Date: Wed Jun 1 13:34:35 2022 +0800
+
+ videorenderer: CB2 compile error [1/1]
+
+ PD#SWPL-81993
+
+ Problem:
+ media_hal compile error
+
+ Solution:
+ media_hal compile error
+
+ Verify:
+ ah212
+
+ Change-Id: I23b8f799821f3cf0b3840588516ad455715b5927
+ Signed-off-by: fei.deng <fei.deng@amlogic.com>
+
+commit ff321ce9d68c5db94aa49f48594c86169aacb1ee
+Author: jianchuan.ping <jianchuan.ping@amlogic.com>
+Date: Mon Mar 7 19:55:02 2022 +0800
+
+ mediasync: CF2 Add get PCR and STC interface. [1/2]
+
+ PD#SWPL-75800
+
+ Problem:
+ Need api to get pcr and stc
+
+ Solution:
+ Add needed interface
+
+ Verify:
+ AP222
+
+ Change-Id: Ibd44f944d31bf8697eee632a61835c65f701d4e3
+ Signed-off-by: jianchuan.ping <jianchuan.ping@amlogic.com>
+
commit 33fe6990ee9a2cd5d019daee8fbb885e3cfd8d41
Author: zhipeng.he <zhipeng.he@amlogic.com>
Date: Wed May 11 20:15:52 2022 +0800
@@ -177,49 +217,9 @@
Change-Id: I725c09bd8d95519be09e136cca43f93a7217cf61
Signed-off-by: fei.deng <fei.deng@amlogic.com>
-commit 3b8287e21f2e9ad216598f755f6f2cdb97e2f1fa
-Author: zhipeng.he <zhipeng.he@amlogic.com>
-Date: Mon May 9 19:04:12 2022 +0800
-
- tsplayer: CB2 keep frame and hidevideo on renderlib [1/1]
-
- PD#SWPL-80834
-
- Problem:
- can not keep frame and hidevideo on renderlib.
-
- Solution:
- keep frame and hidevideo on renderlib.
-
- Verify:
- AH212
-
- Change-Id: Ife23d9cace27a48073061653aa13c5d80015a6d5
- Signed-off-by: zhipeng.he <zhipeng.he@amlogic.com>
-
-commit 427d3943447c142efd9d33669be3fb2d8f8fc7a3
-Author: fei.deng <fei.deng@amlogic.com>
-Date: Tue May 10 15:46:01 2022 +0800
-
- videorenderer: CF2 add keep last frame [1/1]
-
- PD#SWPL-80835
-
- Problem:
- black screen when tsplayer change channel
-
- Solution:
- send keep last frame to westeros
-
- Verify:
- ap222
-
- Change-Id: Ie977f79c164bcbb7381bcdcf4401fcc8f55618e4
- Signed-off-by: fei.deng <fei.deng@amlogic.com>
-
========================================
-Release time: 2022-05-31-16-47
+Release time: 2022-06-01-14-30
========================================