10711 Commits

Author SHA1 Message Date
Jean-Michel Trivi
74eb6f62f8 Change AudioRecordingConfiguration constructor parameter order
Switch the device and client AudioFormat parameters in the
  AudioRecordingConfiguration constructor, so it's the same
  order as the rest of the code involved in sending a callback
  when the recording configuration changes.

Bug 30282058

Change-Id: Iea417f02dcb644e3d4dacbc0e44ea4b2eac28840
2016-07-26 14:00:44 -07:00
TreeHugger Robot
e7e1f0b788 Merge "media: Add hidden api to set video encoding profile and level." into nyc-mr1-dev 2016-07-25 23:40:00 +00:00
Hangyu Kuang
f70ad43f13 media: Add hidden api to set video encoding profile and level.
bug: 30284097
Change-Id: I898f9a05571098a0ca0f57fb5abf58567c16fdd1
2016-07-25 21:31:29 +00:00
Eino-Ville Talvala
2e2aaf6e04 ImageReader: Add discardFreeBuffers method
This method (currently @hide) discards all cached buffers for
the ImageReader, which can be useful to free up memory at the
cost of reallocationt time if more buffers are needed later.

It has no effect on acquired Images, filled Images waiting to be
acquired, or buffers being actively used by the source rendering to the
Surface.

Bug: 28695173
Change-Id: I427a8ba4ad73a267083f843dbf228bfc53a730d9
2016-07-21 17:04:19 -07:00
Bryan Mawhinney
881bc352ee Merge "Add .mov to MediaScanner video file types" into nyc-mr1-dev 2016-07-20 18:58:30 +00:00
Bryan Mawhinney
c9cb80e9e6 Add .mov to MediaScanner video file types
Bug: 16162336
Change-Id: I34467c707494690a9e3e3890f295dd1f7df86c86
2016-07-19 16:01:55 +01:00
Chien-Yu Chen
ca979b9d89 ImageReader: Make close thread safe
Bug: 30191606
Change-Id: Ic5b53c416a7fe3ebcaad2ab78f2e9aef3b790c88
2016-07-18 17:14:27 -07:00
Lajos Molnar
12f860f5a2 Merge "media: document new temporal layering schema values." into nyc-mr1-dev 2016-07-15 05:44:04 +00:00
Lajos Molnar
be00432071 media: clarify MediaFormat.KEY_I_FRAME_INTERVAL
Bug: 30096321
Change-Id: I908b669caf5443fb272a2d274b7cbf7227913b3e
2016-07-15 05:15:24 +00:00
Lajos Molnar
2cfca129d6 media: document new temporal layering schema values.
Also fix doc as these are advertised on the output port.

Bug: 30150921
Bug: 27596987
Change-Id: Ia95876ade36bc82eea0e9795dea0268abbd1c1ef
2016-07-14 19:56:35 -07:00
Lajos Molnar
82d886434d Merge "media: clarify notes in MediaCodec doc" into nyc-mr1-dev 2016-07-15 00:25:30 +00:00
Wei Jia
407fd1ea62 Merge "MediaPlayer: fix typo for OnInfoListener." into nyc-mr1-dev 2016-07-13 22:05:00 +00:00
Jean-Michel Trivi
69c6166684 Merge "Optimize audio playback restriction check" into nyc-mr1-dev 2016-07-13 21:50:59 +00:00
Jean-Michel Trivi
1293c060c8 Optimize audio playback restriction check
Order the playback restriction checks from the most likely
  restriction to the least likely.

Bug 30073948

Change-Id: I6431d15a2ed8b5831f937eab8db940d942082b0e
2016-07-13 19:30:56 +00:00
Eric Laurent
eb8de29269 Merge "Make Dolby TrueHD audio format public" into nyc-mr1-dev 2016-07-13 15:54:04 +00:00
Wei Jia
a03dc2b5eb MediaDataSource: add DrmInitialization for IDataSource.
Bug: 29342399
Bug: 28901867
Change-Id: Ib2049566582aa08783ff588dd25afef4e1c0b5e2
2016-07-13 00:11:36 +00:00
Wei Jia
d973c00b4a MediaPlayer: fix typo for OnInfoListener.
Bug: 30099323
Change-Id: Ic59fe64b4d2b6dcf28d31cb7c480ba6cb7a4cea1
2016-07-12 14:38:50 -07:00
Chris Thornton
4ef887457a SoundTriggerDetector should look at the return code to honour success
The SoundTriggerDetector calls to start/stop recognition should also
check what the return code from the SoundTriggerService are saying -
otherwise it looks like recognition has started when there's been a
problem.

