Commit Graph

653843 Commits

Author SHA1 Message Date
Yvonne Chen
caef1e3328 media: tee load concurrency cause crash issue[1/1]
PD# 154794

tee load concurrency cause crash issue

Change-Id: I1666329f423a46b1e2090cb21cc4b62536b3d0f0
Signed-off-by: Yvonne Chen <yvonne.chen@amlogic.com>
2019-07-23 17:52:49 +09:00
shihong.zheng
3f8b314661 vvp9: fix video stuck when switch resolution
PD# 154775

recalc frame duration when switch resolution

Change-Id: Ib21c186d3bff436691dbf0ff86182f02dc47f51a
Signed-off-by: shihong.zheng <shihong.zheng@amlogic.com>
2019-07-23 17:52:49 +09:00
Yuxi Sun
de821ea11c PD#154292 AVC encoder: increase the AVC encoder instace limit to 3
Change-Id: Id6e38f273bf8ccfbc3b17833533d1ac87b42784c
Signed-off-by: Yuxi Sun <yuxi.sun@amlogic.com>
2019-07-23 17:52:49 +09:00
Yvonne Chen
54e2a386b7 media: fix crash 264 decoder crash issue
PD# 153479

vdec tee swithing caused tee chaos without vdec stop

Change-Id: Ie720ea14975a5b3cb019050485651ad266750037
Signed-off-by: Yvonne Chen <yvonne.chen@amlogic.com>
2019-07-23 17:52:49 +09:00
jintao xu
6b976027b3 PD#152092: decoder: rm logs for vts
Change-Id: I2bbaf458a2c3cd68fe2bc083d065255ec3fe90d8
2019-07-23 17:52:49 +09:00
shihong.zheng
e7f2da8ed9 PD#153240: vvp9: restore checkin pts for vts
Change-Id: I54b531e44d3433ee18e8b09ce94d0fde76ac391c
Signed-off-by: shihong.zheng <shihong.zheng@amlogic.com>
2019-07-23 17:52:49 +09:00
Yuxi Sun
25bd691539 PD#153170: encoder: Add macro to control the enable of GE2D for crop and scale
Change-Id: Ie49442a6ad5eb58fd8e8445db8c5d32843fbdbe3
Signed-off-by: Yuxi Sun <yuxi.sun@amlogic.com>
2019-07-23 17:52:49 +09:00
Nanxin Qin
52e166c021 PD#150542: stream_input: use msecs_to_jiffies to replace magic number
Change-Id: Id9dd93f82896f68f4f510fdb935a534d53ec718d
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
2019-07-23 17:52:49 +09:00
Hui Zhang
f220e52bd2 PD#153316: decoder: sync code from kernel 3.14 trunk,
1)bug148747: amports: add set_dv_metawithel for dv h265 and h264
2)bug149754: amports: support double write 1:2 for h265 & vp9
                       add mcrcc_cache_alg_flag
3)bug148394: vvp9: add vp9 triger data handle
4)bug151930: vvp9: fix unstart timer error
5)bug151982: vvp9: fix buf alloc issue
6)bug142335: amports: vmh264, error handling, reset bugmgr if dpb error
 vmh264, vh265, control decode if disp queue count > disp_vframe_valve_level
7) set vdec clk back to different after  trigger frame handle

Change-Id: I5747f7692adf14af5853fd3760de71e82f0dc6b3
Signed-off-by: Hui Zhang <hui.zhang@amlogic.com>
Signed-off-by: Zhi Zhou <zhi.zhou@amlogic.com>
2019-07-23 17:52:49 +09:00
Nanxin Qin
0ecf09c6d1 PD#152701: decoder: reduce the debug info to pass the vts test.
Change-Id: I4534a27b49c434ca2df48fbf844d93aac0dea03d
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
2019-07-23 17:52:49 +09:00
shihong.zheng
32bf4ecc51 PD#153240: vvp9: use pts for vts test default
Change-Id: I66a59de40fe46d1f7f31a5671607e8b5d83c81d7
Signed-off-by: shihong.zheng <shihong.zheng@amlogic.com>
2019-07-23 17:52:49 +09:00
Yuxi Sun
e8c54a7ae6 PD#148482: decoder: Fix decoder release cause encoder hang problem
Change-Id: If26312aa16e924c293fa39b265aba5ca219128e1
Signed-off-by: Yuxi Sun <yuxi.sun@amlogic.com>
2019-07-23 17:52:49 +09:00
Nanxin Qin
e40a0e0b0c PD#152551: vmh264: remove is_secload_get()
Change-Id: I0dd340fcfddeace6268281010f7cf027014255de
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
2019-07-23 17:52:49 +09:00
shihong.zheng
00146b3d4d PD#152140: vvp9: calc frame duration for unstable pts
Change-Id: I7c80294979729650222c7cb8a046419be0456fcf
Signed-off-by: shihong.zheng <shihong.zheng@amlogic.com>
2019-07-23 17:52:49 +09:00
Nanxin Qin
5b104d75ed PD#152551: vmh264: fixed the problems of crash and screen flicker when playing.
merged code form kernel 3.14:
PD#150863: amports: cherry-pick h264 add_timer patch from customer
PD#150199: vmh264: fix fast_output issue
PD#147795: vmh264: set hevc frame done when TIMEOUT or EMPTY

