11871 Commits

Author SHA1 Message Date
Conrad Chen
73d86e34bb TIF: Fix current position not reported issue
Fixes the issue that when current position or start position is 0,
TIF won't report TimeShiftCurrentPositionChanged() or
TimeShiftStartPositionChanged().

Test: bug fix
Bug: 32211561
Change-Id: I932d772850063f05fb8fc67a4b6bea7400b6443b
2017-02-16 17:01:18 -08:00
Dongwon Kang
4683b83c40 TIF: add PreviewPrograms
Currently, Programs class is being used for storing both linear
tv program and preview program. This change adds PreviewPrograms
class for clear separation.

Test: build and cts-tradefed run cts -m CtsTvTestCases
Bug: 34853064
Change-Id: I9789e0296941783c6096d1ff9a0d81e11370ab65
2017-02-16 23:23:04 +00:00
TreeHugger Robot
e6e61f2fd9 Merge "media: Update MediaMuxer Java doc to reflect new features." 2017-02-16 21:44:14 +00:00
TreeHugger Robot
f582d6c96e Merge "TIF: Add internal provider ID field to channels" 2017-02-16 21:03:26 +00:00
Hangyu Kuang
7e2f547da8 media: Update MediaMuxer Java doc to reflect new features.
Generated a table to summarizes the feature support in different API version
and containers. Features include: Muxing B-frame, 3GP container, multiple
video/audio tracks, metadata tracks.

Test: None as just documentation.
Bug: 28536560
Change-Id: I7ab883a46f4b3420542eae504a33d4ebe1176a65
2017-02-16 11:28:53 -08:00
Hassan Shojania
06b25fb236 Modular DRM for MediaPlayer
Bug:  34559906
Test: Manual through the test app
Change-Id: I1b1ca61e74f250d63ff5ff462905facb81fe44e0
2017-02-15 18:44:54 -08:00
Hassan Shojania
18d58d81b4 Merge "New setDataSource API for accepting cookies" 2017-02-15 23:03:02 +00:00
Conrad Chen
485c9f7ede TIF: Add internal provider ID field to channels
Test: build
Bug: 35101383
Change-Id: Ic725da964a287a2aa434998dd4e5879ea1f8e6bd
2017-02-15 13:23:18 -08:00
Conrad Chen
2e94d3e9fc Merge "TIF: Add browsable field to programs" 2017-02-15 19:15:22 +00:00
Hassan Shojania
a6c969c036 New setDataSource API for accepting cookies
Bug:    34736056
Test:   Manual through the test app
Change-Id: Ibd48d5e292dda490d9e4e4528589b2b7ba97a4b4
2017-02-15 10:02:01 -08:00
Eric Laurent
e0ac9dabc7 Merge "audio: deprecate AudioManager.isBluetoothA2dpOn()" 2017-02-15 02:13:22 +00:00
Andy Hung
27b35add5c Merge "VolumeShaper: Initial implementation" 2017-02-14 01:39:00 +00:00
Conrad Chen
e87a7d9e95 TIF: Add browsable field to programs
Test: build
Bug: 34720053
Change-Id: I8cf43bda833fdb93c898b07d9fdec9ebefa4227b
2017-02-13 11:42:38 -08:00
Ray Essick
b0bd62f96c Metrics for android.media.MediaRecorder
Implementation of getMetrics() API and underlying metrics gathering
for android.media.MediaRecorder.

Bug: 35150984
Test: hacked CTS, observing of 'dumpsys media.metrics'
2017-02-12 19:22:48 -08:00
Andy Hung
035d4ec772 VolumeShaper: Initial implementation
The VolumeShaper is used to apply a volume
envelope to an AudioTrack or a MediaPlayer.

Test: CTS
Bug: 30920125
Bug: 31015569
Change-Id: If8b4bed29760aa3bd15a4b54cae60e40b4f518ee
2017-02-10 18:08:12 -08:00
Mark Goldstein
8e24dbdc97 Update the exception description for start(). am: ac06177a13 am: 8b137cc06b am: fd88989486
am: 673a2df291

Change-Id: I297d9243273a178e31abad5bfedc50422a6a8610
2017-02-11 01:44:40 +00:00
Mark Goldstein
673a2df291 Update the exception description for start(). am: ac06177a13 am: 8b137cc06b
am: fd88989486

Change-Id: I9fef1f2ba9ca5db9b46ea67e2507a682b249c595
2017-02-11 01:38:34 +00:00
Mark Goldstein
8b137cc06b Update the exception description for start().
am: ac06177a13

