Marco Nelissen
199f817de6
Merge "DO NOT MERGE Decoder: Fix allocation for Mbaff weight matrix" into mnc-dev am: cb89747145 -s ours am: b2ce6aa1f3 am: b93a69fcd4 am: 63969de3ba -s ours
...
am: a82c945e4a
Change-Id: Ib1287e02601584936b8525feb55ed9fec845ae18
2017-05-16 16:25:25 +00:00
Marco Nelissen
a82c945e4a
Merge "DO NOT MERGE Decoder: Fix allocation for Mbaff weight matrix" into mnc-dev am: cb89747145 -s ours am: b2ce6aa1f3 am: b93a69fcd4
...
am: 63969de3ba -s ours
Change-Id: I9c47cd5bae6a0c041e54d2fc25f4ca26c6da52a2
2017-05-16 16:22:25 +00:00
Marco Nelissen
63969de3ba
Merge "DO NOT MERGE Decoder: Fix allocation for Mbaff weight matrix" into mnc-dev am: cb89747145 -s ours am: b2ce6aa1f3
...
am: b93a69fcd4
Change-Id: Idec12b72a69b3ea8cf55bd91261da2ddad2a4759
2017-05-16 16:19:25 +00:00
Marco Nelissen
b93a69fcd4
Merge "DO NOT MERGE Decoder: Fix allocation for Mbaff weight matrix" into mnc-dev am: cb89747145 -s ours
...
am: b2ce6aa1f3
Change-Id: Id0a8d9db3c2543f657e5f7b064976de220e74afb
2017-05-16 16:16:25 +00:00
Marco Nelissen
b2ce6aa1f3
Merge "DO NOT MERGE Decoder: Fix allocation for Mbaff weight matrix" into mnc-dev
...
am: cb89747145 -s ours
Change-Id: Ia9b9f922897c4e156bae3a8d60671fb883f55e0d
2017-05-16 16:12:54 +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
Marco Nelissen
cb89747145
Merge "DO NOT MERGE Decoder: Fix allocation for Mbaff weight matrix" into mnc-dev
2017-05-16 15:22:10 +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
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
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
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
60be1fe459
DO NOT MERGE Decoder: Fix allocation for Mbaff weight matrix
...
Increased the allocation size for Mbaff weight
matrix buffer
Bug: 36996978
Change-Id: I66c8ab24ec4083f16a86ffc9c0e36f5fd7785f92
2017-05-12 14:08:44 -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
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
1782ce4b91
Merge changes from topic 'b35583675-mnc-dr' into mnc-dr-dev am: 126058dcb2 am: 217504e29b
...
am: 324309e217
Change-Id: I2ee6d866c047787cf00464a8384c149833158819
2017-05-12 17:50:25 +00:00
Ray Essick
324309e217
Merge changes from topic 'b35583675-mnc-dr' into mnc-dr-dev am: 126058dcb2
...
am: 217504e29b
Change-Id: Ib45a67ba6f1f8c643ec023ef7ed7cf4f17b6e451
2017-05-12 17:48:25 +00:00
Ray Essick
217504e29b
Merge changes from topic 'b35583675-mnc-dr' into mnc-dr-dev
...
am: 126058dcb2
Change-Id: Iab3f6c8e24e1dab74dbcbf4846dac3cefc8260f6
2017-05-12 17:45:55 +00:00
Ray Essick
cba660f4c9
Merge "DO NOT MERGE Fixed bug in the case of resolution change." into nyc-dev
...
am: 3d01dc4bdd
Change-Id: Ia7bcdb836e2cde9925812ddef6736b89cd0e2f8f
2017-05-12 17:45:55 +00:00
Ray Essick
3d01dc4bdd
Merge "DO NOT MERGE Fixed bug in the case of resolution change." into nyc-dev
2017-05-12 17:42:54 +00:00
Ray Essick
126058dcb2
Merge changes from topic 'b35583675-mnc-dr' into mnc-dr-dev
...
* changes:
DO NOT MERGE Fixed bug in the case of resolution change.
DO NOT MERGE Handle level/profile/num_ref_frames/num_reorder change at the same resolution
2017-05-12 17:42:26 +00:00
Hamsalekha S
b421b4bc3b
Decoder: Initialize MB info buffer to zero.
...
Initialize the buffer used to store inter mb info
(reference index, weights etc) to zero.
Bug: 36035683
Change-Id: Ie3ea4307de45813edd553b590df44323be46534f
2017-05-11 12:07:10 -07:00
Harish Mahendrakar
70d50b4389
Fix stack buffer overflow in ih264d_process_intra_mb am: f69e34419b am: cbaa0dc3f9 am: 943e36e510 am: 6a897f0c3a
...
am: b308dc1318
Change-Id: I294bbd58ff6bc340c848783f7cbcfb9d05701e2e
2017-05-10 16:51:44 +00:00