Commit graph

2833 commits

Author SHA1 Message Date
Isha Kulkarni
2f8dcdd41a Decoder: Avoid overlapping memcpy while initializing ref lists
Bug: 117608404
Test: poc with valgrind before/after

Change-Id: I73f2c5302376af11a8f922ceb2e0b1c9cf883f8b
2019-07-16 15:28:02 -07:00
TreeHugger Robot
c83038ec70 Merge "decoder: set u4_frame_decoded to true only after both fields are decoded" 2019-07-11 21:08:57 +00:00
Xin Li
4e78d526d8 [automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: eee112a16f
am: e9882b61ad -s ours
am skip reason: subject contains skip directive

Change-Id: Ibabd1b4c6b84cf72445c3d1f46010d514ca9bf56
2019-07-02 15:29:34 -07:00
Xin Li
e9882b61ad DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master
am: eee112a16f

Change-Id: Ibc67e33b581e23e9da20322ced7897a16372e331
2019-07-02 13:04:32 -07: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
Harish Mahendrakar
f76370c671 decoder: set u4_frame_decoded to true only after both fields are decoded
Currently frame_decoded was set to 1 after first field was decoded
This field in output wasn't used so far, hence no issue was seen till
now.

Bug: 135146280
Test: poc in bug
Change-Id: I90e20134258d828107adf43b5b3e37d4bd375cbd
2019-06-19 15:13:03 -07:00
Isha Kulkarni
38e81e6e87 Merge "Decoder: Add error check for expected_poc in ih264d_decode_pic_order_cnt" into qt-dev am: 6db97fcc8d am: ae2d934d1c
am: 8cc85a6e8a

Change-Id: Iee86cb043ed0fb0813f432757a3e5240ba6d8ce5
2019-05-30 11:18:29 -07:00
Isha Kulkarni
d97d0f457f Merge "Decoder: Add error check for expected_poc in ih264d_decode_pic_order_cnt" into qt-dev am: 6db97fcc8d am: c693cc9fad
am: 4182aa39cb

Change-Id: I34494dbf574bd41b03dc3fcc2de73dfb913fe71f
2019-05-30 11:10:42 -07:00
Isha Kulkarni
8cc85a6e8a Merge "Decoder: Add error check for expected_poc in ih264d_decode_pic_order_cnt" into qt-dev am: 6db97fcc8d
am: ae2d934d1c

Change-Id: Iad065d4e2a7888cb084745194d472579cd3f8a8d
2019-05-30 10:52:43 -07:00
Isha Kulkarni
4182aa39cb Merge "Decoder: Add error check for expected_poc in ih264d_decode_pic_order_cnt" into qt-dev am: 6db97fcc8d
am: c693cc9fad

Change-Id: Ib950ab4532dca999e7bf00db4abb8125681e0974
2019-05-30 10:51:44 -07: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
Isha Kulkarni
c693cc9fad Merge "Decoder: Add error check for expected_poc in ih264d_decode_pic_order_cnt" into qt-dev
am: 6db97fcc8d

Change-Id: I3b6cbf44cc70645356be2b8869cf57ed32c7a445
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
ee62d05922 [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 am: f62e430507
am: f589b13c9f

Change-Id: Ie9fb77ee840d0d8368518f23b99923f00638f444
2019-05-29 14:55:20 -07:00
Rakesh Kumar
9af99bab0a [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 am: 1ffc4072ef
am: e1b1f85845

Change-Id: I97b1309e7009ebc0f6bf96ceaad16aca992c4765
2019-05-29 14:51:41 -07:00
Rakesh Kumar
f589b13c9f [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
am: f62e430507

Change-Id: Icd731ff97993bd52afd472e371d8b8c67c4798bf
2019-05-29 14:46:38 -07:00
Rakesh Kumar
e1b1f85845 [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
am: 1ffc4072ef

Change-Id: I05c228e2b6dcd62f1ec0fa02351f5d912244077a
2019-05-29 14:45:36 -07: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
1ffc4072ef [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: I3fc2480bebd777aee2d4e7efe0a05dbad35c299f
2019-05-29 14:38:35 -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
ddfe02e27f [automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master am: 8fc003e205 -s ours
am: 3e60f2dbed -s ours
am skip reason: subject contains skip directive

Change-Id: I2d04cd72dbe32e9ea0af073e3f34a6b8f03bac62
2019-05-13 18:10:26 -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
71e406ce7b Merge "libavcenc: Fix B frame incomplete subgop issue" into qt-dev am: 26bcb6b37b
am: 261b9745b4

Change-Id: Id96e54a4ec8aab6324af213d047c6fced1eb2716
2019-05-10 21:18:31 -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
ae5bc2f47f Merge "decoder: Remove skip picture support" into qt-dev am: 6cb07e106a
am: 69137d1704

Change-Id: I6ee0e4e49d1dea038221dd7492eaafaa0bc66b2c
2019-05-04 17:21:01 -07: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
4c403a9bad Merge "Decoder: Add missing error checks for parsing sps or pps" into qt-dev am: a09be99800
am: d7d3cf0205

Change-Id: I5dcbeabc705e078971131dbae6c9176bd586ecba
2019-05-04 12:50:56 -07: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
dbca61cca1 decoder: Treat unsupported feature errors as fatal errors am: 54160a6d3e
am: 49a55273e4

Change-Id: I5d6a3e4b0a6b3b4abbf7eb9227e8ed5c793a71b2
2019-05-02 01:14:45 -07: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
7607d73bc4 Encoder: Increased max supported bitrate am: fabba6afaf
am: 9c7675094c

Change-Id: Ied1b520fd48082ead4a588a838e84ce4ec62018c
2019-04-15 16:39:09 -07:00