Commit graph

360 commits

Author SHA1 Message Date
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
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
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
Marco Nelissen
f7e747727c Merge "Decoder: Initialize MB info buffer to zero." into mnc-dev 2017-05-12 21:38:45 +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
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
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
6a897f0c3a Fix stack buffer overflow in ih264d_process_intra_mb am: f69e34419b am: cbaa0dc3f9
am: 943e36e510

Change-Id: I5cc4035677c0d771c8a332f2ec4d27c5fa632cd6
2017-05-10 16:36:09 +00:00
Harish Mahendrakar
943e36e510 Fix stack buffer overflow in ih264d_process_intra_mb am: f69e34419b
am: cbaa0dc3f9

Change-Id: Icfc88f6af57866da1e7333241b4497a34852b773
2017-05-10 16:28:38 +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
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
Marco Nelissen
68c59343e1 Merge "Decoder: Fix in reference list initialization." into mnc-dev am: 0015860fdc am: 9208f9461f
am: c783f2efbe

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

Change-Id: I151a922b85022125b19e050620a7ecd46165bda3
2017-04-06 23:13:42 +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
57ba056850 Merge "Decoder: Fixes in accessing mbaff flag in error cases" into mnc-dev am: 7ace2f5ca2 am: ba33452066
am: e8faa24c74

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

Change-Id: I47fd70b83a28156ed65f6a9badd4375129b8235e
2017-04-05 23:39:05 +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
14276b25d1 Merge "Fix in the case of MMCO 3 (long term reference idx)." into mnc-dev am: 64b617346c am: bfb5f29471
am: 98a81bb017

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

Change-Id: I4cfe55a4216baa64986c4d1966375cc92f8ab22b
2017-04-05 21:16:25 +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
1cbcdd7f16 Merge "Decoder: Fixed error handling for dangling fields" into mnc-dev am: 78334b2a24 am: cd5ebec24a
am: f48987d2fc

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

Change-Id: I47c0da6fb3609c0f31d59366ce7b3f89adbdec18
2017-03-14 22:20:20 +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
Marco Nelissen
858542d83e resolve merge conflicts of 3654ad0 to mnc-dr-dev am: 37345554fe
am: 33d9d00a3c

Change-Id: Ie055bb48e15a3edaef34a9dc30dd65c0769bc1ea
2017-02-14 22:59:01 +00:00
Marco Nelissen
33d9d00a3c resolve merge conflicts of 3654ad0 to mnc-dr-dev
am: 37345554fe

Change-Id: I7117544d1e2c909e353b7df3c42cfc25a9919ecf
2017-02-14 22:55:05 +00:00
Marco Nelissen
37345554fe resolve merge conflicts of 3654ad0 to mnc-dr-dev
Bug: 33818508
Bug: 34013472
Change-Id: I2e99cbceba1c00555d624e8975522725e362362b
2017-02-14 13:49:16 -08:00
Marco Nelissen
3654ad0da5 Merge changes Iec2941f1,I38be0e4c into mnc-dev
* changes:
  Decoder: Add supported width check for MBaff streams
  Decoder: Added a check for unsupported resolutions
2017-02-14 21:30:39 +00:00
Harish Mahendrakar
a37d120eb2 Decoder: Fixed initialization of first_slice_in_pic am: 0b23c81c3d am: 16fa990ce1
am: ab79eb3973

Change-Id: I04510ac0c549313e2082c28d81bd634df6115729
2017-02-14 17:07:07 +00:00
Harish Mahendrakar
89fa016b5f Decoder: Moved end of pic processing to end of decode call am: 494561291a am: ba7f9e2aed
am: 26bb8b98ee

Change-Id: I0e3b1bba6e4bdb11f1d09f8d693f443c8a183198
2017-02-14 17:04:45 +00:00
Harish Mahendrakar
a8a3dc84b0 Decoder: Treat first slice in a picture as part of new picture always am: 8b5fd8f24e am: 8b75cdae9b
am: fb68ae8960

Change-Id: I7b1a01391a4bece53fc64fe4c2173c23c8137cd3
2017-02-14 17:04:37 +00:00
Harish Mahendrakar
ab79eb3973 Decoder: Fixed initialization of first_slice_in_pic am: 0b23c81c3d
am: 16fa990ce1

Change-Id: Id1b05214b3f7d67fea7b7d0a01cbb53b0182c30e
2017-02-14 17:04:36 +00:00
Harish Mahendrakar
26bb8b98ee Decoder: Moved end of pic processing to end of decode call am: 494561291a
am: ba7f9e2aed

Change-Id: I0d8d0bb4265e458dbe1932bf9fc5ff11e367d909
2017-02-14 17:03:15 +00:00
Harish Mahendrakar
16fa990ce1 Decoder: Fixed initialization of first_slice_in_pic
am: 0b23c81c3d

Change-Id: I55e49ca9616a151456342bad7673d0986098b448
2017-02-14 17:03:06 +00:00
Harish Mahendrakar
fb68ae8960 Decoder: Treat first slice in a picture as part of new picture always am: 8b5fd8f24e
am: 8b75cdae9b

Change-Id: Iaadac2cc30016f8a47d85b7b73c130761bb6f004
2017-02-14 17:03:06 +00:00
Harish Mahendrakar
ba7f9e2aed Decoder: Moved end of pic processing to end of decode call
am: 494561291a

Change-Id: Id3867f5dd0788f12f6827ed311a309d1fa58c535
2017-02-14 17:00:16 +00:00
Harish Mahendrakar
8b75cdae9b Decoder: Treat first slice in a picture as part of new picture always
am: 8b5fd8f24e

Change-Id: Ia14e9fae4a08143ff86439b5440ab9cf5e3052e3
2017-02-14 17:00:07 +00:00