Change-Id: I9b4fa46b9a7cab50328d941e2f1158d330e393cd
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
2019-07-23 17:52:49 +09:00
Rongrong Zhou
72bb68f1f5 media: fixed amports: fix h265 stream mode stuck issue
PD#152147:
	decoder size r maybe overwrite by
        amhevc_vdec_loadmc_ex return.

Change-Id: Icc87d293b1eedd557a6d2b12e7ee369d1c1cc7b4
2019-07-23 17:52:49 +09:00
Nanxin Qin
f92fc66378 PD#151634: decoder: the print level is modified to pass the vts test.
Change-Id: I475e27aed1f8b59a25f2ea2c07947fcd5b041df6
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
2019-07-23 17:52:49 +09:00
Nanxin Qin
6f4767d014 PD#152186: firmware: fixed the issure of firmware pre loading for encoder.
Change-Id: Ie38ab97fb5887060886e0f8f5595f475a8be4930
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
2019-07-23 17:52:49 +09:00
Yuxi Sun
e09b3c8126 h264 encoder: use get_data_from_name to get firmware
Change-Id: I1f68bc96eb5c0fc0157fd83e6ff016ed9e4b7c8f
Signed-off-by: Yuxi Sun <yuxi.sun@amlogic.com>
2019-07-23 17:52:49 +09:00
Yvonne Chen
01bd5ba2b8 media_modules: add sec firmload for 4.9[3/3]
PD# 150992

add sec firmload for 4.9 under optee

Change-Id: Id1f5cbcfc293746869bea9542109a9ef7ed628e5
Signed-off-by: Yvonne Chen <yvonne.chen@amlogic.com>
2019-07-23 17:52:49 +09:00
Nanxin Qin
89928d7baa media_modules: fixed some bugs
PD#150106: vh265: remove junk word
	PD#150106: vh265: add pic_list_porcess() in wait_buf 1 (for resolution change)
	PD#150104: amvdec: remove a typo in code
	PD#150103: amports: fix a wrong condition issue
	PD#150087: amports: add return check to stbuf_init
	PD#150089: amports: add return check to pts_start
	PD#150095: vh264_4k2k: add return check to pts_lookup

driver defect clean up:

Change-Id: Ifce2ae15ac942c63a886cdd850959d1f79628f38
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
2019-07-23 17:52:49 +09:00
Nanxin Qin
6972026c5a decoder: fixed the issure of losing frames in playback
PD#151174: add detection of eos data to prevent err in play state

The play ready state requires 3 conditions:
1. input object is valid
2. available with chunk data
3. no eos data received

Change-Id: Idee816458f2da165fce52a74c9d308a32b116d15
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
2019-07-23 17:52:49 +09:00
Nanxin Qin
33a11f4851 decoder: modify the code of style to aviod compile err.
Change-Id: Ib832cf0ada7d3389c004d36039918185363db12c
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
2019-07-23 17:52:49 +09:00
Nanxin Qin
256cfa1fd4 makefile: fixed the issure of Media.mk
Change-Id: Ib842b3c1354fbb6081969a1d77580c92204ce6fe
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
2019-07-23 17:52:49 +09:00
Nanxin Qin
09bbdb6639 media_modules: merged code from 43177e6a on the amlogic-3.14-dev [2/3]
PD#150739: merged code from 43177e6a on the amlogic-3.14-dev
1.decoder: vmh264, fix multi pic in one packet
2.decoder: add amvdec_stop when error reset
3.clk: switch vdec clk source when suspend

