Commit graph

3650 commits

Author SHA1 Message Date
Treehugger Robot
caaefd10ac Merge "avcenc: Set default color aspects to unspecified in VUI" am: b9e8c708aa
Original change: 1777145

Change-Id: I45241f5490e5ddc0fdbe2812e6fdef968b68c6ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-19 16:40:02 +00:00
Treehugger Robot
a15a2acd42 Merge "Encoder: add support for PSNR export" am: ab6bce7870
Original change: 2133373

Change-Id: I570a6b2b750db55225a88e95bf74c97f5004ce91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-19 16:39:53 +00:00
Treehugger Robot
cd1687efd9 Merge "mvc: corrected handling of incorrect bitstreams in refIdxActive parsing" am: eda6e822bd
Original change: 2185479

Change-Id: I5ab3e2903eaaf572a1027cef1958a3afbde532b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-19 16:11:45 +00:00
Treehugger Robot
b9e8c708aa Merge "avcenc: Set default color aspects to unspecified in VUI" 2022-08-19 16:02:56 +00:00
Treehugger Robot
ab6bce7870 Merge "Encoder: add support for PSNR export" 2022-08-19 15:52:16 +00:00
Treehugger Robot
eda6e822bd Merge "mvc: corrected handling of incorrect bitstreams in refIdxActive parsing" 2022-08-19 15:20:56 +00:00
Treehugger Robot
bd827ccc72 Merge "mvc: Fix for int overflow when parsing u1_bits_in_frm_num" am: c5ee6f9883
Original change: 2188236

Change-Id: Id09d9d9e66f286466db4f9aa4f39ca7f54a2f9da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-19 08:12:11 +00:00
Treehugger Robot
c5ee6f9883 Merge "mvc: Fix for int overflow when parsing u1_bits_in_frm_num" 2022-08-19 07:46:59 +00:00
Treehugger Robot
838c379989 Merge "mvc: Signal resolution change correctly in subset SPS" am: 4a169466ec
Original change: 2181820

Change-Id: I640e041ad921da4c932e371fb6d6dd9463b7d5f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-19 06:40:11 +00:00
Treehugger Robot
4a169466ec Merge "mvc: Signal resolution change correctly in subset SPS" 2022-08-19 06:18:19 +00:00
Ashwin Natesan
113c748dd2
mvc: Signal resolution change correctly in subset SPS
Bug: 242500802
Test: fuzzer poc in bug
Change-Id: I1ad1e427fed56b00fc6203328fbe02bb9a453874
2022-08-18 18:49:55 +05:30
Ashwin Natesan
0f0cca684c
mvc: corrected handling of incorrect bitstreams in refIdxActive parsing
Test: fuzzer poc in bug
Bug: 242723830
Change-Id: Ib43c6d24fd45cbab7fe2a7b4b698f50e95b2092a
2022-08-18 16:00:05 +05:30
Harish Mahendrakar
6f403c12e3 avcenc: Set default color aspects to unspecified in VUI
In avcenc test application, when configuring VUI,
color aspects were set to 0. This causes issues when the
clips are decoded using reference decoder where this is treated
as RGB data. Set these to unspecified.

Bug: 242104405
Test: avcenc -c enc.cfg

Change-Id: I2f80250f94faccba52fe945502fc10b793def536
2022-08-17 22:41:47 +00:00
Manisha Jajoo
e559967790 Encoder: add support for PSNR export
This CL adds support to report PSNR between incoming and resulting
encoded frames. Eventually be reported upstream as part of a feedback
mechanism.

Test: avcenc -c enc.cfg
Bug: b/235899898

Change-Id: Id520913ca5964965b5a86bc520240ccd1b28176c
2022-08-17 17:22:00 +00:00
Ashwin Natesan
bb490c0067
mvc: Fix for int overflow when parsing u1_bits_in_frm_num
Bug: 242555278
Test: fuzzer poc in bug
Change-Id: Ie8b8c0a977ad827d7a05fd80b8d8186c78d2acb5
2022-08-16 16:29:40 +05:30
Treehugger Robot
2187495400 Merge "mvc: Set minimum bitstream buffser size correctly" am: 5d36aabe47
Original change: 2183784

