Commit graph

1208 commits

Author SHA1 Message Date
Marco Nelissen
fed8ee727b Merge "Decoder: Fix allocation for Mbaff weight matrix" into mnc-dr-dev am: db8f1ae73f am: dcbf996666 am: 8b4c87943a am: 672cb37cc6 am: ad69241f3a
am: 7ba9ed2338

Change-Id: Iaef13a14e3faba4fee31d42ab342f4eecfc3f69e
2017-05-16 15:42:53 +00:00
Marco Nelissen
7ba9ed2338 Merge "Decoder: Fix allocation for Mbaff weight matrix" into mnc-dr-dev am: db8f1ae73f am: dcbf996666 am: 8b4c87943a am: 672cb37cc6
am: ad69241f3a

Change-Id: Ie05579d8790027230fd0c612fd224c576b8e61bb
2017-05-16 15:39:53 +00:00
Marco Nelissen
ad69241f3a Merge "Decoder: Fix allocation for Mbaff weight matrix" into mnc-dr-dev am: db8f1ae73f am: dcbf996666 am: 8b4c87943a
am: 672cb37cc6

Change-Id: Ic3a2832c01bd74ab7a3c788f5e04a6161fed4c78
2017-05-16 15:36:52 +00:00
Marco Nelissen
672cb37cc6 Merge "Decoder: Fix allocation for Mbaff weight matrix" into mnc-dr-dev am: db8f1ae73f am: dcbf996666
am: 8b4c87943a

Change-Id: I817cc880f6bdb57c193b8ef272bb39b97934ddce
2017-05-16 15:33:21 +00:00
Marco Nelissen
8b4c87943a Merge "Decoder: Fix allocation for Mbaff weight matrix" into mnc-dr-dev am: db8f1ae73f
am: dcbf996666

Change-Id: I8d4d8d06a89bf012e1a0b0bfba0b4428f8d45673
2017-05-16 15:30:21 +00:00
Marco Nelissen
dcbf996666 Merge "Decoder: Fix allocation for Mbaff weight matrix" into mnc-dr-dev
am: db8f1ae73f

Change-Id: I51d0a8db1db66e5246d8f80441a19949e7138d22
2017-05-16 15:27:22 +00:00
Marco Nelissen
db8f1ae73f Merge "Decoder: Fix allocation for Mbaff weight matrix" into mnc-dr-dev 2017-05-16 15:22:17 +00:00
Hamsalekha S
78c8c06c2b Merge "DO NOT MERGE Fixed bug during resolution change" into mnc-dev am: b0399be998 -s ours am: 7fe4422739 -s ours am: 6858ba0b0a -s ours am: c8affe233f -s ours am: cc08835595 -s ours am: 529cd7acaa -s ours
am: 3a5a6a34d7  -s ours

Change-Id: Ie485bd752c2f7973859d9a0b3d66e963320fb375
2017-05-15 19:10:03 +00:00
Hamsalekha S
3a5a6a34d7 Merge "DO NOT MERGE Fixed bug during resolution change" into mnc-dev am: b0399be998 -s ours am: 7fe4422739 -s ours am: 6858ba0b0a -s ours am: c8affe233f -s ours am: cc08835595 -s ours
am: 529cd7acaa  -s ours

Change-Id: Id1c18097331638ad767fbebc6a96ba3e425aea71
2017-05-15 19:04:02 +00:00
Hamsalekha S
529cd7acaa Merge "DO NOT MERGE Fixed bug during resolution change" into mnc-dev am: b0399be998 -s ours am: 7fe4422739 -s ours am: 6858ba0b0a -s ours am: c8affe233f -s ours
am: cc08835595  -s ours

Change-Id: I103b98c5b508a6034f07c5aae81373cb1fe5d28c
2017-05-15 19:01:32 +00:00
Hamsalekha S
cc08835595 Merge "DO NOT MERGE Fixed bug during resolution change" into mnc-dev am: b0399be998 -s ours am: 7fe4422739 -s ours am: 6858ba0b0a -s ours
am: c8affe233f  -s ours

Change-Id: Ia658a621d1fb4d7aee7d87b0ab02b1e72f9620f6
2017-05-15 18:58:31 +00:00
Hamsalekha S
c8affe233f Merge "DO NOT MERGE Fixed bug during resolution change" into mnc-dev am: b0399be998 -s ours am: 7fe4422739 -s ours
am: 6858ba0b0a  -s ours

