Commit graph

355 commits

Author SHA1 Message Date
Marco Nelissen
ed60896ead Merge "Initializing reference list for every P/B slice." into mnc-dev am: 3477b8e0d7 am: d98f1cf41b am: 18c5ca6984 am: 3cc8a48116 am: 93767dc556 am: 900303e2b0 am: 610062c062 am: 12d32dedae
am: 3b7dde2b72

Change-Id: I83cb5c83b4cc97283b017dd9762dc4ff5f074063
2017-06-06 21:07:50 +00:00
Marco Nelissen
900303e2b0 Merge "Initializing reference list for every P/B slice." into mnc-dev am: 3477b8e0d7 am: d98f1cf41b am: 18c5ca6984 am: 3cc8a48116
am: 93767dc556

Change-Id: I7a1787851643bd77bb509f65d378482bb4f1957c
2017-06-06 20:50:48 +00:00
Marco Nelissen
d98f1cf41b Merge "Initializing reference list for every P/B slice." into mnc-dev
am: 3477b8e0d7

Change-Id: I0ccb9c141c7e7e1b8be6e8e6ddc1c333c10a8662
2017-06-06 20:27:41 +00:00
Marco Nelissen
3477b8e0d7 Merge "Initializing reference list for every P/B slice." into mnc-dev 2017-06-06 20:14:42 +00:00
Hamsalekha S
11739774e1 Merge "Fix resolution change within a decode call." into mnc-dev am: 7fc42b801c am: 252ca18add am: 4c6288e861 am: 90fc697c82 am: 8b3d043280 am: d603f906d2 am: e1b496babb am: 85b8159cf0
am: 6edcc25a5a

Change-Id: I3f457a8d87feff17862d7eb26858068683d3c9b1
2017-06-06 18:30:08 +00:00
Hamsalekha S
d603f906d2 Merge "Fix resolution change within a decode call." into mnc-dev am: 7fc42b801c am: 252ca18add am: 4c6288e861 am: 90fc697c82
am: 8b3d043280

Change-Id: I3812d5c6cd9ea03959c020ad12ceec69144a282c
2017-06-06 18:05:00 +00:00
Hamsalekha S
252ca18add Merge "Fix resolution change within a decode call." into mnc-dev
am: 7fc42b801c

Change-Id: Ib6f3680beb6e5d837f2140eed3107a23491f99f6
2017-06-06 17:39:59 +00:00
TreeHugger Robot
7fc42b801c Merge "Fix resolution change within a decode call." into mnc-dev 2017-06-06 17:32:41 +00:00
Hamsalekha S
fe18375850 Fix resolution change within a decode call.
If resolution changes within a decode call,due to multiple
sps, the decoder hangs as the the application will
give the same data again in the next decode call. This
results in a hang. Fixed this by flaging an error,
when sps/resoultion changes within a process call.

Bug: 38487564
Test: ran POC on patched O-based system w/o hanging
Change-Id: I30095b2e8bf573c1a58a316a23b1a5e6a4af589b
2017-06-05 13:28:44 -07:00
Hamsalekha S
04882a6ea6 Merge "Decoder: Fixed allocation size of pred info buffer" into mnc-dr-dev am: 94660850f0 am: a09bbc27eb am: f838a72c3e am: c33c094303 am: 41b9730003 am: daeae82702 am: 7475b6d9ae
am: 56d23c97dc

Change-Id: I81e77d7c248bf5c2951c81d85e0bfd7ed0f9d124
2017-06-02 19:10:29 +00:00
Hamsalekha S
41b9730003 Merge "Decoder: Fixed allocation size of pred info buffer" into mnc-dr-dev am: 94660850f0 am: a09bbc27eb am: f838a72c3e
am: c33c094303

