videorenderer: CB2 set video plane id when playing pip [1/1]
PD#SWPL-125569
Problem:
weston supports dual video,render lib should set video
plane id when playing pip video
Solution:
set video plane id when playing pip video
Verify:
AH212
Build Tag:
Buildroot_DRM_PatchBuild-1814
Commits:
buildroot/package/amlogic/linuxdrm/media_hal:
version: 3.11.11-g13543de(build:1814)
13543de videorenderer: CB2 set video plane id when playing pip [1/1]
Git Hash-Object:
350796566b76ad476c5b6e708e25f1d61412b6ba
example/AmTsPlayerExample/AmTsPlayerExample.cpp
6125678a8d7f68a87aae3c0799e8322f624a128b
prebuilt/aarch64.lp64./AmTsPlayerExample
778b353d6988642a951d30aa8ea6ed178ea4dff5
prebuilt/aarch64.lp64./libmediahal_tsplayer.so
004a264cb4ae027e781017b2fdebb049ec3d7251
prebuilt/aarch64.lp64./libmediahal_videodec.so
af77cff218e3dcf704437c9310a12a65114826ad
prebuilt/aarch64.lp64./libmediahal_videorender.so
177b738bf7cd19f2465a4ca2375276cc1f8e6a6e
prebuilt/arm.aapcs-linux.hard/AmTsPlayerExample
451723c7c1ad8df56f1e9f0230f23d8f04575f4d
prebuilt/arm.aapcs-linux.hard/libmediahal_tsplayer.so
1b3c7fdf09822869371da3b5cdde85f68d0e5c8b
prebuilt/arm.aapcs-linux.hard/libmediahal_videodec.so
85247100f82570c72126048cdbf9c25e59edc5f8
prebuilt/arm.aapcs-linux.hard/libmediahal_videorender.so
6a5a8fc297b0dd4e46398cf9a31337534faa102c
prebuilt/noarch/include/AmTsPlayer.h
e715df5358c2348ce94994cfe31e67952a9deb70
version.txt
Change-Id: I08ed83222b52aedb20870e1eae5b3cf9d0cc53c5
Signed-off-by: DRM Auto Build <tao.guo@amlogic.com>
diff --git a/example/AmTsPlayerExample/AmTsPlayerExample.cpp b/example/AmTsPlayerExample/AmTsPlayerExample.cpp
index 165840d..3507965 100644
--- a/example/AmTsPlayerExample/AmTsPlayerExample.cpp
+++ b/example/AmTsPlayerExample/AmTsPlayerExample.cpp
@@ -443,6 +443,15 @@
printf("----show video \n");
AmTsPlayer_holdVideo(session, &holdVideoParams);
}
+ if (ch == 'e') {
+ float scale = 2.0;
+ printf("----start fast 2.0 \n");
+ AmTsPlayer_startFast(session, scale);
+ }
+ if (ch == 'g') {
+ printf("----stop fast\n");
+ AmTsPlayer_stopFast(session);
+ }
}
res = AmTsPlayer_writeData(session, &ibuf, kRwTimeout);
//usleep(20000);
@@ -498,6 +507,15 @@
printf("----show video \n");
AmTsPlayer_holdVideo(session, &holdVideoParams);
}
+ if (ch == 'e') {
+ float scale = 2.0;
+ printf("----start fast 2.0 \n");
+ AmTsPlayer_startFast(session, scale);
+ }
+ if (ch == 'g') {
+ printf("----stop fast\n");
+ AmTsPlayer_stopFast(session);
+ }
}
}
if (ch != 113)
diff --git a/prebuilt/aarch64.lp64./AmTsPlayerExample b/prebuilt/aarch64.lp64./AmTsPlayerExample
index a83336c..6125678 100755
--- a/prebuilt/aarch64.lp64./AmTsPlayerExample
+++ b/prebuilt/aarch64.lp64./AmTsPlayerExample
Binary files differ
diff --git a/prebuilt/aarch64.lp64./libmediahal_tsplayer.so b/prebuilt/aarch64.lp64./libmediahal_tsplayer.so
index 1e8d2ac..778b353 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 434d6cc..004a264 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 3f64ee2..af77cff 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/AmTsPlayerExample b/prebuilt/arm.aapcs-linux.hard/AmTsPlayerExample
index 35e0c9f..177b738 100755
--- a/prebuilt/arm.aapcs-linux.hard/AmTsPlayerExample
+++ b/prebuilt/arm.aapcs-linux.hard/AmTsPlayerExample
Binary files differ
diff --git a/prebuilt/arm.aapcs-linux.hard/libmediahal_tsplayer.so b/prebuilt/arm.aapcs-linux.hard/libmediahal_tsplayer.so
index e8ed61d..451723c 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 9e41d46..1b3c7fd 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 6abc00e..8524710 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/arm.aapcs-linux.softfp/AmTsPlayerExample b/prebuilt/arm.aapcs-linux.softfp/AmTsPlayerExample
index 5bd9fe6..55ad498 100755
--- a/prebuilt/arm.aapcs-linux.softfp/AmTsPlayerExample
+++ b/prebuilt/arm.aapcs-linux.softfp/AmTsPlayerExample
Binary files differ
diff --git a/prebuilt/arm.aapcs-linux.softfp/AmTsPlayerMultiExample b/prebuilt/arm.aapcs-linux.softfp/AmTsPlayerMultiExample
index a6866eb..6de8db4 100755
--- a/prebuilt/arm.aapcs-linux.softfp/AmTsPlayerMultiExample
+++ b/prebuilt/arm.aapcs-linux.softfp/AmTsPlayerMultiExample
Binary files differ
diff --git a/prebuilt/arm.aapcs-linux.softfp/EsVideoDecPlayer b/prebuilt/arm.aapcs-linux.softfp/EsVideoDecPlayer
index 0351f65..6d75bf5 100755
--- a/prebuilt/arm.aapcs-linux.softfp/EsVideoDecPlayer
+++ b/prebuilt/arm.aapcs-linux.softfp/EsVideoDecPlayer
Binary files differ
diff --git a/prebuilt/arm.aapcs-linux.softfp/libmediahal_mediasync.so b/prebuilt/arm.aapcs-linux.softfp/libmediahal_mediasync.so
index 22bd0d4..8354e0a 100644
--- a/prebuilt/arm.aapcs-linux.softfp/libmediahal_mediasync.so
+++ b/prebuilt/arm.aapcs-linux.softfp/libmediahal_mediasync.so
Binary files differ
diff --git a/prebuilt/arm.aapcs-linux.softfp/libmediahal_resman.so b/prebuilt/arm.aapcs-linux.softfp/libmediahal_resman.so
index ae0ec7b..cf2be71 100644
--- a/prebuilt/arm.aapcs-linux.softfp/libmediahal_resman.so
+++ b/prebuilt/arm.aapcs-linux.softfp/libmediahal_resman.so
Binary files differ
diff --git a/prebuilt/arm.aapcs-linux.softfp/libmediahal_tsplayer.so b/prebuilt/arm.aapcs-linux.softfp/libmediahal_tsplayer.so
index 1b92d65..11f0a2d 100644
--- a/prebuilt/arm.aapcs-linux.softfp/libmediahal_tsplayer.so
+++ b/prebuilt/arm.aapcs-linux.softfp/libmediahal_tsplayer.so
Binary files differ
diff --git a/prebuilt/arm.aapcs-linux.softfp/libmediahal_videodec.so b/prebuilt/arm.aapcs-linux.softfp/libmediahal_videodec.so
index 027555c..0d8f947 100644
--- a/prebuilt/arm.aapcs-linux.softfp/libmediahal_videodec.so
+++ b/prebuilt/arm.aapcs-linux.softfp/libmediahal_videodec.so
Binary files differ
diff --git a/prebuilt/arm.aapcs-linux.softfp/libmediahal_videorender.so b/prebuilt/arm.aapcs-linux.softfp/libmediahal_videorender.so
index 0bbc2a8..fcf2cca 100644
--- a/prebuilt/arm.aapcs-linux.softfp/libmediahal_videorender.so
+++ b/prebuilt/arm.aapcs-linux.softfp/libmediahal_videorender.so
Binary files differ
diff --git a/prebuilt/arm.aapcs-linux.softfp/videorender_server b/prebuilt/arm.aapcs-linux.softfp/videorender_server
index 1c6ae7d..f8fec63 100755
--- a/prebuilt/arm.aapcs-linux.softfp/videorender_server
+++ b/prebuilt/arm.aapcs-linux.softfp/videorender_server
Binary files differ
diff --git a/prebuilt/noarch/include/AmTsPlayer.h b/prebuilt/noarch/include/AmTsPlayer.h
index 1e00124..6a5a8fc 100644
--- a/prebuilt/noarch/include/AmTsPlayer.h
+++ b/prebuilt/noarch/include/AmTsPlayer.h
@@ -251,6 +251,8 @@
AV_AUDIO_CODEC_WMAPRO = 16, // WMAV pro
AV_AUDIO_CODEC_WMALOSSLESS = 17, // WMAV loss less
AV_AUDIO_CODEC_PCM_U8 = 18, //PCM U8
+ AV_AUDIO_CODEC_AV3A = 19, // AVS3-P3 3D Audio/Audio Vivid Audio Codec ID
+ AV_AUDIO_CODEC_PCM_ADPCM_IMA_WAV = 20, //ADPCM IMA WAV
AV_AUDIO_CODEC_MAX = 1000, // Out of range type (Unsupport)
} am_tsplayer_audio_codec;
diff --git a/version.txt b/version.txt
index 3282ab0..c422894 100644
--- a/version.txt
+++ b/version.txt
@@ -1,10 +1,113 @@
=========RELEALSE NOTE=================
-Version: V3.11.6-ga0bdcbb
+Version: V3.11.11-g13543de
========================================
Git commit:
+commit 13543deb837091cf7bf6cfcfac071d59d6a1a1c3
+Author: fei.deng <fei.deng@amlogic.com>
+Date: Thu Jun 1 02:48:17 2023 +0000
+
+ videorenderer: CB2 set video plane id when playing pip [1/1]
+
+ PD#SWPL-125569
+
+ Problem:
+ weston supports dual video,render lib should set video
+ plane id when playing pip video
+
+ Solution:
+ set video plane id when playing pip video
+
+ Verify:
+ AH212
+
+ Change-Id: Ife4ee653b9aa51c255979d7a25c5f77c3f189fa3
+ Signed-off-by: fei.deng <fei.deng@amlogic.com>
+
+commit 692f163cbba033da2597db3a2d823698b7e17148
+Author: zhipeng.he <zhipeng.he@amlogic.com>
+Date: Mon Jun 19 14:43:33 2023 +0800
+
+ tsplayer: CF2 send PresentationId to audio. [1/1]
+
+ PD#SWPL-125402
+
+ Problem:
+ no PresentationId to audio
+
+ Solution:
+ send PresentationId to audio
+
+ Verify:
+ AH212
+
+ Change-Id: Ifde7623f0b797ec135916554ba794a179036954c
+ Signed-off-by: zhipeng.he <zhipeng.he@amlogic.com>
+
+commit dc8d6cd2ad3741841df1f1a8a05f9b99e6b084ff
+Author: zhenya.xie <zhenya.xie@amlogic.com>
+Date: Mon Jun 5 20:14:18 2023 +0800
+
+ tsplayer: CF2 support AC4 [1/1]
+
+ PD#OTT-44667
+
+ Problem:
+ AC4 format not suppert
+
+ Solution:
+ add ac4 format convert
+
+ Verify:
+ yocto
+
+ Change-Id: I70efe8265af1edb5314512570b81612109dbac9a
+ Signed-off-by: zhenya.xie <zhenya.xie@amlogic.com>
+
+commit 0b858414a4f06e37817a05cf07713c915d5edd1b
+Author: zhipeng.he <zhipeng.he@amlogic.com>
+Date: Mon Jun 12 19:55:58 2023 +0800
+
+ tsplayer: CB1 1.5x ff can not work when use renderlib [1/1]
+
+ PD#OTT-43949
+
+ Problem:
+ 1.5x ff can not work when use renderlib
+
+ Solution:
+ set the scale into renderlib,
+ and record the scale on renderlib,
+ setplaybackrate to medaisync.
+
+ Verify:
+ AH212
+
+ Change-Id: I7ed6511a27c1b502095a7afbfd572447c621d091
+ Signed-off-by: zhipeng.he <zhipeng.he@amlogic.com>
+
+commit f1892997bbf0203890d87a0816a627ac10e4063e
+Author: zhipeng.he <zhipeng.he@amlogic.com>
+Date: Thu May 11 14:51:06 2023 +0800
+
+ tsplayer: CF2 add adpcm_ima_wav audio type. [1/1]
+
+ PD#OTT-42838
+
+ Problem:
+ no adpcm_ima_wav this audio type
+
+ Solution:
+ add adpcm_ima_wav audio type
+
+ Verify:
+ AH212
+
+ Change-Id: I9f2b8b621df683156d1a661c2ce35493549cfa63
+ Signed-off-by: zhipeng.he <zhipeng.he@amlogic.com>
+
commit a0bdcbb2cebced5377a73aec0fff4790e939a447
Author: zhipeng.he <zhipeng.he@amlogic.com>
Date: Mon May 15 20:11:34 2023 +0800
@@ -108,119 +211,13 @@
Change-Id: Idcfb169150464954668b0ec9e7f8b8a4c346d2d2
Signed-off-by: yunmin.chen <yunmin.chen@amlogic.com>
-commit 1fe7b0922d1a191d0914f8ad8c3f2272ab4254a8
-Author: zhipeng.he <zhipeng.he@amlogic.com>
-Date: Wed Jun 7 20:05:32 2023 +0800
+========================================
- tsplayer: CB2 onlyaudio not set dmx source [1/1]
-
- PD#SWPL-127192
-
- Problem:
- onlyaudio not set the dmx source,
- onlyaudio can not play.
-
- Solution:
- set the dmx source on AmDemuxWrapperOpen
-
- Verify:
- t5w
-
- Change-Id: Ic7787fed85a09328efb37eee227eb6528a68d70e
- Signed-off-by: zhipeng.he <zhipeng.he@amlogic.com>
-
-commit aa6f9df3ccfbfcbd021882090d257c5b480f3c2d
-Author: yunmin.chen <yunmin.chen@amlogic.com>
-Date: Thu Jun 1 14:53:21 2023 +0800
-
- mediahal: CF2 mediahal release [1/1]
-
- PD#SWPL-123243
-
- Problem:
- mediahal release
-
- Solution:
- release V3.9.45-g0d10a7c
-
- Verify:
- SC2
-
- Change-Id: Ia21e1fef5506b9279122e59fa30bc09e743c29c4
- Signed-off-by: yunmin.chen <yunmin.chen@amlogic.com>
-
-commit 0d10a7c20c2dd314d115ce82db5318d7ad4003bc
-Author: zhipeng.he <zhipeng.he@amlogic.com>
-Date: Tue May 16 15:46:05 2023 +0800
-
- tsplayer: CF2 add hold video feature [1/1]
-
- PD#TV-78044
-
- Problem:
- customer need api to hold video.
-
- Solution:
- add hold video feature
-
- Verify:
- AH212
-
- Change-Id: Ia6a52593e762775c12ed6e636d5515399d620746
- Signed-off-by: zhipeng.he <zhipeng.he@amlogic.com>
-
-commit 0d5113a42308e1f8166e8c1e32b1666049f78d0b
-Author: fei.deng <fei.deng@amlogic.com>
-Date: Thu May 11 05:55:30 2023 +0000
-
- videorenderer: CF2 add hold video feature [1/1]
-
- PD#TV-78044
-
- Problem:
- add hold video feature with pts,on this state, render lib
- will drop and release video frames, but audio is running always
-
- Solution:
- add hold video feature
- set render lib log level and log file with /run/rlib_level
- and /run/rlib_file
-
- Verify:
- AH212
-
- Change-Id: Ifd6beb09667f212c1e89e4e9f469c3adefe52e0d
- Signed-off-by: fei.deng <fei.deng@amlogic.com>
-
-commit de603ead68274ea32411e202c34a775007885c78
-Author: fei.deng <fei.deng@amlogic.com>
-Date: Wed May 31 02:53:31 2023 +0000
-
- videorenderer: CB2 force output mode resolution [1/1]
-
- PD#RSP-5265
-
- Problem:
- render lib received output mode resolution is 1280x720 with wayland, but
- actual resolution should be 1920x1080. westeros use a fixed 1920x1080
- resolution, this cause video window displays incorrectly.
-
- Solution:
- force output mode resolution to 1920x1080
-
- Verify:
- AQ2432
-
- Change-Id: I4bf8a59b8308349c4a0f1691a7ecd5d66c1c8f32
- Signed-off-by: fei.deng <fei.deng@amlogic.com>
+Release time: 2023-06-25-14-58
========================================
-Release time: 2023-06-12-13-26
-
-========================================
-
-Builder: drm.autobuild
+Builder: zhipeng.he
========================================
Release file:
@@ -229,23 +226,29 @@
AmTsPlayer.h
AmVideoDecBase.h
MediaSyncInterface.h
+render_lib.h
resourcemanage.h
-Library file:
+Library and Binary file:
+AmTsPlayerExample
+AmTsPlayerMultiExample
+EsVideoDecPlayer
libmediahal_mediasync.so
libmediahal_resman.so
libmediahal_tsplayer.so
libmediahal_videodec.so
libmediahal_videorender.so
+videorender_server
+
Example file:
AmTsPlayerExample.cpp
Makefile
+
Multi_Example file:
AmTsPlayerMultiExample.cpp
Makefile
-
-Binary file:
-AmTsPlayerExample
-AmTsPlayerMultiExample
+Esvideodecplayer file:
+EsVideoDecPlayer.cpp
+Makefile
========================================