Commit Graph

91 Commits

Author SHA1 Message Date
Dichen Zhang
c69b5192a3 Update MediaFormat java doc
Add KEY_DURATION.

Change-Id: I9019e7969262bf83652e0c041130cabf2fcf6d0b
Bug: 142823918
2020-01-27 17:59:09 +00:00
Santiago Seifert
418cd1d7f4 Add KEY_CODECS_STRING to MediaFormat
KEY_CODECS_STRING is associated to the codec string of a track.

Bug: 132153067
Bug: 134057371
Test: Pending.
Change-Id: I502f11523d2fe6bc78be7382eaaa91d7234d1db0
2020-01-24 14:41:04 +00:00
Henry Fang
6cc8da9138 Add Media Format key for Tuner
Test: manual
bug: 133525759
Change-Id: I083fa5f210b02c56299ef4625491a157131e897e
2020-01-22 10:46:27 -08:00
Jean-Michel Trivi
531731c703 MediaFormat: keys for AAC DRC album mode & output loudness
Bug: 144351156
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: Ib228eff0457e959e0973c7037e8c4bedf90ca480
2020-01-20 15:28:58 -08:00
Artur Satayev
53fe96661b Use new UnsupportedAppUsage annotation.
Existing annotations in libcore/ and frameworks/ will deleted after the migration. This also means that any java library that compiles @UnsupportedAppUsage requires a direct dependency on "unsupportedappusage" java_library.

Bug: 145132366
Test: m && diff unsupportedappusage_index.csv
Change-Id: I4bc8c9482e4bb1af21363f951affff7ee3fefeab
2019-12-18 15:42:06 +00:00
Santiago Seifert
c294a4720c Add pixel aspect ratio information to MediaFormat
Bug: 132153067
Bug: 134057371
Test: Not applicable.
Change-Id: I6369640e2b49350ef368c25820197281f3c30ae5
2019-12-11 11:27:46 +00:00
Santiago Seifert
8095a83b37 MediaFormat: Add ENCODER_DELAY and ENCODER_PADDING
Note that these two already exist in NdkMediaFormat.

Bug: 132153067
Bug: 134057371
Test: Not applicable.
Change-Id: I602bd16e3cda302e538097a9a2ba3487f34fa0f9
2019-12-10 11:32:46 +00:00
Wei Jia
3ff88e38e4 CodecCapabilities: add low latency decoding feature
Test: cts
Bug: 134971304
Change-Id: I73bec6db8b22c03edcb3aa415c6124cfa2b461cf
2019-10-10 09:41:54 -07:00
Wonsik Kim
b06132ad90 media: fix documentation for MediaFormat.KEY_PREPEND_HEADERS_TO_SYNC_FRAMES
Bug: 32746212
Test: builds
Change-Id: I38ecfa879091bc4016fbae04eab77ed6fd9eb1c1
2019-04-04 12:54:59 -07:00
Wonsik Kim
d18e1f34fe media: rename KEY_MAX_BFRAMES to KEY_MAX_B_FRAMES
Rename it to be consistent with use of I_FRAME.

Bug: 129344870
Test: builds
Change-Id: I816439074837452cdbd9ed2a734ea237517ad26f
2019-03-27 08:49:58 -07:00
TreeHugger Robot
1930893edc Merge changes from topic "APIForQueryingHapticsExist"
* changes:
  Add API in RingtoneManager to query if files contain haptic channels.
  Add key for haptic channel count.
2019-03-21 23:33:25 +00:00
Wonsik Kim
33b6db9d76 Merge "media: add MediaFormat.KEY_PREPEND_HEADERS_TO_SYNC_FRAMES" 2019-03-21 16:29:26 +00:00
jiabin
6977b32397 Add key for haptic channel count.
Test: test with files (not) containing haptic channels.
Bug: 128012181
Change-Id: I02438c2b49a2adc7c1643405209877c3747a5558
2019-03-20 15:50:59 -07:00
Wonsik Kim
0d5a4801f4 media: add MediaFormat.KEY_PREPEND_HEADERS_TO_SYNC_FRAMES
Bug: 32746212
Test: atest CtsMediaTestCases:MediaCodecCapabilitiesTest#testPrependHeadersToSyncFrames
Change-Id: I4f99a27f28c897c1259d1bd52ef62a81017587f1
2019-03-19 22:46:15 -07:00
Wonsik Kim
d28eaf750e MediaFormat: add a key for B frames
Bug: 127315857
Test: builds
Change-Id: I680712fd11515579c56dd17173c28faa545a7ad3
2019-03-19 22:34:38 -07:00
Lajos Molnar
8a46826958 media: fix MediaFormat copy constructor
Bug: 124075529
Change-Id: I29a48531f91dd8631833fdf19ee71dacd2ab62ac
2019-02-07 16:33:24 -08:00
Chong Zhang
625f0aad9f Make KEY_MAX_PTS_GAP_TO_ENCODER and KEY_MAX_FPS_TO_ENCODER keys public
These keys are already used by apps, and we need to
add test to ensure they're not broken.

