Commit graph

134 commits

Author SHA1 Message Date
Ray Essick
6e8a07f9fe Merge "Decoder: Reset p_curr_ctxt->i1_ref_idx using memset" am: 8342601b9d
am: a1d9b4383b

Change-Id: I8a7070b1a387e5d5a30fd3ffe08b928530bdf41c
2016-11-29 00:00:58 +00:00
Ray Essick
8996810109 Merge "Decoder: Aligned pi1_left_pred_mode[8] in _DecStruct definition" am: 1b0408dacf
am: 4cd2564672

Change-Id: Ibca8f5318afd9536b76e33d080e5c73bbd33d743
2016-11-29 00:00:45 +00:00
Ray Essick
a1d9b4383b Merge "Decoder: Reset p_curr_ctxt->i1_ref_idx using memset"
am: 8342601b9d

Change-Id: I2846d4293cb18f274037c0f3ac3824d10aff1e47
2016-11-28 23:56:55 +00:00
Ray Essick
4cd2564672 Merge "Decoder: Aligned pi1_left_pred_mode[8] in _DecStruct definition"
am: 1b0408dacf

Change-Id: I9fc43fce5adedbb1255642e0012ae6e9552549b2
2016-11-28 23:56:43 +00:00
Harish Mahendrakar
ef2f525bec Decoder: Reset p_curr_ctxt->i1_ref_idx using memset
Since p_curr_ctxt->i1_ref_idx is not guaranteed to be 4 byte aligned,
use memset instead of using it as an int pointer.
On platforms that do not support unaligned stores, this change is needed

Bug: 33073518
Test: Tested with -fsanitize=alignment enabled on avcdec

Change-Id: I5970454be3250f6f87eab383f3b6afbf5b56f201
2016-11-24 12:19:42 +05:30
Harish Mahendrakar
e98bd1f5a0 Decoder: Aligned pi1_left_pred_mode[8] in _DecStruct definition
This array is sometimes accessed as two WORD32 variables.
On platforms that do not support unaligned load/stores, this needs
to be aligned to 4 byte boundary.

Bug: 33073518
Test: Tested with -fsanitize=alignment enabled on avcdec

Change-Id: I470bc868dde7049be12bee06ee0ba0c4c4bd8566
2016-11-24 12:18:48 +05:30
Harish Mahendrakar
75d40672bd Decoder: Ignore dangling fields during flush am: 4b6344b281
am: b258b1bd56

Change-Id: I5aa03ad409e6f1b2c17764741e0fc32b4a166c53
2016-10-25 19:24:50 +00:00
Harish Mahendrakar
b258b1bd56 Decoder: Ignore dangling fields during flush
am: 4b6344b281

Change-Id: I8017e81b6d14cb507f297c54a95748455d6b5484
2016-10-25 19:20:19 +00:00
Harish Mahendrakar
4b6344b281 Decoder: Ignore dangling fields during flush
If decoder has decoded one field and is waiting for next field,
and flush is called, then ignore the current decoded field.

This is needed to ensure seek works in case of flush between field
decode calls

Bug: 32391809
Test: Tested manually by decoding clip in the above bug in Photos app

Change-Id: I72bb0385c216ebe262b346a56d3bc8fb97f90a7b
2016-10-25 11:47:19 +05:30
Harish Mahendrakar
93059ecf3c Decoder: Fixes in handling errors in Mbaff clips. am: 6676aeb419 am: fab0729908 am: 05bd0e8d4c am: 69b2803e55 am: dcb099e183 am: 80f3b06d90 am: a6aa08d1dc
am: f416648c29

Change-Id: Ic52a5b4acfe095179a89e71b44569d77b0806079
2016-10-19 00:28:13 +00:00
Harish Mahendrakar
80f3b06d90 Decoder: Fixes in handling errors in Mbaff clips. am: 6676aeb419 am: fab0729908 am: 05bd0e8d4c am: 69b2803e55
am: dcb099e183

Change-Id: I9d542a27d8d0410758485a6ca7799c9715bb0729
2016-10-19 00:05:30 +00:00
Harish Mahendrakar
30243167b0 Decoder: Ignore few dpb errors am: 026745ef04 am: 5d794693d5 am: 4483ecc64b am: 7e5239dd82
am: a3a7de7001

Change-Id: I8c3ae6a50d75574789e5540372b0bf7a3170438f
2016-10-19 00:05:11 +00:00
Harish Mahendrakar
dcb099e183 Decoder: Fixes in handling errors in Mbaff clips. am: 6676aeb419 am: fab0729908 am: 05bd0e8d4c
am: 69b2803e55