Change-Id: Ia909b9e4086a3e9d6adc56ee2a1e9bbe28ef5881
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-14 20:58:16 +00:00
Treehugger Robot
5d36aabe47 Merge "mvc: Set minimum bitstream buffser size correctly" 2022-08-14 20:41:32 +00:00
Treehugger Robot
25ba7774e9 Merge "mvc: Correct view id checks in SPS parsing" am: 5fd48009bf
Original change: 2181819

Change-Id: I71eff2bd64ebdaf4ca65b379b87e557c57b45afa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-14 18:03:51 +00:00
Treehugger Robot
5fd48009bf Merge "mvc: Correct view id checks in SPS parsing" 2022-08-14 17:48:52 +00:00
Ashwin Natesan
eb3d11f42f
mvc: Set minimum bitstream buffser size correctly
Bug: 242303994
Test: fuzzer poc in bug
Change-Id: I7bc7fa05c46d9474db4fa8ee7761cf90fa6d8452
2022-08-13 12:09:58 +05:30
Harish Mahendrakar
3328845fa8 encoder: Update dimension check for semi-planar input am: afd2eeb402
Original change: 1782210

Change-Id: I1c1d60f5da17bcd4de359aadaa818878d6ce3c3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-12 17:21:22 +00:00
Ashwin Natesan
79dc65e023
mvc: Correct view id checks in SPS parsing
Corrected checks for number of views and view id
when parsing SPS in MVC decode

Bug: 241865791
Bug: 241867454
Test: fuzzer poc in the bugs
Change-Id: I8241de5c28ddbfebdb639852cf647df5e0a9487b
2022-08-12 12:13:16 +05:30
Harish Mahendrakar
afd2eeb402 encoder: Update dimension check for semi-planar input
For YUV 420 semi-planar input, second plane's width was
wrongly being checked to be equal to half of first plane's width.
Corrected this condition now to check that both these widths are
same.

Bug: 242103647
Test: avcenc -c enc.cfg

Change-Id: I3c06f6e40823ddbf00df0435bfbd1cd314c982e3
2022-08-10 22:47:10 +00:00
Treehugger Robot
f9e89c6707 Merge "Decoder: MVC decoding support added" am: d249d3642d
Original change: 1876797

Change-Id: Ib077451ea8d0ce0adeb124aa01c91c5d9162dfdc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 15:13:07 +00:00
Treehugger Robot
d249d3642d Merge "Decoder: MVC decoding support added" 2022-08-08 14:53:05 +00:00
Ashwin Natesan
779bbfdb00 Decoder: MVC decoding support added
Added support for decoding 'Multiview High' profile, corresponding to
profile_idc of 118 in 'Rec. ITU-T H.264 (08/2021)'.

Bug: 232169767
Test: atest CtsMediaV2TestCases

Change-Id: I63256344a8a205e74f2bcebe555f5ba6cc3163d0
2022-08-06 05:51:31 +00:00
Ray Essick
038306f35e Merge "Set correct defaults for video signal flags in VUI" am: c4f2671a16
Original change: 1972859

Change-Id: I2dd57344672138083f8f7679463b0c50d42167ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-28 22:25:51 +00:00
Ray Essick
c4f2671a16 Merge "Set correct defaults for video signal flags in VUI" 2022-07-28 22:05:03 +00:00
Ray Essick
ac8e211679 Merge "Fix setting IVE_CMD_CTL_SET_VUI_PARAMS with IVE_ENC_MODE_HEADER mode" am: 0948bc7fe3
Original change: 1972861

