Ray Essick
35ab7bdfa0
Merge "Fix in the case of MMCO 3 (long term reference idx)."
2017-03-01 20:54:06 +00:00
Ray Essick
8429840eec
Merge "Bug fix for flush without valid frames"
2017-03-01 20:54:00 +00:00
Hamsalekha S
a3ab2caa43
Fixed bug in the case of resolution change.
...
Modified the way i4_header_decoded in decoder context
is used, to ensure that resolution change is detected
even if PPS has not been decoded.
Bug: 35583675
Test: ran POC, no longer hangs
Change-Id: Ibb3f8dfbeb66a999fd81720a7d2a02dd951a55c4
2017-02-21 12:20:06 -08:00
Hamsalekha S
d0ab5b06d7
Bug fix for flush without valid frames
...
We now return fail and get out of flush mode to accept bitstream in the next call.
Bug: 35585952
Test: test case does not hang
Change-Id: Id22cc98d4a47714475a67918990a181a805c4c9f
2017-02-21 12:18:44 -08:00
Hamsalekha S
6fa5df8811
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.
Bug: 35584425
Test: ran POC - no hang, no segfault.
Change-Id: I94e3857944da675eda38f8e1a9bd887f48bff524
2017-02-21 12:17:02 -08:00
Marco Nelissen
9a7ebde089
resolve merge conflicts of 3654ad0 to mnc-dr-dev am: 37345554fe am: 33d9d00a3c am: 858542d83e am: 2e4b53cfb4 am: 7c50684ef0 am: 834462327b am: 1d999b7cdf am: d7cf476e4d
...
am: f04b34c5b1
2017-02-14 23:48:14 +00:00
Marco Nelissen
ea8a5247fa
resolve merge conflicts of 3654ad0 to mnc-dr-dev am: 37345554fe am: 33d9d00a3c am: 858542d83e am: 2e4b53cfb4 am: 7c50684ef0 am: 834462327b am: 1d999b7cdf am: 9e011993f4
...
am: 9855b0af5a
2017-02-14 23:47:57 +00:00
Marco Nelissen
f04b34c5b1
resolve merge conflicts of 3654ad0 to mnc-dr-dev am: 37345554fe am: 33d9d00a3c am: 858542d83e am: 2e4b53cfb4 am: 7c50684ef0 am: 834462327b am: 1d999b7cdf
...
am: d7cf476e4d
2017-02-14 23:28:16 +00:00
Marco Nelissen
9855b0af5a
resolve merge conflicts of 3654ad0 to mnc-dr-dev am: 37345554fe am: 33d9d00a3c am: 858542d83e am: 2e4b53cfb4 am: 7c50684ef0 am: 834462327b am: 1d999b7cdf
...
am: 9e011993f4
2017-02-14 23:24:24 +00:00
Marco Nelissen
d7cf476e4d
resolve merge conflicts of 3654ad0 to mnc-dr-dev am: 37345554fe am: 33d9d00a3c am: 858542d83e am: 2e4b53cfb4 am: 7c50684ef0 am: 834462327b
...
am: 1d999b7cdf
2017-02-14 23:11:03 +00:00
Marco Nelissen
9e011993f4
resolve merge conflicts of 3654ad0 to mnc-dr-dev am: 37345554fe am: 33d9d00a3c am: 858542d83e am: 2e4b53cfb4 am: 7c50684ef0 am: 834462327b
...
am: 1d999b7cdf
2017-02-14 23:11:03 +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
56dbef7f94
Decoder: Fixed initialization of first_slice_in_pic am: 0b23c81c3d am: 16fa990ce1 am: ab79eb3973 am: a37d120eb2 am: c011eeade7 am: 94e17dc822 am: 9117d918dd am: f837a7796b am: 3b1435ab03
...
am: 632face04c
2017-02-14 17:30:10 +00:00
Harish Mahendrakar
1e548ffb1e
Decoder: Fixed initialization of first_slice_in_pic am: 0b23c81c3d am: 16fa990ce1 am: ab79eb3973 am: a37d120eb2 am: c011eeade7 am: 94e17dc822 am: 9117d918dd am: f837a7796b am: b1bbfa5320
...
am: d84e9b64e1
2017-02-14 17:29:59 +00:00
Harish Mahendrakar
d11de074f7
Merge "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 am: 9432beb534 am: 20c2cfbc12" into nyc-mr2-dev-plus-aosp
...
am: b16f1251eb
2017-02-14 17:29:44 +00:00
Harish Mahendrakar
9e037f09bb
Merge "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 am: 9432beb534 am: 7f690f1ada" into nyc-mr2-dev-plus-aosp
...
am: de7e809c2e
2017-02-14 17:29:31 +00:00
Harish Mahendrakar
73188475c4
Merge "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 am: 981e88d5b8 am: da61ab513f" into nyc-mr2-dev-plus-aosp
...
am: 3fc5d1afe6
2017-02-14 17:29:16 +00:00
Harish Mahendrakar
e4ce532b80
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 am: 981e88d5b8 am: e8daa4f030
...
am: ad74db1ff8
2017-02-14 17:29:02 +00:00
Harish Mahendrakar
632face04c
Decoder: Fixed initialization of first_slice_in_pic am: 0b23c81c3d am: 16fa990ce1 am: ab79eb3973 am: a37d120eb2 am: c011eeade7 am: 94e17dc822 am: 9117d918dd am: f837a7796b
...
am: 3b1435ab03
2017-02-14 17:24:08 +00:00
Harish Mahendrakar
d84e9b64e1
Decoder: Fixed initialization of first_slice_in_pic am: 0b23c81c3d am: 16fa990ce1 am: ab79eb3973 am: a37d120eb2 am: c011eeade7 am: 94e17dc822 am: 9117d918dd am: f837a7796b
...
am: b1bbfa5320
2017-02-14 17:19:02 +00:00
Android Build Merger (Role)
b16f1251eb
Merge "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 am: 9432beb534 am: 20c2cfbc12" into nyc-mr2-dev-plus-aosp
2017-02-14 17:18:55 +00:00
Android Build Merger (Role)
de7e809c2e
Merge "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 am: 9432beb534 am: 7f690f1ada" into nyc-mr2-dev-plus-aosp
2017-02-14 17:18:53 +00:00
Harish Mahendrakar
8bae7fe2a1
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 am: 9432beb534
...
am: 20c2cfbc12
2017-02-14 17:18:49 +00:00
Harish Mahendrakar
68b86555e4
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 am: 9432beb534
...
am: 7f690f1ada
2017-02-14 17:18:48 +00:00
Android Build Merger (Role)
3fc5d1afe6
Merge "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 am: 981e88d5b8 am: da61ab513f" into nyc-mr2-dev-plus-aosp
2017-02-14 17:18:45 +00:00
Harish Mahendrakar
b1bbfa5320
Decoder: Fixed initialization of first_slice_in_pic am: 0b23c81c3d am: 16fa990ce1 am: ab79eb3973 am: a37d120eb2 am: c011eeade7 am: 94e17dc822 am: 9117d918dd
...
am: f837a7796b
2017-02-14 17:18:39 +00:00
Harish Mahendrakar
ad74db1ff8
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 am: 981e88d5b8
...
am: e8daa4f030
2017-02-14 17:18:39 +00:00
Harish Mahendrakar
3b1435ab03
Decoder: Fixed initialization of first_slice_in_pic am: 0b23c81c3d am: 16fa990ce1 am: ab79eb3973 am: a37d120eb2 am: c011eeade7 am: 94e17dc822 am: 9117d918dd
...
am: f837a7796b
2017-02-14 17:18:38 +00:00
Harish Mahendrakar
2b0ee383ac
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 am: 981e88d5b8
...
am: da61ab513f
2017-02-14 17:18:38 +00:00
Harish Mahendrakar
20c2cfbc12
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
...
am: 9432beb534
2017-02-14 17:16:16 +00:00
Harish Mahendrakar
7f690f1ada
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
...
am: 9432beb534
2017-02-14 17:16:16 +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
e8daa4f030
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
...
am: 981e88d5b8
2017-02-14 17:16:08 +00:00
Harish Mahendrakar
da61ab513f
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
...
am: 981e88d5b8
2017-02-14 17:16:07 +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