bug: 80314065
Change-Id: I2f423fd8d5462caf4138f660d452e61b0ab34d66
2019-02-05 15:18:55 -08:00
Chong Zhang
bb609f8319 Expose a few keys that's already used by apps
bug: 80314065
Change-Id: Ia9369decb8c454fe091fca77f8996e1400c14790
2019-02-04 11:14:07 -08:00
Lajos Molnar
49beba10cf media: Add new AVC levels and AV1 media type string
Also remove OMX references for the current constants.

Bug: 122971163
Bug: 111936705
Change-Id: I604ecdeedd5408016fe7c69b763ffbc040ecffd2
2019-01-16 17:29:35 -08:00
TreeHugger Robot
45dbe4ed82 Merge "Add eac3-joc MIME type" 2018-12-11 10:29:05 +00:00
Chong Zhang
6e4fa27afd Add MediaCodec constants for HDR10+
bug: 118507186

Change-Id: I742b93ba4475fb82b7a9f9aaf237f43cfa66a915
2018-12-06 10:42:24 -08:00
Yanning Bai
cdf22ef7cb Add eac3-joc MIME type
Bug: 120549104
Test: make
Change-Id: I443af3f50cb3f2a00ccce1bb8f222f63b1522cb8
2018-12-05 10:28:49 -08:00
Jakub Pawlowski
15a81d7f78 JavaDoc fix
Test: make offline-sdk-docs
Change-Id: I0ae64b0b7c2d46d6b196ae98beecd4cf4e910db2
2018-12-05 13:47:29 +00:00
Jakub Pawlowski
b0b3a64a37 Java doc fix: @throw -> @throws
Test: compile javadoc
Change-Id: I243b824d0573470455d297c6d45a14e1b503e8ff
2018-12-05 10:58:28 +01:00
Lajos Molnar
ad9814849a MediaFormat: add more getters, setters as well as iterators
Add getters with default value.
Add numeric getters for arbitrary numeric format.
Add ability to enumerate and remove keys and feature keys.
Add copy constructor.
Add nullable annotations.

Bug: 112369509
Change-Id: Ifcb4ab7c4b3599aae5f6bf49001e9e8bb24b0a33
2018-11-30 13:32:00 -08:00
ybai
14d2d59f1c Add MIMETYPE_AUDIO_AC4 support in MediaFormat
Add support for MIMETYPE_AUDIO_AC4 in MediaCodecInfo

Bug: 119312182
Test: make offline-sdk-docs

Change-Id: Ia6fc708886e2198bead31ac04c04a679456a3527
2018-11-26 10:00:20 -08:00
Chong Zhang
2773f71aef Retrieve CA_Descriptor private data for scrambled stream
bug: 119039060

Change-Id: I0ba15936059b1b1a7dcf373ac155ae13e0904ddc
2018-11-12 13:38:16 -08:00
Mathew Inwood
31a792ac29 Add @UnsupportedAppUsage annotations
For packages:
  android.media.tv
  android.media.soundtrigger
  android.media.session
  android.media.projection
  android.media.midi
  android.media.effect.effects
  android.media.effect
  android.media.browse
  android.media.audiopolicy
  android.media.audiofx
  android.media

This is an automatically generated CL. See go/UnsupportedAppUsage
for more details.

Exempted-From-Owner-Approval: Mechanical changes to the codebase
which have been approved by Android API council and announced on
android-eng@