Change-Id: I06b52f22e700a2bab7b8618846f79bd0bcf08fd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-28 21:32:06 +00:00
Ray Essick
0948bc7fe3 Merge "Fix setting IVE_CMD_CTL_SET_VUI_PARAMS with IVE_ENC_MODE_HEADER mode" 2022-07-28 21:12:06 +00:00
Martin Storsjo
8362f0939b Set correct defaults for video signal flags in VUI
When u1_video_signal_type_present_flag and
u1_colour_description_present_flag were set, we did write all
fields relating to video signal and color description into
the VUI, even if all those fields were uninitialized (left
at the default cleared zero, which for most fields are
invalid/reserved value zero).

Instead have these flags default to zero, making it clear
that the VUI doesn't (yet) contain correctly set values
for those fields.

Bug: 240470605
Change-Id: I86628cff190c8a40e9c6fd12d3fc8e06419ece7c
2022-07-28 00:31:09 +03:00
Martin Storsjo
a3eaf9ccfc Fix setting IVE_CMD_CTL_SET_VUI_PARAMS with IVE_ENC_MODE_HEADER mode
The ih264e_vui_ip_t struct doesn't contain any input timestamps,
and the IVE_CMD_CTL_SET_VUI_PARAMS command didn't set these fields
at all (leaving them at their default initialized state 0,0).

At the start of ih264e_encode, pending configurations are
applied if their timestamp matches the timestamp of the frame
to be encoded, or applied unconditionally if the timestamps are
equal to -1.

Thus, the parameters set with IVE_CMD_CTL_SET_VUI_PARAMS
previously only got applied if encoding a frame with the specific
timestamp 0, but now they get applied unconditionally on the
next encoded frame.

Bug: 240466320
Change-Id: I12c50251d8485e3f171ac5c87132ddfbc80377d6
2022-07-27 23:57:57 +03:00
Treehugger Robot
6a8e0e3930 Merge "avc_dec_fuzzer: Zero initialize input and output structures to API calls" am: 4be0806e4e
Original change: 2163356

Change-Id: Ie5c73b700919b665c0ec962c27e7f55d22eb6ab0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-21 22:48:39 +00:00
Treehugger Robot
4be0806e4e Merge "avc_dec_fuzzer: Zero initialize input and output structures to API calls" 2022-07-21 21:42:05 +00:00
Harish Mahendrakar
4ab2109685 avc_dec_fuzzer: Zero initialize input and output structures to API calls
Input and output structures to decoder's functions are now zero
initialized. This way any new additional members in these structures
will be initialized correctly.

Bug: oss-fuzz:49322
Bug: 175179303
Test: avc_dec_fuzzer with memory sanitizer
Change-Id: Ic89625aaaededdef107c34bf8bdc793824b96f85
2022-07-21 19:56:14 +00:00
Harish Mahendrakar
08bcd7ac38 Decoder: In case of no free buffers, release all buffers am: 2a238075dc
Original change: https://android-review.googlesource.com/c/platform/external/libavc/+/220010

Change-Id: I80022f457427df0cd867ee4d3c1eafbc3175ec0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20 18:07:14 +00:00
Harish Mahendrakar
2a238075dc Decoder: In case of no free buffers, release all buffers
When decoding erroneous streams, decoder may run out of all buffers
used to hold reference pictures and MV data. In such cases, ignore
all frames till the next IDR frame and then release all buffers while
decoding the IDR frame.

Bug: 236102268
Test: multiple seek on the clip in bug

Change-Id: I14d107a5fdaf5c8d2133e59f48c2b947a5fee5ff
2022-07-20 04:29:15 +00:00
Ray Essick
2d6cd13a61 Merge "Decoder: add support for QP and block_type map export in library" am: aeb7fa461e
Original change: 2014975

Change-Id: If58084c0a1862184c9d23c5a974cedcbfd32f0b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-18 23:59:29 +00:00
Ray Essick
aeb7fa461e Merge "Decoder: add support for QP and block_type map export in library" 2022-07-18 23:35:32 +00:00
Ray Essick
210456c7fe [automerger skipped] Export header files am: 12813f245c -s ours
am skip reason: Merged-In Id6789b54da4d8ec1be6c7a60d8ba2e757d5d8801 with SHA-1 7faf1311eb is already in history

