Commit graph

951 commits

Author SHA1 Message Date
Harish Mahendrakar
c011eeade7 Decoder: Fixed initialization of first_slice_in_pic am: 0b23c81c3d am: 16fa990ce1 am: ab79eb3973
am: a37d120eb2

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

Change-Id: Ib8de0752f0e90dfea59d9e8380d2006dd9643312
2017-02-14 17:07:16 +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
3007985473 Decoder: Treat first slice in a picture as part of new picture always am: 8b5fd8f24e am: 8b75cdae9b am: fb68ae8960
am: a8a3dc84b0

Change-Id: I172945f3e9d84d77ae21d1f737258851529f94c7
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
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
16fa990ce1 Decoder: Fixed initialization of first_slice_in_pic
am: 0b23c81c3d

Change-Id: I55e49ca9616a151456342bad7673d0986098b448
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
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
580daabe65 DO NOT MERGE: Decoder: Fixes an out of bound write in bitstream buffer am: 1f0ab0b089 -s ours am: 4543cf41ad am: f086bb9a89
am: 2b63f25938  -s ours

Change-Id: If83559a5567460bceb3c6c0d8d7b5f97d9de4813
2017-02-14 00:24:38 +00:00
Harish Mahendrakar
2b63f25938 DO NOT MERGE: Decoder: Fixes an out of bound write in bitstream buffer am: 1f0ab0b089 -s ours am: 4543cf41ad
am: f086bb9a89

Change-Id: I1f132937d0d61c029e6add1210920db60f484b92
2017-02-14 00:21:09 +00:00
Harish Mahendrakar
f086bb9a89 DO NOT MERGE: Decoder: Fixes an out of bound write in bitstream buffer am: 1f0ab0b089 -s ours
am: 4543cf41ad

Change-Id: I1e9aee3d7423476c5662e3e89dd6adb2e0ea89bb
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  -s ours

Change-Id: Ifeab263e38c6c3ff67d6e2fe432f0b1596c17844
2017-02-14 00:15:09 +00: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
933d00bfdc Merge "Decoder: Return correct error code for slice header errors" into mnc-dev am: 51ecbcabfb am: cf05624312 am: f0bcc3dfaa
am: 3780d87265

Change-Id: I16d98f94966bbcdc80205cb838b2c8b6ae37fa4e
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

Change-Id: I43344486e8b3b0bc1f7a905969d9f9bed133822b
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

Change-Id: Ife3b0ade038472f264b21298313614f01d3fcd59
2017-02-13 19:28:49 +00:00
Ray Essick
3780d87265 Merge "Decoder: Return correct error code for slice header errors" into mnc-dev am: 51ecbcabfb am: cf05624312
am: f0bcc3dfaa

Change-Id: Id85e1c01feee7e579102184136904da120804090
2017-02-13 19:26:39 +00:00
Ray Essick
6fe876a014 Merge "Decoder: Initialize default reference buffers for all pictures" into mnc-dev am: d61abc5195 am: 16306f7347
am: 0fbfecd7ce

Change-Id: I636e4e2c97d956c0b77d5a090238518c6991e679
2017-02-13 19:26:29 +00:00
Harish Mahendrakar
c8b03b10df Fix in returning end of bitstream error for MBAFF am: 7950bf47b6 am: 73f74a84e1
am: f23ebcfab1

Change-Id: I7569514affdf083c0f439cc23a84f6cf93df0ffa
2017-02-13 19:26:20 +00:00
Ray Essick
f0bcc3dfaa Merge "Decoder: Return correct error code for slice header errors" into mnc-dev am: 51ecbcabfb
am: cf05624312

Change-Id: I642526e91c98d11d0838c3a662a3a14536577926
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

Change-Id: I8cc48a17cfd4d1c2d1f4234c36e88bc17d0b8daf
2017-02-13 19:23:27 +00:00
Harish Mahendrakar
f23ebcfab1 Fix in returning end of bitstream error for MBAFF am: 7950bf47b6
am: 73f74a84e1

Change-Id: Iac07d54ca71b79f6380c3f5c3d4106838bb76642
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

Change-Id: Ib486869b38d66e1fb0fdeffe4316dce6a5ff9fd9
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

Change-Id: Ieb21ecb1c3152bde97adc7cfcfc4d49afcafd93b
2017-02-13 19:20:57 +00:00
Harish Mahendrakar
73f74a84e1 Fix in returning end of bitstream error for MBAFF
am: 7950bf47b6

Change-Id: If45518b6d58c393313dbcb425f7aa2e7bec02056
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
73a3e320d8 Decoder: Fixes an out of bound write in bitstream buffer am: 33ef7de9dd am: 0aab4958fb
am: 9f72b6eca1

Change-Id: I3f25b86b4ad13ad3b7e9a85e51789145d4b1b0ab
2017-02-13 18:49:46 +00:00
Harish Mahendrakar
9f72b6eca1 Decoder: Fixes an out of bound write in bitstream buffer am: 33ef7de9dd
am: 0aab4958fb

Change-Id: Ia5020ba3bfb95390578a82c602d71865443f1c00
2017-02-13 18:47:15 +00:00
Harish Mahendrakar
0aab4958fb Decoder: Fixes an out of bound write in bitstream buffer
am: 33ef7de9dd

Change-Id: If2ca8f044536549a32df1400c12099fa6bc562f1
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
2131a8fa75 Merge "Decoder: Initialize ps_cur_slice->u1_mbaff_frame_flag correctly for error cases" into mnc-dev am: 43a184ad48 am: ab0e425406 am: ecfc52702b
am: 9b41bebc84

Change-Id: I3da0bb96788c08cc08ff46d1ec29eff08926dfcc
2017-01-18 21:17:49 +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

Change-Id: I735691b67ab0b41a8560b0bdd9aaaa5a3947b5d7
2017-01-18 21:17:41 +00:00
Ray Essick
9b41bebc84 Merge "Decoder: Initialize ps_cur_slice->u1_mbaff_frame_flag correctly for error cases" into mnc-dev am: 43a184ad48 am: ab0e425406
am: ecfc52702b

Change-Id: Ib22f7ac401bc0c07409d25183d83e02eeb9b53ec
2017-01-18 21:15:21 +00:00
Harish Mahendrakar
575fdb281f Decoder: Initialize ps_cur_slice->u1_mbaff_frame_flag correctly for error cases am: 1d5640f2f9 am: 5a26569fa3
am: 18a58ec2b6

Change-Id: Ie325272d32387de3902c7a6c88072b4e27264808
2017-01-18 21:15:11 +00: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

Change-Id: I1174c079ff971a216438395ee42338a3fa151716
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

Change-Id: Idd2a9b5a617326d2ee38908ba768085dad257f04
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

Change-Id: I8886826d4c30c0dbfe0ace25ca87cca3fa015c7e
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

Change-Id: I32e960c752ccbc991f8ce04455618a534f1f52c7
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