Commit graph

3062 commits

Author SHA1 Message Date
Ray Essick
820dfca937 Merge "Decoder: Fix integer overflow in poc calculation" am: 159799b4d4 am: d7617ea8b9
Original change: 1376336

Change-Id: I5b3db06c1b204d5933dc14f8394ec2cbe9d21a4c
2020-08-04 21:24:25 +00:00
Ray Essick
d7617ea8b9 Merge "Decoder: Fix integer overflow in poc calculation" am: 159799b4d4
Original change: 1376336

Change-Id: Ic170fcb5a850f2fbf09043b81b92a0b31380b7c3
2020-08-04 21:12:22 +00:00
Ray Essick
159799b4d4 Merge "Decoder: Fix integer overflow in poc calculation" 2020-08-04 20:57:51 +00:00
Shivaansh Agrawal
dfd1f2ff70 Decoder: Fix integer overflow in poc calculation
Passed error and standard compliance tests with integer and address sanitizers.

Bug: 143791063
Test: POC in bug description
Change-Id: Idbba64cfb397b8af3ccd5770ce115fadd0d9112c
2020-08-04 12:16:57 +05:30
Treehugger Robot
f9ff2b6103 Merge "Use blocklist sub-property in sanitize" am: 2b48a52398 am: 8bca87a027
Original change: 1375199

Change-Id: I24643fae4ea0d0f27cc206fe1cc492c0324fcbdc
2020-07-30 23:06:26 +00:00
Treehugger Robot
8bca87a027 Merge "Use blocklist sub-property in sanitize" am: 2b48a52398
Original change: 1375199

Change-Id: Ife0296415e231fbff04f9c135fcd073b0fd8a98b
2020-07-30 21:07:47 +00:00
Treehugger Robot
2b48a52398 Merge "Use blocklist sub-property in sanitize" 2020-07-30 20:34:54 +00:00
Ray Essick
151a2bcee7 Merge "decoder: fix integer overflow when setting i4_prev_max_display_seq" am: 2c7af2702b am: 1c3a955de7
Original change: 1374616

Change-Id: Ib0f3c229217ba175f32d8a1aa6f4a819864e6250
2020-07-29 22:05:36 +00:00
Ray Essick
1c3a955de7 Merge "decoder: fix integer overflow when setting i4_prev_max_display_seq" am: 2c7af2702b
Original change: 1374616

Change-Id: I1f3dada19730c91bd228f0b6901875b4e039e543
2020-07-29 21:47:58 +00:00
Ray Essick
2c7af2702b Merge "decoder: fix integer overflow when setting i4_prev_max_display_seq" 2020-07-29 21:29:42 +00:00
Shivaansh Agrawal
358b09305a decoder: fix integer overflow when setting i4_prev_max_display_seq
reset ps_dec->i4_prev_max_display_seq if out of int32 range
to avoid overflow

Bug: 143791121
Bug: 143791161
Test: POC in bug description
Change-Id: I3d8df556b003a7c739716bb33262ab3a6ca7b2d9
2020-07-29 04:39:31 +00:00
Pirama Arumuga Nainar
6d44b362b9 Use blocklist sub-property in sanitize
Update language to comply with Android’s inclusive language guidance

See https://source.android.com/setup/contribute/respectful-code for
reference

Bug: 161896447
Bug: 162245450

Test: build topic
Change-Id: Id7e09811092c8f026e1006d2a1d8355c444081a6
2020-07-28 14:29:02 -07:00
Harish Mahendrakar
487d9e6e24 decoder: Allow stride to be smaller than decode width am: a0036e742b am: e4649d8d3f
Original change: 1358387

Change-Id: I49c82ad516931b8a7c90dc446a5df5e6ee52e56f
2020-07-09 23:29:53 +00:00
Harish Mahendrakar
e4649d8d3f decoder: Allow stride to be smaller than decode width am: a0036e742b
Original change: 1358387

Change-Id: I157ee538592641cc1ab416403d5eb244eb8cb20e
2020-07-09 23:15:48 +00:00
Harish Mahendrakar
a0036e742b decoder: Allow stride to be smaller than decode width
When cropping is enabled, application can request a stride that
is larger than display width but smaller than decode width.

Bug: 160397536
Test: stagefright -sS <clip in bug>

Change-Id: I453b2de0474f3ae4d021084729c33d52fc1090dc
2020-07-09 17:59:47 +00:00
Aasaipriya Chandran
623f5587d7 Decoder: Fix Null dereference am: 083b9fc086 am: 5365d9ad7f
Original change: 1328476

Change-Id: I1e8275497a20105f4c1545ac4022569005191367
2020-07-01 05:20:11 +00:00
Aasaipriya Chandran
5365d9ad7f Decoder: Fix Null dereference am: 083b9fc086
Original change: 1328476

Change-Id: I33a6cfe12f12cfe575de81dffc24450da35f0682
2020-07-01 05:07:24 +00:00
Aasaipriya Chandran
083b9fc086 Decoder: Fix Null dereference
Add checks to validate long term index and
max long term index parsed in MMCO commands.

Bug: 140358770
Bug: 140680655
Bug: 148772548
Bug: 152148135
Bug: 152434373
Bug: 152550528

