Commit graph

300 commits

Author SHA1 Message Date
TreeHugger Robot
b97daaf1c8 Merge changes from topic "am-d9f32dd9-3390-41f5-bb22-01a4025e5105" into nyc-dr1-dev
* changes:
  [automerger] Update sps id after decoding the sps am: df865d1a3d am: f6dd7e59fc am: fef5c42d9e am: e2882ef69c am: 43add9adfd am: 16c260efdb am: 18dd00f64d
  [automerger] Update sps id after decoding the sps am: df865d1a3d am: f6dd7e59fc am: fef5c42d9e am: e2882ef69c am: 43add9adfd am: 16c260efdb
  [automerger] Update sps id after decoding the sps am: df865d1a3d am: f6dd7e59fc am: fef5c42d9e am: e2882ef69c am: 43add9adfd
  [automerger] Update sps id after decoding the sps am: df865d1a3d am: f6dd7e59fc am: fef5c42d9e am: e2882ef69c
  [automerger] Update sps id after decoding the sps am: df865d1a3d am: f6dd7e59fc am: fef5c42d9e
  [automerger] Update sps id after decoding the sps am: df865d1a3d am: f6dd7e59fc
  [automerger] Update sps id after decoding the sps am: df865d1a3d
  Update sps id after decoding the sps
2018-02-07 22:38:27 +00:00
TreeHugger Robot
2d20d394ca Merge changes from topic "am-bb3693f0-1b1d-44f9-bddc-f066f81f61d7" into nyc-dr1-dev
* changes:
  [automerger] Check limits for log2_max_pic_order_cnt_lsb_minus4 in sps am: 4d32ff55cf am: 1011e9b3e7 am: 840115bf1a am: 8a4369a73f am: 5dd91cba1c am: db58269ba7 am: a7c7893ba1
  [automerger] Check limits for log2_max_pic_order_cnt_lsb_minus4 in sps am: 4d32ff55cf am: 1011e9b3e7 am: 840115bf1a am: 8a4369a73f am: 5dd91cba1c am: db58269ba7
  [automerger] Check limits for log2_max_pic_order_cnt_lsb_minus4 in sps am: 4d32ff55cf am: 1011e9b3e7 am: 840115bf1a am: 8a4369a73f am: 5dd91cba1c
  [automerger] Check limits for log2_max_pic_order_cnt_lsb_minus4 in sps am: 4d32ff55cf am: 1011e9b3e7 am: 840115bf1a am: 8a4369a73f
  [automerger] Check limits for log2_max_pic_order_cnt_lsb_minus4 in sps am: 4d32ff55cf am: 1011e9b3e7 am: 840115bf1a
  [automerger] Check limits for log2_max_pic_order_cnt_lsb_minus4 in sps am: 4d32ff55cf am: 1011e9b3e7
  [automerger] Check limits for log2_max_pic_order_cnt_lsb_minus4 in sps am: 4d32ff55cf
  Check limits for log2_max_pic_order_cnt_lsb_minus4 in sps
2018-01-31 22:25:38 +00:00
Android Build Merger (Role)
484190d3e0 [automerger] Update sps id after decoding the sps am: df865d1a3d am: f6dd7e59fc am: fef5c42d9e am: e2882ef69c am: 43add9adfd am: 16c260efdb am: 18dd00f64d
Change-Id: Ifc362654e5d7a885fdde878cae6de93444701049
2018-01-31 18:44:52 +00:00
Android Build Merger (Role)
18dd00f64d [automerger] Update sps id after decoding the sps am: df865d1a3d am: f6dd7e59fc am: fef5c42d9e am: e2882ef69c am: 43add9adfd am: 16c260efdb
Change-Id: I01e19596b2c40d305f2e127456235d1d353fc1cd
2018-01-31 18:44:51 +00:00
Android Build Merger (Role)
e2882ef69c [automerger] Update sps id after decoding the sps am: df865d1a3d am: f6dd7e59fc am: fef5c42d9e
Change-Id: Iec62ef3e02e3f7b5c4dd97ff7150f782f9c22d44
2018-01-31 18:44:47 +00:00
Android Build Merger (Role)
fef5c42d9e [automerger] Update sps id after decoding the sps am: df865d1a3d am: f6dd7e59fc
Change-Id: Id0dbe58e46afab4c1a565d7c85737b1c493fad3d
2018-01-31 18:44:46 +00:00
Android Build Merger (Role)
f6dd7e59fc [automerger] Update sps id after decoding the sps am: df865d1a3d
Change-Id: I5f0a24ce894a00ed35ad65312897905bb38a0266
2018-01-31 18:44:44 +00:00
Naveen Kumar P
df865d1a3d Update sps id after decoding the sps
The update of sps_id in ps_codec is moved to the end of the sps
parsing function to ensure the sps is completely parsed without
any error

