Commit Graph

11019 Commits

Author SHA1 Message Date
Treehugger Robot
0760c5a6af Merge "fix API description on how to round average qp" am: 1c0277d78d am: 8428f9e7cd am: e766c3d7d9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2067619

Change-Id: I85a79479d8fa4998fa2e0995d5f28cca76486465
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 18:26:36 +00:00
Treehugger Robot
1c0277d78d Merge "fix API description on how to round average qp" 2022-04-21 17:32:29 +00:00
Wonsik Kim
9cd745cee6 Merge "MediaCodecInfo: when explicitly specified reset default bitrate mode" am: 61c2096dbc am: 996fc3da05 am: 6e2b382afc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2065608

Change-Id: I46f407b866252596881ead630ea06704806f1fcc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 04:33:22 +00:00
Yushin Cho
71032c8d67 fix API description on how to round average qp
Average QP is rounded to the nearest integer value.

Test: cts
Bug: 229778486
Change-Id: I16fca81dcab26462b9493784368d29c6b7748fd5
2022-04-19 23:22:21 +00:00
Wonsik Kim
3ad8bdbd5a MediaCodecInfo: when explicitly specified reset default bitrate mode
Bug: 229146532
Test: presubmit
Change-Id: I8bf0c36f471991ab546acd9cf47a3defc13d13ff
2022-04-15 00:30:48 -07:00
TreeHugger Robot
e8d0d4fd90 Merge "Fix Filter callback race condition" into tm-dev 2022-04-14 23:58:16 +00:00
Hongguang
d8a124b758 Fix Filter callback race condition
Bug: 225107597
Test: stress test
Test: atest android.media.tv.tuner.cts
Change-Id: I064095338009cdda8fc03780001b0b0534da4508
2022-04-14 11:19:40 -07:00
Atneya Nair
ed242da52f Update AudioRecord JNI callback and cleanup
Encapsulate AudioRecord native handle into ref-counted object.
Use sp<> to prevent destruction race.
Fulfill new callback interface.

Test: atest AudioRecordTest, atest AudioTrackTest
Bug: 218351957
Bug: 199156212
Change-Id: Ia090556a90e012e6a08f39104f6a0a9f0cdf74f0
2022-04-13 16:35:19 +00:00
Nathalie Le Clair
7b72c39349 Allow for internal types in @hide API
Bug: 227425913
Test: manual
Change-Id: I5fe2e262a4be6412f7f67b55ccdba0a867951f14
2022-04-04 11:30:52 +00:00
Shubang Lu
dabf01fb83 Merge "TIAF API review: add onError" into tm-dev 2022-03-28 23:24:13 +00:00
Andy Hung
6a1b6bc9da Merge "SoundPool: Clean up JNI weak reference handling" into tm-dev 2022-03-28 19:43:21 +00:00
shubang
832d0eb782 TIAF API review: add onError
Bug: 225388549
Test: CTS
Change-Id: I853503c2e4b388168a2eaf59883cbeaa66c5e2a9
2022-03-28 08:54:59 +00:00
Oscar Azucena
cb7a1fe954 Merge "Added logic to reset assistant UIDs on audio crash" into tm-dev 2022-03-24 19:22:21 +00:00
Andy Hung
337cfcbe0a SoundPool: Clean up JNI weak reference handling
Remove unnecessary JNI params and overhead.
Use weak reference entirely on the native side.

Test: atest SoundPoolAacTest
Test: atest SoundPoolHapticTest
Test: atest SoundPoolMidiTest
Test: atest SoundPoolOggTest
Test: atest AudioManagerTest#testSoundEffects
Bug: 223815163
Change-Id: I31964b27ab3e8a96f49794e78537b165e9e84ed3
2022-03-24 10:36:52 -07:00
Yan Han
f4cdc8b1a8 Merge "AudioService: Add general support for Absolute Volume behavior" into tm-dev 2022-03-24 09:45:06 +00:00
Oscar Azucena
3ae3376064 Added logic to reset assistant UIDs on audio crash
On native audioserver recovery the assistant UIDs will reset to an empty
list, followed by adding the current role or setting holder for
assistant. Also added a settings lock around the update assistant
method. Added remove assistant UID for reset hotword detection
connection.

Bug: 222584963
Bug: 222777782
Test: atest VoiceInteractionTest
Test: atest AudioManagerTest
Test: atest HotwordDetectionServiceBasicTest
Test: kill audio server and verify assistant UIDs is not increasing
	unbounded.
Test: adb shell cmd voiceinteraction restart-detection, verify assistant
	UIDs list is not increasing unbounded.