Change-Id: I7468b5b914e45fb98b1914390cf7db5516937912
2017-05-15 18:55:31 +00:00
Hamsalekha S
6858ba0b0a Merge "DO NOT MERGE Fixed bug during resolution change" into mnc-dev am: b0399be998 -s ours
am: 7fe4422739  -s ours

Change-Id: I79a60141ef92755d0267c4e857d681250b551739
2017-05-15 18:52:31 +00:00
Hamsalekha S
7fe4422739 Merge "DO NOT MERGE Fixed bug during resolution change" into mnc-dev
am: b0399be998  -s ours

Change-Id: I7a55489df7f9e11b952f9205089d8f61be5eb4ba
2017-05-15 18:49:31 +00:00
TreeHugger Robot
b0399be998 Merge "DO NOT MERGE Fixed bug during resolution change" into mnc-dev 2017-05-15 18:45:41 +00:00
Hamsalekha S
6b8184944b DO NOT MERGE Fixed bug during resolution change
Modifies how i4_header_decoded is decoder context is used, to ensure
that resolution change is detected even if PPS has not been decoded.

This retrofits parts of the below mentioned 'merged-in' commits
which solve this for mnc-dr and later versions of the library. The retrofit
required dropping portions that affected code introduced in a later baseline.

Bug: 35583675
Test: provided input file no longer hangs
Change-Id: I8fa30543759c5762b18e2380513e2ce616c858ef
Merged-In: I0d248212aaf6635f34a70ad36657416a0c623d32
Merged-In: Ifd21ebe1827d6d0c13018983c46c4301c2bb1669
2017-05-15 10:22:55 -07:00
Marco Nelissen
e8c0283013 Merge "Decoder: Initialize MB info buffer to zero." into nyc-dev am: 31bd7f7fe6 am: 049aabf9c5
am: 3ff76c0667

Change-Id: I04f8af42f63a718253de01ed6d0afa7ad035491a
2017-05-13 01:59:50 +00:00
Marco Nelissen
3ff76c0667 Merge "Decoder: Initialize MB info buffer to zero." into nyc-dev am: 31bd7f7fe6
am: 049aabf9c5

Change-Id: Ic3b08a7fe8358bc491ceae0a1a4727b46fe8cd68
2017-05-13 01:58:19 +00:00
Marco Nelissen
049aabf9c5 Merge "Decoder: Initialize MB info buffer to zero." into nyc-dev
am: 31bd7f7fe6

Change-Id: Ie031e6a9ad10f6cbd919973af34a06e15fd78095
2017-05-13 01:54:49 +00:00
Marco Nelissen
31bd7f7fe6 Merge "Decoder: Initialize MB info buffer to zero." into nyc-dev 2017-05-13 01:44:26 +00:00
Hamsalekha S
9e191ce3a6 Merge "Decoder: Fixed flag u1_top_bottom_decoded." into mnc-dev am: cc07eaa5d2 am: 9a5c62841e am: 514d08016a am: 4dd1490ec9 am: 122d0942a8 am: 917c7eee1c
am: d189b84641

Change-Id: I40e7c517cbbaddf9ba5d42516de40c91298138ef
2017-05-12 23:06:02 +00:00
Marco Nelissen
f483e983c7 Merge "Decoder: Initialize MB info buffer to zero." into mnc-dev am: f7e747727c -s ours am: 7a72e353d6 am: c400de5b4c am: 23e2f0dd30 am: d7f272f601 am: aa03fb2f87
am: 102ca5883d

Change-Id: I52e5e14dc7b273bdd11c84fb0c1ffef7fff0778a
2017-05-12 23:05:53 +00:00
Hamsalekha S
d189b84641 Merge "Decoder: Fixed flag u1_top_bottom_decoded." into mnc-dev am: cc07eaa5d2 am: 9a5c62841e am: 514d08016a am: 4dd1490ec9 am: 122d0942a8
am: 917c7eee1c

Change-Id: Ie878b182fdb3faf7c4088a534f7f292cd47e0831
2017-05-12 23:04:31 +00:00
Marco Nelissen
102ca5883d Merge "Decoder: Initialize MB info buffer to zero." into mnc-dev am: f7e747727c -s ours am: 7a72e353d6 am: c400de5b4c am: 23e2f0dd30 am: d7f272f601
am: aa03fb2f87

