drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
316,317 Commits 1 Branch 0 Tags
Commit Graph

5762 Commits

Author SHA1 Message Date
Hangyu Kuang
f3276baa03 Merge "media: Address API review comments" into oc-dev am: ab312729ce 
am: bde6da6f18

Change-Id: Ic22500200177a43874dbbd5a4fb327a8c9a7d25f
 2017-04-17 17:20:20 +00:00
Hangyu Kuang
ab312729ce Merge "media: Address API review comments" into oc-dev 2017-04-17 17:04:28 +00:00
Ray Essick
697580cc56 Merge "Rework getMetrics() api per API council" into oc-dev am: abbea1df6b 
am: b3934d9043

Change-Id: I0f463f2d04da9a5ecd8ddcad965ce8821b0ee116
 2017-04-15 19:08:10 +00:00
Ray Essick
10353e3601 Rework getMetrics() api per API council 
Reworking the media metrics getMetrics() calls (currently in MediaCodec,
MediaExtractor, MediaPlayer, and MediaRecorder) to fit new direction
from the API Council.

Drop the MediaMetricsSet that we had in the first round; go back
to a PersistableBundle as the return type. Moves the key definitions
from MediaMetricsSet.MediaCodec to MediaCodec.MetricsConstants

Bug: 37083862
Test: ran the corresponding CTS tests
Change-Id: I7905959ad2109887dd8fd16f0eb2831247abab2a
 2017-04-14 17:24:42 -07:00
Hangyu Kuang
5ba5e9182c media: Address API review comments 
Change setNextOutputFile to accept File instead of String. Also add new version
of setOutputFile to accept File.

Bug: 36791064
Test: CTS test.
Change-Id: I1a3d574e7cf36acbf181407131bc9dbf114d30de
 2017-04-14 13:41:01 -07:00
Dongwon Kang
625df43c5c Merge "TIF: add ASPECT_RATIO_4_3 for Preview/WatchNextPrograms" into oc-dev am: 0cdc7c8874 
am: 294176e988

Change-Id: I7332f731883c94f49477258357b3b392b4e21961
 2017-04-14 18:27:05 +00:00
Dongwon Kang
0cdc7c8874 Merge "TIF: add ASPECT_RATIO_4_3 for Preview/WatchNextPrograms" into oc-dev 2017-04-14 17:05:31 +00:00
Jeff Tinker
835a765a3a Merge "Deprecate MediaDrm's EVENT_KEY_EXPIRED method" into oc-dev am: 92fc8bdd51 
am: a29ecc1a1c

Change-Id: I6cb7def4e72bb154227cba3b50ea09ec7f6b5003
 2017-04-14 16:46:07 +00:00
jiabin
cc6759b193 Merge "Add TvProvider methods to block or unblock package, get blocked packages" into oc-dev am: 2ec7decaa5 
am: 4f499a0a17

Change-Id: I0622c0f58c5ba2560b5c17c52a613cadcdb24ecc
 2017-04-14 16:36:01 +00:00
Dongwon Kang
08b24d1507 Merge "TIF: add helper methods for making a channel browsable." into oc-dev am: b2eb818a7d 
am: 3d9ecc264d

Change-Id: I321131835e44d67bb5fab085bc7f36a838dd40e3
 2017-04-14 16:12:49 +00:00
TreeHugger Robot
92fc8bdd51 Merge "Deprecate MediaDrm's EVENT_KEY_EXPIRED method" into oc-dev 2017-04-14 00:09:42 +00:00
TreeHugger Robot
2ec7decaa5 Merge "Add TvProvider methods to block or unblock package, get blocked packages" into oc-dev 2017-04-13 23:39:13 +00:00
Dongwon Kang
2566af67e5 TIF: add ASPECT_RATIO_4_3 for Preview/WatchNextPrograms 
Test: build
Bug: 37288064
Change-Id: I4750547a2550ef058c5fbdeca344fe5a94fc3fc9
 2017-04-13 14:58:45 -07:00
TreeHugger Robot
b2eb818a7d Merge "TIF: add helper methods for making a channel browsable." into oc-dev 2017-04-13 21:23:48 +00:00
jiabin
0b8df1dedb Add TvProvider methods to block or unblock package, get blocked packages 
Test: gts-tradefed run gts -m GtsTvTestCases
Bug: 36697660
Change-Id: I6464542820a4b56e3145eecdf28ebd422a567040
 2017-04-13 11:35:28 -07:00
Chong Zhang
5ad4b40999 Merge changes from topic 'api-review' into oc-dev am: fd89a95f35 
am: 847beba350

Change-Id: I7abb72fe43b565e3fb4b31418192418b686100f9
 2017-04-13 06:45:04 +00:00
Chong Zhang
35af7a8948 MediaCas: address comments for API reviews am: addc39ec27 
am: e0c465fefa

