Commit graph

2991 commits

Author SHA1 Message Date
Ray Essick
b2016b613a Merge "decoder: Update reorder depth to account for display latency" am: adfbdd6c41
Original change: 1398927

Change-Id: I6a482931e4d5d006c88d8526e2936975a649636a
2020-08-17 05:34:23 +00:00
Ray Essick
adfbdd6c41 Merge "decoder: Update reorder depth to account for display latency" 2020-08-17 05:21:00 +00:00
Harish Mahendrakar
f792904577 decoder: Update reorder depth to account for display latency
Decoder returns output with an additional latency of 2.
reorder depth retured is now updated to account for this extra latency

Also move reorder_depth initialization to parse_sps()
Instead of initializing reorder_depth after decoding first picture,
initialize it in parse_sps().

Bug: 163127030
Test: poc in bug
Test: atest android.mediav2.cts

Change-Id: I94b35b2c5df5c910d0159548b168617946a19cc2
2020-08-13 19:23:26 -07: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
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
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
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
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
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
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
Bob Badour
aace37ab1b Add METADATA to libavc: Apache2=NOTICE am: 67c86e8bb8
Change-Id: Id365134ab9da20399dfd8c6bde734f55183a328f
2020-05-01 14:55:34 +00: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
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
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
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
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
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
c239c9df32 DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master
Bug: 151763422
Change-Id: Ia3587770e1ba3bf9159d5ee5aa0ac05926127b75
2020-03-18 19:40:37 -07:00
Automerger Merge Worker
379368e2e1 Remove mips workarounds. am: 748aa1e459 am: db13a9728d
Change-Id: Iceda6e002ab9622fc5a04d804f33631c4cf95a74
2020-03-10 03:39:20 +00:00
Automerger Merge Worker
db13a9728d Remove mips workarounds. am: 748aa1e459
Change-Id: I3205d9efc01850d06262cd7946d14e5247c93374
2020-03-10 03:21:14 +00:00
Elliott Hughes
748aa1e459 Remove mips workarounds.
Test: treehugger
Change-Id: I3396db9548fe941759a6e8f546b81a10b1a7de01
2020-03-06 21:23:46 -08:00
Automerger Merge Worker
987bc27dc2 Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 29fc5cb2f2 am: 091cff7215
Change-Id: I4b278e106a4a3a24e7ee55e6353872a2f8d54596
2020-03-06 00:26:57 +00:00
Automerger Merge Worker
091cff7215 Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 29fc5cb2f2
Change-Id: Ibcb88b4a2350d371469b758454f0590f86745a82
2020-03-06 00:12:23 +00:00
Bill Yi
29fc5cb2f2 Merge stage-aosp-master to aosp-master - DO NOT MERGE
Change-Id: I23687c8b909f4448eedb43242c9366fba6dbe0e9
2020-03-05 09:51:02 -08:00
Harish Mahendrakar
f80afe5b98 decoder: Fix lt_ref increment in ih264d_fix_error_in_dpb
When removing common nodes from short term list if it present in long
term reference list, number of long term buffers was wrongly
incremented. Only decrement of short term buffer count is needed in
such a case.

Bug: 140561484
Bug: 140566606
Bug: 140699853
Bug: 144980954
Bug: 145859214

Test: poc in bug
Change-Id: Iebf7ee7ed65e7b2097a899577982806b03fc6e5d
2020-02-11 16:29:24 -08:00
Harish Mahendrakar
6dd54b9e18 decoder: Fix in detecting dangling fields
When decoder is expecting to decode a field, ensure current slice
being decoded is a field and frame number matches with previous slice's
frame number.

Bug: 144687080
Test: poc in bug
Change-Id: I89d9d7b6fc26797de0420ecb0ca7e66b066aa908
2020-02-11 16:03:29 -08:00
Automerger Merge Worker
0b545cc625 Merge "encoder: Return gracefully from entropy encoding errors" am: 94f5d3f0f7 am: 7be9fe31f8
Change-Id: Ib74b095ac162196e549f41e9d8b7d2d42333e964
2020-01-22 20:20:31 +00:00
Chamarthi Kishore
7be9fe31f8 Merge "encoder: Return gracefully from entropy encoding errors"
am: 94f5d3f0f7

Change-Id: I460d6eb6afa66a5b40e9d34dc2f49e0030f11239
2020-01-22 12:11:17 -08:00
Treehugger Robot
94f5d3f0f7 Merge "encoder: Return gracefully from entropy encoding errors" 2020-01-22 19:49:30 +00:00
Automerger Merge Worker
b816a9c21d DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master am: 2f6efb8050
Change-Id: I48146badcf8fbb820c0ea20d8ef53065135f84be
2020-01-16 18:34:38 +00:00
Xin Li
2f6efb8050 DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master
Bug: 146167222
Change-Id: I0bfd5bcbdfc87b371efb7ab5611ec505a10fa0f6
2020-01-15 15:57:01 -08:00
Automerger Merge Worker
826a705863 Merge "decoder: Fix minimum poc calculation check while adding to display" into oc-dev am: 9d7a036d7b am: cebf26ab4d am: f64194a96f am: ed2b83d989 am: 4b7a562681 am: 8c2ee3ea8b
Change-Id: Idf10b1ae11ad8f376d0b3f2587bebeeece6126f1
2020-01-09 05:04:07 +00:00
Automerger Merge Worker
8c2ee3ea8b Merge "decoder: Fix minimum poc calculation check while adding to display" into oc-dev am: 9d7a036d7b am: cebf26ab4d am: f64194a96f am: ed2b83d989 am: 4b7a562681
Change-Id: I0966eed6f66382e3fa7ccc19558734cc202ed0f3
2020-01-09 04:51:33 +00: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