Change-Id: I43b8f5a7a13d880c130505cd21e08c8e1eb4cf38
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
2019-07-23 17:52:49 +09:00
Yao.Liu
720eaaed05 vp9 decoder: optimize vp9 init for vts [2/2]
Change-Id: I528cf32ff25c6c79177478ba3dc77fe29ba4838e
Signed-off-by: Yao.Liu <yao.liu@amlogic.com>
2019-07-23 17:52:49 +09:00
Yuxi Sun
20484d209a PD#146466: h264 encoder: update h264 ucdoe
Change-Id: I378c53d819767171b6eedbfb2881dce5ec9679c1
Signed-off-by: Yuxi Sun <yuxi.sun@amlogic.com>
2019-07-23 17:52:49 +09:00
Nanxin Qin
83f60ad655 decoder: fixed the issure of mem to avoid leak.
PD#150221: fixed the issure of mem to avoid leak.

Change-Id: Id1ef51e30cfab718e5e57881af5d84eb2609d1b1
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
2019-07-23 17:52:49 +09:00
Nanxin Qin
50a3479782 decoder: fixed a issure of the memory leak when the seek.
PD#150221: fixed a issure of the memory leak when the seek.

Change-Id: Ie11a942f08cfeab59a6e4e7452c82bab62ec5f36
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
2019-07-23 17:52:49 +09:00
Nanxin Qin
f34d529e67 decoder: modify modules dir in the sysfs to compatible with kernel 3.14 [3/3]
PD#150498: modify modules dir in the sysfs to compatible with kernel 3.14

Change-Id: Ie2f5ef1d0473f1683e991ba405e5347e0d95f6db
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
2019-07-23 17:52:49 +09:00
Nanxin Qin
db869884eb media_clock: change the spinlock into the mutexlock to avoid crash.
PD#150369: change the spinlock into the mutexlock to avoid crash.

Change-Id: I96528c1e496d0bc4ff984036a5d36b373732c932
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
2019-07-23 17:52:49 +09:00
Nanxin Qin
8f480325ae decoder: the ionvideo feature was supported
PD#150258: the ionvideo feature was supported

Change-Id: I925d988b57ce058d00cca6bab08d568a06192de7
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
2019-07-23 17:52:49 +09:00
liangzhuo.xie
2018a9c504 PD#149614: fix param null pointer error.
Change-Id: I3e4627353fc5008269a1a5c82bbe9193aa6ff599
2019-07-23 17:52:49 +09:00
Nanxin Qin
63775cf5db decoder: fixed firmware load issure in mult-instance mode.
PD#149867: fixed firmware load issure in mult-instance mode

Change-Id: I68ddae7225e582d2081e4c1e4675c42e3b88ffad
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
2019-07-23 17:52:49 +09:00
Nanxin Qin
5a6207e1e1 media_modules: merged code from 43177e6a on the amlogic-3.14-dev
PD#146152: merged code from 43177e6a on the amlogic-3.14-dev

1. support for multi-instance features
2. some issures with the restoration of H.264/H.265/vp9 in
multiple-instance mode
3. optimized switch gate and decoder clk

Change-Id: Iff829f6e4058c7001901e65c03e283a82fd1ec4a
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
2019-07-23 17:52:49 +09:00
Nanxin Qin
e3523adaab change UCODE_OUT directory [2/2]
PD# NONE

change the directory of ucode_out to vendor/lib/firmware/video

Change-Id: Iceaa4f9699cdd62a2827920a6dc13a76c4a1450e
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
2019-07-23 17:52:49 +09:00
Nanxin Qin
7fb33bed00 add the path of UCODE_OUT [2/2]
PD# NONE

copy the fimware to the UCODE_OUT.

Change-Id: Ia7815156ba4219f7b4a7582322028b3391df9253
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
2019-07-23 17:52:49 +09:00
Hualing Chen
a92859716f PD#147721: media_modules: add dvb driver
1.add dvb stb dmx and frontend driver