Change-Id: I475bfee1f0bcd56a750e4fef8aa8a2b93fe090fc
2022-03-24 04:37:55 +00:00
Ray Essick
48d5cfa846 Merge "Integrate feedback from MediaMetrics API reviews" into tm-dev 2022-03-23 22:38:59 +00:00
Yan Han
f928348826 Merge "AudioDeviceVolumeManager: Add APIs for listeners for device volume behavior changes" into tm-dev 2022-03-23 14:44:24 +00:00
Ray Essick
2ee37d3d6a Integrate feedback from MediaMetrics API reviews
observations about missing action in close().
javadoc on some KEY_* fields.
Implement PlaybackStateEvent within BundleSession as example.

Bug: 220129161
Test: atest CtsMediaHostTestCases  (with corresponding CLs for cts)
Change-Id: I09a8be6d3f2780ca97b6b08cd33ccf35b02c245f
2022-03-22 20:56:03 -07:00
Yixiao Luo
06959ab51c Merge "[SERAPHIC][TIAF] StreamEventResponse with null data parameter will cause a null-pointer crash." into tm-dev 2022-03-22 19:18:19 +00:00
Yan Han
7d4198268d AudioService: Add general support for Absolute Volume behavior
- Adds a map to store information about audio devices using absolute
  volume behavior. The map is updated when devices change behavior.
- setStreamVolume and adjustStreamVolume now notify absolute volume
  listeners after changing the stream state.
- Added option for absolute volume dispatcher to dispatch abstract
  volume adjustments (e.g. raise, lower, mute) as a result of calls to
  adjustStreamVolume. When registering the listener, the controller
  specifies whether it handles adjustments; if it does, future calls to
  adjustStreamVolume are forwarded to the controller without affecting
  stream state.
- Refactoring to support the changes above:
  - rescaleIndex is generalized to allow converting between stream and
    absolute volume ranges.
  - Volume adjustment mode constants are moved into
    AudioDeviceVolumeManager because they are needed when dispatching
    volume adjustments to absolute volume controllers.

Bug: 205817863
Test: atest AbsoluteVolumeBehaviorTest
Change-Id: Ie5fb2179adea2096bd2d226fe73b4f09b28b0cf1
2022-03-22 15:09:26 +01:00
Yan Han
19a4593771 AudioDeviceVolumeManager: Add APIs for listeners for device volume behavior changes
Add APIs for registering and unregistering a listener
for changes to any device's volume behavior.

Bug: 201781907
Test: atest DeviceVolumeBehaviorTest
Change-Id: I75b6463a73109e624ffd14b14bae3f829974f3ea
2022-03-22 11:38:22 +01:00
Yixiao Luo
a92a92fc62 [SERAPHIC][TIAF] StreamEventResponse with null data parameter will cause a null-pointer crash.
Test: atest android.media.tv.interactive.cts.TvInteractiveAppServiceTest
Bug: 224877495
Change-Id: Iab7547f27bb2e2340e42ead981877d3a52055ad4
2022-03-21 19:13:56 -07:00
Yixiao Luo
bbf7f2884a TIAF: handling null objects in DsmccResponse class
Bug: 225256308
Test: atest android.media.tv.interactive.cts.TvInteractiveAppServiceTest
Change-Id: I20c9a5c16ff824f39e5223623672a02edc518e77
2022-03-21 17:20:52 -07:00
Yixiao Luo
a4691b235e Merge "TIAF: Change on API Review: DTV to VOD 2" into tm-dev 2022-03-18 21:40:07 +00:00
Shubang Lu
6d26abc33d Merge "TIAF: add JavaDoc for TvInteractiveAppServiceInfo constructor" into tm-dev 2022-03-18 20:49:33 +00:00
Shubang Lu
365b716cb6 Merge "TIAF API review: remove prepare()" into tm-dev 2022-03-18 20:44:42 +00:00
Shubang Lu
6c1f109937 Merge "TIAF API review: rename onCreateBiInteractiveApp" into tm-dev 2022-03-18 20:43:14 +00:00
Ray Essick
5bb3da076d Merge "Define MediaFormat crop-related constants" into tm-dev 2022-03-18 18:02:08 +00:00
Oliver Woodman
f48450217c Merge "Hide new route discovery preferences in T" into tm-dev 2022-03-18 16:55:14 +00:00
Raymond Tiong
6bdc667d3b Merge "Add recommendation to use MediaActionSound class in a background thread since it relies on binder." am: 23398e75a3 am: 2f04f34eb3 am: d44a439edf
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2025024

Change-Id: I75901c3f89cbad5a4279d54a868947cf84a7446e
2022-03-18 16:04:04 +00:00
shubang
9a08a753f8 TIAF: add JavaDoc for TvInteractiveAppServiceInfo constructor
Test: mmm
Change-Id: Ifc1b584f220dffc813075ec44f57820b988b8966
2022-03-18 15:59:53 +00:00
shubang
bb50a67f88 TIAF API review: remove prepare()
It's no longer necessary and can be confusing

Bug: 219501014
Test: mmm
Change-Id: Id54f20245bb4e44cdf28f8d93b9ed413e3326410
2022-03-18 08:42:51 -07:00
shubang
1de756032c TIAF API review: rename onCreateBiInteractiveApp
Bug: 217554457
Test: CTS
Change-Id: I7096070781956af838a6e8d04ce187f4d5bbe646
2022-03-18 08:31:38 -07:00
shubang
3f49082523 TIAF API review: multiple components
Address feedback from API council

