Commit graph

342 commits

Author SHA1 Message Date
Marco Nelissen
b6433595df Merge "Decoder: Initialize MB info buffer to zero." into nyc-dev am: 31bd7f7fe6 am: 049aabf9c5 am: 3ff76c0667 am: e8c0283013
am: 27f44e43a4

Change-Id: I4ae4e3c8c5e6045cdbe10a2e850c41f8240fbe5a
2017-05-13 02:04:21 +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
c0994c1fea 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 am: 9e191ce3a6
am: ae093b98bc

Change-Id: Ia1f3dd1694f82f24fb7fa006d722c7a9f38a1572
2017-05-12 23:10:02 +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
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
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
c162dc3c14 Decoder: Added an error check while parsing PPS. am: 62f98981ff am: 0f6a1883e8 am: e0e549aad5 am: d9a55dded2 am: d5f3df9c33 am: 4f7fa508be am: 58f4462bc5 am: 7a004abec2
am: 3afa0cacc7

Change-Id: I0ab72ef99a617a2280dff8d13a9cb8e7d94aeb64
2017-05-12 21:20:14 +00: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
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
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
Harish Mahendrakar
b308dc1318 Fix stack buffer overflow in ih264d_process_intra_mb am: f69e34419b am: cbaa0dc3f9 am: 943e36e510
am: 6a897f0c3a

Change-Id: I75f379b049ee2336b50d0fffe77a6a842896819c
2017-05-10 16:43:41 +00:00
Harish Mahendrakar
cbaa0dc3f9 Fix stack buffer overflow in ih264d_process_intra_mb
am: f69e34419b

Change-Id: I154d8dd94d11be2d34b8085c30e24f6bec62d9eb
2017-05-10 16:20:37 +00:00
Harish Mahendrakar
f69e34419b Fix stack buffer overflow in ih264d_process_intra_mb
Aligned the sizes of au1_ngbr_pels to ensure SSE42 functions do not
result in stack buffer overflow

Bug: 36490809

Change-Id: I0bfe493f94647046013759b3ec9db3c627ac471e
2017-05-10 15:58:24 +00:00
Hamsalekha S
1d06027c69 DO NOT MERGE Fixed bug in the case of resolution change.
Modified the way i4_header_decoded in decoder context
is used, to ensure that resolution change is detected
even if PPS has not been decoded.

Bug: 35583675
Test: ran POC, no longer hangs

Change-Id: Ibb3f8dfbeb66a999fd81720a7d2a02dd951a55c4
2017-04-12 12:58:13 -07:00
Hamsalekha S
8454dbfccd DO NOT MERGE Fixed bug in the case of resolution change.
Modified the way i4_header_decoded in decoder context
is used, to ensure that resolution change is detected
even if PPS has not been decoded.

Cherry pick of Change-Id: Ibb3f8dfbeb66a999fd81720a7d2a02dd951a55c4
which went into master post-N.

Bug: 35583675
Test: ran POC, no longer hangs
Change-Id: Ifd21ebe1827d6d0c13018983c46c4301c2bb1669
2017-04-12 10:26:46 -07:00
Wonsik Kim
142221a3f9 DO NOT MERGE Handle level/profile/num_ref_frames/num_reorder change at the same resolution
Cherry pick of Change-Id: Ifa78c3125ab207ce5e39166f4891cba0d3a4e39c
which went into master (post-n). This needed backporting to M so that
the final fix for 35583675 could be integrated.

Bug: 35583675
Test: ran POC without failure
Change-Id: I0d248212aaf6635f34a70ad36657416a0c623d32
2017-04-12 10:23:33 -07:00
Hamsalekha S
2575ae6c98 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: I23561a6a7fe852c0563a631d7ec6ab022cd78ccc
2017-04-11 09:22:16 -07:00
Marco Nelissen
0627bf0405 Merge "Decoder: Fix in reference list initialization." into mnc-dev am: 0015860fdc am: 9208f9461f am: c783f2efbe am: 68c59343e1 am: 0d7aed6e94 am: b581941c80 am: 9a17d36ba0 am: 62b880ae82
am: 88e53d081f

