Bill Yi
75e53c541e
Merge RQ3A.210905.001 to aosp-master - DO NOT MERGE
...
Merged-In: I52a5f915b9bb31f432c4ad55ae4117ff4ddceb54
Merged-In: If80dcc5d1e0a057c965631fc2d33e4e642d7eab9
Merged-In: If80dcc5d1e0a057c965631fc2d33e4e642d7eab9
Change-Id: Ia67df08355cf08f479df3c683a7f981402d27dcd
2021-09-08 17:57:06 -07:00
Rakesh Kumar
fa13b30876
Decoder: Update check for increment u2_cur_slice_num
...
Increment u2_cur_slice_num only if current slice had atleast
one MB of memory left.
Test: clusterfuzz generated poc in bug
Bug: b/182152757
Bug: b/179938345
Bug: b/185112718
Change-Id: Ic5eb07e961bccb7fde954bcfd791fd879804e335
(cherry picked from commit a88e0683a4 )
2021-06-30 23:58:27 +00:00
Shivaansh Agrawal
2205f2da33
Decoder: add support to use ih264d instead of ivd structures
...
Bug: 175759733
Test: avcdec -c dec.cfg
Change-Id: I410bb2213cb375c5eabcb3e23499d6ad43cf1c96
2021-02-25 05:31:40 +00:00
Bill Yi
bd550e880a
Merge RQ1A.210205.004 to aosp-master - DO NOT MERGE
...
Merged-In: I91cbfe74165d1a8f7b7d95edabb10be208ec54a2
Merged-In: I88c74ba5e0cce51e7106bf410744afbc74a7cd5c
Change-Id: Iea197441bcaba9503d1bdcb6f3771e76403bb137
2021-02-03 17:01:27 -08:00
Harish Mahendrakar
fd7e28588f
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
(cherry picked from commit 7e06940dce )
2020-12-15 21:45:29 +00:00
Harish Mahendrakar
82e6bc3fd0
decoder: Update check for first mb in slice am: 7e06940dce am: 4fb26568a9 am: 2bf6790f63 am: 5f4f6e2ecf am: 640eda280b am: d6c30aa7da
...
Original change: 13171299
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I02be4ad3b7142d81f9513539746984e0f4b64909
2020-12-09 03:15:39 +00:00
Harish Mahendrakar
640eda280b
decoder: Update check for first mb in slice am: 7e06940dce am: 4fb26568a9 am: 2bf6790f63 am: 5f4f6e2ecf
...
Original change: 13171299
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I255ad3b9709afceb4cc8b31298bf3a9071ef4b3a
2020-12-09 02:21:19 +00:00
Harish Mahendrakar
5f4f6e2ecf
decoder: Update check for first mb in slice am: 7e06940dce am: 4fb26568a9 am: 2bf6790f63
...
Original change: 13171299
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I99b30e4b2ac5f7b0fdeac9adbce15e92d2b36c8f
2020-12-09 01:48:37 +00:00
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
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
Xin Li
f59c3864fe
Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855
...
Bug: 172690556
Merged-In: I829eb4215ea9aa15adf66e8bbdb37ec88a9bb6a4
Change-Id: I2e739d3606ba9f0938ebc2363cb9443ec3dec912
2020-11-23 13:14:11 -08:00
Shivaansh Agrawal
6efeedf063
Decoder: Fix integer overflow in parse slice
...
Bug: 165976727
Test: POC in bug description
Change-Id: Ia2c8ad5fe6e212d3910a9c91cda52c19f3fac120
2020-11-17 23:34:54 +05:30
Ray Essick
e76f029dc4
Merge "Decoder: Fix integer overflow when scaling motion vectors"
2020-10-11 05:09:38 +00:00
Treehugger Robot
f7225b7fa5
Merge "Decoder: Fix unsigned integer overflow"
2020-10-09 20:06:04 +00:00
Hamsalekha S
3fe5adf3ad
Decoder: Fix heap buffer overflow. am: 0b601e1a4f
...
Original change: 12266630
Change-Id: I829eb4215ea9aa15adf66e8bbdb37ec88a9bb6a4
2020-09-27 17:43:42 +00:00
Neelkamal Semwal
fcf0c2774c
Decoder: Fix integer overflow when scaling motion vectors
...
Typecast to 64-bits for valid overflowing arithmetic operations
Bug: 143791664
Bug: 150044751
Test: poc in bug description
Change-Id: I1b938c7c2d4d817979fff65ab271a42f6bdc3e89
2020-09-18 22:59:16 +05:30
Shivaansh Agrawal
2a28c97cd6
Decoder: Fix NPD issue in mmco function
...
Skip mmco buffer operations if mmco error in sequence
Bug: 168426116
Bug: 168426117
Test: POC in bug description
Change-Id: Ia4f3f48137152e211322ed97f2fafab2f45cb2c3
2020-09-16 17:07:13 +05:30
Manisha Jajoo
8217d22de9
Decoder: Fix unsigned integer overflow
...
Fix integer overflow issues in parse functions
Test: poc in bug
Bug: 143791646
Bug: 150045816
Change-Id: Ie0bde7a5cf266fe327b1d5e43fffe28f6e402188
2020-08-28 15:02:17 +05:30
Xin Li
70bf1e5994
Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)
...
Bug: 166295507
Merged-In: I49c82ad516931b8a7c90dc446a5df5e6ee52e56f
Change-Id: I609894770235673dc005d118062b9f8b4af08ba8
2020-08-27 10:16:27 -07:00
Treehugger Robot
2baef25896
Merge "Decoder: Integer overflow fixes in parsing Qp and weights"
2020-08-20 15:24:02 +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
Harish Mahendrakar
08b77b2351
Decoder: Integer overflow fixes in parsing Qp and weights
...
Error checks for syntax elements related to QP,
luma and chroma prediction weights have been modified
to fix overflow
Bug: 136568141
Bug: 143801227
Bug: 143791288
Test: POC in bug description
Change-Id: I88e886ba4bcda69079f1b0a8344005fe1aa51366
2020-08-06 23:10:15 -07: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
Hamsalekha S
0b601e1a4f
Decoder: Fix heap buffer overflow.
...
Fix bitstream buffer overflow in the function
ih264d_parse_sei_message
Bug: 152895390
Test: POC in bug
Change-Id: I41ff1f7b2834c2d09e546b8e3d37e4cd4abfa28d
2020-07-29 23:47:11 +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
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
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
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
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
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
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
2f6f64e1c1
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 am: 826a705863
...
Change-Id: Ife6f6d0a5231076a9fec4cbf9a449f1fd67abc08
2020-01-09 05:21:04 +00: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
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
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
e40cbbfc51
decoder: Move initialization of dbp_mgr entries to init_decoder() am: 01da7b5a52 am: 41fcd228ae am: cce42ea920 am: 6c9873af88 am: 662efee177 am: 873bac42ec am: 474797af3c
...
am: 942e7f8896
Change-Id: I3fb8acb951bc8043546ab1c8956b664427b16295
2019-11-05 17:20:44 -08:00
Harish Mahendrakar
942e7f8896
decoder: Move initialization of dbp_mgr entries to init_decoder() am: 01da7b5a52 am: 41fcd228ae am: cce42ea920 am: 6c9873af88 am: 662efee177 am: 873bac42ec
...
am: 474797af3c
Change-Id: I315a135615fdace5bc573e9f585133a991b30c77
2019-11-05 17:11:11 -08:00
Harish Mahendrakar
474797af3c
decoder: Move initialization of dbp_mgr entries to init_decoder() am: 01da7b5a52 am: 41fcd228ae am: cce42ea920 am: 6c9873af88 am: 662efee177
...
am: 873bac42ec
Change-Id: I6f5d7d5486926100a815ffcddd134cf998d35c79
2019-11-05 17:05:10 -08:00