10684 Commits

Author SHA1 Message Date
Wei Jia
509cbb6385 MediaDataSource: add DrmInitialization for IDataSource.
Bug: 29342399
Bug: 28901867
Change-Id: Ib2049566582aa08783ff588dd25afef4e1c0b5e2
(cherry picked from commit a03dc2b5eb94a906eeeda5bf0afbcfb60588abb4)
2016-07-13 23:24:20 +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
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
Lajos Molnar
1fe8871f04 Merge "media: document VP9 CSD for MediaCodec" into nyc-dev 2016-06-28 22:27:53 +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
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
Jae Seo
750e48738c Fix documentation for channel types
Bug: 28747244
Change-Id: I492bdb94400b298d7f2e0ccf9054761e60c5a548
2016-06-01 08:24:18 -07:00
Lajos Molnar
87436bb67f media: avoid recursion when evaluating profile support
Bug: 28671284
Bug: 29041205
Change-Id: Ia9b3596a122bd5ba554a4b4ede875ebcadc67b67
2016-05-31 16:41:27 -07:00
Robert Shih
ed78114ffd Fix deadlock when showing subtitles MediaPlayer
Move all SubtitleTrack operations to TimeProvider's event handler thread.

Bug: 28784397
Change-Id: Iff848635390e99ffb19add03277a9d62feece4cc
2016-05-27 15:16:47 -07:00
Hang Yin
39aafafa9a Code Patch for camera preview switch tests
This cl will fix the bug: b/28982885. It enables Raw10 Size Array
only when the device support Raw10.

Change-Id: I6a7a9d47708017f71c47fb5bbb15f3e98b555af4
2016-05-27 14:56:14 -07:00
Lajos Molnar
0d8337c314 media: avoid NPE in CodecCapabilities.createFromProfileLevel
Bug: 28980577
Change-Id: Id020ed350e2a16b7772e05bd6a10235481903b40
2016-05-26 11:45:16 -07:00
Phil Burk
d34d06606d Merge "AudioAttributes docs: warn about small buffer size with FLAG_LOW_LATENCY" into nyc-dev 2016-05-26 17:46:08 +00:00
Phil Burk
2050f6cb43 AudioAttributes docs: warn about small buffer size with FLAG_LOW_LATENCY
Explain buffer size optimization.

This CL has no code changes, just documentation changes.

Bug: 28802853
Change-Id: I91942f00a3e9691e4fc05b24656b8bf4cb538bc2
Signed-off-by: Phil Burk <philburk@google.com>
2016-05-26 10:34:50 -07:00
Lajos Molnar
0581ee4971 media: check profile, level and bitrate for isFormatSupported
Bug: 28671284
Change-Id: I90639816a7410cf65bcd1c5549c3830ca43b8140
2016-05-25 07:44:15 -07:00
Hang Yin
581387a4ae Merge "Created 4 camera preview stress test cases." into nyc-dev 2016-05-25 03:14:02 +00:00
Jean-Michel Trivi
3a91a8417a Merge "Remove deprecated AudioManager.AudioRecordingCallback method" into nyc-dev 2016-05-24 21:17:49 +00:00
Jean-Michel Trivi
602dc777c5 Remove deprecated AudioManager.AudioRecordingCallback method
Remove AudioRecordingCallback.onRecordingConfigChanged(
         AudioRecordingConfiguration[] configs)

Bug 28819230

Change-Id: I3b85bb9313267499ac407099939b5889bdba996b
2016-05-24 12:11:59 -07:00
Lajos Molnar
6c2e08083a media: unhide codec levels
Bug: 28930361
Change-Id: Ic9c55389c75ef0b789722aa0a7bddd5f56b15049
2016-05-24 10:24:47 -07:00
Eric Laurent
b143e3de34 Merge "Fix AudioTrack and AudioRecord documentation" into nyc-dev 2016-05-24 17:15:11 +00:00
Lajos Molnar
2a4001ee62 media: add missing levels in CodecProfileLevel and fix limits
Bug: 28671284
Change-Id: Ie4a91f5639ce8f1c5ac825ec829ac82e695d18b5
2016-05-24 07:43:51 -07:00
Eric Laurent
219de73da2 Fix AudioTrack and AudioRecord documentation
Improve documentation for error codes returned by
AudioTrack.write() and AudioRecord.read() methods.
Fix native to JAVA error code conversion in JNI.

Bug: 28906466

Change-Id: I4d48b1d428834b7a39a14e2d81b6c164696817a8
2016-05-23 17:36:43 -07:00
Hang Yin
3ed27cc2b2 Created 4 camera preview stress test cases.
The 4 stress test cases cover situations of preview switch between
front/back camera and between photo/video mode. Followed Google
Camera App Kenai version streaming rules to set preview request in
the tests.

b/28916141 will be solved once this change is merged

Change-Id: I448be429df5b0813fa2e2f6ff05ad2936afee1b3
2016-05-23 17:29:28 -07:00
Jean-Michel Trivi
f04fab160a Recording activity notification: return list of configuration
Use a list of configurations instead of an array

Bug 28819230

Change-Id: Ia4a3cdabf8337cfb98abe4d0055d497bcab8a5ee
2016-05-23 09:44:58 -07:00
Jae Seo
bd6c16908d MediaBrowserService: Add more explanation on getBrowserRootHints()
Bug: 28840985
Change-Id: If4dbcaaa23093b2e6d5ab6158db67b1248464fb8
2016-05-19 14:17:27 -07:00
Wei Jia
c4e8471ba4 Merge "android_media_MediaSync: Do not pass NULL to AString ctor." into nyc-dev 2016-05-17 21:17:37 +00:00
Jae Seo
18c0cfb075 TIF: Throw a more appropriate runtime exception when building TvInputInfo
Bug: 28775591
Change-Id: I934c8d7fed3dda356cdc3bafe51a79f585918ed0
2016-05-17 10:06:36 -07:00
Wei Jia
838a4ed101 android_media_MediaSync: Do not pass NULL to AString ctor.
Bug: 28643582
Change-Id: I75eaf61007adffdd7e3b07aebb37c12a8e71cf75
2016-05-16 17:40:02 -07:00
Jae Seo
a2a03aa026 TIF: Remove the uniqueness check for track ID from notifyTracksChanged
Requiring uniqueness of ID across all track types seems a little too
much demand for developers and they do want to use the same ID on
different track types. Also, this doesn't seem terribly useful.
Hence remove the check.

Bug: 28436618
Change-Id: I9040310c5ce31bcff522021d83f7508506cbd9d3
2016-05-11 14:32:08 -07:00
Jean-Michel Trivi
0316ed0766 Merge "Fix javadoc missing possible return value in AudioRecordingConfiguration" into nyc-dev 2016-05-11 00:07:47 +00:00
TreeHugger Robot
281d96e238 Merge "TIF: Fix comments for program start/end times" into nyc-dev 2016-05-10 23:36:43 +00:00
Jae Seo
0129c03357 TIF: Fix comments for program start/end times
Bug: 28681747
Change-Id: I28a7359121ca1740c043806e1532ce922c753cbc
2016-05-10 15:17:08 -07:00
TreeHugger Robot
a7ad6e912f Merge "ExifInterface: Set mPosition in AssetStream with proper values" into nyc-dev 2016-05-10 22:06:41 +00:00
TreeHugger Robot
cea42f6353 Merge "TIF: Handle possible memory leaks" into nyc-dev 2016-05-10 01:23:36 +00:00