Commit graph

1263 commits

Author SHA1 Message Date
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

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

Change-Id: I82be319b000386c83fa93932a1fd9d1ceaa6c7e3
2017-02-13 19:40:19 +00:00
Ray Essick
05852a7ac4 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

Change-Id: I56831db8e735d4113664f9c851ad537b604a6db5
2017-02-13 19:37:59 +00:00
Harish Mahendrakar
0b36e00924 Fix in returning end of bitstream error for MBAFF am: 7950bf47b6 am: 73f74a84e1 am: f23ebcfab1 am: c8b03b10df am: 2785504d50 am: 20ae3a04eb
am: 700fa812a9

Change-Id: Ife5a97c15fb9ea49411ce03112cffacefde4f2e6
2017-02-13 19:37:49 +00:00
Ray Essick
988a35fe4e Merge "Decoder: Initialize default reference buffers for all pictures" into mnc-dev am: d61abc5195 am: 16306f7347 am: 0fbfecd7ce am: 6fe876a014 am: ec93be1ae9
am: 82beabb7d1

Change-Id: Ib5cddf3294134dead40d413e9eead7804fe5211c
2017-02-13 19:35:02 +00:00
Harish Mahendrakar
700fa812a9 Fix in returning end of bitstream error for MBAFF am: 7950bf47b6 am: 73f74a84e1 am: f23ebcfab1 am: c8b03b10df am: 2785504d50
am: 20ae3a04eb

Change-Id: Ie184c9c66da527a3ec5e68476d370a61431268f1
2017-02-13 19:34:49 +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

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

Change-Id: Ib2a3100e8ddbf947a3b2634d63f72104af8a22d1
2017-02-13 19:31:50 +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
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
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
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
d61abc5195 Merge "Decoder: Initialize default reference buffers for all pictures" into mnc-dev 2017-02-13 19:15:31 +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
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

Change-Id: I5d0e3112f87665bc116966c963b2b60bbdc586d7
2017-02-13 18:59:47 +00:00
Harish Mahendrakar
109509aeb0 Decoder: Fixes an out of bound write in bitstream buffer am: 33ef7de9dd am: 0aab4958fb am: 9f72b6eca1 am: 73a3e320d8 am: 89377f2acf
am: 9801d7e8d5

Change-Id: Id4e5eb59313597de35be4e68b2ec5ed1d105e06c
2017-02-13 18:57:16 +00:00
Harish Mahendrakar
9801d7e8d5 Decoder: Fixes an out of bound write in bitstream buffer am: 33ef7de9dd am: 0aab4958fb am: 9f72b6eca1 am: 73a3e320d8
am: 89377f2acf

Change-Id: I5d73f67dd377bf7f180701b6a6faaa4ce556271c
2017-02-13 18:54:46 +00:00
Harish Mahendrakar
89377f2acf Decoder: Fixes an out of bound write in bitstream buffer am: 33ef7de9dd am: 0aab4958fb am: 9f72b6eca1
am: 73a3e320d8

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

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
5b45091a28 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 am: 2131a8fa75 am: d76bde3400 am: a7717aeb5f
am: 402dd54fbc

Change-Id: I78a8c850f496ffbbaac1815c4a40f2e0ba4a8fd6
2017-01-18 21:25:50 +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

Change-Id: I2d04a0c85cba2f9eb2cfc5a625efe7e7de8172cd
2017-01-18 21:25:42 +00:00
Ray Essick
402dd54fbc 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 am: 2131a8fa75 am: d76bde3400
am: a7717aeb5f

Change-Id: I6fe443c07cec2b7ca9f6ca47d66bec554e8b589d
2017-01-18 21:23:51 +00:00
Harish Mahendrakar
1695a11ad9 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

Change-Id: Iae02d7ba069a3cf806578fa11135feb0e9813d4d
2017-01-18 21:23:42 +00:00
Ray Essick
a7717aeb5f 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 am: 2131a8fa75
am: d76bde3400

Change-Id: Ia4bf9b2a3002312ceb1a0cd3cf350e9f10399080
2017-01-18 21:22:06 +00:00
Harish Mahendrakar
d41032215c 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

Change-Id: I0b71ea48f9709cedc505b2b92b5a95d78a11c45c
2017-01-18 21:21:58 +00:00
Ray Essick
d76bde3400 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
am: 2131a8fa75

Change-Id: I8dd9fdf27bfb246c0b2c026ecad99401758160f2
2017-01-18 21:20:20 +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

Change-Id: I7600f4b34e8e40d5118d04fdafed6f3a5b589c66
2017-01-18 21:20:13 +00: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
Marco Nelissen
dc128f9abc Merge "DO NOT MERGE Decoder: Increase memory allocation for weights & offsets for interlaced clips" into mnc-dev am: d5424f66e3 am: ce26193738 am: 7d4a72d887 am: 2d7b4c6275 -s ours am: 583dde3e87 am: 875b8fc080 am: fd48a7e788
am: fbc7b7f031

Change-Id: Ibe39bf25b112bb896d9f55c09f8d5c6b2a06ee14
2017-01-18 19:06:05 +00:00
Harish Mahendrakar
28c7bad1c7 DO NOT MERGE Decoder: Increase memory allocation for weights & offsets for interlaced clips am: 74f03b639e -s ours am: 4aa4a30de2 am: d6086cb6ed am: 22dfe1492b -s ours am: 0ba81a83e9 am: 88475aa7fb am: 2e91a0d804
am: dd4d5d7451

Change-Id: I9c58689b6627059609cbdacfc99b0ccb805aa26b
2017-01-18 19:05:58 +00:00
Marco Nelissen
fbc7b7f031 Merge "DO NOT MERGE Decoder: Increase memory allocation for weights & offsets for interlaced clips" into mnc-dev am: d5424f66e3 am: ce26193738 am: 7d4a72d887 am: 2d7b4c6275 -s ours am: 583dde3e87 am: 875b8fc080
am: fd48a7e788

Change-Id: Ib2fc0fda3e2060faf700d9c7f96b88f40eefa6fd
2017-01-18 19:04:04 +00:00
Harish Mahendrakar
dd4d5d7451 DO NOT MERGE Decoder: Increase memory allocation for weights & offsets for interlaced clips am: 74f03b639e -s ours am: 4aa4a30de2 am: d6086cb6ed am: 22dfe1492b -s ours am: 0ba81a83e9 am: 88475aa7fb
am: 2e91a0d804

Change-Id: I96c63bb6584608caee72eeef3173542bcd82fb10
2017-01-18 19:03:57 +00:00
Marco Nelissen
fd48a7e788 Merge "DO NOT MERGE Decoder: Increase memory allocation for weights & offsets for interlaced clips" into mnc-dev am: d5424f66e3 am: ce26193738 am: 7d4a72d887 am: 2d7b4c6275 -s ours am: 583dde3e87
am: 875b8fc080

Change-Id: I642c6d2d46248f5198e65814a2a0464d5e9777fc
2017-01-18 19:02:18 +00:00
Harish Mahendrakar
2e91a0d804 DO NOT MERGE Decoder: Increase memory allocation for weights & offsets for interlaced clips am: 74f03b639e -s ours am: 4aa4a30de2 am: d6086cb6ed am: 22dfe1492b -s ours am: 0ba81a83e9
am: 88475aa7fb

Change-Id: If4870748c257a892f8c9d9499373f70f05c0e1f7
2017-01-18 19:02:11 +00:00