Commit Graph

653869 Commits

Author SHA1 Message Date
Nanxin Qin
f3a40652c5 decoder: fixes some iusses
PD#161606:
1. fixes an issue that the mutex lock could sleeping on isr context.
2. update the video_ucode.bin

Change-Id: I14d73e210d64de46d20396cf8edc33c397bbc1ec
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
2019-07-23 17:52:49 +09:00
Nanxin Qin
24412539ca stream_input: fixes an issue that check the efuse chip cause to crash.
PD#161606:
PD#161757:

Change-Id: Ieadaf82c4b9214ecb2881359d2252270bc1d9192
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
2019-07-23 17:52:49 +09:00
Nanxin Qin
ad1060dd54 decoder: merges code from the branch of the bringup g12a
PD#161606: notes

1. fix avs2 bringup bug: config dblk_data2 and
    config HEVC_SAO_CTRL0 with lcu_size_log2

2. vdec: merge debug code from kernel 3.14,
    support step and schedule profile (multi-instance only)
    echo 0x100 > /sys/module/decoder_common/parameters/step_mode

3. decoder: fixed a bug of the vdec_profile event.
    the ISA register base has changeed to 0x3c00
    on the txlx, g12a platforms

4. decoder: modify the value of the hevc reg HEVC_DBLK_STS1
    G12A changes
    #define HEVC_DBLK_STS0 0x350f
    #define HEVC_DBLK_STS1 0x3510

5. stream_input: add a feature of check efuse status [2/2].

6. media_clock: adds media clk nodes
    echo 1 > /sys/module/media_clock/parameters/set_frq_enable
    echo 667 > /sys/module/media_clock/parameters/vdec_frq
    echo 667 > /sys/module/media_clock/parameters/hevc_frq
    echo 667 > /sys/module/media_clock/parameters/hevcb_frq

7. media_modules: revised dolby vision macro control for g12a

8. ucode: update the video_ucode.bin

Change-Id: Icf781a1e5f8095bd1b14a2b21e525683ad0cc22d
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
2019-07-23 17:52:49 +09:00
Hui Zhang
da8c215f60 media_module: fix vmh264 playback freeze issue
PD#161180:
   1) adjust timeout trigger threshold to prevent an instance not
      being in a deadloop when decoding error happened
   2) add check to a invalid display_q len

Change-Id: I9a8fcc2891aca5b03b75c54b5a9cf2514ed28ca7
Signed-off-by: Hui Zhang <hui.zhang@amlogic.com>
2019-07-23 17:52:49 +09:00
Tellen Yu
4038ecf3fb media_modules: build system changed for Android.mk from P [21/28]
PD# NONE

https://android.googlesource.com/platform/build/+/master/Changes.md

Change-Id: I46221a53a1db08c178ef43aaa09d907e43bfd10a
2019-07-23 17:52:49 +09:00
Hui Zhang
f2c3099fad media_module: fix vmh264 mosaic issue
PD#160726
for longtime run, some stream error might cause pic_dc hardware in wrong state, it can't be recovery,
so this hardware module need to be reset at beginning of decoding slice. mosaic issue will be gone

Change-Id: I850ecfc08b45a66e15ce9a41dbf1d550fe55f640
Signed-off-by: Hui Zhang <hui.zhang@amlogic.com>
2019-07-23 17:52:49 +09:00
zhilei.wu
9f61900e4d media_modules: revised dolby vision macro control for g12a
PD#157605: media_modules: revised dolby vision macro control for g12a

Change-Id: I4a6bb3e904782d87916ea303c74da9e47404e366
Signed-off-by: zhilei.wu <zhilei.wu@amlogic.com>
2019-07-23 17:52:49 +09:00
Yvonne Chen
dc28161f64 media_modules: sec firmload extend with vdec type
PD#159071
	1.change tee load call with vdec type
        2. fixed h264 mmu crashed bug.

Change-Id: I4114a2d0d8c5837a6c51457472bfc0ceca17a99d
Signed-off-by: Yvonne Chen <yvonne.chen@amlogic.com>
2019-07-23 17:52:49 +09:00
shihong.zheng
3f36210b0b mpeg12: fix crash in timer when change clk
PD#155701

timer soft-irq cann't mutex_lock,add schedule work
to change source clk.

Change-Id: I199e3e480523ae546b91155113dc269b45e7beea
Signed-off-by: shihong.zheng <shihong.zheng@amlogic.com>
2019-07-23 17:52:49 +09:00
Zhi Zhou
5cd9351020 media: fix unsupport 12bit may crashed bug.
PD#159195
PD#159359
	1. unspport 12 bit depth,
	   set fatal_error,when >=10bit;
	2. doublewtite 0x100 crash bug.

Change-Id: I6366b769c3be75b3cc44e606d3317272053b6723
2019-07-23 17:52:49 +09:00
Zhi Zhou
a79cbb7c4a decoder: vp9 doublewrite only support [1/1]
PD#158925

	1. vp9 add double write only support
	2. del MMU_ENABEL macro
	3. detect mmu enable by double_write mode.

Change-Id: If755331e4fc1b91a847df081a6c58e24c98f08a5
Signed-off-by: Zhi Zhou <zhi.zhou@amlogic.com>
2019-07-23 17:52:49 +09:00
Yao.Liu
885ec2499b vdec: optimize video latency
PD#156224: reduce sleep time in vdec_core_thread