Original change: 2146379

Change-Id: If8ebc988323be754d33128b4317b674aeda6a06e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-06 16:25:09 +00:00
Ray Essick
12813f245c Export header files
So that consumers don't need to use raw paths via include_dirs
Sort export_include_dirs: [] lists

Bug: 201944383
Test: build

Merged-In: Id6789b54da4d8ec1be6c7a60d8ba2e757d5d8801
Change-Id: Id6789b54da4d8ec1be6c7a60d8ba2e757d5d8801
(cherry picked from commit 7faf1311eb)
2022-07-05 13:34:21 -07:00
Ray Essick
708f6f2e5e Recast FWD_QUANT to avoid -1 / unsigned confusion am: 5fcca088bd
Original change: 2134973

Change-Id: I4082e302b488a569c9dfbbdfcdeca450b12f2696
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 22:40:11 +00:00
Xin Li
6a7d0f2fcc Merge tm-dev-plus-aosp-without-vendor@8763363
Bug: 236760014
Merged-In: I72b5cb8b63351efb60b65ecbb5e7a8c8bc1fcd94
Change-Id: I02c85083a6448c68e9ac6cbb7cd6fdd91408cfaf
2022-06-27 23:38:25 +00:00
Ray Essick
5fcca088bd Recast FWD_QUANT to avoid -1 / unsigned confusion
Bug: 173082061
Test: compilation
Change-Id: I28f0f87ad39719d40747b83119f4c019054812db
2022-06-22 21:21:25 -07:00
Xin Li
a365e8b332 [automerger skipped] Merge Android 12 QPR 3 am: a45e305b24 -s ours am: 32da48a105 -s ours
am skip reason: Merged-In I1e7784d4d48325ed0b7ff5f902630d0824aced23 with SHA-1 0ccf8ac1c1 is already in history

Original change: 2125887

Change-Id: I2843fa6f010b31dd171e5e66943c527c3565b084
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17 00:14:08 +00:00
Xin Li
32da48a105 [automerger skipped] Merge Android 12 QPR 3 am: a45e305b24 -s ours
am skip reason: Merged-In I1e7784d4d48325ed0b7ff5f902630d0824aced23 with SHA-1 0ccf8ac1c1 is already in history

Original change: 2125887

Change-Id: I87e2c7b994daa9d24a3d448d3c42448fc7a913af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-16 19:57:01 +00:00
Xin Li
a45e305b24 Merge Android 12 QPR 3
Bug: 236045730
Merged-In: I1e7784d4d48325ed0b7ff5f902630d0824aced23
Change-Id: I3fd06bf45a010b793469f52f7b868539f4675dca
2022-06-14 16:48:08 -07:00
Shivaansh Agrawal
0033e0fe5e Decoder: add support for QP and block_type map export in library
Bug: 175179303

Test: avcdec -c dec.cfg
Test: atest CtsMediaV2TestCases:CodecDecoderTest
Test: atest VtsHalMediaC2V1_0TargetVideoDecTest

Change-Id: I68f3a85aae1f4bca2c3e1eaad69d8eb7f23481b8
2022-05-17 09:55:20 +05:30
Xin Li
1138fbacd0 [automerger skipped] Merge Android 12 QPR3 ab/8391262 am: aa4f882208 -s ours am: 0ccf8ac1c1 -s ours
am skip reason: Merged-In I8e4f1f4c57fae1510835733173c505326f39e28f with SHA-1 f5513f5722 is already in history

Original change: 17545184

Change-Id: I5e5caf0bd623abcf192afa337073af2e75593a19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03 07:43:49 +00:00
Xin Li
0ccf8ac1c1 [automerger skipped] Merge Android 12 QPR3 ab/8391262 am: aa4f882208 -s ours
am skip reason: Merged-In I8e4f1f4c57fae1510835733173c505326f39e28f with SHA-1 f5513f5722 is already in history

Original change: 17545184

Change-Id: I1e7784d4d48325ed0b7ff5f902630d0824aced23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03 07:11:48 +00:00