Commit Graph

653968 Commits

Author SHA1 Message Date
Hui Zhang
63b5b63e7f media_module: add debug level limit for hdr info
Change-Id: I6c9f1bc8f66366b1859230886978409880c9b621
Signed-off-by: Hui Zhang <hui.zhang@amlogic.com>
2019-07-23 17:52:49 +09:00
Peng Yixin
5f4c8b5445 media_module: h265: fix video play block issue.
PD#174220:

After analyzing SPS, we found the value of sps_num_reorder_pics_0 is 0, it is an error value, which also caused the video play block.

Change-Id: I6e6d9bccf1284977f64fed9805fd329749fe020c
Signed-off-by: Peng Yixin <yixin.peng@amlogic.com>
2019-07-23 17:52:49 +09:00
Jian Xu
05957f1255 adec: clear up the uio interface
PD#166264

Change-Id: I74241eb9844a8642e33084f502d79c690a6cd000
2019-07-23 17:52:49 +09:00
rongrong zhou
b3a170d087 amvdec_ports: fix vdec_h264_if dpb size calculation errors.
PD# 173402

dpb size error

Change-Id: Ia1fcb6c689f4a9663065a38bf1bd04499366d5f8
Signed-off-by: rongrong zhou <rongrong.zhou@amlogic.com>
2019-07-23 17:52:49 +09:00
shihong.zheng
a4d634c06a mh264: parse vui info for buffer number calculation
PD#173030: vmh264: parse vui info max_dec_frame_buffering to
calc reorder_pic_num when bitstream_restriction_flag is enabled.

Change-Id: Ib14e54be3f5149cf4150ac63fe66d88171c14c2b
Signed-off-by: shihong.zheng <shihong.zheng@amlogic.com>
2019-07-23 17:52:49 +09:00
Nanxin Qin
fdfd1e23b1 amvdec_ports: fixed the build err with the kernel 32bit.
PD#170885

Change-Id: I2d4ed2e0dc2497190f00e24e96b28223d675c0dc
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
2019-07-23 17:52:49 +09:00
Nanxin Qin
683ef21d17 amvdec_ports: optimize some codes of the v4l vcodec.
PD#170885

1. support the h264 decoding with multi-instance.
2. the reference count of clk mux has't clean was fixed.
3. replace capture worker to thread process.
4. optimize the machine status of the vcodec.
5. remover some locks unnecessary to promote efficiency.
6. the picture infos used to vda that was fixed.

Change-Id: I061ebdc088c8c7e14eab73032308715da5f4aafb
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
2019-07-23 17:52:49 +09:00
Peng Yixin
8a1571bf31 media_module: h265: fast output the first I frame
PD#172137:
the first I frame output when decoder statu is HEVC_DECPIC_DATA_DONE.

Change-Id: Ib6625b670268b8d9c251c05e261a137199677f6c
Signed-off-by: Peng Yixin <yixin.peng@amlogic.com>
2019-07-23 17:52:49 +09:00
Hui Zhang
d2a0e21fa9 media_module: support 264 mmu for G12A
PD#169065: add 264 mmu support for G12A

ucode gerrit: 47098

Change-Id: I8b0b97005c2f6d9b19a271dab258c014c06bd4e0
Signed-off-by: Hui Zhang <hui.zhang@amlogic.com>
2019-07-23 17:52:49 +09:00
Hui Zhang
b81f149cde media_module: fix MAX_BUF_NUM redefine issue
PD#166415: vp9: fix MAX_BUF_NUM MACRO redefine issue

Change-Id: I54370f682cf6ddfd24d25ef450f2c5b74e944337
Signed-off-by: Hui Zhang <hui.zhang@amlogic.com>
2019-07-23 17:52:49 +09:00
jintao xu
e6db8b0669 decoder: set vp9 buffer to 12 for cpu id less than G12A
PD#166415:

Change-Id: Id5a5b4abe2753f7503796c161abd65aa09ec90d5
Signed-off-by: jintao xu <jintao.xu@amlogic.com>
2019-07-23 17:52:49 +09:00
shihong.zheng
558a8cd709 vmpeg12: fix mpeg12 fw tee_load fail
mpeg12 fw tee load will be fail without name, must pass
a name.

Change-Id: I5bf12ce9158237687c93acc0c54d4c29460cecea
Signed-off-by: shihong.zheng <shihong.zheng@amlogic.com>
2019-07-23 17:52:49 +09:00
shihong.zheng
1a63229ef3 decoder: optimize code and sync from iptv
PD#170744: decoder:
1. fix mh264 mosaic when play mjpeg at sametime in frame mode;
2. sync the mjpeg multi play code;
3. add the mpeg2&mpeg4 multi play code;
4. force exit when load ucode fail;
5. set time out for vdec_disconnet wait_for_completion;
6. reset core when active vdec to disconnect list and before run;
7. fix some coverity error;
8. remove ucode load when mmu enable in vmh264 init.

