Ray Essick
db0571cb3d
Merge "Decoder: Fixed error handling for dangling fields" into mnc-dev am: 78334b2a24 am: cd5ebec24a am: f48987d2fc am: 1cbcdd7f16 am: 3a669baf18 am: 691577d923
...
am: 979ad81ebd
2017-03-14 22:46:51 +00:00
Ray Essick
979ad81ebd
Merge "Decoder: Fixed error handling for dangling fields" into mnc-dev am: 78334b2a24 am: cd5ebec24a am: f48987d2fc am: 1cbcdd7f16 am: 3a669baf18
...
am: 691577d923
2017-03-14 22:40:51 +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
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
2017-03-14 22:30:50 +00:00
Ray Essick
1cbcdd7f16
Merge "Decoder: Fixed error handling for dangling fields" into mnc-dev am: 78334b2a24 am: cd5ebec24a
...
am: f48987d2fc
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
2017-03-14 22:20:20 +00:00
Ray Essick
cd5ebec24a
Merge "Decoder: Fixed error handling for dangling fields" into mnc-dev
...
am: 78334b2a24
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
Marco Nelissen
1d999b7cdf
resolve merge conflicts of 3654ad0 to mnc-dr-dev am: 37345554fe am: 33d9d00a3c am: 858542d83e am: 2e4b53cfb4 am: 7c50684ef0
...
am: 834462327b
2017-02-14 23:08:32 +00:00
Marco Nelissen
834462327b
resolve merge conflicts of 3654ad0 to mnc-dr-dev am: 37345554fe am: 33d9d00a3c am: 858542d83e am: 2e4b53cfb4
...
am: 7c50684ef0
2017-02-14 23:06:02 +00:00
Marco Nelissen
7c50684ef0
resolve merge conflicts of 3654ad0 to mnc-dr-dev am: 37345554fe am: 33d9d00a3c am: 858542d83e
...
am: 2e4b53cfb4
2017-02-14 23:03:32 +00:00
Marco Nelissen
2e4b53cfb4
resolve merge conflicts of 3654ad0 to mnc-dr-dev am: 37345554fe am: 33d9d00a3c
...
am: 858542d83e
2017-02-14 23:01:52 +00:00
Marco Nelissen
858542d83e
resolve merge conflicts of 3654ad0 to mnc-dr-dev am: 37345554fe
...
am: 33d9d00a3c
2017-02-14 22:59:01 +00:00
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
f837a7796b
Decoder: Fixed initialization of first_slice_in_pic am: 0b23c81c3d am: 16fa990ce1 am: ab79eb3973 am: a37d120eb2 am: c011eeade7 am: 94e17dc822
...
am: 9117d918dd
2017-02-14 17:16:08 +00:00
Harish Mahendrakar
9432beb534
Decoder: Moved end of pic processing to end of decode call am: 494561291a am: ba7f9e2aed am: 26bb8b98ee am: 89fa016b5f am: df2fa01c9e am: 7944003371
...
am: fd5c8e352a
2017-02-14 17:13:44 +00:00
Harish Mahendrakar
9117d918dd
Decoder: Fixed initialization of first_slice_in_pic am: 0b23c81c3d am: 16fa990ce1 am: ab79eb3973 am: a37d120eb2 am: c011eeade7
...
am: 94e17dc822
2017-02-14 17:13:37 +00:00
Harish Mahendrakar
981e88d5b8
Decoder: Treat first slice in a picture as part of new picture always am: 8b5fd8f24e am: 8b75cdae9b am: fb68ae8960 am: a8a3dc84b0 am: 3007985473 am: b19aa035f6
...
am: 43fa87413a
2017-02-14 17:13:37 +00:00
Harish Mahendrakar
fd5c8e352a
Decoder: Moved end of pic processing to end of decode call am: 494561291a am: ba7f9e2aed am: 26bb8b98ee am: 89fa016b5f am: df2fa01c9e
...
am: 7944003371
2017-02-14 17:11:45 +00:00
Harish Mahendrakar
94e17dc822
Decoder: Fixed initialization of first_slice_in_pic am: 0b23c81c3d am: 16fa990ce1 am: ab79eb3973 am: a37d120eb2
...
am: c011eeade7
2017-02-14 17:11:38 +00:00
Harish Mahendrakar
43fa87413a
Decoder: Treat first slice in a picture as part of new picture always am: 8b5fd8f24e am: 8b75cdae9b am: fb68ae8960 am: a8a3dc84b0 am: 3007985473
...
am: b19aa035f6
2017-02-14 17:11:38 +00:00
Harish Mahendrakar
7944003371
Decoder: Moved end of pic processing to end of decode call am: 494561291a am: ba7f9e2aed am: 26bb8b98ee am: 89fa016b5f
...
am: df2fa01c9e
2017-02-14 17:08:45 +00:00
Harish Mahendrakar
c011eeade7
Decoder: Fixed initialization of first_slice_in_pic am: 0b23c81c3d am: 16fa990ce1 am: ab79eb3973
...
am: a37d120eb2
2017-02-14 17:08:36 +00:00
Harish Mahendrakar
b19aa035f6
Decoder: Treat first slice in a picture as part of new picture always am: 8b5fd8f24e am: 8b75cdae9b am: fb68ae8960 am: a8a3dc84b0
...
am: 3007985473
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
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
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
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
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
2017-02-14 17:04:37 +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
4aab0f9614
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 am: 580daabe65 am: 293fbba256
...
am: 9be100c242
2017-02-14 00:32:40 +00:00
Harish Mahendrakar
9be100c242
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 am: 580daabe65
...
am: 293fbba256
2017-02-14 00:30:10 +00:00
Harish Mahendrakar
293fbba256
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
...
am: 580daabe65
2017-02-14 00:27:40 +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
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
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
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
