Commit Graph

10287 Commits

Author SHA1 Message Date
Kevin Rocard
326230d491 Merge changes I17264f0e,I0581978f am: 06c8be69b9 am: d9a6df3947 am: 7a30e9f8dd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1902510

Change-Id: Id4d857c4384d5162d8821e4759e9370b7a75eaa1
2022-02-04 12:16:56 +00:00
Kevin Rocard
7a30e9f8dd Merge changes I17264f0e,I0581978f am: 06c8be69b9 am: d9a6df3947
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1902510

Change-Id: I31535966123faa6e06c1c8b10178a880242d9f27
2022-02-04 12:06:31 +00:00
Kevin Rocard
06c8be69b9 Merge changes I17264f0e,I0581978f
* changes:
  Limit transcoding size workaround to windows
  Workaround to fixup MTP transcode file size
2022-02-04 11:25:53 +00:00
William Escande
8e1857760f Merge "BtProfileConnectionInfo update api review" am: cc2c6a0783 am: c2abbda875 am: e18d1a7581
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1959343

Change-Id: Ia53a3e37cef1e55534ceee5e977c5b65e9928153
2022-02-03 00:23:16 +00:00
William Escande
e18d1a7581 Merge "BtProfileConnectionInfo update api review" am: cc2c6a0783 am: c2abbda875
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1959343

Change-Id: I1659669f4ac73a69683dbcbc3af3bf7839f89ce2
2022-02-03 00:06:13 +00:00
William Escande
ac11d77264 BtProfileConnectionInfo update api review
BtProfileConnectionInfo: rename class to BluetoothProfileConnectionInfo
<>.hearingAidInfo: rename to createHearingAidInfo
<>.leAudio: rename to createLeAudio
<>.getIsLeOutput: rename to isLeOutput
<>.getSuppressNoisyIntent: rename to isSuppressNoisyIntent

Did a bit more to keep consistency with a2dp & a2dpSink

Test: build
Test: atest frameworks/base/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/BluetoothProfileConnectionInfoTest.java
Fix: 216294722
Tag: #refactor
Change-Id: I2c4cf8d93b1a8840da1bf92c26d4e76140d0d8da
2022-01-31 19:11:07 +01:00
Treehugger Robot
cd60d3b2e6 Merge "Updates to Dolby Vision Levels" am: e7dd66d7db am: d1928adcae am: 498e2b7944
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1961619

Change-Id: I621e97adabcd9ff2dc8b9ddabdb1684eaba3f55d
2022-01-27 11:21:54 +00:00
Treehugger Robot
498e2b7944 Merge "Updates to Dolby Vision Levels" am: e7dd66d7db am: d1928adcae
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1961619

Change-Id: I4efc107ec69ac886a8408490d63c71a54f2b323d
2022-01-27 11:05:19 +00:00
Treehugger Robot
e7dd66d7db Merge "Updates to Dolby Vision Levels" 2022-01-27 09:34:53 +00:00
Rahul Sabnis
bdd60d42cb Merge "Moving over core/api/*txt files" am: d93ed0045d am: d2c48ad201 am: b5f6cf1c8d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1959811

Change-Id: I9321785d49fa39c96b17a60f20b2bed42279f4ed
2022-01-27 06:19:21 +00:00
Rahul Sabnis
b5f6cf1c8d Merge "Moving over core/api/*txt files" am: d93ed0045d am: d2c48ad201
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1959811

Change-Id: I5a83a5def064d09a34d62460afa0ef3c5cc424b4
2022-01-27 06:13:56 +00:00
Rahul Sabnis
d93ed0045d Merge "Moving over core/api/*txt files" 2022-01-27 05:42:18 +00:00
Baoli Yan
cd7a2e2c05 Updates to Dolby Vision Levels
Added Uhd120,8k30, 8k60