Bug: 219501014
Test: atest android.media.tv.interactive.cts.TvInteractiveAppServiceTest
Change-Id: I655483db22b9a5ad3c3e30200f887fe49e73f240
2022-03-18 07:58:28 +00:00
shubang
553d6fb7c5 TIAF: add signing request and result
Detailed call sequence can be found at
go/tiaf-use-cases

And add INTENT_KEY_COMMAND_TYPE

Bug: 224121339
Bug: 225082750
Test: atest testRequestSigning
Test: atest testSendSigningResult

Change-Id: I32b7e77dc7fc357ce168f486c28c16863bbbb3bf
2022-03-18 04:16:08 +00:00
Yixiao Luo
84edd3f63b TIAF: Change on API Review: DTV to VOD 2
Bug: 217591199
Test: atest android.media.tv.interactive.cts.TvInteractiveAppServiceTest
Change-Id: Iaa4f6d1e19f787bb38215385f8a38a14a538984d
2022-03-17 20:32:00 -07:00
Ray Essick
0f26a198ce Define MediaFormat crop-related constants
MediaFormat used literals "crop-left", "crop-right", crop-bottom
and crop-top. Define appropriate MediaFormat.KEY_XXX for these.

Bug: 178687730
Test: build, boot
Test: atest android.media.codec.cts.EncodeDecodeTest
Change-Id: I1782caa5ff320d3dca19272c5532466199ef72f0
2022-03-17 18:42:57 -07:00
Naomi Musgrave
4b563a2d37 Merge "Capture the contents of a single task" into tm-dev 2022-03-17 17:03:48 +00:00
Raymond Tiong
8c06d5e257 Add recommendation to use MediaActionSound class in a background thread since it
relies on binder.

Bug: 213174684
Test: N/A as it's a comment update
Change-Id: I01ddc0402bd27d19b2e9e7606ad327da703e8aaa
2022-03-17 15:37:51 +00:00
Jean-Michel Trivi
1b7b191bdf Merge "MediaFormat: deprecate KEY_AAC_MAX_OUTPUT_CHANNEL_COUNT" into tm-dev 2022-03-17 14:29:49 +00:00
Jean-Michel Trivi
7e0c385a66 Merge "Spatializer: output listener fires upon registration" into tm-dev 2022-03-17 14:27:04 +00:00
Jean-Michel Trivi
beac78f252 Spatializer: output listener fires upon registration
Address API council feedback to have the output change listener
report the current output upon registration.

Bug: 203004903
Test: atest SpatializerTest
Change-Id: I858a5efef91ad113d02af6734b7b625460f29634
2022-03-16 18:48:24 -07:00
Jean-Michel Trivi
a030e80bdf MediaFormat: deprecate KEY_AAC_MAX_OUTPUT_CHANNEL_COUNT
Deprecate AAC-specific key KEY_AAC_MAX_OUTPUT_CHANNEL_COUNT,
whose usage can be replaced by the codec agnostic key
KEY_MAX_OUTPUT_CHANNEL_COUNT.

Bug: 204239218
Test: atest DecoderTestAacFormat
Change-Id: Iad24e511eeee95266a4e9a7f70904968e27afc6d
2022-03-16 17:51:11 -07:00
Shubang Lu
aaf5caef2f Merge "TIAF API review: rename TvInteractiveAppInfo" into tm-dev 2022-03-17 00:43:32 +00:00
Jean-Michel Trivi
1a89ec7056 Merge "Spatializer: add getter/listener for head tracker availability" into tm-dev 2022-03-16 19:38:24 +00:00
Yixiao Luo
ea42ada7e9 Merge "TIAF: Change on API Review: First round API council questions" into tm-dev 2022-03-16 17:21:33 +00:00
Oliver Woodman
cdb7e2198e Hide new route discovery preferences in T
Bug: 193631822
Test: N/A
Change-Id: I938dc86ccd4ae1b6cb6ad322e17d0769dc300fc5
2022-03-16 12:23:27 +00:00
Jean-Michel Trivi
9fd5a78f98 Spatializer: add getter/listener for head tracker availability
Add getter and listener for tracking whether a head tracker
is available to be used on the current media device when the
spatializer effect is enabled.

Bug: 223725590
Test: atest SpatializerTest
Change-Id: I5d3746f9ab1935843be0d94314943083e98b5d2c
2022-03-15 17:34:45 -07:00
Yixiao Luo
0f18453cc0 TIAF: Change on API Review: First round API council questions
Bug: 217555265
Test: atest android.media.tv.interactive.cts.TvInteractiveAppServiceTest
Change-Id: I84ae13de14fd4336b958dd2e35179cd560317006
2022-03-15 16:02:49 -07:00