Commit Graph

4547 Commits

Author SHA1 Message Date
Jae Seo
c412e925c4 Merge "TIF: Add android.permission.READ_TV_LISTINGS" into nyc-dev am: af326ed2b9
am: 43ddc14d5d

* commit '43ddc14d5da7e9432d4847fe3485a5cd42b783cc':
  TIF: Add android.permission.READ_TV_LISTINGS
2016-02-23 00:14:11 +00:00
Jae Seo
af326ed2b9 Merge "TIF: Add android.permission.READ_TV_LISTINGS" into nyc-dev 2016-02-22 23:44:48 +00:00
Donghyun Cho
53df72c2d2 Merge "MediaSession: Add new methods for preparing media content" into nyc-dev am: f3db5743b9
am: e53db46568

* commit 'e53db46568f2a7830e5fe1d8ddd69d8c0dfb89b7':
  MediaSession: Add new methods for preparing media content
2016-02-22 03:46:43 +00:00
Donghyun Cho
f3db5743b9 Merge "MediaSession: Add new methods for preparing media content" into nyc-dev 2016-02-22 03:38:55 +00:00
Jae Seo
ed76f3509d TIF: Add android.permission.READ_TV_LISTINGS
Bug: 21959866
Change-Id: I6f30289f8660ed8d268bb9138c32d9c6a95bb0b9
2016-02-20 02:17:39 -08:00
Jiabin Huang
8983bd4309 Merge "TIF: optimize android.media.tv.Tvcontract.Programs.Genres#decode" into nyc-dev am: 079cf52336
am: 63f2971dee

* commit '63f2971dee821db92d3fbb88d28ada58897cc89f':
  TIF: optimize android.media.tv.Tvcontract.Programs.Genres#decode
2016-02-20 08:46:05 +00:00
Jiabin Huang
079cf52336 Merge "TIF: optimize android.media.tv.Tvcontract.Programs.Genres#decode" into nyc-dev 2016-02-20 07:01:29 +00:00
Jiabin
0388f0e503 TIF: optimize android.media.tv.Tvcontract.Programs.Genres#decode
test result:
 Decode function takes about 0.25 seconds with 1350 channels in Live Channels.
 The original one takes about 0.37 seconds in the same test case.

Bug: 23307587
Change-Id: I3a1fefe0b3e6c1986c8f515259658f2e3e23011f
2016-02-20 14:22:33 +09:00
Lajos Molnar
a8be884d0b Merge "media: expose audio sample format in MediaFormat" into nyc-dev am: 0ab076c5c9
am: 4474a5cd4b

* commit '4474a5cd4b6b55e14048515be5a04ba438f60e90':
  media: expose audio sample format in MediaFormat
2016-02-19 18:56:54 +00:00
Lajos Molnar
0ab076c5c9 Merge "media: expose audio sample format in MediaFormat" into nyc-dev 2016-02-19 18:47:06 +00:00
Dongwon Kang
6aeca36685 Merge "TIF: Unhide TvContract.Programs.Genres#isCanonical" into nyc-dev am: ca601d9303
am: d98c06cad3

* commit 'd98c06cad34c57eb783d7d61a73d797b7be5deee':
  TIF: Unhide TvContract.Programs.Genres#isCanonical
2016-02-19 00:08:09 +00:00
Dongwon Kang
d16d1f519b TIF: Unhide TvContract.Programs.Genres#isCanonical
Bug: 25726917
Change-Id: I8717b1c9f39f8b5b9196658c1501d5abf2337eb9
2016-02-18 15:42:09 -08:00
Donghyun Cho
22188f1187 MediaSession: Add new methods for preparing media content
Introduced new methods for preparing media content: prepare,
prepareFromMediaId, prepareFromSearch, and prepareFromUri. These methods
allow MediaSession prepare media content rather than play
it. MediaSession will set up a queue or buffer their content during
these preparing requests.
The constants, FLAG_HANDLES_PREPARE_ONLY and EXTRA_PREPARE_ONLY, are
removed because the introduced methods can replace them.

Bug:25841735, Bug:25153060, Bug:25153353
Change-Id: I8fa2097c98fe2fba92b267d2865a9b75d118af09
2016-02-18 18:22:41 +09:00
Lajos Molnar
514a3fb7a6 media: expose audio sample format in MediaFormat
Bug: 27172163
Change-Id: I0ae4c0299839612893bb8a43e7016e49487e1a51
2016-02-17 18:52:36 -08:00
Arunesh Mishra
de15666923 Merge "SoundTriggerHelper changes for GenericSoundModels." into nyc-dev am: df8d02b074
am: 9f43371bae

* commit '9f43371bae759ba773ef179f091d9d5fdf668cad':
  SoundTriggerHelper changes for GenericSoundModels.
2016-02-17 23:51:33 +00:00
Arunesh Mishra
df8d02b074 Merge "SoundTriggerHelper changes for GenericSoundModels." into nyc-dev 2016-02-17 22:42:34 +00:00
Jean-Michel Trivi
3377a8c711 Merge "Audio record notification: only report SDK recording sources" into nyc-dev am: 7fc54dd379
am: 039b29808a

