Ray Essick
517bd2907d
Merge "Decoder: Fixes in accessing mbaff flag in error cases" into mnc-dev am: 7ace2f5ca2 am: ba33452066 am: e8faa24c74 am: 57ba056850 am: aff1a88f83 am: 41bb6d6a66
...
am: 29718feb5c
2017-04-05 23:53:06 +00:00
Ray Essick
29718feb5c
Merge "Decoder: Fixes in accessing mbaff flag in error cases" into mnc-dev am: 7ace2f5ca2 am: ba33452066 am: e8faa24c74 am: 57ba056850 am: aff1a88f83
...
am: 41bb6d6a66
2017-04-05 23:50:37 +00:00
Ray Essick
41bb6d6a66
Merge "Decoder: Fixes in accessing mbaff flag in error cases" into mnc-dev am: 7ace2f5ca2 am: ba33452066 am: e8faa24c74 am: 57ba056850
...
am: aff1a88f83
2017-04-05 23:47:35 +00:00
Ray Essick
aff1a88f83
Merge "Decoder: Fixes in accessing mbaff flag in error cases" into mnc-dev am: 7ace2f5ca2 am: ba33452066 am: e8faa24c74
...
am: 57ba056850
2017-04-05 23:45:06 +00:00
Ray Essick
57ba056850
Merge "Decoder: Fixes in accessing mbaff flag in error cases" into mnc-dev am: 7ace2f5ca2 am: ba33452066
...
am: e8faa24c74
2017-04-05 23:42:06 +00:00
Ray Essick
e8faa24c74
Merge "Decoder: Fixes in accessing mbaff flag in error cases" into mnc-dev am: 7ace2f5ca2
...
am: ba33452066
2017-04-05 23:39:05 +00:00
Ray Essick
ba33452066
Merge "Decoder: Fixes in accessing mbaff flag in error cases" into mnc-dev
...
am: 7ace2f5ca2
2017-04-05 23:36:35 +00:00
Ray Essick
7ace2f5ca2
Merge "Decoder: Fixes in accessing mbaff flag in error cases" into mnc-dev
2017-04-05 23:29:45 +00:00
Ray Essick
96546d1489
Merge "Fix in the case of MMCO 3 (long term reference idx)." into mnc-dev am: 64b617346c am: bfb5f29471 am: 98a81bb017 am: 14276b25d1 am: 24c16eb2b5 am: fa74fd8b50
...
am: d4ee94a55c
2017-04-05 21:30:27 +00:00
Ray Essick
d4ee94a55c
Merge "Fix in the case of MMCO 3 (long term reference idx)." into mnc-dev am: 64b617346c am: bfb5f29471 am: 98a81bb017 am: 14276b25d1 am: 24c16eb2b5
...
am: fa74fd8b50
2017-04-05 21:27:57 +00:00
Ray Essick
fa74fd8b50
Merge "Fix in the case of MMCO 3 (long term reference idx)." into mnc-dev am: 64b617346c am: bfb5f29471 am: 98a81bb017 am: 14276b25d1
...
am: 24c16eb2b5
2017-04-05 21:24:57 +00:00
Ray Essick
24c16eb2b5
Merge "Fix in the case of MMCO 3 (long term reference idx)." into mnc-dev am: 64b617346c am: bfb5f29471 am: 98a81bb017
...
am: 14276b25d1
2017-04-05 21:22:26 +00:00
Ray Essick
14276b25d1
Merge "Fix in the case of MMCO 3 (long term reference idx)." into mnc-dev am: 64b617346c am: bfb5f29471
...
am: 98a81bb017
2017-04-05 21:19:26 +00:00
Ray Essick
98a81bb017
Merge "Fix in the case of MMCO 3 (long term reference idx)." into mnc-dev am: 64b617346c
...
am: bfb5f29471
2017-04-05 21:16:25 +00:00
Ray Essick
bfb5f29471
Merge "Fix in the case of MMCO 3 (long term reference idx)." into mnc-dev
...
am: 64b617346c
2017-04-05 21:13:56 +00:00
Ray Essick
64b617346c
Merge "Fix in the case of MMCO 3 (long term reference idx)." into mnc-dev
2017-04-05 21:09:18 +00:00
Harish Mahendrakar
0f2f2b5fde
Decoder: Fixes in accessing mbaff flag in error cases
...
ps_dec->ps_cur_slice->u1_mbaff_frame_flag is updated in ih264d_start_of_pic().
So updated value should be used after calling ih264d_start_of_pic()
Bug: 33974623
Test: ran POC from bug
Change-Id: I0f1ff5e01ed39767f493f197791e51b0da74952f
(cherry picked from commit 3f6937a003
2017-03-23 23:46:33 +00:00
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
Hamsalekha S
46e96d40db
Fix in the case of MMCO 3 (long term reference idx).
...
Increment number of long term reference buffers only when both top field
and bottom field have been set as long term.
[backport for M/N from master]
Bug: 35584425
Test: ran POC - no hang, no segfault.
Change-Id: I94e3857944da675eda38f8e1a9bd887f48bff524
(cherry picked from commit 6fa5df8811
2017-03-04 20:13:09 +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