Change-Id: I17004b5cb515283178bf69405c7db19c8d44fec1
2017-05-12 23:04:22 +00:00
Hamsalekha S
917c7eee1c Merge "Decoder: Fixed flag u1_top_bottom_decoded." into mnc-dev am: cc07eaa5d2 am: 9a5c62841e am: 514d08016a am: 4dd1490ec9
am: 122d0942a8

Change-Id: I53408f560fed7e2a5d88d5a3e3e5f77f01deb41d
2017-05-12 23:02:32 +00:00
Marco Nelissen
aa03fb2f87 Merge "Decoder: Initialize MB info buffer to zero." into mnc-dev am: f7e747727c -s ours am: 7a72e353d6 am: c400de5b4c am: 23e2f0dd30
am: d7f272f601

Change-Id: I9f10ac70cfa56784450eb5bfd5053a76871cf14e
2017-05-12 23:02:23 +00:00
Hamsalekha S
122d0942a8 Merge "Decoder: Fixed flag u1_top_bottom_decoded." into mnc-dev am: cc07eaa5d2 am: 9a5c62841e am: 514d08016a
am: 4dd1490ec9

Change-Id: I26aba2880f2d669227d25535f6700b6c2034dfcd
2017-05-12 23:00:06 +00:00
Marco Nelissen
d7f272f601 Merge "Decoder: Initialize MB info buffer to zero." into mnc-dev am: f7e747727c -s ours am: 7a72e353d6 am: c400de5b4c
am: 23e2f0dd30

Change-Id: I11d6f7b46e51ccd57d5d83a9d0c3b131d73672e8
2017-05-12 22:59:53 +00:00
Hamsalekha S
4dd1490ec9 Merge "Decoder: Fixed flag u1_top_bottom_decoded." into mnc-dev am: cc07eaa5d2 am: 9a5c62841e
am: 514d08016a

Change-Id: Ic3afed37addb2c75f3b0e02311b510bafe74ed5a
2017-05-12 22:55:33 +00:00
Marco Nelissen
23e2f0dd30 Merge "Decoder: Initialize MB info buffer to zero." into mnc-dev am: f7e747727c -s ours am: 7a72e353d6
am: c400de5b4c

Change-Id: I45f6ed2aa098ac7648bfe08ed3f48051dae28d0d
2017-05-12 22:55:21 +00:00
Hamsalekha S
514d08016a Merge "Decoder: Fixed flag u1_top_bottom_decoded." into mnc-dev am: cc07eaa5d2
am: 9a5c62841e

Change-Id: I6a96fb0b72851baf98e3b89460f667a3f7450a69
2017-05-12 22:52:59 +00:00
Marco Nelissen
c400de5b4c Merge "Decoder: Initialize MB info buffer to zero." into mnc-dev am: f7e747727c -s ours
am: 7a72e353d6

Change-Id: Idcbd3d944f5891fdccef4228c9ed7758bbc40e48
2017-05-12 22:52:51 +00:00
Hamsalekha S
9a5c62841e Merge "Decoder: Fixed flag u1_top_bottom_decoded." into mnc-dev
am: cc07eaa5d2

Change-Id: Ie410da29e20aed95d674aaaeddd683e1f616c448
2017-05-12 22:51:00 +00:00
Marco Nelissen
7a72e353d6 Merge "Decoder: Initialize MB info buffer to zero." into mnc-dev
am: f7e747727c  -s ours

Change-Id: I4bd4fcd8d31f346640aad49ecbf9c2aaa66bf6ef
2017-05-12 22:50:51 +00:00
TreeHugger Robot
cc07eaa5d2 Merge "Decoder: Fixed flag u1_top_bottom_decoded." into mnc-dev 2017-05-12 22:06:48 +00:00
Marco Nelissen
f7e747727c Merge "Decoder: Initialize MB info buffer to zero." into mnc-dev 2017-05-12 21:38:45 +00:00
Hamsalekha S
7a004abec2 Decoder: Added an error check while parsing PPS. am: 62f98981ff am: 0f6a1883e8 am: e0e549aad5 am: d9a55dded2 am: d5f3df9c33 am: 4f7fa508be
am: 58f4462bc5