Change-Id: Ic8f296526ddac5b3904a323ce2850b1d9178a284
Signed-off-by: shihong.zheng <shihong.zheng@amlogic.com>
2019-07-23 17:52:49 +09:00
zhilei.wu
48ee09ae0d vh265: output the correct sei information for dv
PD#169710: vh265: output the correct sei information for dv

Change-Id: I60368cdfa04e76d4b5b5bad5c2c066a50a878431
Signed-off-by: zhilei.wu <zhilei.wu@amlogic.com>
2019-07-23 17:52:49 +09:00
Nanxin Qin
9cf96f904b firmware: update video_ucode.bin
PD#172379:
add a firmware of vp9_mmu for g12a.

ucode commitid:
db4e7eba46d4e88be1cca178e7ee523c14dd9a08

Change-Id: I2f2d02ec387b3b276245f4480409dc8c934f2473
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
2019-07-23 17:52:49 +09:00
Jian Wang
e5d993404e amstream: copy drm flags for slave dec
PD# 171839

copy drm flags for slave dec

Change-Id: Ib1b68b7d72b451e6d2694f518148691004490222
2019-07-23 17:52:49 +09:00
Peng Yixin
43e4a8b210 vh265: config hevc buf num by node
PD#172077

the value of dynamic_buf_num_margin was not set before, it causes the allocation of memory fail when config 1G DDR, so modify the code to set its value in driver.

Change-Id: I86d1f1dac5936bad693f6643826ee35596fb0bac
Signed-off-by: Peng Yixin <yixin.peng@amlogic.com>
2019-07-23 17:52:49 +09:00
Ao Xu
bf633a3836 media_module: solve 32bit compile error
PD#169652: media_modules: solve 32bit compile error

Change-Id: Id12608913df7372a303606dbf39b1f349eaaf08d
Signed-off-by: Ao Xu <ao.xu@amlogic.com>
2019-07-23 17:52:49 +09:00
Nanxin Qin
4bf595fa56 decoder: fixed an issue of the h263 playback.
PD#172068
needs to use VIDEO_DEC_H263 on the firmware loading.

Change-Id: Ia55c47046a848bb300947e5f3b79a73ae2203c05
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
2019-07-23 17:52:49 +09:00
Peng Yixin
fa6ba91951 vmh264: fix block in isr thread.
PD#167539

max_frame_num value exceeds the maximum value in the specification, and that cause block.
judge the validity of max_frame_num value to solve this issue.

Change-Id: Ic08e3f419e18d823cee4d0309b940dffa2058249
Signed-off-by: Peng Yixin <yixin.peng@amlogic.com>
2019-07-23 17:52:49 +09:00
Peng Yixin
38250cbd4a media_module: Getting hdr information from ucode for mh264 and mpeg2
PD#167533:

ucode gerrit id: 49327 and 49371

Change-Id: Id55415f32884425391b128b2e34d57e7a77e5191
Signed-off-by: Peng Yixin <yixin.peng@amlogic.com>
2019-07-23 17:52:49 +09:00
Nanxin Qin
3381e66954 modules: the firmware loading the way was optimized.
PD#171042:
1. removed the way which used cpu type to choice fw.
2. removed redundant code.

ucode gitid
45b7330fd00f96d2e9859ac1ec91d1e46f70a1b2

Change-Id: Ie737701e682244223e437b2d6c5eb02420e10fbb
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
2019-07-23 17:52:49 +09:00
Peng Yixin
9e1e8402e0 media: fix some coverity error
PD#170543

Change-Id: I8494394be526b99f16eab43f5510d4b48aa4a311
Signed-off-by: Peng Yixin <yixin.peng@amlogic.com>
2019-07-23 17:52:49 +09:00
Chuanzhi Wang
f84109b20a media_module: Add configuration items to control dvb module compilation.[2\2]
PD#169652: media_module: add CONFIG_AMLOGIC_DVB

Change-Id: If44aa8cb7f8119320d10413615da9b3606fed522
Signed-off-by: Chuanzhi Wang <chuanzhi.wang@amlogic.com>
2019-07-23 17:52:49 +09:00
nengwen.chen
76c96cd404 hw_demux: fix compile error by commit 'add xtal config for tuner' [1/1]
PD#171245: fix compile error by commit 'add xtal config for tuner'