Bug: 71567394
Test: poc before/after
Change-Id: I072b7e0486170ffc46b5c6807aca492013b1b06e
2018-01-31 10:44:08 -08:00
Android Build Merger (Role)
7bcc6d9e73 [automerger] Check limits for log2_max_pic_order_cnt_lsb_minus4 in sps am: 4d32ff55cf am: 1011e9b3e7 am: 840115bf1a am: 8a4369a73f am: 5dd91cba1c am: db58269ba7 am: a7c7893ba1
Change-Id: I0df8b93e52295851c7e18fdc0758351ebc35dc3b
2018-01-26 20:53:37 +00:00
Android Build Merger (Role)
a7c7893ba1 [automerger] Check limits for log2_max_pic_order_cnt_lsb_minus4 in sps am: 4d32ff55cf am: 1011e9b3e7 am: 840115bf1a am: 8a4369a73f am: 5dd91cba1c am: db58269ba7
Change-Id: If3ab6137a30512fd6ad2f135fd4494e719c01a5b
2018-01-26 20:53:36 +00:00
Android Build Merger (Role)
8a4369a73f [automerger] Check limits for log2_max_pic_order_cnt_lsb_minus4 in sps am: 4d32ff55cf am: 1011e9b3e7 am: 840115bf1a
Change-Id: Ib6de9f35196c1accbfc3351d826b1079ce4b32b4
2018-01-26 20:53:33 +00:00
Android Build Merger (Role)
840115bf1a [automerger] Check limits for log2_max_pic_order_cnt_lsb_minus4 in sps am: 4d32ff55cf am: 1011e9b3e7
Change-Id: I5b0373be695152b8bacacdbf45b666404853a785
2018-01-26 20:53:32 +00:00
Android Build Merger (Role)
1011e9b3e7 [automerger] Check limits for log2_max_pic_order_cnt_lsb_minus4 in sps am: 4d32ff55cf
Change-Id: Ifccdd6f76e543106fb097e15d2782386ebe8bfaf
2018-01-26 20:53:31 +00:00
Naveen Kumar P
4d32ff55cf Check limits for log2_max_pic_order_cnt_lsb_minus4 in sps
Bug: 71766721

According to the spec, the value of log2_max_pic_order_cnt_lsb_minus4
shall be in the range of 0 to 12, inclusive.

Change-Id: Ibd199b6dea246c2fac6214c21e49f27d95c07659
2018-01-26 12:43:44 -08:00
Android Build Merger (Role)
dc6a93286c [automerger] Fix output buffer size check am: ce8a8db32e am: 38414e7695 am: 2ab44f7b06 am: 067b752888 am: 3ed61deace am: 324d31ea53 am: 11b4c7987a
Change-Id: I74315ca218b910693b11a706dc1616f5418b60f6
2018-01-26 19:19:35 +00:00
Android Build Merger (Role)
11b4c7987a [automerger] Fix output buffer size check am: ce8a8db32e am: 38414e7695 am: 2ab44f7b06 am: 067b752888 am: 3ed61deace am: 324d31ea53
Change-Id: I1476fc19793b42609e0d039f3738f2d51fb17235
2018-01-26 19:19:34 +00:00
Android Build Merger (Role)
067b752888 [automerger] Fix output buffer size check am: ce8a8db32e am: 38414e7695 am: 2ab44f7b06
Change-Id: If1a90ff6d878a2672133407b83c4799a57a2a9b3
2018-01-26 19:19:30 +00:00
Android Build Merger (Role)
2ab44f7b06 [automerger] Fix output buffer size check am: ce8a8db32e am: 38414e7695
Change-Id: Iedad8fd1223cc52cbf017d3769f400abc9400cd9
2018-01-26 19:19:29 +00:00
Android Build Merger (Role)
38414e7695 [automerger] Fix output buffer size check am: ce8a8db32e
Change-Id: I182d1d4f1a444258cfe4d304b4740d51b45453d6
2018-01-26 19:19:28 +00:00
Naveen Kumar P
ce8a8db32e Fix output buffer size check
Bug: 72165027
Test: ran poc before/after

