Harish Mahendrakar
3f6937a003
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
2017-02-13 15:55:01 -08:00
Ray Essick
dcf38ce3f3
Merge "Merge "Decoder: Return correct error code for slice header errors" into mnc-dev am: 51ecbcabfb am: cf05624312 am: f0bcc3dfaa am: 3780d87265 am: 933d00bfdc am: 6cca81eabe am: 3549c33934 am: 948453a948 am: 1322b7dca8" into nyc-mr2-dev-plus-aosp
...
am: e8cf9ee414
2017-02-13 19:49:04 +00:00
Ray Essick
f28b7fc9bb
Merge "Merge "Decoder: Initialize default reference buffers for all pictures" into mnc-dev am: d61abc5195 am: 16306f7347 am: 0fbfecd7ce am: 6fe876a014 am: ec93be1ae9 am: 82beabb7d1 am: 988a35fe4e am: 05852a7ac4 am: 8a23930b71" into nyc-mr2-dev-plus-aosp
...
am: dc66a0f70b
2017-02-13 19:48:36 +00:00
Harish Mahendrakar
a1a404d679
Fix in returning end of bitstream error for MBAFF am: 7950bf47b6 am: 73f74a84e1 am: f23ebcfab1 am: c8b03b10df am: 2785504d50 am: 20ae3a04eb am: 700fa812a9 am: 0b36e00924 am: 722ec096b0
...
am: af102c0976
2017-02-13 19:47:50 +00:00
Ray Essick
1322b7dca8
Merge "Decoder: Return correct error code for slice header errors" into mnc-dev am: 51ecbcabfb am: cf05624312 am: f0bcc3dfaa am: 3780d87265 am: 933d00bfdc am: 6cca81eabe am: 3549c33934
...
am: 948453a948
2017-02-13 19:40:36 +00:00
Ray Essick
8a23930b71
Merge "Decoder: Initialize default reference buffers for all pictures" into mnc-dev am: d61abc5195 am: 16306f7347 am: 0fbfecd7ce am: 6fe876a014 am: ec93be1ae9 am: 82beabb7d1 am: 988a35fe4e
...
am: 05852a7ac4
2017-02-13 19:40:27 +00:00
Harish Mahendrakar
722ec096b0
Fix in returning end of bitstream error for MBAFF am: 7950bf47b6 am: 73f74a84e1 am: f23ebcfab1 am: c8b03b10df am: 2785504d50 am: 20ae3a04eb am: 700fa812a9
...
am: 0b36e00924
2017-02-13 19:40:19 +00:00
Ray Essick
6cca81eabe
Merge "Decoder: Return correct error code for slice header errors" into mnc-dev am: 51ecbcabfb am: cf05624312 am: f0bcc3dfaa am: 3780d87265
...
am: 933d00bfdc
2017-02-13 19:32:07 +00:00
Ray Essick
82beabb7d1
Merge "Decoder: Initialize default reference buffers for all pictures" into mnc-dev am: d61abc5195 am: 16306f7347 am: 0fbfecd7ce am: 6fe876a014
...
am: ec93be1ae9
2017-02-13 19:31:58 +00:00
Harish Mahendrakar
20ae3a04eb
Fix in returning end of bitstream error for MBAFF am: 7950bf47b6 am: 73f74a84e1 am: f23ebcfab1 am: c8b03b10df
...
am: 2785504d50
2017-02-13 19:31:50 +00:00
Ray Essick
933d00bfdc
Merge "Decoder: Return correct error code for slice header errors" into mnc-dev am: 51ecbcabfb am: cf05624312 am: f0bcc3dfaa
...
am: 3780d87265
2017-02-13 19:29:08 +00:00
Ray Essick
ec93be1ae9
Merge "Decoder: Initialize default reference buffers for all pictures" into mnc-dev am: d61abc5195 am: 16306f7347 am: 0fbfecd7ce
...
am: 6fe876a014
2017-02-13 19:28:57 +00:00
Harish Mahendrakar
2785504d50
Fix in returning end of bitstream error for MBAFF am: 7950bf47b6 am: 73f74a84e1 am: f23ebcfab1
...
am: c8b03b10df
2017-02-13 19:28:49 +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
b5a151fde9
Decoder: Fixes an out of bound write in bitstream buffer am: 33ef7de9dd am: 0aab4958fb am: 9f72b6eca1 am: 73a3e320d8 am: 89377f2acf am: 9801d7e8d5 am: 109509aeb0 am: cb36e15c72
...
am: 7b4dc14d83
2017-02-13 19:04:17 +00:00
Harish Mahendrakar
7b4dc14d83
Decoder: Fixes an out of bound write in bitstream buffer am: 33ef7de9dd am: 0aab4958fb am: 9f72b6eca1 am: 73a3e320d8 am: 89377f2acf am: 9801d7e8d5 am: 109509aeb0
...
am: cb36e15c72
2017-02-13 19:01:46 +00:00
Harish Mahendrakar
d24b4a2fca
Decoder: Fixes an out of bound write in bitstream buffer am: 33ef7de9dd am: 0aab4958fb am: 9f72b6eca1 am: 73a3e320d8 am: 89377f2acf am: 9801d7e8d5
...
am: 109509aeb0
2017-02-13 18:59:47 +00:00
Harish Mahendrakar
89377f2acf
Decoder: Fixes an out of bound write in bitstream buffer am: 33ef7de9dd am: 0aab4958fb am: 9f72b6eca1
...
am: 73a3e320d8
2017-02-13 18:52:16 +00:00
Harish Mahendrakar
73a3e320d8
Decoder: Fixes an out of bound write in bitstream buffer am: 33ef7de9dd am: 0aab4958fb
...
am: 9f72b6eca1
2017-02-13 18:49:46 +00:00
Harish Mahendrakar
57f60a16d5
Decoder: Fixed error handling for dangling fields
...
In case of dangling fields with gaps in frames enabled,
field pic in cur_slice was wrongly set to 0.
This would cause dangling field to be concealed as a frame, which would
result in a number of MB mismatch and hence a hang.
Bug: 34097672
Change-Id: Ia9b7f72c4676188c45790b2dfbb4fe2c2d2c01f8
2017-02-08 22:40:36 +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
Harish Mahendrakar
3fd5753edd
Decoder: Initialize ps_cur_slice->u1_mbaff_frame_flag correctly for error cases am: 1d5640f2f9 am: 5a26569fa3 am: 18a58ec2b6 am: 575fdb281f am: f8b3e57266 am: afbbd8f654 am: d41032215c am: 1695a11ad9
...
am: ef33c8152b
2017-01-18 21:27:43 +00:00
Harish Mahendrakar
b8110924ae
Decoder: Initialize ps_cur_slice->u1_mbaff_frame_flag correctly for error cases am: 1d5640f2f9 am: 5a26569fa3 am: 18a58ec2b6 am: 575fdb281f am: f8b3e57266 am: afbbd8f654 am: d41032215c
...
am: 1695a11ad9
2017-01-18 21:25:42 +00:00
Harish Mahendrakar
afbbd8f654
Decoder: Initialize ps_cur_slice->u1_mbaff_frame_flag correctly for error cases am: 1d5640f2f9 am: 5a26569fa3 am: 18a58ec2b6 am: 575fdb281f
...
am: f8b3e57266
2017-01-18 21:20:13 +00:00
Harish Mahendrakar
f8b3e57266
Decoder: Initialize ps_cur_slice->u1_mbaff_frame_flag correctly for error cases am: 1d5640f2f9 am: 5a26569fa3 am: 18a58ec2b6
...
am: 575fdb281f
2017-01-18 21:17:41 +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
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
Harish Mahendrakar
9b1b45e25e
Decoder: Fix in checking first_mb_in_slice am: ef27433ca8 am: 274529d8aa am: 3c332522de am: 10f63a26aa am: de892335ff am: a917df6ae0 am: 7543cc871c am: dd87e2dfef
...
am: e8f6525a1f
2017-01-18 18:33:25 +00:00
Harish Mahendrakar
cf1d218c82
Decoder: Fix in checking first_mb_in_slice am: ef27433ca8 am: 274529d8aa am: 3c332522de am: 10f63a26aa am: de892335ff am: a917df6ae0 am: 7543cc871c
...
am: dd87e2dfef
2017-01-18 18:31:25 +00:00
Harish Mahendrakar
a917df6ae0
Decoder: Fix in checking first_mb_in_slice am: ef27433ca8 am: 274529d8aa am: 3c332522de am: 10f63a26aa
...
am: de892335ff
2017-01-18 18:26:25 +00:00
Harish Mahendrakar
de892335ff
Decoder: Fix in checking first_mb_in_slice am: ef27433ca8 am: 274529d8aa am: 3c332522de
...
am: 10f63a26aa
2017-01-18 18:23:55 +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
Harish Mahendrakar
0053d16a77
Decoder: Padded gau1_ih264d_top_left_mb_part_indx_mod to avoid an out of bound read am: b88f59d835 am: bb4b279eb1 am: 5508b75095 am: 3863ea3522
...
am: d54ff99a52
2017-01-18 18:01:51 +00:00
Harish Mahendrakar
d54ff99a52
Decoder: Padded gau1_ih264d_top_left_mb_part_indx_mod to avoid an out of bound read am: b88f59d835 am: bb4b279eb1 am: 5508b75095
...
am: 3863ea3522
2017-01-18 17:54:20 +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
Harish Mahendrakar
5cede4f3cb
Decoder: Increase memory allocation for weights & offsets for interlaced clips am: bee9b9a54b am: bfc735cf17 am: 87c2d690fa am: 826159785f am: 3f1af4a90c am: 1806c2e12b am: e4acdfb8c3
...
am: ff829f7be7
2017-01-18 17:26:17 +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
Harish Mahendrakar
4b2c277d9c
Decoder: Increase memory allocation for weights & offsets for interlaced clips am: bee9b9a54b am: bfc735cf17 am: 87c2d690fa am: 826159785f am: 3f1af4a90c am: 1806c2e12b
...
am: e4acdfb8c3
2017-01-18 17:19:47 +00:00
Harish Mahendrakar
3f1af4a90c
Decoder: Increase memory allocation for weights & offsets for interlaced clips am: bee9b9a54b am: bfc735cf17 am: 87c2d690fa
...
am: 826159785f
2017-01-18 16:59:45 +00:00
Harish Mahendrakar
826159785f
Decoder: Increase memory allocation for weights & offsets for interlaced clips am: bee9b9a54b am: bfc735cf17
...
am: 87c2d690fa
2017-01-18 16:53:14 +00:00
Harish Mahendrakar
bfc735cf17
Decoder: Increase memory allocation for weights & offsets for interlaced clips
...
am: bee9b9a54b
2017-01-18 16:41:13 +00:00