Change-Id: Icd6d2ab5ec30a5ffe66082311a77cca376a37148
2016-07-11 22:03:16 -07:00
Eric Laurent
abda9c33e5 Make Dolby TrueHD audio format public
Bug: 30024357
Change-Id: I4e8e8cde6e6c87c96e07e1828da0fad96c0f9e76
2016-07-11 17:08:14 -07:00
Eric Laurent
b2fe804064 Merge "Add Dolby TrueHD audio format" into nyc-mr1-dev 2016-07-08 23:08:02 +00:00
Jean-Michel Trivi
ee0a01c8a6 Merge \"More javadoc for audio recording activity API\" into nyc-dev
am: 8d5fd92314

Change-Id: If513added909df2135fb57a2f86804edec821177
2016-07-08 19:49:09 +00:00
Jean-Michel Trivi
8d5fd92314 Merge "More javadoc for audio recording activity API" into nyc-dev 2016-07-08 19:36:33 +00:00
Eric Laurent
b4fae5ba39 Add Dolby TrueHD audio format
Format is not public for now.
Unhide at next API bump.

Bug: 30024357
Change-Id: Ic307214d8ac8b7bb57609bf609366968efafd7cc
2016-07-07 18:58:11 -07:00
Eric Laurent
f638978b07 Merge \"SoundPool: fix enforced camera shutter sound\" into nyc-dev
am: a2266f7a0f

Change-Id: Ibb406207b55a532fdb42a68d0787b851deec8d05
2016-07-07 20:49:13 +00:00
Eric Laurent
1913e5acc4 SoundPool: fix enforced camera shutter sound
Make sure that camera shutter sound is played in
total silence DND mode when enforced by country
regulation.

Bug: 29973005
Change-Id: I208f7ae5b07777eac48597f68feae6358999b2c3
2016-07-07 18:47:03 +00:00
Jean-Michel Trivi
7872affa96 More javadoc for audio recording activity API
Better overview of feature inside AudioRecordingConfiguration
 class description.
Addition of @see links in AudioManager query and callback methods.

Bug 27929523

Change-Id: I9159ffd40d68f7c65f59570119821087643f9030
2016-07-06 18:12:01 -07:00
Bryan Mawhinney
5f0c3a5319 Make MediaScanner extract "date taken" from videos, if present
Bug: 29530912
Change-Id: I0f6847a4844e06609cd990e7727edddef4c028fa
2016-06-29 17:59:51 +01:00
Lajos Molnar
024005e5e4 media: clarify notes in MediaCodec doc
Bug: 23709311
Change-Id: I4af683a8f43db29fa5a777832a659a6c43a7a8d1
2016-06-28 15:50:21 -07:00
Lajos Molnar
1fe8871f04 Merge "media: document VP9 CSD for MediaCodec" into nyc-dev 2016-06-28 22:27:53 +00:00
Lajos Molnar
eb6fac8029 Merge \"media: document rotation and scaling issues for MediaCodec\" into nyc-dev
am: af9d9f9b3e

Change-Id: Ie9d890df1b77c8fd79766e5ea329e5f8db4a94eb
2016-06-28 22:26:44 +00:00
Lajos Molnar
af9d9f9b3e Merge "media: document rotation and scaling issues for MediaCodec" into nyc-dev 2016-06-28 22:21:02 +00:00
Lajos Molnar
556e012979 Merge "media: document format keys for MediaExtractor/CodecCapabilities" into nyc-dev 2016-06-28 22:19:30 +00:00
Lajos Molnar
4461356ea8 media: document rotation and scaling issues for MediaCodec
Bug: 23709311
Bug: 28512795
Change-Id: Iddebd13b4cd4c50bca8736d3aca71571ad16633a
2016-06-28 10:38:34 -07:00
Lajos Molnar
db56549ff2 media: document format keys for MediaExtractor/CodecCapabilities
Bug: 29618892
Change-Id: I78049997c153fe00fbcf4475eeefdc937de284dd
2016-06-28 17:20:09 +00:00
Lajos Molnar
671da98e2d media: document VP9 CSD for MediaCodec
Also document that concatenated CSD is only supported for AVC.