Change-Id: If6d3b6e8c22352c36965c2584f4c98619b881987
2017-06-02 18:55:57 +00:00
TreeHugger Robot
0a91df5eca Merge "DO NOT MERGE Decoder: Fixed allocation size of pred info buffer" into mnc-dev 2017-06-02 18:40:21 +00:00
TreeHugger Robot
94660850f0 Merge "Decoder: Fixed allocation size of pred info buffer" into mnc-dr-dev 2017-06-02 18:40:21 +00:00
Hamsalekha S
f9d3f9af8f Initializing reference list for every P/B slice.
Reference list needs to be initialized for every P/B
slice, to ensure colocated picture always points to a
valid picture buffer, even in the case of error.

Bug: 36279112

Change-Id: I051d7e725b0af209cc7bb333db8da3518adf78a0
2017-06-02 10:22:52 -07:00
Marco Nelissen
a0ae601cb3 Merge "Decoder: Initialize MB info buffer to zero." into mnc-dr-dev 2017-05-17 17:12:37 +00:00
Hamsalekha S
ab7163fac0 Merge "Decoder: Fix end of bitstream error." into mnc-dev am: 810356f4de am: 65077f6cfe am: 82c7a3628e am: fa3361f209 am: b1d2064d95 am: c81da59a51 am: 5b33069e8f am: 45c34bc177
am: 0382af937e

Change-Id: I6cda7c7e1165e64aef67976450b4438d22c70b97
2017-05-16 21:15:17 +00:00
Hamsalekha S
c81da59a51 Merge "Decoder: Fix end of bitstream error." into mnc-dev am: 810356f4de am: 65077f6cfe am: 82c7a3628e am: fa3361f209
am: b1d2064d95

Change-Id: I51dc76f14c9ea31f35387f3150701e4ccc3f2f93
2017-05-16 21:02:15 +00:00
Hamsalekha S
b1d2064d95 Merge "Decoder: Fix end of bitstream error." into mnc-dev am: 810356f4de am: 65077f6cfe am: 82c7a3628e
am: fa3361f209

Change-Id: I95aa40e17b977f59da993c8c2b3ebe04a0e7609f
2017-05-16 20:58:44 +00:00
Hamsalekha S
65077f6cfe Merge "Decoder: Fix end of bitstream error." into mnc-dev
am: 810356f4de

Change-Id: Ibca3bfa3cd3dc50a53c02a2d972cf41b10ac5848
2017-05-16 20:49:45 +00:00
TreeHugger Robot
810356f4de Merge "Decoder: Fix end of bitstream error." into mnc-dev 2017-05-16 20:36:28 +00:00
Marco Nelissen
4c3a564cd5 Merge "Decoder: Fix allocation for Mbaff weight matrix" into mnc-dr-dev am: db8f1ae73f am: dcbf996666 am: 8b4c87943a am: 672cb37cc6 am: ad69241f3a am: 7ba9ed2338 am: fed8ee727b
am: 5ed090d7d8

Change-Id: I5350e400a52e386affd04bcff694f70c1c5b0d70
2017-05-16 15:49:53 +00:00
Marco Nelissen
ad69241f3a Merge "Decoder: Fix allocation for Mbaff weight matrix" into mnc-dr-dev am: db8f1ae73f am: dcbf996666 am: 8b4c87943a
am: 672cb37cc6

Change-Id: Ic3a2832c01bd74ab7a3c788f5e04a6161fed4c78
2017-05-16 15:36:52 +00:00
Marco Nelissen
672cb37cc6 Merge "Decoder: Fix allocation for Mbaff weight matrix" into mnc-dr-dev am: db8f1ae73f am: dcbf996666
am: 8b4c87943a

Change-Id: I817cc880f6bdb57c193b8ef272bb39b97934ddce
2017-05-16 15:33:21 +00:00
Marco Nelissen
db8f1ae73f Merge "Decoder: Fix allocation for Mbaff weight matrix" into mnc-dr-dev 2017-05-16 15:22:17 +00:00
Marco Nelissen
cb89747145 Merge "DO NOT MERGE Decoder: Fix allocation for Mbaff weight matrix" into mnc-dev 2017-05-16 15:22:10 +00:00
Hamsalekha S
9041bb17f7 Decoder: Initialize MB info buffer to zero.
Initialize the buffer used to store inter mb info
(reference index, weights etc) to zero.

Bug: 36035683

