Marco Nelissen
33d9d00a3c
resolve merge conflicts of 3654ad0 to mnc-dr-dev
...
am: 37345554fe
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
ab79eb3973
Decoder: Fixed initialization of first_slice_in_pic am: 0b23c81c3d
...
am: 16fa990ce1
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
2017-02-14 17:03:15 +00:00
Harish Mahendrakar
16fa990ce1
Decoder: Fixed initialization of first_slice_in_pic
...
am: 0b23c81c3d
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
2017-02-14 17:03:06 +00:00
Harish Mahendrakar
ba7f9e2aed
Decoder: Moved end of pic processing to end of decode call
...
am: 494561291a
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
2017-02-14 17:00:07 +00:00
Harish Mahendrakar
0b23c81c3d
Decoder: Fixed initialization of first_slice_in_pic
...
To handle some errors, first_slice_in_pic was being set to 2.
This is now cleaned up and first_slice_in_pic is set to 1 only once per pic.
This will ensure picture level initializations are done only once even in case
of error clips
Bug: 33717589
Bug: 33551775
Bug: 33716442
Bug: 33677995
Change-Id: If341436b3cbaa724017eedddd88c2e6fac36d8ba
2017-02-14 16:59:09 +00:00
Harish Mahendrakar
494561291a
Decoder: Moved end of pic processing to end of decode call
...
ih264d_end_of_pic() was called after parsing slice of a new picture.
This is now being done at the end of decode of the current picture.
decode_gaps_in_frame_num which needs frame_num of new slice is now
done after decoding frame_num in new slice.
This helps in handling errors in picaff streams with gaps in frames
Bug: 33588051
Bug: 33641588
Bug: 34097231
Change-Id: I1a26e611aaa2c19e2043e05a210849bd21b22220
2017-02-14 16:58:07 +00:00
Harish Mahendrakar
8b5fd8f24e
Decoder: Treat first slice in a picture as part of new picture always
...
This is needed to decode streams with consecutive IDRs.
Bug: 34097231
Test: successful run of POC in security bug
Change-Id: Ib737a4ef4b8c5bb7a57c90292102dd28af0615fe
2017-02-14 04:41:02 +00:00
Harish Mahendrakar
f086bb9a89
DO NOT MERGE: Decoder: Fixes an out of bound write in bitstream buffer am: 1f0ab0b089 -s ours
...
am: 4543cf41ad
2017-02-14 00:18:09 +00:00
Harish Mahendrakar
4543cf41ad
DO NOT MERGE: Decoder: Fixes an out of bound write in bitstream buffer
...
am: 1f0ab0b089
2017-02-14 00:15:09 +00:00
Harish Mahendrakar
69b5191865
Decoder: Add supported width check for MBaff streams
...
In case of MBAff streams, decoder processes two rows at a time,
this limits maximum supported width to 1920 for MBAff streams.
Bug: 33818508
Bug: 34013472
Change-Id: Iec2941f116cf3c36b63013a930319960023a3b42
2017-02-13 15:30:57 -08:00
Harish Mahendrakar
9d60a0c5da
Decoder: Added a check for unsupported resolutions
...
Decoder now returns an error for resolutions greater than 3840x2176
Bug: 24542936
Change-Id: I38be0e4c5cf2a980bfd4c781f3b49171f73b5ccb
2017-02-13 15:30:46 -08:00
Harish Mahendrakar
1f0ab0b089
DO NOT MERGE: Decoder: Fixes an out of bound write in bitstream buffer
...
[this is for mnc-dev only, not any other mnc-*-dev flavors;
there is a different patch for mnc-dr-dev, nyc-* and going forward]
After emulation prevention, data is written as an int,
so at least 3 additional bytes should be available.
And since bitstream functions read 8 bytes ahead, 8 extra bytes
should be available in the bitstream buffer.
Bug: 33934721
Test: Ittiam testing, POC in the bug no longer fails
Change-Id: I444ec6f85d01b0bade9f827e15c4b476779d6c69
2017-02-13 14:44:11 -08:00
Ray Essick
f0bcc3dfaa
Merge "Decoder: Return correct error code for slice header errors" into mnc-dev am: 51ecbcabfb
...
am: cf05624312
2017-02-13 19:23:36 +00:00
Ray Essick
0fbfecd7ce
Merge "Decoder: Initialize default reference buffers for all pictures" into mnc-dev am: d61abc5195
...
am: 16306f7347
2017-02-13 19:23:27 +00:00
Harish Mahendrakar
f23ebcfab1
Fix in returning end of bitstream error for MBAFF am: 7950bf47b6
...
am: 73f74a84e1
2017-02-13 19:23:18 +00:00
Ray Essick
cf05624312
Merge "Decoder: Return correct error code for slice header errors" into mnc-dev
...
am: 51ecbcabfb
2017-02-13 19:21:06 +00:00
Ray Essick
16306f7347
Merge "Decoder: Initialize default reference buffers for all pictures" into mnc-dev
...
am: d61abc5195
2017-02-13 19:20:57 +00:00
Harish Mahendrakar
73f74a84e1
Fix in returning end of bitstream error for MBAFF
...
am: 7950bf47b6
2017-02-13 19:20:47 +00:00
Ray Essick
51ecbcabfb
Merge "Decoder: Return correct error code for slice header errors" into mnc-dev
2017-02-13 19:15:36 +00:00
Ray Essick
d61abc5195
Merge "Decoder: Initialize default reference buffers for all pictures" into mnc-dev
2017-02-13 19:15:31 +00:00
Harish Mahendrakar
9a00f562a6
Decoder: Return correct error code for slice header errors
...
Return ERROR_INV_SLICE_HDR_T instead of ERROR_INV_SPS_PPS_T for slice
header errors.
Bug: 34097915
Change-Id: I45d14a71f2322ff349058baaf65fb0f3c1140fba
2017-02-13 19:14:59 +00:00
Harish Mahendrakar
f634481e94
Decoder: Initialize default reference buffers for all pictures
...
Reference buffer is now initialized to default value for
each pic before decoding the first slice in the pic
Bug: 34097866
Change-Id: Id64b123af2188217ce833f11db0e6c0681d41dfd
2017-02-13 19:14:50 +00:00
Harish Mahendrakar
7950bf47b6
Fix in returning end of bitstream error for MBAFF
...
In case of MBAFF streams, slices should terminate on
even MB boundary. If bytes are exhausted with odd number
of MBs decoded for MBAff, then treat that as error.
Bug: 33933140
Change-Id: Ifc26b66ff8ebdb3aec5c0d6c512e4cac3f54c5b7
2017-02-13 19:14:18 +00:00
Harish Mahendrakar
0aab4958fb
Decoder: Fixes an out of bound write in bitstream buffer
...
am: 33ef7de9dd
2017-02-13 18:44:45 +00:00
Harish Mahendrakar
33ef7de9dd
Decoder: Fixes an out of bound write in bitstream buffer
...
[for mnc-dr-dev and later; mnc-dev gets a different patch]
After emulation prevention, data is written as an int,
so at least 3 additional bytes should be available.
And since bitstream functions read 8 bytes ahead, 8 extra bytes
should be available in the bitstream buffer.
Bug: 33934721
Change-Id: I444ec6f85d01b0bade9f827e15c4b476779d6c69
2017-01-19 09:17:00 -08:00
Ray Essick
ecfc52702b
Merge "Decoder: Initialize ps_cur_slice->u1_mbaff_frame_flag correctly for error cases" into mnc-dev am: 43a184ad48
...
am: ab0e425406
2017-01-18 21:13:19 +00:00
Harish Mahendrakar
18a58ec2b6
Decoder: Initialize ps_cur_slice->u1_mbaff_frame_flag correctly for error cases am: 1d5640f2f9
...
am: 5a26569fa3
2017-01-18 21:13:12 +00:00
Ray Essick
ab0e425406
Merge "Decoder: Initialize ps_cur_slice->u1_mbaff_frame_flag correctly for error cases" into mnc-dev
...
am: 43a184ad48
2017-01-18 21:11:12 +00:00
Harish Mahendrakar
5a26569fa3
Decoder: Initialize ps_cur_slice->u1_mbaff_frame_flag correctly for error cases
...
am: 1d5640f2f9
2017-01-18 21:11:11 +00:00
Ray Essick
43a184ad48
Merge "Decoder: Initialize ps_cur_slice->u1_mbaff_frame_flag correctly for error cases" into mnc-dev
2017-01-18 21:00:19 +00:00
Marco Nelissen
7d4a72d887
Merge "DO NOT MERGE Decoder: Increase memory allocation for weights & offsets for interlaced clips" into mnc-dev am: d5424f66e3
...
am: ce26193738
2017-01-18 18:54:04 +00:00
Harish Mahendrakar
d6086cb6ed
DO NOT MERGE Decoder: Increase memory allocation for weights & offsets for interlaced clips am: 74f03b639e -s ours
...
am: 4aa4a30de2
2017-01-18 18:53:56 +00:00
Marco Nelissen
ce26193738
Merge "DO NOT MERGE Decoder: Increase memory allocation for weights & offsets for interlaced clips" into mnc-dev
...
am: d5424f66e3
2017-01-18 18:51:57 +00:00
Harish Mahendrakar
4aa4a30de2
DO NOT MERGE Decoder: Increase memory allocation for weights & offsets for interlaced clips
...
am: 74f03b639e
2017-01-18 18:51:57 +00:00
Marco Nelissen
d5424f66e3
Merge "DO NOT MERGE Decoder: Increase memory allocation for weights & offsets for interlaced clips" into mnc-dev
2017-01-18 18:42:47 +00:00
Marco Nelissen
de511dec6e
Merge "Decoder: Fix in checking first_mb_in_slice" into mnc-dev am: 78523d557a
...
am: 11e48510ee
2017-01-18 18:20:31 +00:00
Harish Mahendrakar
3c332522de
Decoder: Fix in checking first_mb_in_slice am: ef27433ca8
...
am: 274529d8aa
2017-01-18 18:20:24 +00:00
Marco Nelissen
11e48510ee
Merge "Decoder: Fix in checking first_mb_in_slice" into mnc-dev
...
am: 78523d557a
2017-01-18 18:18:25 +00:00
Harish Mahendrakar
274529d8aa
Decoder: Fix in checking first_mb_in_slice
...
am: ef27433ca8
2017-01-18 18:18:24 +00:00
Marco Nelissen
78523d557a
Merge "Decoder: Fix in checking first_mb_in_slice" into mnc-dev
2017-01-18 18:07:51 +00:00
Marco Nelissen
8a4bb00e14
Merge "Decoder: Padded gau1_ih264d_top_left_mb_part_indx_mod to avoid an out of bound read" into mnc-dev am: 4e0cdd450e
...
am: 2bdef88e48
2017-01-18 17:39:26 +00:00
Harish Mahendrakar
5508b75095
Decoder: Padded gau1_ih264d_top_left_mb_part_indx_mod to avoid an out of bound read am: b88f59d835
...
am: bb4b279eb1
2017-01-18 17:39:18 +00:00
Marco Nelissen
2bdef88e48
Merge "Decoder: Padded gau1_ih264d_top_left_mb_part_indx_mod to avoid an out of bound read" into mnc-dev
...
am: 4e0cdd450e
2017-01-18 17:32:48 +00:00
Harish Mahendrakar
bb4b279eb1
Decoder: Padded gau1_ih264d_top_left_mb_part_indx_mod to avoid an out of bound read
...
am: b88f59d835
2017-01-18 17:32:47 +00:00
Marco Nelissen
4e0cdd450e
Merge "Decoder: Padded gau1_ih264d_top_left_mb_part_indx_mod to avoid an out of bound read" into mnc-dev
2017-01-18 17:25:17 +00:00