Change-Id: Ie26061f05f05cc1095401966bd6902d186fa1591
2016-10-18 23:58:44 +00:00
Harish Mahendrakar
a3a7de7001 Decoder: Ignore few dpb errors am: 026745ef04 am: 5d794693d5 am: 4483ecc64b
am: 7e5239dd82

Change-Id: I4cbbe4ecf9a16e92941409b26a1b23fa09d80fa1
2016-10-18 23:58:28 +00:00
Harish Mahendrakar
fab0729908 Decoder: Fixes in handling errors in Mbaff clips.
am: 6676aeb419

Change-Id: If83edf15d904c166661b3ab6065c5230269231dd
2016-10-18 23:36:38 +00:00
Harish Mahendrakar
5d794693d5 Decoder: Ignore few dpb errors
am: 026745ef04

Change-Id: Ibd9e7f2c7936fcd1f8bea8a84b99eb9780947feb
2016-10-18 23:36:27 +00:00
Harish Mahendrakar
6676aeb419 Decoder: Fixes in handling errors in Mbaff clips.
Fixes mb_x, mb_y and first_mb_in_slice for Mbaff error streams

Bug: 30481714

Change-Id: Ie99f3b57e48a620a4bc7aee88031955a2e1b6753
2016-10-18 12:19:18 -07:00
Harish Mahendrakar
026745ef04 Decoder: Ignore few dpb errors
Ignore dpb errors, where decoder fails to release a non-existing picture
from reference lists. This is needed to decode streams where few pictures
are missing.

Change-Id: I8ece68cb1fa22473029e16158cd86ce7a197027a
2016-10-18 12:19:06 -07:00
Harish Mahendrakar
fe243c2298 Decoder: Fixes for handling errors in multi-slice MB Aff streams am: bc71ad2d43 am: 02f663b3c2 am: ea085f8526 am: 19ab04056d
am: 670293535c

Change-Id: I16015eb69ae5dd257debbaea2de12966b559bb48
2016-09-22 22:00:31 +00:00
Harish Mahendrakar
6a5a01eb14 Decoder: Fixes for handling errors in multi-slice MB Aff streams am: bc71ad2d43 am: 02f663b3c2 am: ea085f8526 am: 19ab04056d
am: 670293535c

Change-Id: I3ec518c62575a1081ccc7d1ebc828f1091f297d5
2016-09-22 22:00:31 +00:00
Harish Mahendrakar
670293535c Decoder: Fixes for handling errors in multi-slice MB Aff streams am: bc71ad2d43 am: 02f663b3c2 am: ea085f8526
am: 19ab04056d

Change-Id: Ia8b75b824f8225143f52295460c5ec8285b6b443
2016-09-22 21:58:32 +00:00
Harish Mahendrakar
02f663b3c2 Decoder: Fixes for handling errors in multi-slice MB Aff streams
am: bc71ad2d43

Change-Id: Ibcbdbb3c4473b3199abff8d47444e59416589695
2016-09-22 18:19:55 +00:00
Harish Mahendrakar
bc71ad2d43 Decoder: Fixes for handling errors in multi-slice MB Aff streams
Initialize default reference buffer for erroneous interlaced clips
Pick slice_type from decode thread slice structure
Call start_of_pic only once

Bug: 30822755
Change-Id: I553c646446d99a626d62351aa1b385355191cdc3
2016-09-22 08:29:34 -07:00
Harish Mahendrakar
a2723f8647 Fix in the case of invalid SPS PPS am: c2e8ffe451 am: ff7ccdab0c am: 956ab4c476 am: 5c1f3eb993
am: 8b610a8350

Change-Id: I586ffd87cbb76040e18eed79b8b776dcd1567e5c
2016-09-21 20:49:00 +00:00
Harish Mahendrakar
86c5eddcf6 Fix in the case of invalid SPS PPS am: c2e8ffe451 am: ff7ccdab0c am: 956ab4c476 am: 5c1f3eb993
am: 8b610a8350

Change-Id: I610cbaeccbf36d7209264e46faa34b8c4d5df17e
2016-09-21 20:49:00 +00:00
Harish Mahendrakar
8b610a8350 Fix in the case of invalid SPS PPS am: c2e8ffe451 am: ff7ccdab0c am: 956ab4c476
am: 5c1f3eb993

Change-Id: Ic3fe94c0c5ab99f62a560c999dfb1d9815eab1d5
2016-09-21 20:46:29 +00:00
Harish Mahendrakar
ff7ccdab0c Fix in the case of invalid SPS PPS
am: c2e8ffe451

Change-Id: Iaf266c5ff2187ba980737b699884e3ebebe87bd0
2016-09-21 20:38:58 +00:00
Harish Mahendrakar
c2e8ffe451 Fix in the case of invalid SPS PPS
Bug: 31092462
Change-Id: I0e2ab5a1088717bbf36f6b0cf859b5a6e0f59c5d
2016-09-21 09:50:06 -07:00
Harish Mahendrakar
b424a5e101 Fixed error concealment when no MBs are decoded in the current pic am: b926905ee2 am: ff54ee6115 am: 9fca73a55e am: 19080458ba
am: 9836aa04a9