Change-Id: I124d99971918daa7768d79daa01ecbbb86f60199
2017-02-11 01:29:27 +00:00
Mark Goldstein
ac06177a13 Update the exception description for start().
Bug: 31592353
Change-Id: Ic325a8004a87b71c0b43d02db58d4717b4b3831d
2017-02-10 13:22:24 -08:00
Ray Essick
242ca74094 Merge "API android.media.MediaExtractor.getMetrics()" 2017-02-08 18:58:23 +00:00
TreeHugger Robot
1dd026d981 Merge "TIF: add BaseProgramColumns in TvContract" 2017-02-08 09:51:52 +00:00
Ray Essick
ba5ce2c0f8 API android.media.MediaExtractor.getMetrics()
adds the API getMetrics() to android.media.MediaExtractor
includes plumbing through JNI to the underlying mediaextractor
code in frameworks/av.

Tested with some CTS modifications; a more formal set of CTS
updates will be along later.

Bug: 35094936
Test: modified CTS to invoke new API and output results
Change-Id: Id8d56c9c3273b86bbd11e248bdf5004be90b91ef
2017-02-07 15:35:39 -08:00
Jean-Michel Trivi
bdc2365489 Merge "Audio player delayed start: don't throw exception" 2017-02-07 20:03:56 +00:00
Eric Laurent
c117bea6dc audio: deprecate AudioManager.isBluetoothA2dpOn()
This method name is misleading and the functionality is now
replaced by the more generic AudioManager.getDevices() method.

Bug: 35076621
Test: make, make update-api
Change-Id: Idc2e55f85722d3197fc8fab115af33f5da889d57
2017-02-07 11:14:19 -08:00
Jean-Michel Trivi
10ffc78304 Audio player delayed start: don't throw exception
When the framework sets a delayed start on a PlayerBase instance
  (e.g. MediaPlayer or AudioTrack), catch the IllegalStateException
  that can be thrown if the player's state has changed by the time
  the actual start command gets executed.

Test: generate notifications played by NotificationPlayer
Bug 35019197

Change-Id: I51fd0305bc83b34e33fbcf9331f55627d32702f3
2017-02-07 10:47:31 -08:00
Jaewan Kim
620f72841f Merge "Add oneway keyword for the IOnMediaKeyListener" 2017-02-07 07:59:25 +00:00
Dongwon Kang
c6eb54ce43 TIF: add BaseProgramColumns in TvContract
Programs and RecordedPrograms have a lot in common. This change
introduces BaseProgramColumns which removes the duplicates.
This will be also helpful for the further clean-up.

Test: build & passes CtsTvTestCases without modification
Bug: 34853064
Change-Id: I4ad352a9a904e7fef57c56acec5583df92b4226c
2017-02-06 16:59:29 -08:00
Jean-Michel Trivi
49e57a2d9f Merge "API for app to know what to set in Activity.setVolumeControlStream()" 2017-02-06 18:54:35 +00:00
Jaewan Kim
5bdb4e0583 Add oneway keyword for the IOnMediaKeyListener
Test: Tested manually
Change-Id: I35406ff6688b7529873e246226a9617244b4f391
2017-02-06 22:07:24 +09:00
Sungsoo
99c1f9f453 MediaSession: Add methods for queue managements
Bug: 30203831
Test: Passed MediaControllerTest
Change-Id: Ibc33572d21bd83d47660be8f41173b9cea206015
2017-02-06 17:38:13 +09:00
Jean-Michel Trivi
a690473348 API for app to know what to set in Activity.setVolumeControlStream()
Stream types are deprecated to describe an audio playback use case.
But they are used for volume control. This API helps the developer
  go from an AudioAttributes instance used for playback, to a
  stream type used to describe which volume stream type should be
  used when the user presses on the volume keys.

Test: see AudioAttributes cts test
Bug 21267880

Change-Id: I2b9da5b282e8ed2342c61c14a7f59b874d0ce979
2017-02-04 16:35:25 -08:00
Andy Hung
763aeb5b94 Merge "AudioTrack: Enable deep buffer under certain conditions" 2017-02-04 01:43:13 +00:00
Dongwon Kang
2c3c4036d5 TIF: use @StringDef annotations in TvContract
Test: build
Bug: 34949964
Change-Id: I59ec8ff245f36a1981a012349892114fe26d5265
2017-02-03 13:19:14 -08:00
Andy Hung
9025cc090b AudioTrack: Enable deep buffer under certain conditions
Under certain conditions, i.e. USAGE_MEDIA and
CONTENT_TYPE UNKNOWN, MUSIC, MOVIE and large buffers
we route the AudioTrack to deep buffer to save power.

