Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
257,328 Commits 3 Branches 0 Tags
05ab7a37a4b67f7e620f5cc349c256a03f1dbb5d
Commit Graph

51 Commits

Author SHA1 Message Date
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
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
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
0581ee4971 media: check profile, level and bitrate for isFormatSupported 
Bug: 28671284
Change-Id: I90639816a7410cf65bcd1c5549c3830ca43b8140
 2016-05-25 07:44:15 -07:00
Lajos Molnar
7a5a93b776 media: document MediaFormat.KEY_FRAME_RATE better 
Bug: 27126548
Change-Id: I7e6a70bd192623d335816c1aa135448b7846aa92
 2016-04-08 23:44:05 +00:00
Hangyu Kuang
5cbd0b84ac stagefright: Document that encoders are free to use available tools 
associated with the speficifed profile.

Bug:27597166
Change-Id: I1437d29c49ddad4779c82baf76c81a0286fa93c8
 2016-03-14 22:27:13 +00:00
Lajos Molnar
b12d49bb1e media: add MediaFormat.COLOR_ IntDefs 
Bug: 27383733
Change-Id: Idb50af5e700e979254b6533b62687555e14c5226
 2016-03-08 20:38:10 -08:00
Lajos Molnar
ac76fa3581 media: expose MediaFormat.KEY_HDR_STATIC_INFO key 
Bug: 25684127
Change-Id: I6c48f8ed11a23e5d47210d15be4f759bd93ba1da
 2016-03-08 20:38:10 -08:00
Lajos Molnar
6ef0ac3278 media: Add track ID format key 
Bug: 25684127
Change-Id: I574515c3c144f5cabe4f40d934d062de1dd20851
 2016-03-03 16:12:52 +00:00
Lajos Molnar
514a3fb7a6 media: expose audio sample format in MediaFormat 
Bug: 27172163
Change-Id: I0ae4c0299839612893bb8a43e7016e49487e1a51
 2016-02-17 18:52:36 -08:00
Lajos Molnar
6d9ef6419a media: expose media format keys for color characteristics 
Bug:  25684127
Change-Id: Ib4aa7487d1bca27eff5f31cd736e935f5bb7e8f0
 2016-01-27 14:39:09 -08:00
Hangyu Kuang
8e498db77a Merge "media: Add interface to query and set intra refresh for encoder." 2016-01-27 18:06:25 +00:00
Hangyu Kuang
e9618e810a media: Add interface to query and set intra refresh for encoder. 
Bug:26587630
Change-Id: I913a56b4888e2c46ad30ba0e9c3130da7101f7a4
 2016-01-27 16:37:04 +00:00
Ronghua Wu
005cb41630 media: Add MIMETYPE_VIDEO_DOLBY_VISION. 
Bug: 25684127
Change-Id: I0ff5e395904aded3e5fe1f731d167668e17ff757
 2016-01-11 11:22:56 -08:00
Ronghua Wu
5755817422 Revert "media: Add MIMETYPE_VIDEO_DOLBY_AVC and MIMETYPE_VIDEO_DOLBY_HEVC." 
This reverts commit 58a30f1cf6.

Change-Id: I067892ea5a70f366ef20c45781616715705f4ec4
 2016-01-08 09:45:17 -08:00
Ronghua Wu
58a30f1cf6 media: Add MIMETYPE_VIDEO_DOLBY_AVC and MIMETYPE_VIDEO_DOLBY_HEVC. 
Bug: 25684127
Change-Id: I535b1971e0fe6b19e5182b09ca04b69b337a8474
 2015-12-10 12:36:14 -08:00
Chong Zhang
52c58bb699 MediaCodec: unhide mime type for EAC3 
bug: 18723951
Change-Id: I8c77be6ede428e92b089b19b2bd627992466a591
 2015-05-27 14:07:29 -07:00
Lajos Molnar
931ae62f29 media: unhide and document already used fields 
Bug: 18134807
Bug: 19300915
Bug: 11990564
Change-Id: Iaeab4a5359b946c4b1aeef6083d10045079b9720
 2015-04-23 19:39:57 -07:00
Ronghua Wu
3392ce4a04 media: add MediaFormat.KEY_OPERATING_RATE. 
Bug: 19620911
Change-Id: I5c742adaac2175fbbc06821ba0a516c72cc4f3f7
 2015-04-07 13:38:31 -07:00
Andreas Gampe
6ec9fd8b3b am c3228a9d: am 3d33314e: Merge "Frameworks/base: Use equals for Integer comparison" 
* commit 'c3228a9d400bcacd15fbbdf136ee1f9cf56de2d0':
  Frameworks/base: Use equals for Integer comparison
 2015-03-16 20:26:32 +00:00