* commit '039b29808a94b56cdd63c6b3a15752ce38613241':
  Audio record notification: only report SDK recording sources
2016-02-17 22:30:15 +00:00
Arunesh Mishra
3fff7f5634 SoundTriggerHelper changes for GenericSoundModels.
- Refactoring SoundTriggerHelper to handle generic sound models.
     - Ability to store multiple models, callback and state information.
     - Separate out initialization to be done per voice model, per any model
     and per generic model.
 - Minor change to the API exposed -- removing the Handler from the
   createSoundTriggerDetector call.
 - Added callback processing for onRecognitionEvent().
 - Added logic for stopAll().
 - Changes to the SoundTriggerTestApp to start/stop recognition.
     - Multiple models (3).
     - Ability to start/stop/load/unload individual models.

Bug: 22860713
Bug: 27222043
Change-Id: Ie5d811babb956bead653fb560a43f1e549ed11bd
2016-02-17 14:24:03 -08:00
Jean-Michel Trivi
7fc54dd379 Merge "Audio record notification: only report SDK recording sources" into nyc-dev 2016-02-17 22:09:16 +00:00
Jean-Michel Trivi
dd2772a339 Audio record notification: only report SDK recording sources
Bug 22876530

Change-Id: I7575170ee2d7414c8bf9a04a9adc936b66c33e15
2016-02-17 12:37:11 -08:00
Dongwon Kang
a2b0acdcad Merge "TIF: Release passthrough session when HardwareSession is released" into nyc-dev am: 37f3488c5c
am: 467a7c73ba

* commit '467a7c73ba2d1d6cec9c1f0782c3d5582aa73595':
  TIF: Release passthrough session when HardwareSession is released
2016-02-17 19:43:12 +00:00
Dongwon Kang
78364ddc04 TIF: Release passthrough session when HardwareSession is released
Bug: https://code.google.com/p/android/issues/detail?id=200114
Change-Id: I5d74eb56297e468b95aa0f99b159b2b54f93f5d2
2016-02-17 11:25:54 -08:00
Jae Seo
5f08b3c079 Merge "TIF: Rename setTvInputInfo to updateTvInputInfo" into nyc-dev am: 519e0591fe
am: ee87545754

* commit 'ee8754575485512c36c878628351cf070cab53ce':
  TIF: Rename setTvInputInfo to updateTvInputInfo
2016-02-17 02:59:13 +00:00
Jae Seo
aa5605ffee TIF: Rename setTvInputInfo to updateTvInputInfo
As TvInputInfo includes many complex objects as fields, it is not
practical to check whether an existing TvInputInfo has actually
"changed" by using simple comparisons when a new TvInputInfo object is
set by a TV input service.
This code change renames
  - setTvInputInfo to updateTvInputInfo
  - onTvInputInfoChanged to onTvInputInfoUpdated
to indicate that the callback is mechanically invoked whenever
updateTvInputInfo method is called.

Change-Id: Ia351b3591d0ed9da962311546f0ba51158e6478e
2016-02-16 15:44:47 -08:00
Dongwon Kang
d155aeb29f Merge "TIF: Unhide TvInputInfo.isHidden/loadCustomLabel" into nyc-dev am: 8da2bf4946
am: 2a94f9b7ea

* commit '2a94f9b7ea30969934d310c17013d8748eb59cf5':
  TIF: Unhide TvInputInfo.isHidden/loadCustomLabel
2016-02-16 17:39:09 +00:00
Dongwon Kang
8da2bf4946 Merge "TIF: Unhide TvInputInfo.isHidden/loadCustomLabel" into nyc-dev 2016-02-16 17:22:08 +00:00
Sungsoo Lim
52d04f1f61 Minor changes on MediaBrowser am: 77dc4bb09e
am: 01da43b1a4

* commit '01da43b1a40e898221f157073d9b263669503371':
  Minor changes on MediaBrowser
2016-02-16 06:50:18 +00:00
Sungsoo Lim
77dc4bb09e Minor changes on MediaBrowser
- Rename add and remove in Subscription putCallback and removeCallback
  for better readability.
- Fix a broken link of javadoc.

Change-Id: If41941d1134d4ee6ef953932ca572f5d445a2aff
2016-02-16 15:20:44 +09:00
Hangyu Kuang
bd752db971 Merge "Update Android mediamuxer documentation as it supports webm already." into nyc-dev am: 6dfd022bb8
am: b6678262dd

* commit 'b6678262dde0a6ad72f1018e0da2c2d3a3c669b3':
  Update Android mediamuxer documentation as it supports webm already.
2016-02-12 23:44:02 +00:00
Hangyu Kuang
6dfd022bb8 Merge "Update Android mediamuxer documentation as it supports webm already." into nyc-dev 2016-02-12 23:30:49 +00:00
Phil Burk
24dbb9a508 Merge "AudioFormat: implement ENCODING_IEC61937" into nyc-dev am: af9aa07fbd
am: d6af0a24af

* commit 'd6af0a24af744d5e1588756ef5e997332e7d75c5':
  AudioFormat: implement ENCODING_IEC61937