Change-Id: Ibc8a31750999da842e36156f939448989ee50511
Test: Play Movies, CTS
Bug: 30687201
2017-02-03 09:18:34 -08:00
TreeHugger Robot
ec3211830e Merge "TIF: add COLUMN_SYSTEM_APPROVED in Channels" 2017-02-02 22:54:44 +00:00
TreeHugger Robot
39455174d7 Merge "TIF: change the column names to be consistent with other fields" 2017-02-02 22:54:00 +00:00
Hangyu Kuang
48a3cb6984 Merge "media: Add 3gpp output format to MediaMuxer." 2017-02-02 18:07:22 +00:00
Dongwon Kang
eedc4b5b7d TIF: change the column names to be consistent with other fields
1. Add _MILLIS for time related columns.
2. Remove PREVIEW_ prefix.
(COLUMN_PREVIEW_VIDEO_URI is an exception since the meaning is not
clear without it.)
3. Add _URI for COLUMN_LOGO

Test: cts-tradefed run cts -m CtsTvTestCases
Bug: 34806184
Change-Id: I1c75b0402508911a37491c7712f12574e574fb9b
2017-02-01 16:13:26 -08:00
Hangyu Kuang
03299f9c8e media: Add 3gpp output format to MediaMuxer.
Test: CTS test.
Bug: 34281643
Change-Id: I45b65728aa1fbde7cee88ca41d7f1bd692fc866c
2017-02-01 15:44:49 -08:00
Jean-Michel Trivi
6deaa4c8cf Merge "Notification playback synchronized with audio focus" 2017-02-01 18:43:36 +00:00
Dongwon Kang
72529d0fa7 TIF: add COLUMN_SYSTEM_APPROVED in Channels
Test: cts-tradefed run cts -m CtsTvTestCases
Bug: 34679597
Change-Id: I271e37ae89b2b7f64ab3ba2fdd2cc363f7c98764
2017-01-31 18:07:31 -08:00
Jean-Michel Trivi
99489ccf74 Notification playback synchronized with audio focus
PlayerProxy: more control options (pan, delayed start),
  remove exceptions in method signatures.
Use delayed start on notification playback for better sync
  between media apps and notifications
Disabled for now: support for AudioService (through
  MediaFocusControl and PlaybackActivityMonitor) to enforce
  audio ducking of focus owners losing audio focus with
  AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK, and who don't
  play audio that has a content labelled as CONTENT_TYPE_SPEECH.
  This feature will be enabled when setting a VolumeShaper
  on a player works.

Test: play music and play notification
Bug 30258418

Change-Id: I4e4d911645306bbde17f74288f3b61781fe0e3fe
2017-01-31 15:40:09 -08:00
Edwin Wong
e9b8348027 Merge "Pass application packagename to drm plugin." 2017-01-31 05:03:44 +00:00
Hassan Shojania
0b52e95c3f Modular DRM for MediaPlayer
Bug:  34559906
Test: Manual through the test app

Change-Id: If76e2898e6064c5661193872b907b1720838c678
2017-01-27 19:03:09 -08:00
Ray Essick
0e0fee1e3a API access to mediametrics
provide SDK/API access to media metrics for user apps. This lets the
apps metrics data for their instances of player and codecs. Others
to come.

Bug: 34715803
Test: booted, invoked new APIs to verify desired results
Change-Id: Iaae6406aadef30adc893952961ac154a7c4c761d
2017-01-27 17:58:30 +00:00
Jae Seo
434602faa9 TIF: Add types and "watch next" types for programs
Test: build
Bug: 34160270
Change-Id: I50bf7c36e33cd24bf80785150a2858cfec683546
2017-01-26 10:08:48 -08:00
Jae Seo
523415e814 TIF: Add more fields needed for new content recommendation
Test: build
Bug: 34160270
Change-Id: Ibb40ed39573049ace180ae319cebe96222f84b00
2017-01-26 08:58:50 -08:00
TreeHugger Robot
10dcfd3688 Merge "Add an intent that asks the launcher to make a channel browsable." 2017-01-26 08:30:12 +00:00
TreeHugger Robot
60d820b050 Merge "media: Add new MediaMuxer constructor that takes FileDescriptor." 2017-01-26 08:22:01 +00:00
TreeHugger Robot
da57f6b420 Merge "TIF: Add more fields for guide view on launcher" 2017-01-26 06:00:56 +00:00