Change-Id: If87e2cd96df1a14b7b0c9d753af35fb779c2fbae
 2017-04-13 06:43:36 +00:00
Chong Zhang
e0c465fefa MediaCas: address comments for API reviews 
am: addc39ec27

Change-Id: Ib4bb32cc09d9352bdbc4913dfdfdf1e92c11487f
 2017-04-13 06:32:28 +00:00
TreeHugger Robot
fd89a95f35 Merge changes from topic 'api-review' into oc-dev 
* changes:
  MediaCas: combine openSession methods
  MediaCas: address comments for API reviews
 2017-04-13 06:23:51 +00:00
Dongwon Kang
2e7f5ce709 TIF: add helper methods for making a channel browsable. 
Test: build and manually tested with a local app.
Bug: 36395259, Bug: 36097352
Change-Id: I512ed6f4da21af01445fdbcd2f200a681c5dde19
 2017-04-12 20:55:22 -07:00
Jeff Tinker
112b98b578 Deprecate MediaDrm's EVENT_KEY_EXPIRED method 
It has been replaced by onKeyStatusChange

Test: make offline-sdk-docs

bug: 21661111
Change-Id: I18e6604e9d3db7fb05209ad053b07546e7dd2bbd
 2017-04-12 17:26:57 -07:00
Dongwon Kang
02f7b9a1e3 Merge "TIF: add review rating columns to programs" into oc-dev am: bf02434e79 
am: 648e007501

Change-Id: Iab298377ad614291e6c194d056a3f070be470ce8
 2017-04-12 17:40:44 +00:00
Dongwon Kang
bf02434e79 Merge "TIF: add review rating columns to programs" into oc-dev 2017-04-12 17:12:23 +00:00
Jean-Michel Trivi
ea65fc90f3 Merge "VolumeShaper: update API, use "Millis" instead of "Ms"" into oc-dev am: 170e3e242b 
am: 163cdf2fb5

Change-Id: If40faebdb11c9ffe6648b22b43bede52ee6bfeec
 2017-04-12 16:00:45 +00:00
Jean-Michel Trivi
170e3e242b Merge "VolumeShaper: update API, use "Millis" instead of "Ms"" into oc-dev 2017-04-12 15:45:58 +00:00
Paul Mclean
72bd4e2c52 Merge "Optimize HW_AV_SYNC playback by avoiding multiple timestamp block allocations." into oc-dev am: e0e55f535a 
am: ffec10fcd5

Change-Id: Ie914337e190ba49d7ce4f0b3a3e485a14a4dd3d2
 2017-04-12 15:37:54 +00:00
Paul Mclean
e0e55f535a Merge "Optimize HW_AV_SYNC playback by avoiding multiple timestamp block allocations." into oc-dev 2017-04-12 15:16:22 +00:00
Jean-Michel Trivi
0dfbd1569d VolumeShaper: update API, use "Millis" instead of "Ms" 
Test: make
Bug: 36785428
Change-Id: Ib77ff448bb8454453b1bd39f1491b0189b4ff15b
 2017-04-11 19:05:26 -07:00
Conrad Chen
46e47cbecc Merge "TIF: add TvInputManager methods to notify apps" into oc-dev am: 307bec8572 
am: 081db81a99

Change-Id: I267fe4c5723ffa66c0555bba862b1618aebae5fd
 2017-04-12 01:30:33 +00:00
Conrad Chen
307bec8572 Merge "TIF: add TvInputManager methods to notify apps" into oc-dev 2017-04-12 00:25:37 +00:00
Chong Zhang
625e180454 MediaCas: combine openSession methods 
Combine the two openSession methods into one that doesn't take
any arguments. This gives the client more flexibility in creating
sessions, they can better control how to share sessions across
different elementary streams.

bug: 22804304

Change-Id: I95ce75476b19e9ca851c40f873f46d5c7fa583ef
 2017-04-11 13:13:28 -07:00
Chong Zhang
addc39ec27 MediaCas: address comments for API reviews 
- Wrap session id byte array in Session object

- Move session operations from MediaCas to Session

- Remove position prarameters on descramble() method

- Retrieve cas info for a track by getCasInfo() instead
  of getDrmInitData().

bug: 22804304
bug: 36791613
bug: 36783335

Change-Id: Ib3ad8d6a2f679c0e60d2bb025ac5999339722306
 2017-04-11 13:13:22 -07:00
Paul McLean
3b3ed7af3b Optimize HW_AV_SYNC playback by avoiding multiple timestamp block allocations. 
Bug: 33627517
Test: CTS and Manual
Change-Id: Ic27d630d27efef48fc0d1db023aaec556e62e073
 2017-04-11 12:52:05 -07:00