Change-Id: I23561a6a7fe852c0563a631d7ec6ab022cd78ccc
(cherry picked from commit 2575ae6c98)
2017-05-15 19:43:33 +00:00
TreeHugger Robot
b0399be998 Merge "DO NOT MERGE Fixed bug during resolution change" into mnc-dev 2017-05-15 18:45:41 +00:00
Hamsalekha S
6b8184944b DO NOT MERGE Fixed bug during resolution change
Modifies how i4_header_decoded is decoder context is used, to ensure
that resolution change is detected even if PPS has not been decoded.

This retrofits parts of the below mentioned 'merged-in' commits
which solve this for mnc-dr and later versions of the library. The retrofit
required dropping portions that affected code introduced in a later baseline.

Bug: 35583675
Test: provided input file no longer hangs
Change-Id: I8fa30543759c5762b18e2380513e2ce616c858ef
Merged-In: I0d248212aaf6635f34a70ad36657416a0c623d32
Merged-In: Ifd21ebe1827d6d0c13018983c46c4301c2bb1669
2017-05-15 10:22:55 -07:00
Marco Nelissen
1010c9a53c Merge "Decoder: Initialize MB info buffer to zero." into nyc-dev am: 31bd7f7fe6 am: 049aabf9c5 am: 3ff76c0667 am: e8c0283013
am: 27f44e43a4

Change-Id: I4b407d9c77c859893079bf8d63df4b689b07caa5
2017-05-13 02:04:20 +00:00
Marco Nelissen
049aabf9c5 Merge "Decoder: Initialize MB info buffer to zero." into nyc-dev
am: 31bd7f7fe6

Change-Id: Ie031e6a9ad10f6cbd919973af34a06e15fd78095
2017-05-13 01:54:49 +00:00
Marco Nelissen
31bd7f7fe6 Merge "Decoder: Initialize MB info buffer to zero." into nyc-dev 2017-05-13 01:44:26 +00:00
Hamsalekha S
eff1a1d6ca Merge "Decoder: Fixed flag u1_top_bottom_decoded." into mnc-dev am: cc07eaa5d2 am: 9a5c62841e am: 514d08016a am: 4dd1490ec9 am: 122d0942a8 am: 917c7eee1c am: d189b84641 am: 9e191ce3a6
am: ae093b98bc

Change-Id: Ia9ec6cfdd6411cd9088afba3bbae21adbed3e977
2017-05-12 23:10:01 +00:00
Hamsalekha S
917c7eee1c Merge "Decoder: Fixed flag u1_top_bottom_decoded." into mnc-dev am: cc07eaa5d2 am: 9a5c62841e am: 514d08016a am: 4dd1490ec9
am: 122d0942a8

Change-Id: I53408f560fed7e2a5d88d5a3e3e5f77f01deb41d
2017-05-12 23:02:32 +00:00
Hamsalekha S
9a5c62841e Merge "Decoder: Fixed flag u1_top_bottom_decoded." into mnc-dev
am: cc07eaa5d2

Change-Id: Ie410da29e20aed95d674aaaeddd683e1f616c448
2017-05-12 22:51:00 +00:00
TreeHugger Robot
cc07eaa5d2 Merge "Decoder: Fixed flag u1_top_bottom_decoded." into mnc-dev 2017-05-12 22:06:48 +00:00
Marco Nelissen
f7e747727c Merge "Decoder: Initialize MB info buffer to zero." into mnc-dev 2017-05-12 21:38:45 +00:00
Hamsalekha S
5b3f5d435c Decoder: Added an error check while parsing PPS. am: 62f98981ff am: 0f6a1883e8 am: e0e549aad5 am: d9a55dded2 am: d5f3df9c33 am: 4f7fa508be am: 58f4462bc5 am: 7a004abec2
am: 3afa0cacc7

Change-Id: Iad78ace13e67fef9e25309786ba75b4482e29074
2017-05-12 21:20:14 +00:00
Hamsalekha S
07db35ad5a Decoder: Fix allocation for Mbaff weight matrix
Increased the allocation size for Mbaff weight
matrix buffer