Test: poc in bug
Change-Id: I9052ce7721491fdd5fb4807ec33e399cee8c70cf
2020-06-12 17:21:26 +05:30
Xin Li
b9ac19d700 [automerger skipped] Merge QQ3A.200605.002 into master am: fa8ec83555 -s ours am: ac50543642 -s ours
am skip reason: Change-Id Ie57dcb92f1c0aaebd5e701f01ebdc899add7f9ba with SHA-1 243c865c04 is in history

Original change: 1323306

Change-Id: Ic37296cc6e68dd547d8a9887f654b65810f992e1
2020-06-08 16:07:54 +00:00
Xin Li
ac50543642 [automerger skipped] Merge QQ3A.200605.002 into master am: fa8ec83555 -s ours
am skip reason: Change-Id Ie57dcb92f1c0aaebd5e701f01ebdc899add7f9ba with SHA-1 243c865c04 is in history

Original change: 1323306

Change-Id: Ib0ede67235b9134b778d99d3cfd44db4c44bbafa
2020-06-08 15:56:39 +00:00
Xin Li
fa8ec83555 Merge QQ3A.200605.002 into master
Bug: 158095402
Merged-In: Ie57dcb92f1c0aaebd5e701f01ebdc899add7f9ba
Change-Id: Iddded152601d50b336a2a313789acf156a82eb76
2020-06-03 10:45:00 -07:00
Ray Essick
00d9216e5a point to new repo hooks for mainline uploads am: 6129152b6f
Change-Id: I273306213e5b18e08df7ad6178ee9c89d09a5adc
2020-05-29 23:49:26 +00:00
Harish Mahendrakar
3fdc4a4f4c Added fuzz_config field in avc_dec_fuzzer am: 5a52ec8cdd am: 243c865c04
Change-Id: I58bc0a01212289a2e348ccd8f7bf168dd23658de
2020-05-29 21:40:07 +00:00
Harish Mahendrakar
243c865c04 Added fuzz_config field in avc_dec_fuzzer am: 5a52ec8cdd
Change-Id: Ie57dcb92f1c0aaebd5e701f01ebdc899add7f9ba
2020-05-29 21:27:29 +00:00
Harish Mahendrakar
5a52ec8cdd Added fuzz_config field in avc_dec_fuzzer
Test: ./avc_dec_fuzzer
Bug: 157680018
Change-Id: Ia06f33596cacb8b5d856ff778135fc4a78e2fb66
2020-05-28 14:20:18 -07:00
Ray Essick
6129152b6f point to new repo hooks for mainline uploads
Bug: 157501573
Test: upload
Change-Id: If1f024379589f420fd23e4f25e0d178a10b84f11
2020-05-26 15:16:18 -07:00
Jooyung Han
9b285bc9f5 [automerger skipped] Set min_sdk_version to be part of mainline modules am: e8d70076de -s ours
am skip reason: Change-Id Ib206ae858601b0dca6dccb09e8c53028feef0362 with SHA-1 89a120262a is in history

Change-Id: I8b74933c2fa603d2a5759f16cb99803f631a90a8
2020-05-01 16:03:59 +00:00
Bob Badour
5f020cdc88 Add METADATA to libavc: Apache2=NOTICE am: 67c86e8bb8 am: aace37ab1b
Change-Id: Id438a6783d840cfd5b97768f0a08177e136b475b
2020-05-01 15:09:03 +00:00
Bob Badour
aace37ab1b Add METADATA to libavc: Apache2=NOTICE am: 67c86e8bb8
Change-Id: Id365134ab9da20399dfd8c6bde734f55183a328f
2020-05-01 14:55:34 +00:00
Jooyung Han
e8d70076de Set min_sdk_version to be part of mainline modules
Modules contributing mainline modules (APK/APEX) should set
min_sdk_version as well as apex_available.

For now setting min_sdk_version doesn't change build outputs.
But build-time checks will be added soon.

Bug: 152655956
Test: m
Merged-In: Ib206ae858601b0dca6dccb09e8c53028feef0362
Merged-In: I6cfff21dcaf861392f8b69d97195831cdda4c1be
Change-Id: I6cfff21dcaf861392f8b69d97195831cdda4c1be
(cherry picked from commit 669c6bb63c)
2020-05-01 23:11:53 +09:00
Bob Badour
67c86e8bb8 Add METADATA to libavc: Apache2=NOTICE
Bug: 68860345
Bug: 69058154
Bug: 151953481

Test: no code changes
Change-Id: I7b68ffa24730dce2b2bc7d460444200c5497c3ec
2020-04-30 16:15:18 -07:00
Jiyong Park
bc264ca83c mark libavc and libavcenc available to the platform am: 89a120262a am: c1574ef37c
Change-Id: I136d5df05712196d6d49395549a9014c76aac9eb
2020-04-30 05:04:28 +00:00
Jiyong Park
c1574ef37c mark libavc and libavcenc available to the platform am: 89a120262a
Change-Id: Ib1478309d094743642c61e085b7cb6eb8d4ae75d
2020-04-30 04:52:41 +00:00
Jiyong Park
89a120262a mark libavc and libavcenc available to the platform
The library is installed to the platform via the dependency chain:

android.hardware.media.omx@1.0-service
-> libstagefright_soft_avcdec
-> libavc

and

-> libstagefright_soft_avcenc
-> libavcenc

Bug: 153073816
Test: m
Change-Id: Ib206ae858601b0dca6dccb09e8c53028feef0362
2020-04-24 21:44:52 +09:00
Jooyung Han
c4407e1109 Set min_sdk_version to be part of mainline modules am: 669c6bb63c am: f384c6243d
Change-Id: Ib7bf1db145e74c6b62f2b5e409fe50a9c7240c32
2020-04-24 03:47:50 +00:00
Jooyung Han
f384c6243d Set min_sdk_version to be part of mainline modules am: 669c6bb63c
Change-Id: Iaf2a2846d41b388062abeac2364f07439c245146
2020-04-24 03:28:57 +00:00
Jooyung Han
669c6bb63c Set min_sdk_version to be part of mainline modules
Modules contributing mainline modules (APK/APEX) should set
min_sdk_version as well as apex_available.

For now setting min_sdk_version doesn't change build outputs.
But build-time checks will be added soon.

Bug: 152655956
Test: m
Change-Id: I6cfff21dcaf861392f8b69d97195831cdda4c1be
2020-04-24 10:02:10 +09:00
Xin Li
d1127d37f1 [automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6382244 into stag-aosp-master am: 980478d737 -s ours
am skip reason: subject contains skip directive

Change-Id: I9d0d33c78b0f849886b28837dc1ae2d9c71e2746
2020-04-10 19:07:11 +00:00
Xin Li
980478d737 DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6382244 into stag-aosp-master
Bug: 151763422
Change-Id: I93894206d44ef7ef16ee5087dd9d7cb2ba9fbf72
2020-04-09 18:41:50 -07:00
Harish Mahendrakar
f4d20ea18d Revert "decoder: set u4_frame_decoded to true only after both fields are decoded" am: e0ad0016f0
Change-Id: Ided07fdb373498857764c8405045e5cf4d505cd3
2020-04-07 20:18:44 +00:00
Harish Mahendrakar
e0ad0016f0 Revert "decoder: set u4_frame_decoded to true only after both fields are decoded"
This reverts commit f76370c671.

Reason: This breaks interlaced clips which are sent one field at a time

C2 plugin for avc decoder is now updated to appropriately handle both
types of interlaced content, i.e. sent as one field per one input buffer
and sent as two fields per one input

Bug: 135146280
Bug: 152087140
Test: poc in bugs
Test: atest android.media.cts.DecoderTest

Change-Id: Ic79d13a4bd93573767c86ed31264e8780da8d9a5
2020-04-06 15:33:53 -07:00
TreeHugger Robot
a1e0fdfc29 Merge "decoder: Fix lt_ref increment in ih264d_fix_error_in_dpb" into qt-qpr1-dev am: 280902e61f am: 7286f5f021
Change-Id: I221080f07954036f86be223837c4cbd09e5060ff
2020-03-20 03:03:47 +00:00
Harish Mahendrakar
aa6e6d474c decoder: Fix in detecting dangling fields am: 6dd54b9e18 am: 7e44189621
Change-Id: I6bee46a07b8b362a10de33c446d4658d9bc64d7c
2020-03-20 03:03:17 +00:00
TreeHugger Robot
66556bc9a3 Merge "decoder: Fix lt_ref increment in ih264d_fix_error_in_dpb" into qt-qpr1-dev am: 280902e61f
Change-Id: I3a0e050d5e7f17f8233dd7203d0a382c86a70971
2020-03-20 02:39:03 +00:00
Harish Mahendrakar
c0215b1b3d decoder: Fix in detecting dangling fields am: 6dd54b9e18
Change-Id: I61076f4526feeb891a5f866d6f965211e9e65edc
2020-03-20 02:38:56 +00:00
TreeHugger Robot
7286f5f021 Merge "decoder: Fix lt_ref increment in ih264d_fix_error_in_dpb" into qt-qpr1-dev am: 280902e61f
Change-Id: I3f9e5f1019b7759e83a2cc7f2848766f52bcdfed
2020-03-20 02:38:53 +00:00
Harish Mahendrakar
7e44189621 decoder: Fix in detecting dangling fields am: 6dd54b9e18
Change-Id: Ia546016131ba894365e90089a6644383c76bf325
2020-03-20 02:38:43 +00:00
TreeHugger Robot
280902e61f Merge "decoder: Fix lt_ref increment in ih264d_fix_error_in_dpb" into qt-qpr1-dev 2020-03-20 02:24:36 +00:00
Xin Li
bf906e86b1 DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: c239c9df32
Change-Id: Ic20b817cec7a999501a0b266bf033b2e99f76f4b
2020-03-19 04:30:20 +00:00
Xin Li
ba0f067e29 [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: c239c9df32 -s ours
am skip reason: subject contains skip directive

Change-Id: I8b425fa4967086ca6a002e93c0549a43761fae75
2020-03-19 04:29:53 +00:00