Andreas Gampe
5c5978985a Frameworks/base: Use equals for Integer comparison 
Integer == is dangerous, as equal objects may not be identical
objects. In fact, MediaFormat.setInteger was creating a new object
every time.

Change MediaFormat.setInteger and setLong to use valueOf, which
may reuse returned objects.

Change-Id: Iedcc6003adbf05c0c870aa4b3ada7f181a5b870e
 2015-03-15 15:45:15 -07:00
Ronghua Wu
c33958833f media: add MediaFormat.KEY_PRIORITY. 
Change-Id: I82e2adb3dfac90952a11e2253fe06a2d9be1bc09
 2015-03-14 01:21:42 +00:00
Rachad
6564f5be74 MediaCodec: Added E-AC3 mime type (@hide). 
Bug: 17883772
Change-Id: I48b2ab64812d860bb1a01d0a14e10690b86c4519
 2014-12-23 16:12:44 -08:00
Ryan Lothian
1e88cf0796 Fix broken @see javadoc in android.media.* classes 
This CL fixes all android.media.* javadoc that includes an "ERROR(...)"
message when rendered to HTML.

Bug: 18537403
Change-Id: Ic60f7cfe4cf4961da163d955387d65a5d2011905
(cherry picked from commit d550f9028e)
 2014-11-26 18:49:01 +00:00
Lajos Molnar
217474682a media: update MediaCodec/Info/List/Format APIs based on review comments 
Bug: 17059255
Change-Id: Ifbba2a0799e7db5ae48190ba6b1e4ba13fffa167
 2014-08-27 14:40:02 -07:00
Rachad
73fc533b2e Added Tunneled video playback support to MediaCodec 
Bug:16132368
Change-Id: I8c28cd9fbf3ca2d441f5ffa6892fbc5f70184908
 2014-08-09 01:29:43 +00:00
Robert Shih
3cdf7c5b62 MediaPlayer: support external timed text in java 
Bug: 16385674
Change-Id: I7c2bf7a7d88c8396c3e228e3cf500998a3fa9db8
 2014-07-29 14:00:13 -07:00
Zhijun He
86c545ea8c MediaFormat: add capture rate key 
Change-Id: I2f7dd244d41d52aab6a172ae5df3e1fce3edd694
 2014-07-25 00:52:42 +00:00
Lajos Molnar
4b902d72db MediaFormat: add KEY_TEMPORAL_LAYERING 
Bug: 14562236
Change-Id: I343d2859e48552d7372fec3b77aea868ff1bfc33
 2014-07-22 20:36:05 -07:00
Alan Viverette
bfe76f4547 Fix docs build error in MediaFormat 
Change-Id: I5faf72efa1a792f9a500eb4abc76d4e4cda5516d
 2014-07-21 19:37:17 -07:00
Jean-Michel Trivi
a8a3f55865 New MediaFormat keys for AAC 
Decoder:
    KEY_AAC_DRC_ATTENUATION_FACTOR
    KEY_AAC_DRC_BOOST_FACTOR
    KEY_AAC_DRC_HEAVY_COMPRESSION
    KEY_AAC_DRC_TARGET_REFERENCE_LEVEL
    KEY_AAC_ENCODED_TARGET_LEVEL
    KEY_AAC_MAX_OUTPUT_CHANNEL_COUNT
Encoder:
    KEY_AAC_SBR_MODE

Change-Id: I69abe01add135875446914134d93a58815992e07
 2014-07-21 16:47:34 -07:00
Lajos Molnar
b58dc31322 Extend MediaCodecInfo to describe usable codec limits and features 
Bug: 11990470
Bug: 12065651
Bug: 16131974
Change-Id: I841b8507e823f1ddf14754e34029a9bed4f402d8
 2014-07-19 02:14:00 -07:00
Lajos Molnar
b84624571b Merge "Misc. media API changes" into klp-dev 2013-09-18 17:20:08 +00:00
Lajos Molnar
8a39021dfa Misc. media API changes 
- MediaCodec.setParameter signature to take android.os.Bundle
- PARAMETER_KEY_VIDEO_BITRATE value
- comments for MediaFormat.KEY_LANGUAGE and createSubtitleFormat

Change-Id: I092e9830cb21df08b331854cbd28c758db06bc10
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 10461617
 2013-09-17 19:05:37 -07:00
Lajos Molnar
d486f9656a Add CaptioningManager listener Subtitle support. 
Update default track selection based on settings change.
Implement HLS track selection scheme.
This requires synchronization for subtitletrack and controller.