2016-02-12 22:38:16 +00:00
Phil Burk
af9aa07fbd Merge "AudioFormat: implement ENCODING_IEC61937" into nyc-dev 2016-02-12 22:24:55 +00:00
Dongwon Kang
edbe2652f9 TIF: Unhide TvInputInfo.isHidden/loadCustomLabel
Needed to load input preferences set by user in settings.

Bug: 26850395
Change-Id: I5cd4e2474724c247c765cafa829fc9d7f363da45
2016-02-12 11:16:27 -08:00
Hangyu Kuang
89de5eb346 Update Android mediamuxer documentation as it supports webm already.
Bug: 27075269

Change-Id: Ie2571bb90b6d8dac85dad48d845e21c80b2b250f
2016-02-12 10:55:59 -08:00
Jean-Michel Trivi
d1b5ee30b8 Merge "Dynamic audio policies: JNI support for UID rules" into nyc-dev am: d9cd292369
am: 6c8dc0b27f

* commit '6c8dc0b27f41843ca4bb9409014ad3078c30a1a1':
  Dynamic audio policies: JNI support for UID rules
2016-02-12 17:04:27 +00:00
Jean-Michel Trivi
d9cd292369 Merge "Dynamic audio policies: JNI support for UID rules" into nyc-dev 2016-02-12 16:57:50 +00:00
Sungsoo Lim
4ea42be17d Merge "MediaBrowser: Use volatile keywords for variables used in multithreads" 2016-02-12 07:46:33 +00:00
Sungsoo Lim
61daa146eb Merge "MediaBrowser: Make forceCloseConnection() be called in the same thread" 2016-02-12 07:42:27 +00:00
Phil Burk
d817dfd531 Merge "AudioTrack: fix docs for return code for setBufferSizeInFrames()" into nyc-dev 2016-02-12 06:32:14 +00:00
Sungsoo Lim
0d3315a341 MediaBrowser: Make forceCloseConnection() be called in the same thread
Bug: 26508006
Change-Id: I465aca6f9b9acf2cf30c2f324dc91fea1301baad
2016-02-12 15:22:47 +09:00
Phil Burk
cd0e210651 AudioTrack: fix docs for return code for setBufferSizeInFrames()
Also added some documentation links that were failing before.

Change-Id: I0a744dd0a3d3e1d09f643b35d976863fa0422d10
Signed-off-by: Phil Burk <philburk@google.com>
2016-02-11 16:42:13 -08:00
Jae Seo
25c9c5edab TIF: Separate service connection errors from recording errors
Also clarify the expected behaviors when an error has occurred in a
recording session.

Bug: 27110861
Change-Id: I811197e45ea94b1b0e151d534a1f030a84b89d10
2016-02-11 15:44:55 -08:00
Phil Burk
43f4b276a5 AudioFormat: implement ENCODING_IEC61937
Allows applications to wrap compressed audio in a PCM
stream and pass through directly to HDMI output.

Bug: 24541671
Bug: 20891646
Bug: 26373761
Signed-off-by: Phil Burk <philburk@google.com>

Change-Id: If29e10b0665758330eca085bfeaac19fefc373b3
2016-02-11 19:36:12 +00:00
Sungsoo Lim
51af2f017f MediaBrowser: Use volatile keywords for variables used in multithreads
Bug: 26057903, Bug: 26545483
Change-Id: I859dfd62f00fae166dc7eec652dd3ff3cd00d28d
2016-02-11 15:38:32 +09:00
Jean-Michel Trivi
ba6b4b400d Dynamic audio policies: JNI support for UID rules
Rename AttributeMatchCriterion to AudioMixMatchCriterion to be consistent
 with the fact that now mixing rules are not always about audio attributes.

AudioSystem JNI: add support for UID-based rules.

Bug 26798796

Change-Id: Icb0f57841c94f410e1fac9ed071a829a26b9a58e
2016-02-10 14:26:35 -08:00
Jae Seo
a2a0c735ff TIF: Add Active Format Description to TvTrackInfo
Bug: 21277083
Change-Id: Ided4ffcd2816e7bb11a81ef10f3b6e1499c6e89b
2016-02-10 14:03:18 -08:00
Youngsang Cho
4ecf78116e TIF: Add INPUT_ID field in RecordedProgram
INPUT_ID can be retrieved from CHANNEL_ID. But, even if the channel
is removed, recording should be playable. So INPUT_ID is needed.

Change-Id: I7042a19758ce71e77ca2ae7613015e4d22f0d41f
2016-02-10 21:16:22 +00:00
Jae Seo
425c8bf292 Merge "TIF: Rename connect()/disconnect() and remove unnecessary methods" into nyc-dev 2016-02-10 18:27:06 +00:00
Jae Seo
e3c11e8429 TIF: Rename connect()/disconnect() and remove unnecessary methods
Bug: 26969670
Change-Id: Iee7d1af2eecc11bb28a8d9d7e377b4754a37095c
2016-02-09 19:18:29 -08:00
Chulwoo Lee
65fa5ea41e Fix build
Change-Id: I9498ecda9b05c7166faf9f648f0b61682a88c4da
2016-02-09 17:49:54 -08:00