Change-Id: I8d05bf46320cc7111bbbc215198997b3747bbe49
Signed-off-by: Hualing Chen <hualing.chen@amlogic.com>
2019-07-23 17:52:49 +09:00
Xindong Xu
8cca8ae22f copy ko to lib_vendor
Change-Id: I5dc31f76da72f0413cb302ae2991b58a9f769d62
Signed-off-by: Xindong Xu <xindong.xu@amlogic.com>
2019-07-23 17:52:49 +09:00
Xindong Xu
e14836c975 PD#145255: generate amlogic files to vendor/
Change-Id: I5c8cad08b992cf688d09190af3a7a879fa77a43e
2019-07-23 17:52:49 +09:00
Nanxin Qin
c5f0a5ef09 add drivers of the multimedia
Change-Id: Icde0895b71770e393cb6a61bedf04aa199f6463d
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
2019-07-23 17:52:49 +09:00
afl1
0f1ea98bbe Revert "ODROID-COMMON: slipstream Amlogic drivers"
This reverts commit 5ef121eb61.
2019-07-23 17:52:49 +09:00
Kevin Kim
ff66238b3e ODROID-N2:Merge amlogic BSP 2019.0415
Change-Id: I0eab66ee8951fe297a7c831f6b90652314a4972a
2019-07-23 17:52:49 +09:00
Wenfeng Guo
8c30037ad1 di: fix TL1 cave video 1080i 60hz have drawing [1/1]
PD#SWPL-7006

Problem:
TL1 cave video 1080i 60hz have drawing.

Solution:
dark scenes don't into pulldown32 by vlsi yanling

Verify:
TL1

Signed

Change-Id: Ib77c0f99940c416943baa9b9a8a02a059b274e5b
Signed-off-by: Wenfeng Guo <wenfeng.guo@amlogic.com>
2019-07-23 17:52:49 +09:00
Yong Qin
ebbc51cfa6 di: small window bottom of the screen no video [1/1]
PD#TV-4708

Problem:
small window,v scaling mode, bottom of the screen is no video.

Solution:
vline is odd, mif out is not more enouth

Verify:
verify on TL1

Change-Id: I2ac35af3632e8b14df5c773b322d4b2d64b050ba
Signed-off-by: Yong Qin <yong.qin@amlogic.com>
2019-07-23 17:52:49 +09:00
Yong Qin
7104d5ed92 di: small window bottom of the screen is blank [1/1]
PD#TV-4708

Problem:
small window, bottom of the screen is covered by
blank on the online video

Solution:
vline is odd, mif out is not right

Verify:
verify on TL1

Change-Id: I39eb0cdfd2f4b200a09a9c8b779f509caf6dea37
Signed-off-by: Yong Qin <yong.qin@amlogic.com>
2019-07-23 17:52:49 +09:00
Wenfeng Guo
1257af5e20 deinterlace: fix tl1 in 1080i has small sawtooth [1/1]
PD#SWPL-4072

Problem:
tl1 1080i in some dark scenes and roller coasters
have small sawtooth

Solution:
adjust a set of registers with special motion

Verify:
tl1

Change-Id: Idbe62e823f1c6c683b67d000978de1862c8e3162
Signed-off-by: Wenfeng Guo <wenfeng.guo@amlogic.com>
2019-07-23 17:52:49 +09:00
Yong Qin
f70db4be00 Revert "di: change clkb frq from 500 to 667 [1/1]"
This reverts commit c75a783c42.

Change-Id: I2bf82f1ceeebc1377d45b76ee1d2563811c154ca
Signed-off-by: Yong Qin <yong.qin@amlogic.com>
2019-07-23 17:52:49 +09:00
Yong Qin
d5edafddec di: bringup for tm2 [1/1]
PD#SWPL-6575

Problem:
chip bring up

Solution:
1.add tm2 chip id for tm2
2.add h scaling down function for tm2

Verify:
tm2

Change-Id: I364d7c07be331d81ef546357445225c6071f8e3c
Signed-off-by: Yong Qin <yong.qin@amlogic.com>

Conflicts:
	drivers/amlogic/media/deinterlace/deinterlace.c
	drivers/amlogic/media/deinterlace/deinterlace_dbg.c
	drivers/amlogic/media/deinterlace/deinterlace_hw.c
	drivers/amlogic/media/deinterlace/nr_drv.c
2019-07-23 17:52:49 +09:00
Yong Qin
f0f35b4b77 di: change clkb frq from 500 to 667 [1/1]
PD#SWPL-6762

Problem:
di clkb frq is not right

Solution:
change from 500 to 667

Verify:
tl1

Change-Id: I9c62bb9936630937f19d8a6b490a8266d73a268c
Signed-off-by: Yong Qin <yong.qin@amlogic.com>
2019-07-23 17:52:49 +09:00