Change-Id: Ieca524810cfef67b8dde42a8484957f4601dc58d
2017-05-12 21:14:13 +00:00
Hamsalekha S
58f4462bc5 Decoder: Added an error check while parsing PPS. am: 62f98981ff am: 0f6a1883e8 am: e0e549aad5 am: d9a55dded2 am: d5f3df9c33
am: 4f7fa508be

Change-Id: I45ba92f847bc16e9fda33a3d594271f8688ce6f9
2017-05-12 21:11:46 +00:00
Hamsalekha S
07db35ad5a Decoder: Fix allocation for Mbaff weight matrix
Increased the allocation size for Mbaff weight
matrix buffer

Bug: 36996978

Change-Id: I21cf2cb1010abdc6346f743f5237ae1730c4bf41
2017-05-12 14:11:10 -07:00
Hamsalekha S
4f7fa508be Decoder: Added an error check while parsing PPS. am: 62f98981ff am: 0f6a1883e8 am: e0e549aad5 am: d9a55dded2
am: d5f3df9c33

Change-Id: I8c2bfdd9bc97e79747b62d62bd28a683d6d9d77f
2017-05-12 21:08:07 +00:00
Hamsalekha S
d5f3df9c33 Decoder: Added an error check while parsing PPS. am: 62f98981ff am: 0f6a1883e8 am: e0e549aad5
am: d9a55dded2

Change-Id: I9da641f5a525d603a01acf53e298e5fcda0bf679
2017-05-12 21:05:11 +00:00
Hamsalekha S
d9a55dded2 Decoder: Added an error check while parsing PPS. am: 62f98981ff am: 0f6a1883e8
am: e0e549aad5

Change-Id: I6d26c461742bd9283a4aa3e67048a0b71c5d696c
2017-05-12 21:02:42 +00:00
Hamsalekha S
e0e549aad5 Decoder: Added an error check while parsing PPS. am: 62f98981ff
am: 0f6a1883e8

Change-Id: I045f9f92f077c3bc11296c5c8943ccde2a81aab9
2017-05-12 21:00:12 +00:00
Hamsalekha S
0f6a1883e8 Decoder: Added an error check while parsing PPS.
am: 62f98981ff

Change-Id: I2976869f34cf2a20078c3fe4504db9e6c5a3035d
2017-05-12 20:56:41 +00:00
Hamsalekha S
62f98981ff Decoder: Added an error check while parsing PPS.
Added an error check while parsing PPS syntax element
second_chroma_qp_index_offset.

Bug: 37207120

Change-Id: Icba6b7bcf5940505717ee61134ed801c221b6e26
2017-05-12 20:46:28 +00:00
Hamsalekha S
7703822731 Decoder: Fixed flag u1_top_bottom_decoded.
Fixed initialization of flag u1_top_bottom_decoded
in decoder context. This flag indicates if top
field and botton field is decoded.

Bug: 36993291
Test: avcdec --input poc.h264 --output /dev/null
Change-Id: I9f8a2620683abd8b15e4780d76d4849394710716
2017-05-12 20:14:46 +00:00
Ray Essick
a72c352767 Merge changes from topic 'b35583675-mnc-dr' into mnc-dr-dev am: 126058dcb2 am: 217504e29b am: 324309e217 am: 1782ce4b91 am: 2f800e28a7
am: 4f80cfbc5e

Change-Id: I6747710056da53e99f316c4a23cbf4c2e0fae84f
2017-05-12 17:56:56 +00:00
Ray Essick
4f80cfbc5e Merge changes from topic 'b35583675-mnc-dr' into mnc-dr-dev am: 126058dcb2 am: 217504e29b am: 324309e217 am: 1782ce4b91
am: 2f800e28a7

Change-Id: I7ec0548adaa8501295490c31d328908daaddf2a4
2017-05-12 17:54:56 +00:00
Ray Essick
2f800e28a7 Merge changes from topic 'b35583675-mnc-dr' into mnc-dr-dev am: 126058dcb2 am: 217504e29b am: 324309e217
am: 1782ce4b91

Change-Id: I77a7338c0828bb78089b326cbcdf1590e43df4ba
2017-05-12 17:52:26 +00:00
Ray Essick
b481f67005 Merge "DO NOT MERGE Fixed bug in the case of resolution change." into nyc-dev am: 3d01dc4bdd am: cba660f4c9
am: dab287d4a0

Change-Id: I9c334e5892968a8166e75ba0905bfe3d9ecac6ff
2017-05-12 17:50:27 +00:00