Bug: 10672559
Change-Id: I54867655068802ef35f92a6341f8b5bb068555ee
2016-06-28 14:20:31 +00:00
TreeHugger Robot
5059e65fec Merge "media: document format keys for MediaMuxer" into nyc-dev 2016-06-27 16:10:39 +00:00
Lajos Molnar
2c35fd0eba media: document output image crop and layout for MediaCodec
These use hidden, now deprecated MediaFormat keys.

Bug: 14127601
Change-Id: Ib51e4ef41204c9be34ad571300fcb7860feb504e
2016-06-24 17:03:02 -07:00
Lajos Molnar
43a2398258 media: document format keys for MediaExtractor/CodecCapabilities
Bug: 29618892
Change-Id: I78049997c153fe00fbcf4475eeefdc937de284dd
2016-06-24 17:01:26 -07:00
Lajos Molnar
5495adca3a media: document format keys for MediaMuxer
Bug: 19461810
Change-Id: Iee4396aa6f00b3f580c02fa99f0b9291700f5738
2016-06-24 16:56:53 -07:00
Lajos Molnar
231746f67c media: document VP9 CSD for MediaCodec
Also document that concatenated CSD is only supported for AVC.

Bug: 10672559
Change-Id: I54867655068802ef35f92a6341f8b5bb068555ee
2016-06-24 16:46:34 -07:00
Lajos Molnar
b28b99a425 media: update getAchievableFrameRatesFor javadoc
Bug: 28752802
Change-Id: I1c04ae7c3f9f15f84ff185af8d8f3c89958f5595
2016-06-23 18:47:54 +00:00
Eric Laurent
0f0da49fce Fix JAVA doc for AudioRecord and AudioTrack Builder
The default sampling rate chosen for an AudioTrack or AudioRecord
constructed with a Builder not specifying a sampling rate is not
the primary output sampling rate but depends on the device actually
selected.

Bug: 29541155
Change-Id: Ifcab65418b816b7321b6e9542b9e4bb95f748f95
2016-06-21 15:12:31 -07:00
Wei Jia
ce4957eb37 MediaPlayer: fix java doc for setPlaybackParams.
Bug: 29032949
Change-Id: I75a59e2a4c75b5e84e2257f8e386d7b05faf9c1b
2016-06-20 15:57:23 -07:00
Yujie Qin
cad1666867 Report error correctly for the implementation of
StreamInterface::GetData()

Bug: 28889197
Change-Id: Id07755e1b3637f85b6176a59935ad3a5597cfb05
2016-06-16 11:42:41 +02:00
Wei Jia
77e351f81e MediaPlayer: fix java doc for setSurface and setDisplay.
Bug: 29149415
Change-Id: I281b6328c068255387ca01a987ff136c3be5e25b
2016-06-14 10:56:57 -07:00
Jae Seo
22168a7dfc TIF: Set the surface secure
Bug: 29104650
Change-Id: I481bf30c57a7c29faaf1cafe64607c22fe55f707
2016-06-02 15:07:17 -07:00
Lajos Molnar
2fc9c6925a media: fix issues with video profile levels
Support additional corner cases in level ordering:
- MPEG4Level1 only implies support for MPEG4Level0
- HEVC high tier levels are only supported by other high tier levels

H263 unusual level definitions:
- levels 45/50+ define minimum requirements that codecs can extend
- levels 10-45 define minimum size
- restrict to QCIF and CIF only if codecs only supports levels 10-40
  (or 45 in profiles 0 and 2)

MPEG4 max width/height/frame rate:
- Only specified for MPEG4Level0/0b
- Using arbitrary 2:1 aspect ratio and 60fps for other levels
  This is sure to include typical sizes for levels

Fix level limits:
- MPEG2LevelML max 25fps for D1 PAL
- H263Level20 max 30fps, but only 15fps for CIF
- H263Level45 max 15fps
- H263Level45+ min alignment is 4
- MPEG4Level0b max 15fps
- add support for VP9 HDR profiles
- fix HEVC overflow for Level62 calculations

Bug: 28671284
Change-Id: Ie75ae1d19f20d5c6eb40807d03c3b487854eb9a0
2016-06-01 19:08:34 -07:00
Jae Seo
cf7b33426e Merge "Fix documentation for channel types" into nyc-dev 2016-06-02 00:03:53 +00:00
TreeHugger Robot
9061b26f1e Merge "media: avoid NPE in CodecCapabilities.createFromProfileLevel" into nyc-dev 2016-06-01 23:29:49 +00:00
Robert Shih
d579be0cf2 Merge "Fix deadlock when showing subtitles MediaPlayer" into nyc-dev 2016-06-01 17:17:00 +00:00