Harish Mahendrakar
83f2b8ab29
DO NOT MERGE Decoder: Initialize few VUI params to signal unspecified values
...
Initialize video_format to 5 and colour_primaries, transfer_characteristics
and matrix_coefficients to 2 to signal that these are not present in the bitstream.
Bug: 29640760
Change-Id: Ib54ceadcd6d7962e3077bc7266d70983b1d0e141
2016-07-11 22:29:33 +00:00
Hangyu Kuang
b4a03ec634
Merge "DO NOT MERGE Decoder: Added support for exporting VUI params" into nyc-mr1-dev
2016-07-11 22:28:53 +00:00
Harish Mahendrakar
ba93b7fedb
DO NOT MERGE Decoder: Added support for exporting VUI params
...
Bug: 27442922
Change-Id: I4bc3a9fb31ffea1e9e8ae32e5ed49fcc12fbdf42
2016-07-11 22:21:03 +00:00
Robert Shih
ac9332c9ac
Merge \\\\"Decoder: Initialize first_pb_nal_in_pic for error slices\\\\" into mnc-dev am: b9d7cba8bf am: c73e000665 am: 59248aa67c
...
am: c4ef0f6129
Change-Id: I57e93af0f4f9d3f3f2d0cbbccbf21397602cc87a
2016-06-21 19:01:42 +00:00
Harish Mahendrakar
c73e000665
Merge \"Decoder: Initialize first_pb_nal_in_pic for error slices\" into mnc-dev
...
am: b9d7cba8bf
Change-Id: I62f9c45eea70968942198b20f47c158dede39d8d
2016-06-21 18:53:18 +00:00
Robert Shih
b9d7cba8bf
Merge "Decoder: Initialize first_pb_nal_in_pic for error slices" into mnc-dev
2016-06-21 18:47:11 +00:00
Harish Mahendrakar
49f36805b3
Decoder: Do not conceal slices with invalid SPS/PPS am: 3a419eac8d am: 48b182db5d am: ea40cf81eb
...
am: 44a2462a71
Change-Id: I42e0c567f5c24841a2f678ff6e2faff85c002c71
2016-06-21 17:44:01 +00:00
Harish Mahendrakar
48b182db5d
Decoder: Do not conceal slices with invalid SPS/PPS
...
am: 3a419eac8d
Change-Id: I09e962ab090f890a149cb967f2b04fd95a7d76d7
2016-06-21 17:35:49 +00:00
Harish Mahendrakar
7a54468cf8
Decoder: Initialize first_pb_nal_in_pic for error slices
...
first_pb_nal_in_pic was uninitialized for error clips
Bug: 29023649
Change-Id: Ie4e0a94059c5f675bf619e31534846e2c2ca58ae
2016-06-16 17:28:19 -07:00
Harish Mahendrakar
3a419eac8d
Decoder: Do not conceal slices with invalid SPS/PPS
...
Bug: 28835995
2016-06-14 13:43:54 -07:00
Marco Nelissen
afe52d7476
Merge \\\\"Decoder: Fix slice number increment for error clips\\\\" into mnc-dev am: 2e88a2aa67 am: d75185f90e am: abd921f407
...
am: 46635d205b
Change-Id: I33ae1d1daeb6b7ca83a7ce4913e6b7f40ca87283
2016-06-10 21:42:37 +00:00
Harish Mahendrakar
d75185f90e
Merge \"Decoder: Fix slice number increment for error clips\" into mnc-dev
...
am: 2e88a2aa67
Change-Id: I791c029e3b39202db3f49f13fbb511904b5e8fef
2016-06-10 21:31:13 +00:00
Marco Nelissen
2e88a2aa67
Merge "Decoder: Fix slice number increment for error clips" into mnc-dev
2016-06-10 21:21:44 +00:00
Harish Mahendrakar
5e4f64c074
Decoder: Fix slice number increment for error clips
...
Bug: 28673410
2016-06-09 08:31:55 -07:00
Harish Mahendrakar
64e6a63272
Fix slice params for interlaced video am: 2c9d67ffaf am: b70297ef4b
...
am: 4abe7805da
* commit '4abe7805da ':
Fix slice params for interlaced video
Change-Id: Ie82a2a710d461fa6a2192d3d63741b4eeb2b8ce0
2016-05-26 00:17:40 +00:00
Harish Mahendrakar
2c9d67ffaf
Fix slice params for interlaced video
...
Bug: 28165661
Change-Id: I912a86bd78ebf0617fd2bc6eb2b5a61afc17bf53
2016-05-25 20:06:08 +00:00
Harish Mahendrakar
cdfd7573ec
Fix slice params for interlaced video
...
Bug: 28165661
Change-Id: I912a86bd78ebf0617fd2bc6eb2b5a61afc17bf53
2016-05-25 02:25:00 +00:00
Harish Mahendrakar
c6d37bf231
Decoder: Set u1_long_term_reference_flag to 0 for error concealment am: eacafb943c am: 4e5762ce4b am: 941c3b423d
...
am: 81497a0788
* commit '81497a0788 ':
Decoder: Set u1_long_term_reference_flag to 0 for error concealment
Change-Id: I8c6ee4489729f5036c8066ad8c4da1d28a5b9851
2016-05-24 00:54:11 +00:00
Harish Mahendrakar
4e5762ce4b
Decoder: Set u1_long_term_reference_flag to 0 for error concealment
...
am: eacafb943c
* commit 'eacafb943c ':
Decoder: Set u1_long_term_reference_flag to 0 for error concealment
Change-Id: I8836bf700a7b77deff062d9d1737b903583ad6b2
2016-05-24 00:28:43 +00:00
Harish Mahendrakar
eacafb943c
Decoder: Set u1_long_term_reference_flag to 0 for error concealment
...
For MBs which are in error, set u1_long_term_reference_flag to zero.
This ensures latest frame is used for concealment
Bug: 28470138
Change-Id: I58eab5bc1da277823f3dbb4103ba50867f8935dc
2016-05-23 21:26:38 +00:00
Harish Mahendrakar
f34b7a27a2
Decoder: Initialize slice parameters before concealing error MBs am: 33db7a0f4e am: 129a6006b4 am: fc855de43f
...
am: 634b546f34
* commit '634b546f34 ':
Decoder: Initialize slice parameters before concealing error MBs
Change-Id: I9b919624c7914e7e8ef4607dd7bd5a763eff3e0f
2016-05-23 18:49:09 +00:00
Harish Mahendrakar
129a6006b4
Decoder: Initialize slice parameters before concealing error MBs
...
am: 33db7a0f4e
* commit '33db7a0f4e ':
Decoder: Initialize slice parameters before concealing error MBs
Change-Id: I91b5e507d6871e523add85ed774c5de2b85fcf18
2016-05-23 18:34:43 +00:00
Harish Mahendrakar
33db7a0f4e
Decoder: Initialize slice parameters before concealing error MBs
...
Also memset ps_dec_op structure to zero.
For error input, this ensures dimensions are initialized to zero
Bug: 28165661
Change-Id: I66eb2ddc5e02e74b7ff04da5f749443920f37141
2016-05-20 15:27:35 -07:00
Marco Nelissen
c6f7be0ea0
Merge "Decoder: Fix for handling invalid intra mode" into mnc-dev am: 37579218eb am: af63f6f357 am: 2d0ff948ac
...
am: a2199594ae
* commit 'a2199594ae ':
Decoder: Fix for handling invalid intra mode
Change-Id: I8ce213525d0d821cf0c0b4b2e01c04c6a01505d3
2016-05-13 22:39:07 +00:00
Harish Mahendrakar
af63f6f357
Merge "Decoder: Fix for handling invalid intra mode" into mnc-dev
...
am: 37579218eb
* commit '37579218eb ':
Decoder: Fix for handling invalid intra mode
Change-Id: Ia41f2b0c19b83d3508044487469176894ba898d4
2016-05-13 22:31:11 +00:00
Marco Nelissen
37579218eb
Merge "Decoder: Fix for handling invalid intra mode" into mnc-dev
2016-05-13 22:20:17 +00:00
Harish Mahendrakar
3efc4664c8
Decoder: Memset few structures to zero to handle error clips am: 370bd8625d am: 3fa6dfb504
...
am: a17f3104aa
* commit 'a17f3104aa ':
Decoder: Memset few structures to zero to handle error clips
Change-Id: I5b1b3aa713c27b215143f58f5cfb536d779ba5c2
2016-05-13 19:51:35 +00:00
Harish Mahendrakar
370bd8625d
Decoder: Memset few structures to zero to handle error clips
...
Bug: 27907656
Change-Id: I671d135dd5c324c39b4ede990b7225d52ba882cd
2016-05-11 09:20:48 -07:00
Harish Mahendrakar
43a1cf620f
DO NOT MERGE. AVC decoder: init structures
...
Memset few structures to zero to handle error clips
Bug: 27907656
Change-Id: I517841fc8b6d674f7e4e3ebaf60dd2e42f1152ae
2016-05-11 08:18:59 -07:00
Harish Mahendrakar
f38d14c5d9
Decoder: Fix for handling invalid intra mode
...
Bug: 28165659
Change-Id: I2291a287c27291695f4f3d6e753b6bbd7dfd9e42
2016-05-10 10:35:27 -07:00
Wonsik Kim
4fb0fcb8cc
Handle level/profile/num_ref_frames/num_reorder change at the same resolution
...
Bug: 28083781
Change-Id: Ifa78c3125ab207ce5e39166f4891cba0d3a4e39c
2016-04-18 15:59:09 +09:00
Harish Mahendrakar
0c20244073
Decoder: Fix stack underflow in CAVLC 4x4 parse functions
...
am: ef3da4e699
* commit 'ef3da4e699 ':
Decoder: Fix stack underflow in CAVLC 4x4 parse functions
2016-02-23 02:25:42 +00:00
Harish Mahendrakar
1284f0c297
Ensure ih264d_start_of_pic() is not repeated in ih264d_mark_err_slice_skip()
...
am: c7a1cf4e0b
* commit 'c7a1cf4e0b ':
Ensure ih264d_start_of_pic() is not repeated in ih264d_mark_err_slice_skip()
2016-02-23 02:25:36 +00:00
Harish Mahendrakar
ef3da4e699
Decoder: Fix stack underflow in CAVLC 4x4 parse functions
...
Bug: 26399350
Change-Id: Id768751672a7b093ab6e53d4fc0b3188d470920e
2016-02-22 14:54:08 -08:00
Harish Mahendrakar
c7a1cf4e0b
Ensure ih264d_start_of_pic() is not repeated in ih264d_mark_err_slice_skip()
...
In case of error in handling MMCO commpands/reference list creation,
ih264d_start_of_pic() was called again in ih264d_mark_err_slice_skip() resulting in
leaking a picture or an MV buffer in buffer manager.
To fix this, ensure prev_slice_err is set to 1 only if u4_pic_buf_got is zero, before
calling ih264d_mark_err_slice_skip() at the end of picture decode.
This will ensure ih264d_start_of_pic() is not repeated
Bug: 25818142
Change-Id: I7d5a9179533581eec663bc6a19a2901e7cce6af3
2016-02-22 14:27:52 -08:00
Naveen Kumar Ponnusamy
64112d21e3
Return error when there are more mmco params than allocated size
...
am: 943323f1d9
* commit '943323f1d9 ':
Return error when there are more mmco params than allocated size
2016-01-15 02:10:55 +00:00
Naveen Kumar Ponnusamy
943323f1d9
Return error when there are more mmco params than allocated size
...
Bug: 25818142
Change-Id: I5c1b23985eeca5192b42703c627ca3d060e4e13d
2016-01-13 21:18:46 +00:00
Harish Mahendrakar
608fc7f4ae
Decoder Update mb count after mb map is set.
...
am: 4a524d3a8a
* commit '4a524d3a8a ':
Decoder Update mb count after mb map is set.
2016-01-07 21:07:40 +00:00
Harish Mahendrakar
4a524d3a8a
Decoder Update mb count after mb map is set.
...
Bug: 25928803
Change-Id: Iccc58a7dd1c5c6ea656dfca332cfb8dddba4de37
2016-01-07 11:08:06 -08:00
Dan Willemsen
1c01bc10a9
Remove __DATE__/__TIME__ from Android builds
...
This removes unnecessary changes from build to build.
Bug: 24204119
Change-Id: I25258314fe56ea186d38d756fb5fb04aa689a812
(cherry picked from commit f197ccb756 )
2015-10-30 21:54:53 +00:00
Marco Nelissen
66be90d7a0
Reconcile branch with master after mass cherrypicks
...
Change-Id: Ib017480389cb9f5204e5437716653016da348dba
2015-10-16 20:23:10 +00:00
Harish Mahendrakar
7ba9f34a49
Decoder: Memset 8 extra bytes at the end of internal bitstream buffer
...
Decoder may read 8 extra bytes at the end of this buffer, though it will never be used
Setting it to zero will ensure unitialized reads are avoided
Change-Id: I724239861cb9fa64f3a70cb5450e094cb3afa20c
2015-10-16 20:12:42 +00:00
Harish Mahendrakar
e023fbb28c
Decoder: Once all the MBs in a picture are decoded ignore remaining bytes
...
Once all the MBs are decoded, simply break from decode loops and do not signal an error
This will handle cases where there may be extra bytes at the end of picture data
Change-Id: I6d8ec918df5375f135e60f85b9a56ab2a5313a64
2015-10-16 20:09:34 +00:00
Harish Mahendrakar
e027a11e31
Decoder: Exit gracefully in case of allocation failure
...
Skip error concealment when allocation fails for decoder buffers
Change-Id: I785f31cad5dca52c8c67cba78cdd330b7b4539e1
2015-10-16 19:29:43 +00:00
Harish Mahendrakar
5351d3a403
Decoder: Added a check for unsupported resolutions
...
Decoder now returns an error for resolutions greater than 3840x2176
Bug: 24542936
Change-Id: I38be0e4c5cf2a980bfd4c781f3b49171f73b5ccb
2015-10-13 23:28:19 +00:00
Hamsalekha S
9d04b13b62
Moved check for level after check for resolution change.
...
This is required for DRC tests in CTS .
Change-Id: Icd0fe10d97c6ee55f8358682a578bddb58590de4
2015-10-09 11:35:26 -07:00
Harish Mahendrakar
59348127de
Decoder: Fixed an issue in handling flush
...
Fixed a NULL pointer reference, when flush is called before
decoding any pictures.
This was seen in following CTS test,
android.media.cts.DecoderTest#testCodecResetsH264WithSurface
Fixed code formatting issues in ih264d_set_flush_mode
Updated the testbench to call flush before decoding starts
Bug: 24405410
Change-Id: Ib04e0b15573b2482c9d5b43c8bc7dd30d8f8efdd
2015-09-25 22:24:55 +00:00
Harish Mahendrakar
07ae78bd27
Decoder: Fixed an out of bound read in intra pred buffers
...
Bug: 23453762
Change-Id: I129e5a2ac8b9a28f3c894ebca0aef7063ca5934e
(cherry picked from commit 040ec939c6 )
2015-09-25 16:47:27 +00:00
Harish Mahendrakar
251b007ecc
Decoder: Reduced memory requirements
...
Memory allocations are now done based on contents of SPS
API changed to move allocations inside the library
Also changed strlen to strnlen
Bug: 24221026
Change-Id: I9130457f564cddb4da7ec6399cc9fe88ee871217
2015-09-23 18:35:27 +00:00
Harish Mahendrakar
2ee0c1bced
Return error in SPS/PPS parsing when extra bytes are read from input
...
Bug: 24157524
Change-Id: I4b319ef8e23e1ba5f84f52b92f40ba7fb1429101
2015-09-18 14:12:13 -07:00