Commit Graph

4992 Commits

Author SHA1 Message Date
Eric Laurent
4b09c6bc9e Merge \"Add Dolby TrueHD audio format\" into nyc-mr1-dev
am: b2fe804064

Change-Id: I2eba2e118c6ce34299ffe894d2c6e6ef9140fa24
2016-07-08 23:13:13 +00: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
7cd1622ca3 Merge \\"More javadoc for audio recording activity API\\" into nyc-dev am: 8d5fd92314
am: a90df50109

Change-Id: I256b03cae0e76b7a5c61a691c9359a091f1f666a
2016-07-08 19:55:08 +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
a90df50109 Merge \"More javadoc for audio recording activity API\" into nyc-dev
am: 8d5fd92314

Change-Id: I58f991a41a6d17ca8e854109dad6ab41b14bc65a
2016-07-08 19:45:54 +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
be50351b72 Merge \\"SoundPool: fix enforced camera shutter sound\\" into nyc-dev am: a2266f7a0f
am: a165d12737

Change-Id: I8e79a3f627ec38c736decdca2c88b56a4f5b5452
2016-07-07 20:57:54 +00: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
a165d12737 Merge \"SoundPool: fix enforced camera shutter sound\" into nyc-dev
am: a2266f7a0f

Change-Id: I6ae2457bd8bd9f53b35373fb1be7eb66f80f1510
2016-07-07 20:46:20 +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
Bryan Mawhinney
1cba847a71 Merge \"Make MediaScanner extract \"date taken\" from videos, if present\" into nyc-mr1-dev
am: d63dbfdb6b

Change-Id: I5ea0eafbc2e122f2756098ac98b50c03fe773be5
2016-07-07 09:28: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
818f7c8c1a Merge \"media: document VP9 CSD for MediaCodec\" into nyc-dev
am: 1fe8871f04

Change-Id: I20c207b5bc735221eaf8982759d00b7a2a89a983
2016-06-28 22:32:07 +00:00
Lajos Molnar
3cdb912b8a Merge \\"media: document rotation and scaling issues for MediaCodec\\" into nyc-dev am: af9d9f9b3e
am: 2d9139410f

Change-Id: I7f46ee8cf0cc5c16b235186c30bb72db8005fa6a
2016-06-28 22:31:55 +00:00
Lajos Molnar
1fe8871f04 Merge "media: document VP9 CSD for MediaCodec" into nyc-dev 2016-06-28 22:27:53 +00:00
Lajos Molnar
2d9139410f Merge \"media: document rotation and scaling issues for MediaCodec\" into nyc-dev
am: af9d9f9b3e

Change-Id: I9a34f84efbc54d49ecc90c1e095be643d26876d3
2016-06-28 22:27:05 +00:00
Lajos Molnar
29522123db Merge \"media: document format keys for MediaExtractor/CodecCapabilities\" into nyc-dev
am: 556e012979

Change-Id: I259b49699bf3e606da8e40aba85288b5a41fe31f
2016-06-28 22:26:58 +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
b353834077 Merge \"media: document format keys for MediaExtractor/CodecCapabilities\" into nyc-mr1-dev
am: 41f0e20739

Change-Id: I482ec13bc3cdf1d7b1a485c2c7baee5131102c56
2016-06-28 19:01:57 +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
c8fea44e5e Merge \"media: document VP9 CSD for MediaCodec\" into nyc-mr1-dev
am: 5b2fd818a0

Change-Id: Id7ed6f9342601ee8f67ff28f37c9b38b96e9c084
2016-06-28 16:02:13 +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
Lajos Molnar
3e81ab2c73 Merge \"media: document format keys for MediaMuxer\" into nyc-dev
am: 5059e65fec

Change-Id: I69c5b31fda557ea8d9ca0540f3878f566ada9b56
2016-06-27 16:16:41 +00:00
Lajos Molnar
69484dcd8a Merge \"media: document output image crop and layout for MediaCodec\" into nyc-dev
am: 939484b8ab