Change-Id: I303bce09f127ee8e11417e570bcdf468b2f92eeb
Signed-off-by: nengwen.chen <nengwen.chen@amlogic.com>
2019-07-23 17:52:49 +09:00
Tellen Yu
1fdc1fa5cc Revert "hw_demux: add xtal config for tuner [2/3]"
This reverts commit fc1f54405421230a43f5f472bb79de4b64dae480.

Change-Id: I15d10a6ca42ceeb249a10b0bb55c0f7febce4ab4
2019-07-23 17:52:49 +09:00
Hui Zhang
ec67375d53 media_module: add vmh264 ip only mode
PD#170460:
   vmh264: decoder get ip only flag from application and
 enable ip only fast output in dpb.

Change-Id: I15a160c65bd0e23324a356c5f78957884395e8d2
Signed-off-by: Hui Zhang <hui.zhang@amlogic.com>
2019-07-23 17:52:49 +09:00
nengwen.chen
9f5ff17601 hw_demux: add xtal config for tuner [2/3]
PD#171245: add xtal config for tuner

Change-Id: I62bc6dd3c5a154d3cc439d8542b99ecb4f0ccbdf
Signed-off-by: nengwen.chen <nengwen.chen@amlogic.com>
2019-07-23 17:52:49 +09:00
shihong.zheng
c0bc723b1d 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: I57995a56257e592ceb122ee3420f3201f3b913b8
Signed-off-by: shihong.zheng <shihong.zheng@amlogic.com>
2019-07-23 17:52:49 +09:00
Hui Zhang
46539beba2 PD#170564: optimize mpeg4 decoedr
Change-Id: I3499150842ece14f4a6302840aff65c5414e29e1
Signed-off-by: Hui Zhang <hui.zhang@amlogic.com>
2019-07-23 17:52:49 +09:00
Chuangcheng Peng
ed0282932f demux:close print info
PD# 170313

Change-Id: I67c0c3141712797311a95af0320b87487ada7f5a
Signed-off-by: Chuangcheng Peng <chuangcheng.peng@amlogic.com>
2019-07-23 17:52:49 +09:00
Rong Zhang
63adcffa88 PD#170621: MH264: level_idc is read from local memory uncorrectly
ucode gerrit id: 48715

Change-Id: I07f2fd75bb9148b35fe68fa08db822d36897e891
Signed-off-by: Rong Zhang <rong.zhang@amlogic.com>
2019-07-23 17:52:49 +09:00
Peng Yixin
2204358fe1 media: Support Closed Caption and subtitle.
PD#170181

1.Add Support Closed Caption driver code.
2.Add subtitle driver code.

Change-Id: If0c6023592c8a3f9fb50a301fe46c6dc3cadb2f1
Signed-off-by: Peng Yixin <yixin.peng@amlogic.com>
2019-07-23 17:52:49 +09:00
Yixin Peng
74a6910af7 vdec: reduce CPU usage.
PD#170687

1.modify code: decode schedule doesn't work when video isn't play.

Change-Id: I7dfbe1b90e30980e05003404a8b4275502153639
2019-07-23 17:52:49 +09:00
nengwen.chen
6c4eb9137c hw_demux: modify tuner config in dts [2/3]
PD#170567: modify tuner config in dts

Change-Id: Icb47d7e68c220b7fe98281d308a971a5cbdd768a
Signed-off-by: nengwen.chen <nengwen.chen@amlogic.com>
2019-07-23 17:52:49 +09:00
rongrong zhou
7ff5d2db36 codec_mm: fix alloc fail issue
PD# 169831

1. if alloc bmmu idx fail, try free keep video
2. delete redundant code to set the connected status in vmjpeg_multi

Change-Id: I356be5cf530600c3b439b4beab6289eba98c9d1a
2019-07-23 17:52:49 +09:00
Rong Zhang
09700c2fbb PD#169326: H265: support over decode check for single mode
ucode gerrit id: 47661

Change-Id: Ib4bbc5854f9c4fe89308188814179e3ecad02465
Signed-off-by: Rong Zhang <rong.zhang@amlogic.com>
2019-07-23 17:52:49 +09:00
Hui Zhang
040fa9e2fe media_module: add 265 non-mmu ucode support
PD#170347: vh265:
	for multi-instances application . double write will be set to 0x10
for memory saving , (double write only mode), it must run under non-mmu
mode. so add non-mmu ucode to support it.
	ucode gerrit: 48398

Change-Id: I70d9c2186ceb03fb3eff28478548da571d265b4c
Signed-off-by: Hui Zhang <hui.zhang@amlogic.com>
2019-07-23 17:52:49 +09:00
Yahui Han
83f81c8481 dvb: merge from projects/verimatrix/905d-android-0425. [1/1]
PD# 152116

