wrapper/libavc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
3025 commits 1 branch 10 tags 7 MiB
Commit graph

3025 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
c626f5c8fe Remove mips workarounds. am: 748aa1e459 am: db13a9728d 
Change-Id: I85298d8f1c19bae831848b9b1c6500e0e27d2584
 2020-03-10 03:39:10 +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
7456fa0f27 [automerger skipped] Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 29fc5cb2f2 am: 091cff7215 -s ours 
am skip reason: subject contains skip directive

Change-Id: Ib8d4b5c700db530ed2d7ddf8f69ba7efa486cba8
 2020-03-06 00:25:36 +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
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