Change-Id: I59176977801e382bbc4a6656bef526115c6d0ce6
2017-04-06 23:40:13 +00:00
Marco Nelissen
b581941c80 Merge "Decoder: Fix in reference list initialization." into mnc-dev am: 0015860fdc am: 9208f9461f am: c783f2efbe am: 68c59343e1
am: 0d7aed6e94

Change-Id: I4c6078819cfa010fbeae9843e842c2ab0580bf1e
2017-04-06 23:24:43 +00:00
Marco Nelissen
0d7aed6e94 Merge "Decoder: Fix in reference list initialization." into mnc-dev am: 0015860fdc am: 9208f9461f am: c783f2efbe
am: 68c59343e1

Change-Id: I1c765b8f5a0d82e673ecf5e64df2616ffb4ce444
2017-04-06 23:21:12 +00:00
Marco Nelissen
9208f9461f Merge "Decoder: Fix in reference list initialization." into mnc-dev
am: 0015860fdc

Change-Id: I731793974cd3607fed07cb7895234e5f9484a0ea
2017-04-06 23:10:11 +00:00
Marco Nelissen
0015860fdc Merge "Decoder: Fix in reference list initialization." into mnc-dev 2017-04-06 23:00:48 +00:00
Ray Essick
41bb6d6a66 Merge "Decoder: Fixes in accessing mbaff flag in error cases" into mnc-dev am: 7ace2f5ca2 am: ba33452066 am: e8faa24c74 am: 57ba056850
am: aff1a88f83

Change-Id: I361ec98b31db1d82106b1042c2170008fa661ec7
2017-04-05 23:47:35 +00:00
Ray Essick
aff1a88f83 Merge "Decoder: Fixes in accessing mbaff flag in error cases" into mnc-dev am: 7ace2f5ca2 am: ba33452066 am: e8faa24c74
am: 57ba056850

Change-Id: I17a61a91bafc8dc1c888b2d084f5b64e2adb01cf
2017-04-05 23:45:06 +00:00
Ray Essick
ba33452066 Merge "Decoder: Fixes in accessing mbaff flag in error cases" into mnc-dev
am: 7ace2f5ca2

Change-Id: I5dde0d284cb06fa2faddae483900df1102d9bc52
2017-04-05 23:36:35 +00:00
Ray Essick
7ace2f5ca2 Merge "Decoder: Fixes in accessing mbaff flag in error cases" into mnc-dev 2017-04-05 23:29:45 +00:00
Ray Essick
fa74fd8b50 Merge "Fix in the case of MMCO 3 (long term reference idx)." into mnc-dev am: 64b617346c am: bfb5f29471 am: 98a81bb017 am: 14276b25d1
am: 24c16eb2b5

Change-Id: I271a81f034a16b81f23389a5f91b2de1a384bc12
2017-04-05 21:24:57 +00:00
Ray Essick
24c16eb2b5 Merge "Fix in the case of MMCO 3 (long term reference idx)." into mnc-dev am: 64b617346c am: bfb5f29471 am: 98a81bb017
am: 14276b25d1

Change-Id: Idc8f7d3cc1c5869a11d0abc2bdf1aedf38fa8224
2017-04-05 21:22:26 +00:00
Ray Essick
bfb5f29471 Merge "Fix in the case of MMCO 3 (long term reference idx)." into mnc-dev
am: 64b617346c