Bug: 110868826
Test: m
Change-Id: I3bd40136d7fc948f66eca6b2d139c15e39c5a248
2018-08-17 08:54:26 +01:00
Chong Zhang
55135d5d5f Fix broken javadoc link in MediaFormat
bug: 74979696
Change-Id: I83965f3d1d395cb0953da9605b27861a1d84cde7
2018-07-09 11:39:35 -07:00
Jean-Michel Trivi
5cf2899ccd MediaFormat: fix javadoc for AAC-related keys
Bug: 71430241
Test: make offline-sdk-docs
Change-Id: Id0d6439e0ff35af0a34d0c51cdcdafa8822fd5a9
2018-05-17 15:26:28 -07:00
Jean-Michel Trivi
aabf284cbb MediaPlayer subtitle data / time discontinuity interfaces
Expose in SDK the interfaces necessary to implement unbundled
  subtitle support, which requires:
  - exposing an interface to receive the encoded subtitle data
  - exposing an interface while allows a renderer to synchronize
    its rendering clock with the media time of the player.
Deprecate duplicated timed text constant, all timed text / sub
  mime types are defined in MediaFormat.

Bug: 76121592
Test: make offline-sdk-docs
Change-Id: I42cc1d69069babb69a2feeba3f54da89889f4602
2018-03-28 11:35:14 -07:00
Chong Zhang
6c8512978a heif: address api review comments
- renaming of MediaFormat keys related to grid config

- add methods to MediaMetadataRetriever to get image/frame
  with default bitmap config

- fix java doc

bug: 74831433

Change-Id: Iec607e615d34bea0620070592e4adcfc04cbccae
2018-03-15 15:05:29 -07:00
Jean-Michel Trivi
bba1e9f24d MediaFormat: declare key for AAC decoder DRC effect type
Bug: 71430241
Test: CTS AAC decoder test

Change-Id: I077bdccf2b3ce935feaa6f14c75640d2f20affb7
2018-02-16 21:04:48 -08:00
Chong Zhang
8883329936 MediaCodec: expose constant quality mode
Also fix a bug where the supported bitcontrol mode
bitmask is wrong.

bug: 63633199
Change-Id: Ib2c21b0d846bcc31f61027d875f801a2282c1101
2018-01-24 15:10:03 -08:00
Hangyu Kuang
786828b623 mediaformat: Expose frame reordering to application.
Bug: 68114820
Test: None
Change-Id: I7cf4a9843c705657215bec7b7acdd119f54503b4
2018-01-03 13:42:17 -08:00
Chong Zhang
e70785fac6 heif: add muxer support for heic tracks
bug: 63633199

Change-Id: I367b29ae86be4e7d365fbfb66ca1cc463eb77571
2017-11-21 15:27:44 -08:00
Chong Zhang
4342f08fab heif: support heif image sequence and dual-function files
- Add a few methods to MediaMetadataRetriever to get still
  images and frames by index.

- Declare keys in MediaFormat related to heif still images.

bug: 63633199

test:
cts-tradefed run cts-dev --module CtsMediaTestCases --compatibility:module-arg CtsMediaTestCases:include-annotation:android.platform.test.annotations.RequiresDevice

Change-Id: I9556b27f7395a163aadd01e979930061878994d0
2017-10-30 19:59:43 +00:00
Chong Zhang
addc39ec27 MediaCas: address comments for API reviews
- Wrap session id byte array in Session object

- Move session operations from MediaCas to Session

- Remove position prarameters on descramble() method

- Retrieve cas info for a track by getCasInfo() instead
  of getDrmInitData().

bug: 22804304
bug: 36791613
bug: 36783335

Change-Id: Ib3ad8d6a2f679c0e60d2bb025ac5999339722306
2017-04-11 13:13:22 -07:00
Hangyu Kuang
cd923a219f media: Add new key for latency support
Test: NONE
Bug: 34221970
Change-Id: Id2d64f9be6bffaff1897079b5132388046882334
2017-02-27 18:10:17 +00:00
Chong Zhang
d5927ae883 MediaCas: add framework APIs
Java API changes to support MediaCas framework.

Also add partial-frame related enums to MediaCodec,
MediaCodecInfo, and MediaExtractor as a way to indicate
a input frame contains partial data.

Test: basic test app and test plugin to execise the code path;
impelenting playback of CAS-secured MPEG2TS streams, including
a Widevine-based CAS plugin, locally modified ExoPlayer and
Android TV Tuner input.

bug: 22804304
Change-Id: Ia4ba1d4046f7588e42bfb21e726390457d2fc8e3
2017-02-22 17:27:01 -08: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
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