Change-Id: Ie70d1dbaecf0174fa9e6daa52378113165568efe
Signed-off-by: Yao.Liu <yao.liu@amlogic.com>
2019-07-23 17:52:49 +09:00
Zhi Zhou
1e6d885a6a media: format drivers code for upstream.
PD#157273

	1. format code as kernel's format.
	2. add kernel's format scripts to this script dir.

Change-Id: Id45c0919d0476b2cd990b027e80bbe7fed3a90be
Signed-off-by: Zhi Zhou <zhi.zhou@amlogic.com>
2019-07-23 17:52:49 +09:00
Nanxin Qin
5cb7626bc3 decoder: fixed the issure of the h264 4k source can not playback.
PD#156749: add the h264 mmu fw and update the ucode bin.

Change-Id: Icd1ecaedd9276281dd68da4c5e4624b6e9a32d2c
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
2019-07-23 17:52:49 +09:00
shuanglong wang
38d5f13777 Revert "decoder: fixed the issure of the h264 4k source can not playback."
This reverts commit a85e88b3d90c6818c599af62b3fc66126067ea19.

Change-Id: Ib126689e66c5bf097df6fb0f863831da2ecaa470
2019-07-23 17:52:49 +09:00
Nanxin Qin
0b1d56559c decoder: fixed the issure of the h264 4k source can not playback.
PD#156749: add the h264 mmu fw and update the ucode bin.

Change-Id: Ie0c2590d0547d44a97119737cd784f950d3d1b77
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
2019-07-23 17:52:49 +09:00
Jian Wang
cfd2a67553 avs : fix omx+avs seek problem [3/12]
PD# 147955

fix omx+avs seek problem
(cherry picked from commit 215eb370a2d0e33fb03cc36eba9a6ad251c8e893)

Change-Id: I1973d0f55f69a8ecb96c8ab40369e0ce321294eb
2019-07-23 17:52:49 +09:00
Hui Zhang
7d0e07af7f media : optimize decoder timing for vts [1/1]
PD#155696

1) replace msleep with sema in h265
2) decrease scatter mem cache size for non-4k h265
3) set vdec thread to higher priority
4) zz:set vdec work to higher priority
5) zz:don't reload mc code when on instance.
6) zz:del config SCALELUT_WR_ADDR for each frame.
7) zz:profile add some paras for debug.

Change-Id: Ie4be769269c8a485755f5610d3739df26d34cf17
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
Yao.Liu
a9b14a22a9 vvp9: reduce vp9 decoder memory
PD#155696: reduce 720p vp9 decoder memory

Change-Id: Ie08a449301cb4fa77538fadb1d314e27849059e8
Signed-off-by: Yao.Liu <yao.liu@amlogic.com>
2019-07-23 17:52:49 +09:00
Nanxin Qin
768a189659 firmware: adds a reload node to avoid the fw load fail [1/1]
PD#156498: add mutex lock to avoid concurrency events.

usage:
cat sys/class/firmware_codec/reload
echo 1 > sys/class/firmware_codec/reload
echo 2 > sys/class/firmware_codec/reload

set 1 means that the fw is forced to update
set 2 means that the fw is try to reload

Change-Id: I99d629a8862cd13d394566fd31c788d01a302019
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
2019-07-23 17:52:49 +09:00
Jiacheng Mei
42e7ff77a7 PD#154292: update encoder ucode for gts testSimulcastBitrateSyncH264
Change-Id: I87f5dc6ed6047a1c261ddd8afecfc548022106e6
2019-07-23 17:52:49 +09:00
Tao Dong
dbb47661b3 PD#156738 : revert for VTS panic issue
Revert "firmware: adds a reload node to avoid the fw load fail [1/1]"

This reverts commit c3a2d6233635072a5d5c34498f990dafbc70261b.

Change-Id: I030809b913133cb3ac9a680cfec98fbcde97d40d
2019-07-23 17:52:49 +09:00
Nanxin Qin
546d11e2ec firmware: adds a reload node to avoid the fw load fail [1/1]
PD#156498: adds a reload node to avoid the fw load fail

usage:
cat sys/class/firmware_codec/reload
echo 1 > sys/class/firmware_codec/reload
echo 2 > sys/class/firmware_codec/reload

set 1 means that the fw is forced to update
set 2 means that the fw is try to reload

Change-Id: Id453860386cb3eb9dbd21c0ae7238c34655ab1ed
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
2019-07-23 17:52:49 +09:00
Yvonne Chen
12cc0d94aa media: add mjpeg mult-dec for 4.9[2/2]
PD# 153297

add mjpeg mult-dec for 4.9

Change-Id: Ib8ccb12681b1e1b92506476f392abcdfee3dcb08
2019-07-23 17:52:49 +09:00
Yuxi Sun
2aa95716a6 PD#154885 AVC encoder: update ucode firmware
Change-Id: Ic9697332f1bd63d1a26537c2ee4e85f696c16847
Signed-off-by: Yuxi Sun <yuxi.sun@amlogic.com>
2019-07-23 17:52:49 +09:00
Nanxin Qin
8bd1de4c0e firmware: add a item of firmware cfg for the txlx [1/1]
PD#154260: add a item of firmware cfg for the txlx.

Change-Id: I0ce62cdc96b8e9a09a7abaff1c8258b858607285
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
2019-07-23 17:52:49 +09:00
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