Commit Graph

7486 Commits

Author SHA1 Message Date
TreeHugger Robot
377a19b992 Merge "Revert changes for moving MediaSessionService into AML" 2019-02-12 09:31:52 +00:00
TreeHugger Robot
caf294d029 Merge "Make remote player support ramping ringer" 2019-02-11 19:18:22 +00:00
Yiwen Chen
eac542e74c Make remote player support ramping ringer
Bug: 120789399
Test: Tested on device
Change-Id: I81e576afa1dcb25a65dc95534b0bd1f1da405ee7
2019-02-11 00:57:00 +00:00
Lajos Molnar
8c1d8e024a Merge "media: add macroblockrate to PerformancePoint" 2019-02-08 23:29:38 +00:00
Lajos Molnar
aa602f16fc Merge "media: support AVC Level 6+ for CodecCapabilities" 2019-02-08 23:28:16 +00:00
Lajos Molnar
8a46826958 media: fix MediaFormat copy constructor
Bug: 124075529
Change-Id: I29a48531f91dd8631833fdf19ee71dacd2ab62ac
2019-02-07 16:33:24 -08:00
Lajos Molnar
338ca88ca5 media: add macroblockrate to PerformancePoint
- also add a constructor so apps can create their performance points
- remove width and height as they are not by themselves meaningful
  (only their product)
- document that we are using macroblocks

Bug: 124061036
Change-Id: I70ff9f059859b83397ba484b9ea9215d1d2751ef
2019-02-07 14:44:01 -08:00
Shuzhen Wang
ebd10b8fcf Merge "Camera: Add HEIC format output" 2019-02-07 19:15:32 +00:00
Kevin Rocard
a3b457d90d Merge "Audio Policy: Allow to use DAP RENDER|LOOPBACK" 2019-02-07 03:10:10 +00:00
Shuzhen Wang
f655b1c876 Camera: Add HEIC format output
- Add HEIC ImageFormat.
- Add HEIC related camera static metatadata.
- Handle BlobID and BlobSize properly for HEIC format.

Test: Camera CTS
Bug: 79465976
Change-Id: I8606711b036e695e23671c4563364c24aad9ed84
2019-02-06 10:11:20 -08:00
Jeff Sharkey
82cfc42abd Merge "Add support for XMP tags." 2019-02-06 16:03:02 +00:00
Jeff Sharkey
d95d0d2d9e Add support for XMP tags.
These Extensible Metadata Platform (XMP) tags contain XML data which
is used to communicate rich metadata information beyond EXIF.

TIFF: Tag 700
JPEG: Application segment 1 (0xFFE1) with segment header
"http://ns.adobe.com/xap/1.0/\x00"

Bug: 120791890
Test: atest cts/tests/tests/media/src/android/media/cts/ExifInterfaceTest.java
Change-Id: Iacccbf9b516b3204d99a760eaeb19a41554c3f97
2019-02-05 18:24:17 -07:00
Robert Berry
c7b72600a9 Audio Policy: Allow to use DAP RENDER|LOOPBACK
Test: adb shell audiorecorder --target /data/file.raw
Bug: 111453086
Change-Id: I11698ece5164e10118967e84717bc3a6c17419cf
Signed-off-by: Kevin Rocard <krocard@google.com>
Signed-off-by: Robert Berry <robertberry@google.com>
2019-02-05 16:16:15 -08:00
Chong Zhang
625f0aad9f Make KEY_MAX_PTS_GAP_TO_ENCODER and KEY_MAX_FPS_TO_ENCODER keys public
These keys are already used by apps, and we need to
add test to ensure they're not broken.

bug: 80314065
Change-Id: I2f423fd8d5462caf4138f660d452e61b0ab34d66
2019-02-05 15:18:55 -08:00
TreeHugger Robot
49181399d5 Merge "audio: fix AudioRecordingConfiguration.equals()" 2019-02-04 23:58:33 +00:00
TreeHugger Robot
f727b8cf97 Merge "Expose a few keys that's already used by apps" 2019-02-04 23:25:48 +00:00
TreeHugger Robot
95902c563b Merge "CamcorderProfiles: Add new camcorder profiles" 2019-02-04 22:10:52 +00:00
Eric Laurent
c511faec51 audio: fix AudioRecordingConfiguration.equals()
Use Arrays.equals() instead of equals() methods on the effects
Arrays contained in AudioRecordingConfiguration.

Bug: 123702064
Test: cts-tradefed run cts-dev -m CtsMediaTestCases -t android.media.cts.AudioRecordingConfigurationTest
Change-Id: I11d1321f1a5d8f50c248a4702bbba6a309280b5a
2019-02-04 12:34:53 -08:00
Chong Zhang
bb609f8319 Expose a few keys that's already used by apps
bug: 80314065
Change-Id: Ia9369decb8c454fe091fca77f8996e1400c14790
2019-02-04 11:14:07 -08:00
Henry Fang
5215ac9d41 Revert "Revert "Add public API to use new interfaces from cas@1.1""
This reverts commit cdcaed6acb.