Change-Id: I8295956d264ab2016a83957ace37d9d7b1acde4c
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 10326117
 2013-09-17 10:09:18 -07:00
Lajos Molnar
24390c11b2 MediaFormat: add getInteger with default value convenience method 
Change-Id: I58947a2f4a286fef74f74cb189469278056d4759
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 10326117
 2013-09-12 15:35:31 -07:00
Lajos Molnar
03cd51cd17 Merge "MediaFormat.java: Add KEY_MAX_WIDTH and KEY_MAX_HEIGHT" into klp-dev 2013-09-12 00:19:17 +00:00
Chong Zhang
f8ca13b7a0 Pass subtitle track properties to SubtitleController 
Bug: 10326117
Change-Id: I387406adf3e1bd835b031dd5fbd2e1cdeaf2fe87
 2013-09-11 15:02:47 -07:00
Lajos Molnar
9a4575c314 MediaFormat.java: Add KEY_MAX_WIDTH and KEY_MAX_HEIGHT 
KEY_MAX_WIDTH and KEY_MAX_HEIGHT are optional video decoder
format keys.  Specify both to request seamless resolution-
change support from video decoders that support this feature.
You can check this via CodecCapabilities.isFeatureSupported.

The codecs use the MAX_WIDTH/HEIGHT values as hints for the
range of resolutions that needs to be supported.  Note,
however, that some codecs may require more memory just by
_preparing_ for larger maximum resolutions, whether or not
that resolution is actually used.

Change-Id: I00fe986ef894fec4bb39bceed081da0e88725d59
Signed-off-by: Lajos Molnar <lajos@google.com>
Related-to-bug: 7093648
 2013-09-06 11:13:33 -07:00
Andreas Huber
e79ba15453 Merge "Expose KEY_REPEAT_PREVIOUS_FRAME_AFTER and KEY_PUSH_BLANK_BUFFERS_ON_STOP" into klp-dev 2013-08-19 15:39:29 +00:00
Lajos Molnar
dc775c66bf MediaFormat: added subtitle format 
Added KEY_LANGUAGE that for now only refers to subtitles.
Added createSubtitleFormat() method to create base format.

Signed-off-by: Lajos Molnar <lajos@google.com>
Change-Id: I344c36a3fd0d88c285cdebf3f67e549553b37a8e
Bug: 10326117
 2013-08-15 11:43:02 -07:00
Andreas Huber
8f4d43c3c4 Expose KEY_REPEAT_PREVIOUS_FRAME_AFTER and KEY_PUSH_BLANK_BUFFERS_ON_STOP 
MediaFormat keys.

Change-Id: I37ec076f0b1f0aea9a460c9dc1751f1160860df9
 2013-08-14 10:42:47 -07:00
Marco Nelissen
f38b528701 Merge "MediaFormat: Explain that KEY_COLOR_FORMAT is used with decoders as well" 2013-07-30 17:11:55 +00:00
Martin Storsjo
816af56eac MediaFormat: Fix the documentation link to the AAC profile constants 
Change-Id: If1780436baa2884cea05ccd8ab74745af790eb17
 2013-07-25 12:53:46 +03:00
Martin Storsjo
158754b1bf MediaFormat: Explain that KEY_COLOR_FORMAT is used with decoders as well 
If reading the decoded pixel data (instead of letting the system
render it), this is critical for interpreting the data correctly.

The video MediaCodec CTS tests use this MediaFormat key in this
way as well.

Therefore, make sure the documentation reflects the actual use of
this field - claiming that it is encoder-only is misleading.

Change-Id: I9bfd295a95dd3e7d1fa3189886fd243b07bb82cc
 2013-07-25 10:52:54 +03:00
Andreas Huber
08067d376e Make it clear that non-optional MediaFormat keys are required 
Also mark KEY_CHANNEL_MASK optional.

Change-Id: I569087f564dc60a89b15a3440a9b1c538927f610
 2012-12-05 11:12:26 -08:00
Andreas Huber
99a86d0633 Clarify that MediaFormat.KEY_IS_ADTS only applies to decoding AAC audio content 
and cannot be used to configure the _encoder_ to emit ADTS content.

Change-Id: I47177099b204027b726b2c7ec9b93be6835d88f6
related-to-bug: 7542186
 2012-11-14 09:16:59 -08:00
Jean-Michel Trivi
08fb063f07 Add compression level key for FLAC encoding 
Change-Id: Ic4c32694841b6f37ca44061d14bb81fc267696cc
 2012-05-09 19:16:14 -07:00