Conrad Chen
558acf96db TIF: add TvInputManager methods to notify apps 
Adds TvInputManager methods to notify apps with protected broadcasts
for:
1. Disabling browsable state of preview and watch next programs.
2. Adding preview programs to watch next programs.

Test: build and verify manually to check if notifications are
      broadcasted.
Bug: 35881266

Change-Id: I20fd5b63f42b2c74277315bbbd251b71c649e5c1
 2017-04-11 12:03:04 -07:00
Zhijun He
017f4870a1 Merge "ImageReader/Writer: add usage flag support" into oc-dev am: 96d4ac0cc6 
am: 4e1b44b4e1

Change-Id: Ibac93b68bb2dd5461bac5d818d25fcbd0d455425
 2017-04-11 16:43:46 +00:00
Zhijun He
916d8ac650 ImageReader/Writer: add usage flag support 
Also add an ImageWriter ctor to take additional arugment (format)

Test: ImageReader and Writer CTS tests
Bug: 32766711
Change-Id: I99e3862dd5b9a85c9df7879c14c84b68a35718ec
 2017-04-10 23:38:32 +00:00
Wei Jia
66acecdb03 Merge "MediaPlayer: add 2 more info notifications for playback error" into oc-dev am: e79081aeaa 
am: 1dccc5841d

Change-Id: I06503dd272057c20d6ba2cdf4f2410d3030491ba
 2017-04-08 00:42:54 +00:00
TreeHugger Robot
e79081aeaa Merge "MediaPlayer: add 2 more info notifications for playback error" into oc-dev 2017-04-08 00:24:12 +00:00
Wei Jia
ae3e7067ef MediaPlayer: add 2 more info notifications for playback error 
Test: mediaplayer doesn't send error notify to client when only one track has error.
Bug: 24761723
Change-Id: I7221dfdbc6a256532186c654406bbe06de831798
 2017-04-07 15:24:50 -07:00
Wei Jia
e1a76bb7b3 Merge "MediaPlayer: hide BufferingParams API" into oc-dev am: 4c2a62edb6 
am: 2c51d55fcc

Change-Id: I031b205a5244f4dab5d5f7904c86badd95e31d18
 2017-04-07 22:01:05 +00:00
TreeHugger Robot
4c2a62edb6 Merge "MediaPlayer: hide BufferingParams API" into oc-dev 2017-04-07 21:46:40 +00:00
Dongwon Kang
c09571ba26 Merge "Add intent to intialize programs on APP installed" into oc-dev am: 9c1e85384e 
am: 2b45152532

Change-Id: Idfafd349f7c03c183cf8bc7b49097ec735d36225
 2017-04-06 23:39:43 +00:00
Dongwon Kang
9c1e85384e Merge "Add intent to intialize programs on APP installed" into oc-dev 2017-04-06 22:49:50 +00:00
Jeff Tinker
0ccaa4afda Merge "Fix StringDef usage in MediaDrm API" into oc-dev am: d2b1f3812c 
am: 4b1a00ed84

Change-Id: I76c1568e4617887d65305bd8dbc62f1d1e95f178
 2017-04-06 19:49:02 +00:00
TreeHugger Robot
d2b1f3812c Merge "Fix StringDef usage in MediaDrm API" into oc-dev 2017-04-06 17:50:27 +00:00
Wei Jia
f3d93a0f69 MediaPlayer: hide BufferingParams API 
Test: compiles
Bug: 36280094
Change-Id: I52f3e71fb0e090ac48711bbb8ea7cbdf8db00074
 2017-04-06 10:09:05 -07:00
Conrad Chen
1f6d4b5c81 Add intent to intialize programs on APP installed 
Adds a new broadcast intent for system APPs to send when some TV APP met
certain requirements is newly installed. The intent will wake up the APP
and notify it to initialize its channel and program list to the system
provider.

Test: build
Bug: 34739955
Change-Id: Ib172b40434db4a439ec0db7bf8b28037d0bfb8a8
 2017-04-06 08:42:59 -07:00
Jeff Tinker
c0f83f39cf Merge "Clarify MediaDrm#getKeyRequest docs: init and mimeType" into oc-dev am: 2375cd1a84 
am: 99030a938c

Change-Id: I3f1475e6d906af3d918dcdd63dbace15672e1a34
 2017-04-06 06:34:02 +00:00
TreeHugger Robot
2375cd1a84 Merge "Clarify MediaDrm#getKeyRequest docs: init and mimeType" into oc-dev 2017-04-06 06:21:06 +00:00
Jeff Tinker
47e13eeb77 Merge "Update MediaDrm documentation for provideKeyResponse" into oc-dev am: ff8bf0cc95 
am: d506056de8

Change-Id: I9de1c14653a8284288eeb99e1a1605db15531ae0
 2017-04-06 06:20:18 +00:00