Harish Mahendrakar
2461f041da
Merge "Added avc_dec_fuzzer" am: 219459dcb3 am: 6b7b0ac4ee am: 6cfc9cfe9c
...
am: 808d34180a
Change-Id: Iad773952d463af6403439900f42e01de0ccb0eba
2019-08-15 15:44:52 -07:00
Harish Mahendrakar
69e9b06b43
Merge "Added CMakeLists.txt for x86/x64 build" am: c6d02cd3df am: ab5b036e75 am: de04474be6
...
am: 3686c6d081
Change-Id: I423b80eb68dd8b7e95a4eb796f8e9e75ef664783
2019-08-15 15:34:41 -07:00
Harish Mahendrakar
808d34180a
Merge "Added avc_dec_fuzzer" am: 219459dcb3 am: 6b7b0ac4ee
...
am: 6cfc9cfe9c
Change-Id: I233ef8a542ac8e5098de8352eff0068a9ad8edd6
2019-08-15 15:08:17 -07:00
Harish Mahendrakar
3686c6d081
Merge "Added CMakeLists.txt for x86/x64 build" am: c6d02cd3df am: ab5b036e75
...
am: de04474be6
Change-Id: I20ab72791045b3f38623b00e60171f9c74ad4520
2019-08-15 15:03:16 -07:00
Harish Mahendrakar
6cfc9cfe9c
Merge "Added avc_dec_fuzzer" am: 219459dcb3
...
am: 6b7b0ac4ee
Change-Id: I55874ca705f6ceba7137215864742f94ccbba920
2019-08-15 14:51:43 -07:00
Harish Mahendrakar
de04474be6
Merge "Added CMakeLists.txt for x86/x64 build" am: c6d02cd3df
...
am: ab5b036e75
Change-Id: I556e8b341ae2685f5ec1fbcdc91d448e8cd761be
2019-08-15 14:49:53 -07:00
Harish Mahendrakar
6b7b0ac4ee
Merge "Added avc_dec_fuzzer"
...
am: 219459dcb3
Change-Id: I2f971e0f8c77ff259eebc34e6bbf3d556d6a1491
2019-08-15 14:38:49 -07:00
Harish Mahendrakar
ab5b036e75
Merge "Added CMakeLists.txt for x86/x64 build"
...
am: c6d02cd3df
Change-Id: Ib5316e158d0fc3183b9185da8cc734da9511098e
2019-08-15 14:37:09 -07:00
Treehugger Robot
219459dcb3
Merge "Added avc_dec_fuzzer"
2019-08-15 21:31:00 +00:00
Treehugger Robot
c6d02cd3df
Merge "Added CMakeLists.txt for x86/x64 build"
2019-08-15 20:33:30 +00:00
Xin Li
d2c1343066
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master am: 9f3122c427 -s ours am: 61b451ddf1 -s ours am: 2bf070e0ac
...
am: 17a55363f2
Change-Id: I4b49dfe5c2e50f5a6397c229f51abfa3f8005408
2019-08-15 00:33:17 -07:00
Xin Li
17a55363f2
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master am: 9f3122c427 -s ours am: 61b451ddf1 -s ours
...
am: 2bf070e0ac
Change-Id: I8c82e61f4654b059ad5d6421fa7165bf1c654442
2019-08-15 00:14:21 -07:00
Xin Li
2bf070e0ac
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master am: 9f3122c427 -s ours
...
am: 61b451ddf1 -s ours
am skip reason: subject contains skip directive
Change-Id: I3f0ea87d124b2799c339d8ce3ac3c64ae3409406
2019-08-14 23:50:44 -07:00
Xin Li
61b451ddf1
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master
...
am: 9f3122c427 -s ours
am skip reason: subject contains skip directive
Change-Id: I32b2a6d9922a22ae3f41d35b1d2d5dfc8677e021
2019-08-14 23:30:39 -07:00
Xin Li
9f3122c427
DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master
...
Bug: 139369544
Change-Id: If2c60e9bc1ed74a5204f42efd04f069f781b7ecf
2019-08-13 16:36:35 -07:00
Harish Mahendrakar
1cf2178de2
Added avc_dec_fuzzer
...
Test: ./avc_dec_fuzzer
Bug: 135629550
Change-Id: I6a7685873941b4680e53003e597a6785ca5584e5
2019-08-13 14:43:27 -07:00
android-build-team Robot
373d5d9baf
Snap for 5674421 from b536cc95b0 to pi-platform-release
...
Change-Id: I2777fb6a6b2ae26f6aa3185d70b4f617350ad1b1
2019-08-13 16:28:17 +00:00
Harish Mahendrakar
c315d743f9
Added CMakeLists.txt for x86/x64 build
...
Bug: 135629550
Test: cmake && make
Change-Id: I44a611b6123600b5c7dfec07ad09e2d98c667635
2019-08-05 23:19:32 +00:00
Xin Li
e9882b61ad
DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master
...
am: eee112a16f
Change-Id: Ibc67e33b581e23e9da20322ced7897a16372e331
2019-07-02 13:04:32 -07:00
Xin Li
eee112a16f
DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master
...
Bug: 134405016
Change-Id: I72440490aead58587713874572a5981b3bfbe4a3
2019-07-01 20:59:30 +00:00
android-build-team Robot
b536cc95b0
Merge cherrypicks of [7995446, 7995447, 7996042, 7996138, 7995448, 7995449, 7995789, 7995790, 7995450, 7996029, 7996030, 7996139, 7996140, 7996141, 7996142, 7996143, 7996144, 7995544, 7995545, 7995546, 7995547, 7995548, 7995549, 7995550, 7996145, 7996146, 7996032, 7996147, 7996148, 7996149, 7996150, 7994747, 7994748, 7995451, 7994749, 7994750, 7995966, 7995967, 7994751, 7996151, 7996152, 7996153] into pi-qpr3-b-release
...
Change-Id: I3436902e2cb5cc53e9c09ffeb32ca08ea696531c
2019-06-12 09:56:51 +00:00
Rakesh Kumar
13de16c79e
Decoder: Delete node from st if lt and st point to same
...
If lt_list and st_list point to same node then delete it from st.
If there is error while adding a node in bottom field of lt_list (top is
already added) then this node will be pointed by st_list also. So we need
to remove it from st_list
bug: 73552574
Test: poc before/after on Android N security branch
Change-Id: I95304c242c5854b18c5c7220d114ce6215760124
(cherry picked from commit f312a1d305 )
2019-06-12 09:54:49 +00:00
Isha Kulkarni
8cc85a6e8a
Merge "Decoder: Add error check for expected_poc in ih264d_decode_pic_order_cnt" into qt-dev am: 6db97fcc8d
...
am: ae2d934d1c
Change-Id: Iad065d4e2a7888cb084745194d472579cd3f8a8d
2019-05-30 10:52:43 -07:00
Isha Kulkarni
4182aa39cb
Merge "Decoder: Add error check for expected_poc in ih264d_decode_pic_order_cnt" into qt-dev am: 6db97fcc8d
...
am: c693cc9fad
Change-Id: Ib950ab4532dca999e7bf00db4abb8125681e0974
2019-05-30 10:51:44 -07:00
Isha Kulkarni
ae2d934d1c
Merge "Decoder: Add error check for expected_poc in ih264d_decode_pic_order_cnt" into qt-dev
...
am: 6db97fcc8d
Change-Id: I4085ac83977bcbfb20f065f3f27f14ad90add2bc
2019-05-30 10:41:41 -07:00
Isha Kulkarni
c693cc9fad
Merge "Decoder: Add error check for expected_poc in ih264d_decode_pic_order_cnt" into qt-dev
...
am: 6db97fcc8d
Change-Id: I3b6cbf44cc70645356be2b8869cf57ed32c7a445
2019-05-30 10:41:41 -07:00
TreeHugger Robot
6db97fcc8d
Merge "Decoder: Add error check for expected_poc in ih264d_decode_pic_order_cnt" into qt-dev
2019-05-30 17:31:28 +00:00
Rakesh Kumar
f589b13c9f
[automerger] Decoder: Delete node from st if lt and st point to same am: f312a1d305 am: f82a1f8d7f am: ae2c8cfdc1 am: 8332d0bfa2 am: 1e6ef7fee5 am: b1734142ff am: 9460fbd521 am: 224bcf4592 am: d406f08816 am: 75cd59e45b
...
am: f62e430507
Change-Id: Icd731ff97993bd52afd472e371d8b8c67c4798bf
2019-05-29 14:46:38 -07:00
Rakesh Kumar
e1b1f85845
[automerger] Decoder: Delete node from st if lt and st point to same am: f312a1d305 am: f82a1f8d7f am: ae2c8cfdc1 am: 8332d0bfa2 am: 1e6ef7fee5 am: b1734142ff am: 9460fbd521 am: 224bcf4592 am: d406f08816 am: 75cd59e45b
...
am: 1ffc4072ef
Change-Id: I05c228e2b6dcd62f1ec0fa02351f5d912244077a
2019-05-29 14:45:36 -07:00
Rakesh Kumar
f62e430507
[automerger] Decoder: Delete node from st if lt and st point to same am: f312a1d305 am: f82a1f8d7f am: ae2c8cfdc1 am: 8332d0bfa2 am: 1e6ef7fee5 am: b1734142ff am: 9460fbd521 am: 224bcf4592 am: d406f08816
...
am: 75cd59e45b
Change-Id: I756104f5abeb4c46374d1aaa11d1fd5898bce6a3
2019-05-29 14:39:39 -07:00
Rakesh Kumar
1ffc4072ef
[automerger] Decoder: Delete node from st if lt and st point to same am: f312a1d305 am: f82a1f8d7f am: ae2c8cfdc1 am: 8332d0bfa2 am: 1e6ef7fee5 am: b1734142ff am: 9460fbd521 am: 224bcf4592 am: d406f08816
...
am: 75cd59e45b
Change-Id: I3fc2480bebd777aee2d4e7efe0a05dbad35c299f
2019-05-29 14:38:35 -07:00
Rakesh Kumar
75cd59e45b
[automerger] Decoder: Delete node from st if lt and st point to same am: f312a1d305 am: f82a1f8d7f am: ae2c8cfdc1 am: 8332d0bfa2 am: 1e6ef7fee5 am: b1734142ff am: 9460fbd521 am: 224bcf4592
...
am: d406f08816
Change-Id: I1351851c15384868d9ab579857e4fc46076f5942
2019-05-29 14:31:32 -07:00
Rakesh Kumar
d406f08816
[automerger] Decoder: Delete node from st if lt and st point to same am: f312a1d305 am: f82a1f8d7f am: ae2c8cfdc1 am: 8332d0bfa2 am: 1e6ef7fee5 am: b1734142ff am: 9460fbd521
...
am: 224bcf4592
Change-Id: I17d333502eaf3084c0c08dd0fd2a4494c3251ab4
2019-05-29 14:23:26 -07:00
Rakesh Kumar
224bcf4592
[automerger] Decoder: Delete node from st if lt and st point to same am: f312a1d305 am: f82a1f8d7f am: ae2c8cfdc1 am: 8332d0bfa2 am: 1e6ef7fee5 am: b1734142ff
...
am: 9460fbd521
Change-Id: I0c53bc30225153ff03d44670f6967a05e161c654
2019-05-29 14:16:23 -07:00
Rakesh Kumar
9460fbd521
[automerger] Decoder: Delete node from st if lt and st point to same am: f312a1d305 am: f82a1f8d7f am: ae2c8cfdc1 am: 8332d0bfa2 am: 1e6ef7fee5
...
am: b1734142ff
Change-Id: I86f63de8c4eb3c534aeafbbb592c738f8805188c
2019-05-29 14:11:21 -07:00
Isha Kulkarni
89daff526a
Decoder: Add error check for expected_poc in ih264d_decode_pic_order_cnt
...
Bug: 131625739
Test: Validate with poc in bug
Change-Id: I3e1c132e28ad35541a0b9c4632b1f43611b90dea
2019-05-29 13:46:13 -07:00
Xin Li
3e60f2dbed
[automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master
...
am: 8fc003e205 -s ours
am skip reason: subject contains skip directive
Change-Id: I7298fc8b6359e040faad40e71eaac093f2bbe287
2019-05-13 17:42:24 -07:00
Xin Li
8fc003e205
DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master
...
Bug: 132622481
Change-Id: I412fce0a111b51a5a56bb455cb3588d92ceb30ec
2019-05-13 15:39:08 -07:00
Thomala Srinivas
261b9745b4
Merge "libavcenc: Fix B frame incomplete subgop issue" into qt-dev
...
am: 26bcb6b37b
Change-Id: I2f009eff3986783c4a08697994ce3d2540c6be82
2019-05-10 18:29:20 -07:00
TreeHugger Robot
26bcb6b37b
Merge "libavcenc: Fix B frame incomplete subgop issue" into qt-dev
2019-05-11 00:45:45 +00:00
Thomala Srinivas
5c3b992b6f
libavcenc: Fix B frame incomplete subgop issue
...
The encoder doesn't return remaining frames if last subgop is
incomplete. This problem is solved by swapping last NULL P frame
(as subgop is incomplete last P frame will be NULL) with the
last valid (non- NULL) B frame. Complete subgop swapping is not done.
Also update MAX_NUM_BFRAMES to 8 and added a separate macro to
define maximum number of pictures in input queue
Bug: 132063959
Test: run cts -m CtsMediaTestCases \
-t android.media.cts.VideoEncoderTest
Change-Id: I9625c5f5f64ec60032c44dad54f735991921d6dd
2019-05-10 15:06:15 -07:00
Android Build Merger (Role)
b1734142ff
[automerger] Decoder: Delete node from st if lt and st point to same am: f312a1d305 am: f82a1f8d7f am: ae2c8cfdc1 am: 8332d0bfa2 am: 1e6ef7fee5
...
Change-Id: Id6d3411d949ae069369d7bef1c50f904cf9c97dc
2019-05-08 18:45:13 +00:00
Android Build Merger (Role)
1e6ef7fee5
[automerger] Decoder: Delete node from st if lt and st point to same am: f312a1d305 am: f82a1f8d7f am: ae2c8cfdc1 am: 8332d0bfa2
...
Change-Id: Ie1677fa6ad378564e164729d80b7d1edf4bd214c
2019-05-08 18:45:11 +00:00
Android Build Merger (Role)
8332d0bfa2
[automerger] Decoder: Delete node from st if lt and st point to same am: f312a1d305 am: f82a1f8d7f am: ae2c8cfdc1
...
Change-Id: Iebc6317ca7ae7f6417cfd1e1cff39110e6fe82db
2019-05-08 18:45:09 +00:00
Android Build Merger (Role)
ae2c8cfdc1
[automerger] Decoder: Delete node from st if lt and st point to same am: f312a1d305 am: f82a1f8d7f
...
Change-Id: Ibca538dbd7a3d262fa87ca47d3f951a9b6c1e9f4
2019-05-08 18:45:07 +00:00
Android Build Merger (Role)
f82a1f8d7f
[automerger] Decoder: Delete node from st if lt and st point to same am: f312a1d305
...
Change-Id: I90a0c3fca5d7542301994711448d7c79fe98e704
2019-05-08 18:45:05 +00:00
Rakesh Kumar
f312a1d305
Decoder: Delete node from st if lt and st point to same
...
If lt_list and st_list point to same node then delete it from st.
If there is error while adding a node in bottom field of lt_list (top is
already added) then this node will be pointed by st_list also. So we need
to remove it from st_list
bug: 73552574
Test: poc before/after on Android N security branch
Change-Id: I95304c242c5854b18c5c7220d114ce6215760124
2019-05-08 11:44:40 -07:00
android-build-team Robot
7b42c48cc6
Snap for 5450365 from 48900d4e51 to pi-platform-release
...
Change-Id: I672f09de3677ccbc8e851628100da8e467a5507b
2019-05-07 21:52:43 +00:00
Harish Mahendrakar
69137d1704
Merge "decoder: Remove skip picture support" into qt-dev
...
am: 6cb07e106a
Change-Id: I9a8e7503ee0a475eb0df73179d5d7099a2ce6490
2019-05-04 17:12:46 -07:00
TreeHugger Robot
6cb07e106a
Merge "decoder: Remove skip picture support" into qt-dev
2019-05-04 21:16:35 +00:00