Change-Id: I7a2f3551c304c180df9e05b06de9de7bef0b9436
2016-07-14 01:37:54 +00:00
Harish Mahendrakar
7419a0e039 Fixed error concealment when no MBs are decoded in the current pic am: b926905ee2 am: ff54ee6115 am: 9fca73a55e am: 19080458ba
am: 9836aa04a9

Change-Id: Iccfd85fcf60aa708c08fdebe0dc1d4bd27141181
2016-07-14 01:37:53 +00:00
Harish Mahendrakar
9836aa04a9 Fixed error concealment when no MBs are decoded in the current pic am: b926905ee2 am: ff54ee6115 am: 9fca73a55e
am: 19080458ba

Change-Id: Ibe5dc75e9b5d340f8c9ad412797b3948da00ef24
2016-07-14 01:34:37 +00:00
Harish Mahendrakar
ff54ee6115 Fixed error concealment when no MBs are decoded in the current pic
am: b926905ee2

Change-Id: I8a0a6fc068b543a4431b085c9335301e89ef2e14
2016-07-14 01:22:44 +00:00
Harish Mahendrakar
b926905ee2 Fixed error concealment when no MBs are decoded in the current pic
Bug: 29493002
Change-Id: I3fae547ddb0616b4e6579580985232bd3d65881e
2016-07-13 17:32:27 -07:00
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
Bill Yi
63fed249f5 Merge commit 'f2dadab7e1' into HEAD 2016-06-28 08:59:01 -07:00
Harish Mahendrakar
ed7bec2330 Merge \\"Decoder: Initialize few VUI params to signal unspecified values\\" am: 98a713ba39
am: 0558888c28

Change-Id: I284fcfea1079e0c2f2e6b489f7b7cb69b76826b6
2016-06-28 15:27:15 +00:00
Harish Mahendrakar
0558888c28 Merge \"Decoder: Initialize few VUI params to signal unspecified values\"
am: 98a713ba39

Change-Id: Ib132cd86000079770635b8f101c8ce5affde8b10
2016-06-28 15:24:39 +00:00
Treehugger Robot
98a713ba39 Merge "Decoder: Initialize few VUI params to signal unspecified values" 2016-06-28 15:20:42 +00:00
Harish Mahendrakar
871f061df4 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-06-27 14:15:39 +05:30
Ray Essick
daefcde2ed DO NOT MERGE ANYWHERE: Remove several memset() calls which overwrote buffers initialized
in buf_mgr_init().  Affects 6.0 only.
2016-06-23 22:07:15 +00:00
Harish Mahendrakar
8b078e826e Decoder: Added support for exporting VUI params am: d5953ced23
am: a1fa8e86e8

Change-Id: I1363116738bb33b3c9a999ba7159f4c80d9eef89
2016-06-23 16:01:53 +00:00
Harish Mahendrakar
a1fa8e86e8 Decoder: Added support for exporting VUI params
am: d5953ced23

Change-Id: I01485a055330902830f64850c1ddfa2ce4b8ce25
2016-06-23 15:58:05 +00:00
Harish Mahendrakar
d5953ced23 Decoder: Added support for exporting VUI params
Bug: 27442922

Change-Id: I4bc3a9fb31ffea1e9e8ae32e5ed49fcc12fbdf42
2016-06-22 04:10:00 +00:00
Ray Essick
1cb4c241b9 Merge \\"Decoder: Simplified error checks on display stride\\" am: e8463cdf28
am: fb5a6f6fcc

Change-Id: I19f6dbf1268ad302a4c2fc5b8dd2f6f30948f2db
2016-06-21 21:25:06 +00:00
Harish Mahendrakar
fb5a6f6fcc Merge \"Decoder: Simplified error checks on display stride\"
am: e8463cdf28

Change-Id: Ie404c25afb8461451b738a174431c2cd6d6c03be
2016-06-21 21:22:17 +00:00
Ray Essick
e8463cdf28 Merge "Decoder: Simplified error checks on display stride" 2016-06-21 21:15:43 +00:00
Harish Mahendrakar
f773f0affa Merge \\\\\"Decoder: Initialize first_pb_nal_in_pic for error slices\\\\\" into mnc-dev am: b9d7cba8bf am: c73e000665 am: 59248aa67c am: c4ef0f6129
am: ac9332c9ac

Change-Id: I0e24a9a24d78be351bd3fcbca9ec7640b874b7f4
2016-06-21 19:04:25 +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