For output buffer size check, the parameter wd is set to larger
of disp_wd and disp_strd.

Change-Id: I1fc745753762b8a8e943165d0bf6525c500fb020
2018-01-26 10:29:51 -08:00
Naveen Kumar P
11a326d1fe Merge "Check if luma wd and ht are multiple of min cb size" into lmp-dev am: 6a587c6be7
am: b743e04ef4

Change-Id: I525571135133138fded3df3838186eec3ee675f8
2017-12-04 22:56:53 +00:00
Naveen Kumar P
b743e04ef4 Merge "Check if luma wd and ht are multiple of min cb size" into lmp-dev
am: 6a587c6be7

Change-Id: I3cdb3354f7a2172bf9ca4b18c7f37eba469a5433
2017-12-04 22:54:24 +00:00
TreeHugger Robot
6a587c6be7 Merge "Check if luma wd and ht are multiple of min cb size" into lmp-dev 2017-12-04 22:47:22 +00:00
Naveen Kumar P
d053b9dc55 Merge "Check if luma wd and ht are multiple of min cb size" into mnc-dr-dev am: 918c794d94 am: 634a9c6275 am: 19381bf8f7
am: 09719a1747

Change-Id: I313f1e82e12f92256715ae67741a0fa8d62e2d8b
2017-12-02 04:28:32 +00:00
Naveen Kumar P
09719a1747 Merge "Check if luma wd and ht are multiple of min cb size" into mnc-dr-dev am: 918c794d94 am: 634a9c6275
am: 19381bf8f7

Change-Id: I47067a8736a65a8c5b027f8be320bd22a18e9bc2
2017-12-02 04:26:04 +00:00
TreeHugger Robot
918c794d94 Merge "Check if luma wd and ht are multiple of min cb size" into mnc-dr-dev 2017-12-02 04:15:28 +00:00
Naveen Kumar P
ec2c7b5be8 Merge "Update ctb pu map for I slice" into lmp-dev am: d4cb5bc056 am: 2c01a8105a am: 3598a31588 am: 3249f368df am: ef55cf7d83 am: a1930d6125
am: 143746ee0a

Change-Id: I2bb2b69ef1fc9a929b7cffa57b2dca0e5aa847f1
2017-11-30 02:13:20 +00:00
Naveen Kumar P
143746ee0a Merge "Update ctb pu map for I slice" into lmp-dev am: d4cb5bc056 am: 2c01a8105a am: 3598a31588 am: 3249f368df am: ef55cf7d83
am: a1930d6125

Change-Id: I165e84d820229238899e74dda5c869a16b971296
2017-11-30 02:11:49 +00:00
Naveen Kumar P
3249f368df Merge "Update ctb pu map for I slice" into lmp-dev am: d4cb5bc056 am: 2c01a8105a
am: 3598a31588

Change-Id: Ib9d9d7f15fbe75180e6ea476af613c318e782254
2017-11-30 01:57:28 +00:00
Naveen Kumar P
3598a31588 Merge "Update ctb pu map for I slice" into lmp-dev am: d4cb5bc056
am: 2c01a8105a

Change-Id: I713638a47505ff1fcc01346c792390c20f0251cc
2017-11-30 01:51:59 +00:00
Naveen Kumar P
2c01a8105a Merge "Update ctb pu map for I slice" into lmp-dev
am: d4cb5bc056

Change-Id: I32d4d68b49c5e4ce1303ea0e3eef5daca30480bb
2017-11-30 01:47:06 +00:00
TreeHugger Robot
d4cb5bc056 Merge "Update ctb pu map for I slice" into lmp-dev 2017-11-30 01:23:41 +00:00
Naveen Kumar P
43f126112a Update ctb pu map for I slice
The update in I slice is required for P/B slices in the same
frame for accessing neighbor pus.

Bug: 62851602
Bug: 63522067
Test: re-run PoC from b/62851602
Change-Id: Ie5e43f1cd5649b2745b6527654bc24d8c7d42932
2017-11-21 11:50:04 -08:00
Naveen Kumar P
2e75afa0b6 Merge "Fix first frame error return" into mnc-dev am: cd5fc07378 am: 6a8d396574 am: de7f47bcc0 am: 6f830783d1
am: 4ced4d140b

Change-Id: I5693cee77a29fe6591a8d15a698af976688664be
2017-11-07 22:28:24 +00:00
Naveen Kumar P
4ced4d140b Merge "Fix first frame error return" into mnc-dev am: cd5fc07378 am: 6a8d396574 am: de7f47bcc0
am: 6f830783d1

