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-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
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
Ivan Lozano
472410cc7e
Merge "Remove libavc sanitizer diagnostics."
2019-02-14 16:42:50 +00:00
Ray Essick
fbc772b17b
Merge "Decoder: Add null check for scaling matrix."
2019-02-12 21:54:59 +00:00
Ivan Lozano
096aa21441
Remove libavc sanitizer diagnostics.
...
Remove libavc sanitizer diagnostics.
Bug: 111547941
Test: mma -j
Change-Id: I0d9bce58f23e71a9751c81eea74f48b33307b169
2019-02-12 11:07:58 -08:00
Sasha Smundak
50d9f2caad
[automerger skipped] Explicitly include log/log.h instead of cutils/log.h am: 5302433b0a am: 833d8486f7
...
am: ea716c66fa -s ours
am skip reason: change_id Id8940e053c90c45ba39cdd27a44cc83f130487b7 with SHA1 51f1a220ec is in history
Change-Id: I57e71aac0688b7d70c98b18e6fd6234902fdac96
2019-02-06 11:54:53 -08:00
Sasha Smundak
ea716c66fa
Explicitly include log/log.h instead of cutils/log.h am: 5302433b0a
...
am: 833d8486f7
Change-Id: Ided4e39ba54ac8d77fb2c473bce6fe0065ca2875
2019-02-06 11:46:00 -08:00
Sasha Smundak
833d8486f7
Explicitly include log/log.h instead of cutils/log.h
...
am: 5302433b0a
Change-Id: I2b0b50931f81eb946c7507baa973cf4dcc8cdc74
2019-02-06 11:23:34 -08:00
Sasha Smundak
5302433b0a
Explicitly include log/log.h instead of cutils/log.h
...
Eliminates the warning.
Test: treehugger
Bug: 123758136
Change-Id: Id8940e053c90c45ba39cdd27a44cc83f130487b7
Merged-In: Id8940e053c90c45ba39cdd27a44cc83f130487b7
2019-02-06 09:56:24 -08:00
Sasha Smundak
51f1a220ec
Explicitly include log/log.h instead of cutils/log.h
...
Eliminates the warning.
Test: treehugger
Bug: 123758136
Change-Id: Id8940e053c90c45ba39cdd27a44cc83f130487b7
2019-02-01 10:45:14 -08:00
android-build-team Robot
44fa3522bc
Merge cherrypicks of [6072697, 6072075, 6072758, 6072124, 6072885, 6072886, 6072887, 6072580, 6072581, 6072582, 6072583, 6072584, 6072132, 6072195, 6072133, 6072077, 6072134, 6072078, 6072211, 6072762, 6072763, 6072908, 6072909, 6072910, 6072911, 6072912, 6072913, 6072914, 6072930, 6072212, 6072743] into pi-qpr2-release
...
Change-Id: I0a7349f9ede5ed8ee33e639f64b6c1d5ec31e0df
2019-01-16 18:57:50 +00:00
Harish Mahendrakar
a9915afb55
decoder: Signal IVD_RES_CHANGED error for change in crop params
...
IVD_RES_CHANGED was not signaled when crop parameters changed, i.e.
display dimensions changed without change in decode dimensions.
In such cases, if output buffer was allocated as per the current
dimension being decoded, without IVD_RES_CHANGED signalled, there can be
an OOB write if the new buffer is smaller than the frame being returned
as output
Bug: 118399205
Test: vendor
Change-Id: Ia750a99cda08a3254a6f8ea8b55d07e655b34d05
(cherry picked from commit 442a01bf37 )
2019-01-16 18:55:40 +00:00
Ivan Lozano
c82890ed09
Additional libavc blacklisted functions.
...
Add additional functions to the libavc blacklist. Some of these seem
to be benign overflows, and a couple are performance related.
Bug: 110791537
Test: One of the CTS media tests triggered this overflow.
Change-Id: I4b67171176e27811892495795c1a06b0374c325a
2019-01-11 13:28:47 -08:00
S Hamsalekha
f28de0366c
Decoder: Add null check for scaling matrix.
...
Also void->word32 return type so failure can be signaled to caller.
Bug: 115743419
Test: vendor + poc
Change-Id: I0a07ac11255c2c672803aab7085824c417bde282
2019-01-08 11:37:37 -08:00
Ivan Lozano
c8bcfb3f66
Enforce ubsan sanitizers in libavc.
...
Keep sanitizers in diagnostics mode but don't recover from them so we
get errors in tombstones.
Bug: 110791537
Test: mma -j
Change-Id: Ib5e7d110ded68e19e276d79f99f648fea3f70078
2018-12-17 10:28:34 -08:00
Yi Kong
4b62b29321
Suppress null-pointer-arithmetic warning am: 9908df5214 am: a515293da1
...
am: 072f38f8fd
Change-Id: I8296af0f1f3e19314d6c58fe62d5076dd33abd18
2018-12-13 12:57:42 -08:00
Yi Kong
072f38f8fd
Suppress null-pointer-arithmetic warning am: 9908df5214
...
am: a515293da1
Change-Id: Ic8aafff4f51e93f708803b64d1d1ace96e156202
2018-12-13 12:48:36 -08:00
Yi Kong
a515293da1
Suppress null-pointer-arithmetic warning
...
am: 9908df5214
Change-Id: Ifab6cce2993ffb19bc4319369d7069e3e9034636
2018-12-13 12:32:29 -08:00
Yi Kong
9908df5214
Suppress null-pointer-arithmetic warning
...
Test: m checkbuild
Bug: 72331524
Change-Id: I592abac6402809d126ad83fe6a79551bf068e90c
2018-12-12 02:45:09 -08:00
Ivan Lozano
f0cc0686dd
Merge "Enable bounds sanitization in libavc."
2018-12-06 01:55:24 +00:00