Reason for revert: <Verified build locally, CL is fine. original issue may be caused by conflict between merges>

Change-Id: Id9707692a704c3d4475aee1f6c580208eb6ab744
Test: Manual
Bug: 122472761
2019-02-04 10:57:38 -08:00
Hyundo Moon
ff36c48229 Revert "Remove MediaController2 usages in MediaSessionServiceImpl"
This reverts commit c1e4316e02.

Reason for revert: Now the circular dependency problem is resolved, this change is now obsolete.

Bug: 123336670
Change-Id: I065d811e9b8a3c7f851fb66d9527d62b417f1420
2019-02-01 14:54:24 +09:00
Dongwon Kang
610e0670a1 Merge changes from topic "media2-stub"
* changes:
  Move Session2Token to media apex
  Add updatable_media_stubs to prevent private API use.
2019-02-01 04:49:14 +00:00
Andy Hung
dd45d82911 Merge "Add master audio balance" 2019-02-01 01:53:28 +00:00
Dongwon Kang
e6e5f41302 Move Session2Token to media apex
Test: build
Change-Id: Id55fe0fa8596f98a84f5bdc89755631b18c7d308
2019-01-31 15:33:41 -08:00
Edward Savage-Jones
35c292f57a Add master audio balance
Test: Change Balance through Settings, play audio
Bug: 28390736
Change-Id: I6cebd3fa448239999c5d624f10902152d0db679b
2019-01-31 15:30:42 -08:00
TreeHugger Robot
5f70acf095 Merge "Resolve feedback from API review" 2019-01-31 21:21:04 +00:00
Praveen Chavan
8f94d12b85 CamcorderProfiles: Add new camcorder profiles
add VGA. QHD, 4K-DCI profiles

Bug:122944520
Test: run cts -m CtsMediaTestCases -t android.media.cts.CamcorderProfileTest --skip-preconditions
 run cts -m CtsMediaTestCases -t android.media.cts.CameraProfileTest --skip-preconditions

Change-Id: I1067da3769635365048529fe315e6971c2d51696
2019-01-31 11:28:28 -08:00
Jeff Tinker
8de43ee121 Resolve feedback from API review
Fix inconsistent naming of offline license states

bug:120489407
bug:120488811
test:cts and gts media tests

Change-Id: I6cceac233cf8882c5bf7fbef7503764c611125d1
2019-01-31 00:48:20 -08:00
Sungsoo Lim
89f6f4ed0b Revert VolumeProvider API changes
Bug: 119539695
Test: build
Change-Id: I57e204bb25501448e3bdf67e59c8e5b696d5b191
2019-01-31 15:35:48 +09:00
Insun Kang
504e3eb27a Revert changes for moving MediaSessionService into AML
Bug: 123000882
Test: n/a
Change-Id: I3d3bffa27916ccbe45bfa32517a4d06e043b9bbb
2019-01-31 15:32:04 +09:00
Sungsoo Lim
e6f9bdeb42 Revert Media 1.0 API changes for mainline module
Bug: 119539695
Test: pass MediaSessionTest, MediaControllerTest, and
      MediaSessionManagerTest
Change-Id: I2453dfcd3852c77a825b5ed5db197591303a6115
2019-01-31 11:28:09 +09:00
Xusong Wang
72492e27b6 Merge "Revert "Add public API to use new interfaces from cas@1.1"" 2019-01-31 01:00:57 +00:00
Henry Fang
cdcaed6acb Revert "Add public API to use new interfaces from cas@1.1"
This reverts commit 818719dd45.

Reason for revert: <INSERT REASONING HERE>

Change-Id: I595c1949ed139700144f19ee5bd7f91a5f0a1edd
2019-01-31 00:46:05 +00:00
Hyundo Moon
88dd29a6a3 Merge changes Ie30f0ca8,I59b4d4ce
* changes:
  Move Media 1.0 files in mainline back to framework
  Remove MediaSessionEngine.CallbackStub
2019-01-31 00:35:30 +00:00
TreeHugger Robot
7d84a0bd97 Merge "MediaCodec: change exception type" 2019-01-30 23:49:46 +00:00
Henry Fang
d3f4b874b1 Merge "Add public API to use new interfaces from cas@1.1" 2019-01-30 22:53:50 +00:00
Mikhail Naganov
a730a5ebb3 MediaCodec: change exception type
As suggested in API review, change IllegalArgumentException
to NullPointerException for the case when the argument is null.