Change-Id: Iefa07132097e1736677f7ad9133a6ee06397f2a8
2017-11-07 22:08:40 +00:00
Bernhard Rosenkrnzer
d330076fb7 Update assembly files to unified syntax
am: e34131d744

Change-Id: I67525321b3be3df8533f25022d57c7292d0897c0
2017-11-07 22:03:39 +00:00
Naveen Kumar P
6a8d396574 Merge "Fix first frame error return" into mnc-dev
am: cd5fc07378

Change-Id: I2f72c111d266c040204fb5cc994f883e486f8281
2017-11-07 21:57:09 +00:00
TreeHugger Robot
cd5fc07378 Merge "Fix first frame error return" into mnc-dev 2017-11-07 21:48:07 +00:00
Naveen Kumar P
8fff219fac Fix first frame error return
Remove the check that returns before joining the slave threads
if there is an error in the first frame. And in slice error mode
do not parse bitstream.

Bug: 64784973
Test: no longer hangs on POC
Change-Id: I3c2e2d9f84304bcb34831d7d796da710154774fa
2017-11-07 18:30:03 +00:00
Bernhard Rosenkränzer
e34131d744 Update assembly files to unified syntax
This allows them to be built with clang's internal assembler.
Also, pass -I flags to the assembler explicitly and stop disabling
clang.

Bug: 68320413
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
Change-Id: I67dfd0d1b44217af6cf159f4d8810b3c2173702b
2017-11-06 17:14:37 -08:00
Sungtak Lee
bd43385f77 Merge "Return error for negative crop parameters" into lmp-mr1-dev am: a96528e62e am: 4852744932 am: 1e8ce1e3fd am: b0fc6be6a2 am: 1b261917c5
am: a6c6fdf878

Change-Id: I9705cc0660ab53a6f29dfec172b468ce5cd14232
2017-11-06 22:52:18 +00:00
Sungtak Lee
a6c6fdf878 Merge "Return error for negative crop parameters" into lmp-mr1-dev am: a96528e62e am: 4852744932 am: 1e8ce1e3fd am: b0fc6be6a2
am: 1b261917c5

Change-Id: Ibcb942a187d0960b9ee16f68ed6349f797d3eda2
2017-11-06 22:49:14 +00:00
Sungtak Lee
1e8ce1e3fd Merge "Return error for negative crop parameters" into lmp-mr1-dev am: a96528e62e
am: 4852744932

Change-Id: I158447b65362d6603421b7503196e90d62fa7d14
2017-11-06 22:40:42 +00:00
Sungtak Lee
4852744932 Merge "Return error for negative crop parameters" into lmp-mr1-dev
am: a96528e62e

Change-Id: I5d95d3aeebc111d2268988c644c7dc6b6cd26f4a
2017-11-06 22:38:12 +00:00
Sungtak Lee
a96528e62e Merge "Return error for negative crop parameters" into lmp-mr1-dev 2017-11-06 22:31:31 +00:00
Ray Essick
3715a6f036 Merge "DO NOT MERGE Consume bytes for sps with unsupported resolution" into lmp-dev 2017-11-03 22:34:15 +00:00
Ray Essick
fe18947966 Merge "DO NOT MERGE Consume bytes for sps with unsupported resolution" into mnc-dev
am: 7973e3adee

Change-Id: I280d506882c7d8b796248897549fb5b9747671d7
2017-11-03 20:30:44 +00:00
Ray Essick
7973e3adee Merge "DO NOT MERGE Consume bytes for sps with unsupported resolution" into mnc-dev 2017-11-03 20:24:47 +00:00
Naveen Kumar P
377b26c01a Merge "Fix slice address zero for not first slice in pic" into lmp-dev am: 114aff802c am: ad70f9c5e2 am: 20a7f0e1b4 am: ef0772c3ca am: 198f56da58 am: 769c1bfda4
am: 84cd0f6f22

Change-Id: I2592eb008296ffcfd8bc9e43bd053518fd128c6b
2017-11-03 19:22:09 +00:00
Wei Jia
46fa92251b Merge "Fix prev slice incomplete check" into lmp-dev am: 94c2e4ad73 am: 7ec4d76835 am: c0b7da5b7c am: 9d4d24e860 am: 8146b1fa13 am: 49e301c21f
am: 4d8b33a446

Change-Id: I53a4079cd51327b9cced65c342d291e8977a5f9e
2017-11-03 19:21:55 +00:00