Change-Id: Iee0b8c9d07ac7847248e18f23fc26c5d8939f5bb
2016-06-27 16:16:37 +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
a4b5454f73 Merge \"media: update getAchievableFrameRatesFor javadoc\" into nyc-dev
am: 8fe82686ef

Change-Id: I7eac5a104c11d6176d0b8c5469e9a35b36e5cdc4
2016-06-23 21:33:51 +00:00
Lajos Molnar
b28b99a425 media: update getAchievableFrameRatesFor javadoc
Bug: 28752802
Change-Id: I1c04ae7c3f9f15f84ff185af8d8f3c89958f5595
2016-06-23 18:47:54 +00:00
Eric Laurent
4b44c63852 Merge \"Fix JAVA doc for AudioRecord and AudioTrack Builder\" into nyc-dev
am: 34ed8ad3c2

Change-Id: I1de0df33e6e8f8a453d9c94302d16722d2a0a4a6
2016-06-22 01:17:42 +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
2beba073d1 Merge \"MediaPlayer: fix java doc for setPlaybackParams.\" into nyc-dev
am: bd45be5032

Change-Id: I1b3604fe84dacf3febf324de154cad00fcd688b8
2016-06-20 23:03:20 +00:00
Wei Jia
ce4957eb37 MediaPlayer: fix java doc for setPlaybackParams.
Bug: 29032949
Change-Id: I75a59e2a4c75b5e84e2257f8e386d7b05faf9c1b
2016-06-20 15:57:23 -07:00
Wei Jia
6a58862af8 Merge \"MediaPlayer: fix java doc for setSurface and setDisplay.\" into nyc-dev
am: c6f39a0c36

Change-Id: I1c6dea8e60e96804c9d7564b367c21b146728072
2016-06-14 18:58:55 +00: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
711ae66a4b Merge "TIF: Set the surface secure" into nyc-dev
am: 9675f16bba

* commit '9675f16bba6837840038aea92e9db5893cecd33e':
  TIF: Set the surface secure

Change-Id: Ic70459cd294453907ce573c55ca0f16868177789
2016-06-06 20:01:14 +00:00
Jae Seo
22168a7dfc TIF: Set the surface secure
Bug: 29104650
Change-Id: I481bf30c57a7c29faaf1cafe64607c22fe55f707
2016-06-02 15:07:17 -07:00
Lajos Molnar
49f982ec7b media: fix issues with video profile levels
am: 2fc9c6925a

* commit '2fc9c6925a51b18452e8080d5ac2d50babd0c866':
  media: fix issues with video profile levels

Change-Id: Id691f951f7b27aded9d2e9d996cd01ebc172d7cf
2016-06-02 03:57:49 +00: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
e96afc7bc2 Merge "Fix documentation for channel types" into nyc-dev
am: cf7b33426e

* commit 'cf7b33426e6db0abab94895c3c89c76869f0a8c6':
  Fix documentation for channel types

Change-Id: I4d70f850761d639d4f9ceeff1fe3d33483267415
2016-06-02 00:10:33 +00:00
Jae Seo
cf7b33426e Merge "Fix documentation for channel types" into nyc-dev 2016-06-02 00:03:53 +00:00
Lajos Molnar
12273862c3 Merge "media: avoid NPE in CodecCapabilities.createFromProfileLevel" into nyc-dev
am: 9061b26f1e

* commit '9061b26f1ecba936f6f912398a9238c21dfa789c':
  media: avoid NPE in CodecCapabilities.createFromProfileLevel

Change-Id: I3cd969d6e686714cd7d9fa49eec70e9d810df36b
2016-06-01 23:44:12 +00:00
TreeHugger Robot
9061b26f1e Merge "media: avoid NPE in CodecCapabilities.createFromProfileLevel" into nyc-dev 2016-06-01 23:29:49 +00:00