Bug: 123569725
Test: make
Change-Id: I4f0d6fd609b1c2f2096fe0f610804f49432cb650
2019-01-30 12:32:42 -08:00
Hyundo Moon
83ff14c310 Move Media 1.0 files in mainline back to framework
Test: make update-api -j; make -j;
atest CtsMediaTestCases:android.media.cts.MediaSessionTest;
atest CtsMediaTestCases:android.media.cts.MediaControllerTest;
atest CtsMediaTestCases:android.media.cts.MediaBrowserTest;
Change-Id: Ie30f0ca86bd9303683bf6573f2f5858c6fb3206a
2019-01-30 22:03:04 +09:00
Hyundo Moon
2a5179df15 Remove MediaSessionEngine.CallbackStub
This CL also removes SessionCallbackLink.CallbackStub class
from the system API list.

Bug: 123500993
Test: make update-api -j; make -j;
      atest CtsMediaTestCases:android.media.cts.MediaSessionTest;
      atest CtsMediaTestCases:android.media.cts.MediaControllerTest;
Change-Id: I59b4d4ce058c53c82d816152039c51b109f0c245
2019-01-30 19:43:57 +09:00
Sungsoo Lim
15c52f693d Move Rating and MediaDescription into mainline module
Bug: 119539695
Test: pass MediaSessionTest, MediaControllerTest and
      MediaSessionManagerTest
Change-Id: I2274a473700b6ea432e368aeeb5201d449d53635
2019-01-30 13:58:31 +09:00
TreeHugger Robot
1444690e53 Merge changes I1d901692,I3e0bca75
* changes:
  ControllerLink: Remove unused parameter asSystemService
  MediaController: Remove dispatching key event as system service APIs
2019-01-30 01:53:50 +00:00
TreeHugger Robot
d070768d8d Merge "Move MediaMetadata class back to framework" 2019-01-30 01:04:04 +00:00
Jaewan Kim
8be71c0fe2 MediaController: Remove dispatching key event as system service APIs
This removes hidden API usages from the fwk to apex, which would be
prohibited.

With this API, the dispatching logic is changed as follows for sending
key events directly to MediaSessionRecord through MediaSessionService.

Before:
    PhoneWindow
    -> MediaController.dispatch***AsSystemService(key)
    -> MediaSessionRecord

After:
    PhoneWindow
    -> MediaSessionManager.dispatch**AsSystemService(sessionToken, key)
    -> MediaSessionService
    -> MediaSessionRecord

Bug: 123485698
Test: Build, flash and injected some key events
Change-Id: I3e0bca7565ae2f142c3389322d867700646d5038
2019-01-29 21:21:17 +09:00
Hyundo Moon
a17bf2d0f2 Move MediaMetadata class back to framework
Due to the @UnsupportedAppUsage on
MediaMetadata.getKeyFromMetadataEditorKey, we'd better not to move the
class to APEX. This CL moves the MediaMetadata back to framework.

Also, in order to avoid hidden framework API usages in mainline module,
this CL moves the usage of hidden constructor of MediaMetadata.Builder()
from MediaSessionEngine to MediaSession.

Bug: 123488217
Test: make update-api -j; make -j;
      vendor/google/tools/flashall;
      atest CtsMediaTestCases:android.media.cts.MediaSessionTest;
      atest CtsMediaTestCases:android.media.cts.MediaControllerTest;
Change-Id: I21b4f0f59214478071bb0eafa93bb9538e44bf4e
2019-01-29 17:16:50 +09:00
Jaewan Kim
d0bb9eab0d Merge changes Ib3c350ba,I9f6b17a6
* changes:
  MediaController: Make getTag() public
  MediaRouter: Remove hidden annotation usages
2019-01-29 07:38:46 +00:00
Hyundo Moon
99cd4d4739 Merge "Remove unused MediaSession.notifyRemoteVolumeChanged()" 2019-01-29 06:53:35 +00:00
Jaewan Kim
36a0ff35fb MediaRouter: Remove hidden annotation usages
This removes hidden annotation usages from the framework to the apex,
which would be prohibited.

Test: Build
Bug: 123485698
Change-Id: I9f6b17a61c5438e0d538a7a97587c375d8603613
2019-01-29 15:31:13 +09:00
Hyundo Moon
2e4e51b365 Remove unused MediaSession.notifyRemoteVolumeChanged()
Bug: 123499849
Test: make -j;
Change-Id: Ie629b0811e07444cf277c9552aaece558e1c1f41
2019-01-29 13:50:46 +09:00
Sudheer Shanka
ca923a9aab Merge "Update DownloadStorageProvider to include MediaStore.Downloads." 2019-01-29 02:57:44 +00:00
TreeHugger Robot
e82f0371a5 Merge changes I6bda318c,Ie4d259dc
* changes:
  MediaController: Remove unused constructors
  Make ISessionManager.getSessions() return list of tokens
2019-01-29 02:31:23 +00:00