Change-Id: Ia57a698ac23ee4abeefe194c8585301941984771
2017-04-05 21:13:56 +00:00
Ray Essick
64b617346c Merge "Fix in the case of MMCO 3 (long term reference idx)." into mnc-dev 2017-04-05 21:09:18 +00:00
Harish Mahendrakar
0f2f2b5fde Decoder: Fixes in accessing mbaff flag in error cases
ps_dec->ps_cur_slice->u1_mbaff_frame_flag is updated in ih264d_start_of_pic().
So updated value should be used after calling ih264d_start_of_pic()

Bug: 33974623
Test: ran POC from bug
Change-Id: I0f1ff5e01ed39767f493f197791e51b0da74952f
(cherry picked from commit 3f6937a003)
2017-03-23 23:46:33 +00:00
Hamsalekha S
93954f5e9a Decoder: Fix in reference list initialization.
In the case of error, initialize the new reference list1 with the first
picture in default list0 instead of default list1, as first picture in
list1 could still be invalid.

Bug: 36035074

Change-Id: I7ab493ee7a157cbefcd4da8389ff1ff899c16b7f
2017-03-22 16:55:01 +00:00
Ray Essick
691577d923 Merge "Decoder: Fixed error handling for dangling fields" into mnc-dev am: 78334b2a24 am: cd5ebec24a am: f48987d2fc am: 1cbcdd7f16
am: 3a669baf18

Change-Id: I828a75f93c0a49474f9be6d075ca3b75d27cf8fd
2017-03-14 22:35:50 +00:00
Ray Essick
3a669baf18 Merge "Decoder: Fixed error handling for dangling fields" into mnc-dev am: 78334b2a24 am: cd5ebec24a am: f48987d2fc
am: 1cbcdd7f16

Change-Id: I2adb58066b67a321c9b7275874a7ebb04e8e7c9d
2017-03-14 22:30:50 +00:00
Ray Essick
cd5ebec24a Merge "Decoder: Fixed error handling for dangling fields" into mnc-dev
am: 78334b2a24

Change-Id: Id5cb9826e72c59890526300ad9e8833b61691c20
2017-03-14 22:15:20 +00:00
Ray Essick
78334b2a24 Merge "Decoder: Fixed error handling for dangling fields" into mnc-dev 2017-03-14 22:08:38 +00:00
Hamsalekha S
46e96d40db Fix in the case of MMCO 3 (long term reference idx).
Increment number of long term reference buffers only when both top field
and bottom field have been set as long term.

[backport for M/N from master]

Bug: 35584425
Test: ran POC - no hang, no segfault.

Change-Id: I94e3857944da675eda38f8e1a9bd887f48bff524
(cherry picked from commit 6fa5df8811)
2017-03-04 20:13:09 +00:00
Ray Essick
35ab7bdfa0 Merge "Fix in the case of MMCO 3 (long term reference idx)." 2017-03-01 20:54:06 +00:00
Ray Essick
8429840eec Merge "Bug fix for flush without valid frames" 2017-03-01 20:54:00 +00:00
Hamsalekha S
a3ab2caa43 Fixed bug in the case of resolution change.
Modified the way i4_header_decoded in decoder context
is used, to ensure that resolution change is detected
even if PPS has not been decoded.

Bug: 35583675
Test: ran POC, no longer hangs

Change-Id: Ibb3f8dfbeb66a999fd81720a7d2a02dd951a55c4
2017-02-21 12:20:06 -08:00
Hamsalekha S
d0ab5b06d7 Bug fix for flush without valid frames
We now return fail and get out of flush mode to accept bitstream in the next call.

Bug: 35585952
Test: test case does not hang

Change-Id: Id22cc98d4a47714475a67918990a181a805c4c9f
2017-02-21 12:18:44 -08:00
Hamsalekha S
6fa5df8811 Fix in the case of MMCO 3 (long term reference idx).
Increment number of long term reference buffers only when both top field
and bottom field have been set as long term.

Bug: 35584425
Test: ran POC - no hang, no segfault.

Change-Id: I94e3857944da675eda38f8e1a9bd887f48bff524
2017-02-21 12:17:02 -08:00