Bug: 36996978

Change-Id: I21cf2cb1010abdc6346f743f5237ae1730c4bf41
2017-05-12 14:11:10 -07:00
Hamsalekha S
60be1fe459 DO NOT MERGE Decoder: Fix allocation for Mbaff weight matrix
Increased the allocation size for Mbaff weight
matrix buffer

Bug: 36996978

Change-Id: I66c8ab24ec4083f16a86ffc9c0e36f5fd7785f92
2017-05-12 14:08:44 -07:00
Hamsalekha S
4f7fa508be Decoder: Added an error check while parsing PPS. am: 62f98981ff am: 0f6a1883e8 am: e0e549aad5 am: d9a55dded2
am: d5f3df9c33

Change-Id: I8c2bfdd9bc97e79747b62d62bd28a683d6d9d77f
2017-05-12 21:08:07 +00:00
Hamsalekha S
0f6a1883e8 Decoder: Added an error check while parsing PPS.
am: 62f98981ff

Change-Id: I2976869f34cf2a20078c3fe4504db9e6c5a3035d
2017-05-12 20:56:41 +00:00
Hamsalekha S
62f98981ff Decoder: Added an error check while parsing PPS.
Added an error check while parsing PPS syntax element
second_chroma_qp_index_offset.

Bug: 37207120

Change-Id: Icba6b7bcf5940505717ee61134ed801c221b6e26
2017-05-12 20:46:28 +00:00
Hamsalekha S
7703822731 Decoder: Fixed flag u1_top_bottom_decoded.
Fixed initialization of flag u1_top_bottom_decoded
in decoder context. This flag indicates if top
field and botton field is decoded.

Bug: 36993291
Test: avcdec --input poc.h264 --output /dev/null
Change-Id: I9f8a2620683abd8b15e4780d76d4849394710716
2017-05-12 20:14:46 +00:00
Hamsalekha S
9008aed514 Decoder: Fixed allocation size of pred info buffer
Buffer allocation size for pred info was increased
in the case number reference frames equal to 1.

Bug: 36998372
Change-Id: I1f84a16703422109d40bed8436f35d0c2069c088
2017-05-12 17:58:03 +00:00
Ray Essick
cdf68c8457 Merge "DO NOT MERGE Fixed bug in the case of resolution change." into nyc-dev am: 3d01dc4bdd am: cba660f4c9 am: dab287d4a0 am: b481f67005
am: ebc18d97c1

Change-Id: Idea2bc3cd1fadaa371df92199e9c7397438a0362
2017-05-12 17:54:56 +00:00
Ray Essick
cba660f4c9 Merge "DO NOT MERGE Fixed bug in the case of resolution change." into nyc-dev
am: 3d01dc4bdd

Change-Id: Ia7bcdb836e2cde9925812ddef6736b89cd0e2f8f
2017-05-12 17:45:55 +00:00
Ray Essick
3d01dc4bdd Merge "DO NOT MERGE Fixed bug in the case of resolution change." into nyc-dev 2017-05-12 17:42:54 +00:00
Ray Essick
126058dcb2 Merge changes from topic 'b35583675-mnc-dr' into mnc-dr-dev
* changes:
  DO NOT MERGE Fixed bug in the case of resolution change.
  DO NOT MERGE Handle level/profile/num_ref_frames/num_reorder change at the same resolution
2017-05-12 17:42:26 +00:00
Hamsalekha S
2e01924cd6 Decoder: Fix end of bitstream error.
The end of bistream error check was fixed for
odd number of macroblocks in Mbaff frames.

Bug: 37008096
Test: Ittiam-verified
Change-Id: I058d74a3c1d1511968c2b36802dfc5c102947919
2017-05-11 17:11:25 -07:00
Hamsalekha S
6a5cb80068 DO NOT MERGE Decoder: Fixed allocation size of pred info buffer
Buffer allocation size for pred info was increased
in the case number reference frames equal to 1.

Bug: 36998372
Change-Id: I1f84a16703422109d40bed8436f35d0c2069c088
2017-05-11 15:09:57 -07:00