Commit graph

2813 commits

Author SHA1 Message Date
Harish Mahendrakar
2bf6790f63 decoder: Update check for first mb in slice am: 7e06940dce am: 4fb26568a9
Original change: 13171299

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I062c47998e23df0fe4d9c18ad9622aa55eb7ec96
2020-12-09 01:33:06 +00:00
Harish Mahendrakar
4fb26568a9 decoder: Update check for first mb in slice am: 7e06940dce
Original change: 13171299

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0c8a04ddea6fc1a08fcde807f7c78c8810a5ce81
2020-12-09 01:02:10 +00:00
Harish Mahendrakar
7e06940dce decoder: Update check for first mb in slice
first_mb_in_slice shouldn't be >= mbs in the picture.

Test: poc in bugs
Bug: b/174238784
Bug: b/174507022
Bug: oss-fuzz:27856
Bug: oss-fuzz:28039
Change-Id: Id3a41c8c2ddf814910fc2d5dd4f57bdd84d28fec
2020-12-04 16:09:10 -08:00
Automerger Merge Worker
4b7a562681 Merge "decoder: Fix minimum poc calculation check while adding to display" into oc-dev am: 9d7a036d7b am: cebf26ab4d am: f64194a96f am: ed2b83d989
Change-Id: I7feff45df303f49d95b4d5b07019929dead2810c
2020-01-09 04:38:27 +00:00
Automerger Merge Worker
ed2b83d989 Merge "decoder: Fix minimum poc calculation check while adding to display" into oc-dev am: 9d7a036d7b am: cebf26ab4d am: f64194a96f
Change-Id: I7bd7ba5f8adb66af75ef92257576bef227507f15
2020-01-09 04:21:17 +00:00
Automerger Merge Worker
f64194a96f Merge "decoder: Fix minimum poc calculation check while adding to display" into oc-dev am: 9d7a036d7b am: cebf26ab4d
Change-Id: Ib8872212d43d41ae25f28992b6c02ab15cb72b26
2020-01-09 04:06:39 +00:00
Automerger Merge Worker
cebf26ab4d Merge "decoder: Fix minimum poc calculation check while adding to display" into oc-dev am: 9d7a036d7b
Change-Id: I8d4b3415dfe5d2148f3211de258798de214559d0
2020-01-09 03:49:11 +00:00
TreeHugger Robot
9d7a036d7b Merge "decoder: Fix minimum poc calculation check while adding to display" into oc-dev 2020-01-09 03:32:14 +00:00
Harish Mahendrakar
ffcf2a87d6 decoder: Fix minimum poc calculation check while adding to display
While adding the decoded buffer to display queue, allow buffer with
poc set to 0x7FFFFFFF

Bug: 145364230
Test: poc in bug
Change-Id: I2a15f73b8422cfa4fd3360bc21c0cea4542a3375
2020-01-02 10:22:38 -08:00
Harish Mahendrakar
662efee177 decoder: Move initialization of dbp_mgr entries to init_decoder() am: 01da7b5a52 am: 41fcd228ae am: cce42ea920
am: 6c9873af88

Change-Id: Ie95d6b810f751847eed7bc2c17c120a891b88fef
2019-11-05 16:52:06 -08:00
Harish Mahendrakar
6c9873af88 decoder: Move initialization of dbp_mgr entries to init_decoder() am: 01da7b5a52 am: 41fcd228ae
am: cce42ea920

Change-Id: Ic12eb8cd9a900cae262b9f2e8a28925b33e4a018
2019-11-05 16:43:04 -08:00
Harish Mahendrakar
cce42ea920 decoder: Move initialization of dbp_mgr entries to init_decoder() am: 01da7b5a52
am: 41fcd228ae

Change-Id: Id8fa44c3401f7ac1d2a540fa35cf0f4346da2c42
2019-11-05 16:31:59 -08:00
Harish Mahendrakar
41fcd228ae decoder: Move initialization of dbp_mgr entries to init_decoder()
am: 01da7b5a52

Change-Id: I93871c49b268b3ead96db8e44eb268c70f124379
2019-11-05 16:25:58 -08:00
Harish Mahendrakar
01da7b5a52 decoder: Move initialization of dbp_mgr entries to init_decoder()
Earlier these were only initialized during static buffer allocations.
Initializing them in init_decoder() will ensure that these get
initialized to default values during reset() as well. Without this,
in some error cases, there is a possibility of heap-use-after free,
when resolution changes and these pointers point to memory that is freed

Bug: 142602711
Test: poc in bug
Change-Id: Ie39fee0eca56bf32cdc558099bf167d05eb89620
2019-10-29 19:52:49 -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
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
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
TreeHugger Robot
6cb07e106a Merge "decoder: Remove skip picture support" into qt-dev 2019-05-04 21:16:35 +00: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
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
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
The Android Open Source Project
184fc557a2 [automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into stage-aosp-master
am: 0196074a0a -s ours
am skip reason: subject contains skip directive

Change-Id: I4201b205b739e6ac253c73c55f04b1b8942fc2fd
2019-03-11 09:19:22 -07:00
Xin Li
76461ebab8 DO NOT MERGE - Merge PPRL.190305.001 into master
Bug: 127812889
Change-Id: I92a7733be6b1a12e87d8ed066dbd7dba4af5f576
2019-03-11 09:13:24 -07:00
The Android Open Source Project
0196074a0a DO NOT MERGE - Merge PPRL.190305.001 into stage-aosp-master
Bug: 127812889
Change-Id: I9fb6688097aab43770c668060c0e6769f44eae4d
2019-03-08 15:56:56 -08:00
android-build-team Robot
bbe89f4115 Snap for 5240760 from 44fa3522bc to pi-platform-release
Change-Id: I09a46a7a06215c26684268daec1fc4b7452daafd
2019-03-08 18:36:46 +00:00
Xin Li
c8429b6e97 Merge stage-aosp-master into pi-dev-plus-aosp
am: 42bae9665c

Change-Id: I5cb212c77d8af05fd73439ea06433b9cdd32c21d
2019-02-25 04:07:47 -08:00
Xin Li
42bae9665c Merge stage-aosp-master into pi-dev-plus-aosp
Bug: 126125118
Change-Id: If7b6d433bacf767516d2c27e3e1c3a365672a3e2
2019-02-25 00:28:39 -08:00
Xin Li
1c16be3720 DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
Bug: 120848293
Change-Id: Ie3a560c6683a7b355ad06d0f015cb536f327c8a4
2019-02-21 09:24:55 -08:00