Change-Id: I609e45b6f496debf320292358dbe894b439dc124
2022-01-26 17:08:47 -08:00
Roopa Sattiraju
86058b62d8 Moving over core/api/*txt files
Bug: 196026708
Test: Compile
Merged-In: I636f00132a13467e63b08f21d9cc9dcaab250b8a
Change-Id: I636f00132a13467e63b08f21d9cc9dcaab250b8a
2022-01-26 14:21:29 -08:00
Lajos Molnar
92c9c7e549 Merge "media: MediaCodec: add RGBA_1010102 and RGBA_F16 format support" am: 5cb80afc4e am: 55b9fb04dd am: 2495949c0e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1960940

Change-Id: I85e89605a414cc97e01b67493150384832f13793
2022-01-26 19:18:51 +00:00
Lajos Molnar
2495949c0e Merge "media: MediaCodec: add RGBA_1010102 and RGBA_F16 format support" am: 5cb80afc4e am: 55b9fb04dd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1960940

Change-Id: I5d5d76fec988199b53bfdfd384979bf39492a50a
2022-01-26 19:01:36 +00:00
Lajos Molnar
5cb80afc4e Merge "media: MediaCodec: add RGBA_1010102 and RGBA_F16 format support" 2022-01-26 18:19:36 +00:00
Lajos Molnar
77f4235010 Merge "media: MediaCodecInfo: Unhide COLOR_FormatYUVP010" am: 32c80f0b44 am: eb9ed7ff5d am: 2e270a6a54
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1960659

Change-Id: I865b95bc6a09774535d145013855c27a1b456ffd
2022-01-26 05:27:44 +00:00
Lajos Molnar
2e270a6a54 Merge "media: MediaCodecInfo: Unhide COLOR_FormatYUVP010" am: 32c80f0b44 am: eb9ed7ff5d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1960659

Change-Id: I9aa3cfe442af156b8112c94c48536baae4e83184
2022-01-26 05:16:08 +00:00
Lajos Molnar
79ad8fe8a7 media: MediaCodec: add RGBA_1010102 and RGBA_F16 format support
Due to existing naming conventions these become
COLOR_Format32bitABGR2101010 and COLOR_Format64bitABGRFloat.

Bug: 197651595
Test: build
Change-Id: I9ce6177ec9d2a73ab9faa67c1d7c7d42fc9a35f7
2022-01-25 16:41:06 -08:00
Gopalakrishnan Nallasamy
721eaa785c media: MediaCodecInfo: Unhide COLOR_FormatYUVP010
Bug: 206456921
Test: atest android.media.cts.ImageReaderDecoderTest
Change-Id: I73ce2b459b59a8b8713889cf00739c9e9d28cd03
2022-01-25 16:40:27 -08:00
Yushin Cho
c08386e934 Merge "enc stat: Add feauture and its keys to MediaCodec" am: 93f84575c3 am: fc1026972d am: e7d1145f95
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1891583

Change-Id: I8b6d2be7809e82a3e655d91404c1c86548761b3c
2022-01-21 19:15:52 +00:00
Yushin Cho
e7d1145f95 Merge "enc stat: Add feauture and its keys to MediaCodec" am: 93f84575c3 am: fc1026972d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1891583

Change-Id: Ib2557d6089a5e15b5d7d1be6120fe020a73d0597
2022-01-21 18:53:57 +00:00
Yushin Cho
93f84575c3 Merge "enc stat: Add feauture and its keys to MediaCodec" 2022-01-21 18:36:05 +00:00
Yushin Cho
90ae857738 enc stat: Add feauture and its keys to MediaCodec
Add feature name 'EncodingStatistics' to MediaCodecInfo and its two
keys of average_qp and picture_type to MediaFormat.

App client chooses the 'Level' of an Encoding Statistics information,
where the Level decides the scope of encoding statistics that video
encoder provide the App client with.

With Android T, there will be one level only and the expected kinds
of encoding statistics are average block QP and the picture type of
a frame.

Bug: 205793764
Bug: 203696003
Test: cts
Change-Id: Id8c61de9646ac03926f00a9d223b022bbb9a6925
2022-01-20 20:16:08 -08:00
Treehugger Robot
0a7f6d8cf5 Merge "Add AUDIO_FORMAT_LC3 in BtCodec" am: a57618d34d am: cb6ef1e9cc am: 34e5b686b2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1864574

Change-Id: I9103756ff79c8641c0bef708981df9322b8dbb55
2022-01-20 07:09:08 +00:00
Treehugger Robot
34e5b686b2 Merge "Add AUDIO_FORMAT_LC3 in BtCodec" am: a57618d34d am: cb6ef1e9cc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1864574

Change-Id: I086c599c0525c4e39e66675a5b33f870b22d5f53
2022-01-20 06:52:38 +00:00
Treehugger Robot
a57618d34d Merge "Add AUDIO_FORMAT_LC3 in BtCodec" 2022-01-20 06:19:05 +00:00
Kevin Rocard
f6cbd46ee0 Merge "Refactor Ringtone.playFallbackRingtone" am: 2f56b3ab02 am: cbba151c10 am: 010e3ddc5f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1931765

Change-Id: I4d17fdf6a29cc66fce523c227f82a19366ca5636
2022-01-20 05:48:14 +00:00
Kevin Rocard
010e3ddc5f Merge "Refactor Ringtone.playFallbackRingtone" am: 2f56b3ab02 am: cbba151c10
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1931765

Change-Id: I18f7b2d6f60e6757715ca2ba103d1cc87ed0d42a
2022-01-20 05:35:58 +00:00
Kevin Rocard
2f56b3ab02 Merge "Refactor Ringtone.playFallbackRingtone" 2022-01-19 19:42:26 +00:00
Ted Wang
d9c9831f71 Add AUDIO_FORMAT_LC3 in BtCodec
Bug: 203621600
Test: make
Change-Id: I447b361c5efe578ba1b142791aee7043faf08f52
2022-01-19 15:35:00 +08:00
Anton Hansson
84043479d1 Merge "Rename framework-media-sources" am: 365a2bab75 am: 5d88388c85 am: 85986b212a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1951816

Change-Id: Iecc9e9f916c92b6a05bcbed1e82ffbddfea6411e
2022-01-17 12:41:07 +00:00
Anton Hansson
85986b212a Merge "Rename framework-media-sources" am: 365a2bab75 am: 5d88388c85
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1951816

Change-Id: I520321cfaab4563911880a592072f9e288901299
2022-01-17 12:29:17 +00:00
Anton Hansson
365a2bab75 Merge "Rename framework-media-sources" 2022-01-17 12:01:38 +00:00
Anton Hansson
3b6477f81b Rename framework-media-sources
So that we can use this name for the sources of the module called
"framework-media". non-updatable-sources is a pattern employed by other
modules.

Test: m nothing
Change-Id: I766675d2f10aadd1dd753271e5e39f9c28372716
2022-01-17 10:17:15 +00:00
Treehugger Robot
c6fd683779 Merge "Update tuner module owners" am: ea05aa56e7 am: c688368d75 am: b4873a331f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1949657

Change-Id: If577c5bfec59ce7547fe6dee00c69d010938e221
2022-01-14 20:37:20 +00:00
Treehugger Robot
b4873a331f Merge "Update tuner module owners" am: ea05aa56e7 am: c688368d75
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1949657

Change-Id: Ie346c21599cb0bc8793eedd816d3049596cd47ca
2022-01-14 20:19:54 +00:00
Treehugger Robot
ea05aa56e7 Merge "Update tuner module owners" 2022-01-14 19:46:10 +00:00
William Escande
d21cf5f8d9 Merge "Add BtProfileConnectionInfo.a2dpSinkInfo" am: 2d39eb02ca am: dc198a070d am: 744cd007db
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1933145

Change-Id: I651585b35f2cf307caf48a2ddb78adafdfc64405
2022-01-14 17:57:44 +00:00
William Escande
744cd007db Merge "Add BtProfileConnectionInfo.a2dpSinkInfo" am: 2d39eb02ca am: dc198a070d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1933145

Change-Id: Iabc35b74ac6b52c6c4a1d45d6694600f1539d050
2022-01-14 17:42:02 +00:00
William Escande
2d39eb02ca Merge "Add BtProfileConnectionInfo.a2dpSinkInfo" 2022-01-14 17:02:46 +00:00
Kevin Rocard
0950c0197a Refactor Ringtone.playFallbackRingtone
Use early returns to avoid deep nesting conditions.

Change-Id: I8f0e736277c0ea2e666b4d5e2c35e1d3e6e3479d
2022-01-14 15:39:07 +00:00
Henry Fang
9aa0ab03fd Merge "Add TvInputManager.Hardware overrideAudioSink with AudioDeviceInfo" am: 764afbbae0 am: f1cec5bb49 am: 8dd3756132
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1580304

Change-Id: I202504be0cb134605adc4d6eeebebaa86602cd43
2022-01-14 02:55:10 +00:00
Henry Fang
8dd3756132 Merge "Add TvInputManager.Hardware overrideAudioSink with AudioDeviceInfo" am: 764afbbae0 am: f1cec5bb49
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1580304

Change-Id: I47124be32f498066fbba206c0274f852e4782abf
2022-01-14 02:35:25 +00:00
Henry Fang
764afbbae0 Merge "Add TvInputManager.Hardware overrideAudioSink with AudioDeviceInfo" 2022-01-14 01:53:31 +00:00
Hongguang
c24c9f735c Update tuner module owners
Bug: 214432253
Fix: 214432253
Test: Presubmit
Change-Id: Ieecdcd92e7a993d12861ace45098e72346c93148
2022-01-14 00:47:04 +00:00
Eric Laurent
984591b424 Merge "AudioService: dump routing cache in AudioSystemAdapter" into sc-v2-dev am: 2969fc57f9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16591745

Change-Id: I98d49fa9d0e126162e7e8d6d290aa03f4370d144
2022-01-11 09:33:10 +00:00
Jean-Michel Trivi
c4c4ccc037 AudioService: dump routing cache in AudioSystemAdapter
Bug: 211217374
Test: adb shell dumpsys audio, look under AudioSystemAdapter
Change-Id: Ibfa62f09165287d4dc7a6822debcd1ff1a38eca6
2022-01-10 19:10:35 -08:00
William Escande
c070d597e2 Merge "Add SystemApi tag on getLastAudibleStreamVolume" am: f3a2e55ff7 am: ee0ad09554 am: b8be957ad7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1863058

Change-Id: If49dd39c13ee0ef0493b05f750ba666ea78c210d
2022-01-05 19:15:54 +00:00