Commit graph

3010 commits

Author SHA1 Message Date
Harish Mahendrakar
5ddd1567f9 Revert "decoder: set u4_frame_decoded to true only after both fields are decoded" am: e0ad0016f0
Change-Id: I94dd473b5afb7b9f5e155b0ed081d312187a135e
2020-04-07 20:19:02 +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
b51f786034 Merge "decoder: Fix lt_ref increment in ih264d_fix_error_in_dpb" into qt-qpr1-dev am: 280902e61f am: 7286f5f021
Change-Id: Id436aee0eaf0f45794186713cec5ec6e463da5c5
2020-03-20 03:03:14 +00:00
Harish Mahendrakar
9157866b2b decoder: Fix in detecting dangling fields am: 6dd54b9e18 am: 7e44189621
Change-Id: I24f0868f85ec1eb081d50e2da07606ecb58f3e90
2020-03-20 03:02:55 +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
93a6f1db82 Merge "encoder: Return gracefully from entropy encoding errors" am: 94f5d3f0f7 am: 7be9fe31f8 am: 0b545cc625
Change-Id: Ia99a4e1a024310153d372cca66fa97aeb1e5b2bd
2020-01-22 20:37:55 +00: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
22d5c95471 [automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master am: 2f6efb8050 am: b816a9c21d -s ours
am skip reason: subject contains skip directive

Change-Id: Ia9cc33c2d7affffef667b3f0f059ad35003333fc
2020-01-16 19:00:59 +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
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
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
Automerger Merge Worker
cebf26ab4d Merge "decoder: Fix minimum poc calculation check while adding to display" into oc-dev am: 9d7a036d7b
Change-Id: I8d4b3415dfe5d2148f3211de258798de214559d0
2020-01-09 03:49:11 +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
Dongwon Kang
3716098904 Add a repo upload hook for checking the mainline code change.
Test: repo upload w/ and wo/ changes in mainline path.
Change-Id: I35319bfdd673cef855295dcc4821c8db81fe07eb
2019-12-06 12:07:39 -08:00
Automerger Merge Worker
1670387156 Merge Android10 QPR1 into AOSP master am: dd964bfe0c am: 992c9d196f
Change-Id: I8bffa7907f69356099028ea4f884c7aea86d3d5b
2019-12-04 16:57:56 +00:00
Xin Li
992c9d196f Merge Android10 QPR1 into AOSP master am: dd964bfe0c
am: 1b97c6e8ba

Change-Id: I15fd5bf6fa3e4cd6b3acc4f2d19a75f8b24a9b2d
2019-12-04 08:08:13 -08:00
Xin Li
1b97c6e8ba Merge Android10 QPR1 into AOSP master
am: dd964bfe0c

Change-Id: Idcb351aa982a5d95a16ec12e4500f68cb5b00e13
2019-12-03 16:08:09 -08:00
Chamarthi Kishore
4bc3e63c30 encoder: Return gracefully from entropy encoding errors
Recent error propagation change in encoder introduced a DoS when
output buffer is not large enough to hold the frame encoded.
This commit fixes the DoS seen.

Test: avcenc -c enc.cfg, avcdec -c dec.cfg
Test: revert fix for b/144928581 to reduce the output buffer size
Test: atest android.media.cts.VideoEncoderTest#testGoogH264FlexMaxMax
Test: atest android.media.cts.VideoEncoderTest#testGoogH264Flex1080p

Bug:145019703

Change-Id: I3b3408153a2cb8541a87547d51dd8bde25a33d6c
2019-12-03 15:30:38 +05:30
Xin Li
dd964bfe0c Merge Android10 QPR1 into AOSP master
Bug: 145570283
Change-Id: I3aa82731c599d2e1a92fa9f309aa34c641dd3116
2019-12-02 21:25:05 -08:00
Harish Mahendrakar
86d06a286a Merge "fuzzer: Updates to fuzzer plugin" am: 25e615b9cb am: 82735c3553
am: e5204d0626

Change-Id: I10c81150f7ecd9fbdab94eaa85d0abddd2d850f1
2019-11-14 13:30:11 -08:00
Harish Mahendrakar
e5204d0626 Merge "fuzzer: Updates to fuzzer plugin" am: 25e615b9cb
am: 82735c3553

Change-Id: I0678fcfb220e7679bed499738d3bdce0649722f7
2019-11-14 13:26:56 -08:00
Harish Mahendrakar
82735c3553 Merge "fuzzer: Updates to fuzzer plugin"
am: 25e615b9cb

Change-Id: Ic4b2c071197abb0b08774f0a4f5f71bf6ad17225
2019-11-14 13:23:04 -08:00
Treehugger Robot
25e615b9cb Merge "fuzzer: Updates to fuzzer plugin" 2019-11-14 21:12:42 +00: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
Harish Mahendrakar
873bac42ec decoder: Move initialization of dbp_mgr entries to init_decoder() am: 01da7b5a52 am: 41fcd228ae am: cce42ea920 am: 6c9873af88
am: 662efee177

Change-Id: I14c0ab90853acfae799d88c288b3e28bfa734336
2019-11-05 16:58:10 -08:00
Harish Mahendrakar
662efee177 decoder: Move initialization of dbp_mgr entries to init_decoder() am: 01da7b5a52 am: 41fcd228ae am: cce42ea920
am: 6c9873af88

Change-Id: Ie95d6b810f751847eed7bc2c17c120a891b88fef
2019-11-05 16:52:06 -08:00
Harish Mahendrakar
6c9873af88 decoder: Move initialization of dbp_mgr entries to init_decoder() am: 01da7b5a52 am: 41fcd228ae
am: cce42ea920

Change-Id: Ic12eb8cd9a900cae262b9f2e8a28925b33e4a018
2019-11-05 16:43:04 -08:00
Harish Mahendrakar
cce42ea920 decoder: Move initialization of dbp_mgr entries to init_decoder() am: 01da7b5a52
am: 41fcd228ae

Change-Id: Id8fa44c3401f7ac1d2a540fa35cf0f4346da2c42
2019-11-05 16:31:59 -08:00
Harish Mahendrakar
41fcd228ae decoder: Move initialization of dbp_mgr entries to init_decoder()
am: 01da7b5a52

Change-Id: I93871c49b268b3ead96db8e44eb268c70f124379
2019-11-05 16:25:58 -08:00
Chamarthi Kishore
68dce05ea6 Merge changes I015ebe03,Idc0b0db5 am: 00fa4b6490 am: 7684b467b4
am: d49fffd5f4

Change-Id: I0da6b5b695adb949b28ca9d29f806cd11625d2eb
2019-10-31 19:11:43 -07:00
Chamarthi Kishore
d49fffd5f4 Merge changes I015ebe03,Idc0b0db5 am: 00fa4b6490
am: 7684b467b4

Change-Id: I6a0fc13cef05afdbd5df7a15481e3bf330ac250b
2019-10-31 19:05:49 -07:00
Chamarthi Kishore
7684b467b4 Merge changes I015ebe03,Idc0b0db5
am: 00fa4b6490

Change-Id: I71e761af5fd1551643418dd7979491c2a6b7a7ee
2019-10-31 18:59:50 -07:00
Treehugger Robot
00fa4b6490 Merge changes I015ebe03,Idc0b0db5
* changes:
  libavc: Handling of Error propagation
  libavc: Add MDCV, CLL, CCV and AVE SEI messages
2019-11-01 01:43:17 +00:00
Xin Li
3c84c2a29b [automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: a4681ae1f2
am: c0891c3904 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib525c89073d451ee28591d0111fffa1adfe6b5a7
2019-10-31 14:01:47 -07:00
Xin Li
c0891c3904 DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
am: a4681ae1f2

Change-Id: I4ac47f8ce3f707852184a195e1915719ac76f7d1
2019-10-31 13:14:25 -07:00
Xin Li
a4681ae1f2 DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
Bug: 142003500
Change-Id: I389ad42476fc31f17978132b3361c344e1a755b3
2019-10-30 11:47:56 -07:00