Commit graph

2820 commits

Author SHA1 Message Date
Harish Mahendrakar
de04474be6 Merge "Added CMakeLists.txt for x86/x64 build" am: c6d02cd3df
am: ab5b036e75

Change-Id: I556e8b341ae2685f5ec1fbcdc91d448e8cd761be
2019-08-15 14:49:53 -07:00
Harish Mahendrakar
ab5b036e75 Merge "Added CMakeLists.txt for x86/x64 build"
am: c6d02cd3df

Change-Id: Ib5316e158d0fc3183b9185da8cc734da9511098e
2019-08-15 14:37:09 -07:00
Treehugger Robot
c6d02cd3df Merge "Added CMakeLists.txt for x86/x64 build" 2019-08-15 20:33:30 +00:00
Xin Li
2bf070e0ac [automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master am: 9f3122c427 -s ours
am: 61b451ddf1 -s ours
am skip reason: subject contains skip directive

Change-Id: I3f0ea87d124b2799c339d8ce3ac3c64ae3409406
2019-08-14 23:50:44 -07:00
Xin Li
61b451ddf1 [automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master
am: 9f3122c427 -s ours
am skip reason: subject contains skip directive

Change-Id: I32b2a6d9922a22ae3f41d35b1d2d5dfc8677e021
2019-08-14 23:30:39 -07:00
Xin Li
9f3122c427 DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master
Bug: 139369544
Change-Id: If2c60e9bc1ed74a5204f42efd04f069f781b7ecf
2019-08-13 16:36:35 -07:00
android-build-team Robot
373d5d9baf Snap for 5674421 from b536cc95b0 to pi-platform-release
Change-Id: I2777fb6a6b2ae26f6aa3185d70b4f617350ad1b1
2019-08-13 16:28:17 +00:00
Harish Mahendrakar
c315d743f9 Added CMakeLists.txt for x86/x64 build
Bug: 135629550
Test: cmake && make
Change-Id: I44a611b6123600b5c7dfec07ad09e2d98c667635
2019-08-05 23:19:32 +00:00
Xin Li
eee112a16f DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master
Bug: 134405016
Change-Id: I72440490aead58587713874572a5981b3bfbe4a3
2019-07-01 20:59:30 +00:00
android-build-team Robot
b536cc95b0 Merge cherrypicks of [7995446, 7995447, 7996042, 7996138, 7995448, 7995449, 7995789, 7995790, 7995450, 7996029, 7996030, 7996139, 7996140, 7996141, 7996142, 7996143, 7996144, 7995544, 7995545, 7995546, 7995547, 7995548, 7995549, 7995550, 7996145, 7996146, 7996032, 7996147, 7996148, 7996149, 7996150, 7994747, 7994748, 7995451, 7994749, 7994750, 7995966, 7995967, 7994751, 7996151, 7996152, 7996153] into pi-qpr3-b-release
Change-Id: I3436902e2cb5cc53e9c09ffeb32ca08ea696531c
2019-06-12 09:56:51 +00:00
Rakesh Kumar
13de16c79e Decoder: Delete node from st if lt and st point to same
If lt_list and st_list point to same node then delete it from st.
If there is error while adding a node in bottom field of lt_list (top is
already added) then this node will be pointed by st_list also. So we need
to remove it from st_list

bug: 73552574
Test: poc before/after on Android N security branch
Change-Id: I95304c242c5854b18c5c7220d114ce6215760124
(cherry picked from commit f312a1d305)
2019-06-12 09:54:49 +00:00
Isha Kulkarni
ae2d934d1c Merge "Decoder: Add error check for expected_poc in ih264d_decode_pic_order_cnt" into qt-dev
am: 6db97fcc8d

Change-Id: I4085ac83977bcbfb20f065f3f27f14ad90add2bc
2019-05-30 10:41:41 -07:00
TreeHugger Robot
6db97fcc8d Merge "Decoder: Add error check for expected_poc in ih264d_decode_pic_order_cnt" into qt-dev 2019-05-30 17:31:28 +00:00
Rakesh Kumar
f62e430507 [automerger] Decoder: Delete node from st if lt and st point to same am: f312a1d305 am: f82a1f8d7f am: ae2c8cfdc1 am: 8332d0bfa2 am: 1e6ef7fee5 am: b1734142ff am: 9460fbd521 am: 224bcf4592 am: d406f08816
am: 75cd59e45b

Change-Id: I756104f5abeb4c46374d1aaa11d1fd5898bce6a3
2019-05-29 14:39:39 -07:00
Rakesh Kumar
75cd59e45b [automerger] Decoder: Delete node from st if lt and st point to same am: f312a1d305 am: f82a1f8d7f am: ae2c8cfdc1 am: 8332d0bfa2 am: 1e6ef7fee5 am: b1734142ff am: 9460fbd521 am: 224bcf4592
am: d406f08816

Change-Id: I1351851c15384868d9ab579857e4fc46076f5942
2019-05-29 14:31:32 -07:00
Rakesh Kumar
d406f08816 [automerger] Decoder: Delete node from st if lt and st point to same am: f312a1d305 am: f82a1f8d7f am: ae2c8cfdc1 am: 8332d0bfa2 am: 1e6ef7fee5 am: b1734142ff am: 9460fbd521
am: 224bcf4592

Change-Id: I17d333502eaf3084c0c08dd0fd2a4494c3251ab4
2019-05-29 14:23:26 -07:00
Rakesh Kumar
224bcf4592 [automerger] Decoder: Delete node from st if lt and st point to same am: f312a1d305 am: f82a1f8d7f am: ae2c8cfdc1 am: 8332d0bfa2 am: 1e6ef7fee5 am: b1734142ff
am: 9460fbd521

Change-Id: I0c53bc30225153ff03d44670f6967a05e161c654
2019-05-29 14:16:23 -07:00
Rakesh Kumar
9460fbd521 [automerger] Decoder: Delete node from st if lt and st point to same am: f312a1d305 am: f82a1f8d7f am: ae2c8cfdc1 am: 8332d0bfa2 am: 1e6ef7fee5
am: b1734142ff

Change-Id: I86f63de8c4eb3c534aeafbbb592c738f8805188c
2019-05-29 14:11:21 -07:00
Isha Kulkarni
89daff526a Decoder: Add error check for expected_poc in ih264d_decode_pic_order_cnt
Bug: 131625739
Test: Validate with poc in bug

Change-Id: I3e1c132e28ad35541a0b9c4632b1f43611b90dea
2019-05-29 13:46:13 -07:00
Xin Li
3e60f2dbed [automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master
am: 8fc003e205 -s ours
am skip reason: subject contains skip directive

Change-Id: I7298fc8b6359e040faad40e71eaac093f2bbe287
2019-05-13 17:42:24 -07:00
Xin Li
8fc003e205 DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master
Bug: 132622481
Change-Id: I412fce0a111b51a5a56bb455cb3588d92ceb30ec
2019-05-13 15:39:08 -07:00
Thomala Srinivas
261b9745b4 Merge "libavcenc: Fix B frame incomplete subgop issue" into qt-dev
am: 26bcb6b37b

Change-Id: I2f009eff3986783c4a08697994ce3d2540c6be82
2019-05-10 18:29:20 -07:00
TreeHugger Robot
26bcb6b37b Merge "libavcenc: Fix B frame incomplete subgop issue" into qt-dev 2019-05-11 00:45:45 +00:00
Thomala Srinivas
5c3b992b6f libavcenc: Fix B frame incomplete subgop issue
The encoder doesn't return remaining frames if last subgop is
incomplete. This problem is solved by swapping last NULL P frame
(as subgop is incomplete last P frame will be NULL) with the
last valid (non- NULL) B frame. Complete subgop swapping is not done.

Also update MAX_NUM_BFRAMES to 8 and added a separate macro to
define maximum number of pictures in input queue

Bug: 132063959
Test: run cts -m CtsMediaTestCases \
 -t android.media.cts.VideoEncoderTest
Change-Id: I9625c5f5f64ec60032c44dad54f735991921d6dd
2019-05-10 15:06:15 -07:00
Android Build Merger (Role)
b1734142ff [automerger] Decoder: Delete node from st if lt and st point to same am: f312a1d305 am: f82a1f8d7f am: ae2c8cfdc1 am: 8332d0bfa2 am: 1e6ef7fee5
Change-Id: Id6d3411d949ae069369d7bef1c50f904cf9c97dc
2019-05-08 18:45:13 +00:00
Android Build Merger (Role)
1e6ef7fee5 [automerger] Decoder: Delete node from st if lt and st point to same am: f312a1d305 am: f82a1f8d7f am: ae2c8cfdc1 am: 8332d0bfa2
Change-Id: Ie1677fa6ad378564e164729d80b7d1edf4bd214c
2019-05-08 18:45:11 +00:00
Android Build Merger (Role)
8332d0bfa2 [automerger] Decoder: Delete node from st if lt and st point to same am: f312a1d305 am: f82a1f8d7f am: ae2c8cfdc1
Change-Id: Iebc6317ca7ae7f6417cfd1e1cff39110e6fe82db
2019-05-08 18:45:09 +00:00
Android Build Merger (Role)
ae2c8cfdc1 [automerger] Decoder: Delete node from st if lt and st point to same am: f312a1d305 am: f82a1f8d7f
Change-Id: Ibca538dbd7a3d262fa87ca47d3f951a9b6c1e9f4
2019-05-08 18:45:07 +00:00
Android Build Merger (Role)
f82a1f8d7f [automerger] Decoder: Delete node from st if lt and st point to same am: f312a1d305
Change-Id: I90a0c3fca5d7542301994711448d7c79fe98e704
2019-05-08 18:45:05 +00:00
Rakesh Kumar
f312a1d305 Decoder: Delete node from st if lt and st point to same
If lt_list and st_list point to same node then delete it from st.
If there is error while adding a node in bottom field of lt_list (top is
already added) then this node will be pointed by st_list also. So we need
to remove it from st_list

bug: 73552574
Test: poc before/after on Android N security branch
Change-Id: I95304c242c5854b18c5c7220d114ce6215760124
2019-05-08 11:44:40 -07:00
android-build-team Robot
7b42c48cc6 Snap for 5450365 from 48900d4e51 to pi-platform-release
Change-Id: I672f09de3677ccbc8e851628100da8e467a5507b
2019-05-07 21:52:43 +00:00
Harish Mahendrakar
69137d1704 Merge "decoder: Remove skip picture support" into qt-dev
am: 6cb07e106a

Change-Id: I9a8e7503ee0a475eb0df73179d5d7099a2ce6490
2019-05-04 17:12:46 -07:00
TreeHugger Robot
6cb07e106a Merge "decoder: Remove skip picture support" into qt-dev 2019-05-04 21:16:35 +00:00
Ritu Baldwa
d7d3cf0205 Merge "Decoder: Add missing error checks for parsing sps or pps" into qt-dev
am: a09be99800

Change-Id: Ib0d6a80bb5de0f206b493af5da70ccb651eb9623
2019-05-04 12:45:58 -07:00
TreeHugger Robot
a09be99800 Merge "Decoder: Add missing error checks for parsing sps or pps" into qt-dev 2019-05-04 19:37:30 +00:00
Harish Mahendrakar
49a55273e4 decoder: Treat unsupported feature errors as fatal errors
am: 54160a6d3e

Change-Id: If8d2ad6d3219f1bda65ba140e2a92ffc048c2f6e
2019-05-01 21:17:30 -07:00
Harish Mahendrakar
4f95fc0b9c decoder: Remove skip picture support
SKIP_P and SKIP_PB support was experimental and is not used
in libstagefright

Bug: 130541597
Test: poc in bug
Change-Id: If13b435e80d13d57de2fee0aa07ea7e6abca481b
2019-05-01 13:18:27 -07:00
Ritu Baldwa
b3427a4c49 Decoder: Add missing error checks for parsing sps or pps
Return error to application if valid sps or pps has not been decoded.
Also add check to prevent parsing of pps, if valid sps is not present.

Test: Tested a few clips with missing sps/pps
Bug: 129746168
Bug: 130575087

Change-Id: I1a6409d1cffc66c1b910d2102ab10a94e0227107
2019-05-01 13:01:23 -07:00
Harish Mahendrakar
54160a6d3e decoder: Treat unsupported feature errors as fatal errors
This will ensure clips with supported bitdepth or unsupport color
formats are not attempted to be decoded till end of the sequence.

Bug: 130578045
Test: adb shell stagefright -s -S /sdcard/crowd422_h264.mp4
Test: Ensure decoder doesn't attemp decoding all frames

Change-Id: I118ef2141f77986f6ec65c91dfeaa7ef17646c43
2019-04-30 17:14:01 -07:00
Harish Mahendrakar
9c7675094c Encoder: Increased max supported bitrate
am: fabba6afaf

Change-Id: I9a2a0dcf3af6e473fd73910f0f816d1b45b873b2
2019-04-15 16:14:12 -07:00
Harish Mahendrakar
fabba6afaf Encoder: Increased max supported bitrate
Increased max bitrate to 240mbps
Bug: 116040772
Test: CTS test

Change-Id: I87d5e2e540e72d3a41a04becf01ff13965361a23
2019-04-15 12:42:48 -07:00
S Hamsalekha
65477dcfb9 Decoder: Replacing some numbers with equivalent macros.
Bug: 118445723
Test: vendor
Change-Id: I2dbdf3bf289c34409db341d7c0502cd88a20bab5
2019-03-28 14:40:47 -07:00
Isha Kulkarni
34769a5b08 Decoder: Fix Integer Sanitizer Issues
Bug: 118445723
Test: vendor
Change-Id: I719898beb93ca5d20d9822f685ac6d4920252cdf
2019-03-28 14:40:40 -07:00
Isha Kulkarni
43dc60e81e Decoder: Fix Integer Sanitizer Issues in ih264d_parse_cavlc
Bug:118445723
Test: vendor
Change-Id: I71b3c0f548b57c51c80de0bd4c640f56b2f31a55
2019-03-28 14:40:34 -07:00
Isha Shrikant Kulkarni
96f7193ba0 Decoder: Fix integer sanitizer issues in ih264d_parse_cabac
Bug: 118445723
Test: vendor
Change-Id: Icf98785fa474bd9c774ba4282b9c3d73360a69ea
2019-03-28 14:40:27 -07:00
Isha Shrikant Kulkarni
fc7139a53e Decoder: Fix Integer Sanitizer issues in ih264d_process_bslice
Bug: 118445723
Test: vendor
Change-Id: Ib5d8f72be016330beafa6e7996976eeff1b23c39
2019-03-28 14:40:17 -07:00
Xin Li
fb23fbfa68 [automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into master am: 76461ebab8 -s ours am: d3539c5765 -s ours
am: b605d5282b -s ours
am skip reason: subject contains skip directive

Change-Id: I9e651afed5c9fe347b8b23a7befd8f058a2f3f50
2019-03-12 22:56:36 -07:00
Xin Li
b605d5282b [automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into master am: 76461ebab8 -s ours
am: d3539c5765 -s ours
am skip reason: subject contains skip directive

Change-Id: I03f0dc6434ceb56a9101e5ca0e8eccf70fd30e57
2019-03-12 22:29:25 -07:00
Xin Li
d3539c5765 [automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into master
am: 76461ebab8 -s ours
am skip reason: subject contains skip directive

Change-Id: I17af56eae52d99b95946b4f080c87f1ced9fcc7b
2019-03-12 21:21:39 -07:00
The Android Open Source Project
17ddb978a8 [automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into stage-aosp-master am: 0196074a0a -s ours
am: 184fc557a2 -s ours
am skip reason: subject contains skip directive

Change-Id: I576d8576ec68e59961644cac7646f293d1c1af01
2019-03-11 09:32:08 -07:00