support config aysncfifo buffer length in dts file.

Change-Id: Ie996fb93b654f1c7ebd86cab0656a0959c6fd537
2019-07-23 17:52:49 +09:00
shihong.zheng
56d8cdee56 vh265: fix crash in task handle
PD#168978

gHevc will free when module remove, but h265_task process is not quit,
and will run before kthread_run again. add task break after stop.

Change-Id: I3bb88801eb093c29237bf410221f5067f923f08d
Signed-off-by: shihong.zheng <shihong.zheng@amlogic.com>
2019-07-23 17:52:49 +09:00
Peng Yixin
db300ca1de media_module: fix issue on h265
PD#167443:
1.fix allocate memory fail: add a judgment statement about the width and height of video.
2.add code to put mv buffer when already got mv buffer and allocation mmu memory failure.

Change-Id: I9934716cbe0157b02b5f64c6a53e73bb8e1d7fc2
Signed-off-by: Peng Yixin <yixin.peng@amlogic.com>
2019-07-23 17:52:49 +09:00
Peng Yixin
a7aeb2aa48 PD#167020: vdec: fix cann't play all video after use aiqiyi play video
1.Delete redundant code to set the connected statu in mh264
2.add mutex, to fix core schedule statu is active but no decoder being scheduled, it cause all video cann't play.

Change-Id: Ica094d8068be78d36699749c5b32e8e3ad34d4ca
Signed-off-by: Peng Yixin <yixin.peng@amlogic.com>
2019-07-23 17:52:49 +09:00
Conglin Guo
3be62d451e media_module: interface optimization for get cpu id
PD#168480:media_module:
1: interface optimization for get cpu id

Change-Id: Ic5211341becf381347f89bc2a1d41c0482a847e8
Signed-off-by: Conglin Guo <conglin.guo@amlogic.com>
2019-07-23 17:52:49 +09:00
Hui Zhang
c6e24e8e29 media_module: fix issue on gts
PD#169800: vmh264: change error_proc_policy for gts test
	
        bit[12] = 1 : i_only when error happen.
        old policy may discard many pictures when error happen,it will lead gst 
        test fail. So change this policy to disbaled to  meet gst test

Change-Id: I02d64285e012ac26433884aba8764162171e3e97
Signed-off-by: Hui Zhang <hui.zhang@amlogic.com>
2019-07-23 17:52:49 +09:00
Nanxin Qin
ca44d65706 fw: optimize the code that cause the mem leak.
PD#168987

Change-Id: Ie71c41778ef909c0c676d93d3e87e2644d935cdf
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
2019-07-23 17:52:49 +09:00
shihong.zheng
9ceecdb7d1 vmjpeg: add g12b mjpeg ucode
PD#168987

add g12b pure hardware decode to improved performance.

Change-Id: I2c61fe4ba1a6ae97dc1c437cc969fe486c37be16
Signed-off-by: shihong.zheng <shihong.zheng@amlogic.com>
2019-07-23 17:52:49 +09:00
nengwen.chen
68ff3759d7 hw_demux: txl: add dtmb for txl
PD#169838: hw_demux: txl: add dtmb for txl

Change-Id: Ibfdce0f298cfec3e77a1221b975dca8879254604
Signed-off-by: nengwen.chen <nengwen.chen@amlogic.com>
2019-07-23 17:52:49 +09:00
Conglin Guo
6ce9ee378d media_module: get chip id info from device tree
PD#168480:get cpu id ver from  dts ,in stead of get_cpu_type interface

Change-Id: Ib96afad61995282c56716268db70149b27c3cd3d
Signed-off-by: Conglin Guo <conglin.guo@amlogic.com>
2019-07-23 17:52:49 +09:00
Nanxin Qin
a11dd82dca fixed an issue with building on the Android P.
PD#153299:
BOARD_AML_VENDOR_PATH instead of ANDROID_BUILD_TOP.

Change-Id: I5e7724d334379cc97795b144b652688ff14ded1b
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
2019-07-23 17:52:49 +09:00
shihong.zheng
14f66edb98 h265: fix dolby vision video cannot play [1/2]
PD#169274: dv: merge rain dolby vision support bypass_el,
fix cache dirty problem patch from 3.14. related bug is 166832.

Change-Id: Idf07dd5d1c9fccd7ec8a1f11d5213f9ce2b0db43
Signed-off-by: shihong.zheng <shihong.zheng@amlogic.com>
2019-07-23 17:52:49 +09:00