75 Commits

Author SHA1 Message Date
Santiago Seifert
fc74570e66 Align CryptoInfo value and identity equality
CryptoInfo.pattern is private, so users need to ensure
CryptoInfo instances do not change between being obtained
from MediaParser, and being passed to MediaCodec. This CL
ensures that MediaParser does not modify any already output
CryptoInfo instances.

Bug: 154120292
Test: manually.
Test: atest CtsMediaParserTestCases.
Change-Id: I800b6e6ae98af490e5001a5da35cae5d3b8449e6
2020-05-29 22:06:15 +01:00
Santiago Seifert
3fe718ae20 Merge "Add parameter for including supplemental data" into rvc-dev 2020-05-14 21:35:00 +00:00
Santiago Seifert
e4edcab468 Add parameter for including supplemental data
Bug: 154120292
Test: atest CtsMediaParserTestCases
Change-Id: Ic374df6863558bc4432175b0483fabe855423d8c
2020-05-14 19:23:10 +01:00
Santiago Seifert
56070b5299 Throw when trying to create MediaParser before R
Bug: 147586901
Test: atest CtsMediaParserTestCases
Test: Manually tested.
Change-Id: I17567905c20f86ce53c60cf9888e8bf4034b1b96
2020-05-13 13:28:34 +01:00
Santiago Seifert
b7cc9681ff Merge "Fill crypto data in MediaParser" into rvc-dev 2020-05-11 14:29:22 +00:00
Santiago Seifert
862804deb8 Fill crypto data in MediaParser
Also support in-band sample data format, for
efficient exoplayer use.

Bug: 154120292
Test: atest CtsMediaParserTestCases
Change-Id: Ieb209d1033bd5a66c6f51008bd0c382868a58be7
2020-05-07 19:19:44 +01:00
Anton Hansson
340954c017 Enable api lint and check_last_api for modules
This adds checking of module api compatibility to the individual module
api rules. Until now, this checking has been done via the monolithic
metalava runs which we are aiming to get rid of.

Now is a good time to do this because we can compare them to the just
finalized version 30 API, which we have no diffs with. Baseline the
existing wifi failures that metalava fails to find in the previous API.

Bug: 144149403
Test: m checkapi
Change-Id: Id222895daa3a769c265965b052a17d5a1ca18462
2020-05-05 19:17:08 +01:00
TreeHugger Robot
cbbc9c5c21 Merge changes I82cecd20,I2b4e41a4 into rvc-dev
* changes:
  updatable-media: Set min_sdk_version
  Set min_sdk_version to be part of mainline modules
2020-05-02 15:36:33 +00:00
Jooyung Han
88dcf0f5e2 updatable-media: Set min_sdk_version
Modules contributing mainline modules (APK/APEX) should set
min_sdk_version as well as apex_available.

For now setting min_sdk_version doesn't change build outputs.
But build-time checks will be added soon.

updatable-media is a member of com.android.media.

Bug: 152655956
Test: m
Change-Id: I82cecd20888189657693cb9f406c831c6aa42905
2020-05-02 00:59:57 +09:00
Santiago Seifert
f09d6319a8 Merge "Add sample data part to TrackOutput implementation" into rvc-dev 2020-05-01 12:56:36 +00:00
Anton Hansson
8bf731c0fc Rename module dist files
This makes the filenames of the disted artifacts (api txts and stubs)
match the module name of the modules they're from. This matches the
naming scheme used by java_sdk_library, which should make the future
transition to this build rule easier.

Bug: 149293194
Test: lunch sdk_phone_armv7 && m sdk dist && find out/dist/apistubs
Change-Id: I076f30931bf2524d57703873cd7de25b3f23b457
2020-04-30 17:42:20 +01:00
Santiago Seifert
9e215de209 Add sample data part to TrackOutput implementation
Bug: 153662231
Test: atest CtsMediaParserTestCases
Change-Id: I4d1bc80d1cb288c13bb9ed4607fdde03c3f5cbc0
2020-04-29 19:49:44 +01:00
Santiago Seifert
d06e83b791 Replace some javadoc symbols with HTML encoding
Bug: 154120292
Test: N/A.
Change-Id: I5d1b59ae714db30b2c39a3919a01cc2c15fc0f64
2020-04-28 21:08:05 +01:00
Santiago Seifert
aba783aae2 Defer extractor init until after sniff
Instead of doing it immediately after sniff success.
This prevents some extractor implementations from
outputting formats during the "sniffing" advance.

Bug: 154120292
Test: atest CtsMediaParserTestCases
Change-Id: I4f3349a8053d371cd06beaf24bd9745da0a4a093
2020-04-24 16:55:58 +00:00
Santiago Seifert
f9145f5186 Derive PCM encoding from ExoPlayer's format
Bug: 154120292
Test: atest CtsMediaParserTestCases
Change-Id: I90091810a09bfddaaf02257e3ad4a9458eda91d7
2020-04-20 16:36:38 +01:00
Santiago Seifert
f3c89a6851 Make schemeInitData constructor ref non-static
Bug: 154120292
Test: atest CtsMediaParserTestCases
Change-Id: I21cba4406fec20a69ad9a2f830213883a708ca20
2020-04-19 15:07:14 +01:00
Santiago Seifert
26e55eb8ab Merge "Populate some missing fields in TrackData" into rvc-dev 2020-04-17 17:36:26 +00:00
Santiago Seifert
c695579817 Populate some missing fields in TrackData
Involving MediaFormat and DrmInitData

Bug: 154120292
Test: atest CtsMediaParserTestCases
Change-Id: If1d334633846020c4ffc166f148f9f841f5318a4
2020-04-17 16:26:17 +01:00
Santiago Seifert
edaedb06ee Merge "Replace data source with data reader" into rvc-dev 2020-04-17 14:58:32 +00:00
Santiago Seifert
68d9a4730d Replace data source with data reader
Bug: 154120292
Test: atest CtsMediaParserTestCases
Change-Id: I7b2f60f373c19d98f97aaa8d26230e77d3c6df95
2020-04-17 14:03:02 +01:00
Santiago Seifert
c4afc400a8 Fix extractor creation
Missing MP4 flags and creation by name parameters.

Bug: 154120292
Test: atest CtsMediaParserTestCases
Change-Id: I19b56b6f40a821ad9fa14a6e03c83206ce867dfe
2020-04-15 18:24:51 +01:00
Santiago Seifert
8dae07b7ea Update ExoPlayer version
Bug: 153662231
Test: atest CtsMediaParserTestCases
Change-Id: I302b6832b189402a30f4a968d7cb4fad304e0c75
2020-04-14 14:51:12 +01:00
Sungsoo Lim
383371cdc5 Merge "Do not export private AIDL files of the media module" into rvc-dev 2020-04-10 05:28:21 +00:00
Anton Hansson
e4a55252b2 Don't specify sdk_version for stubs
The default specifies sdk_version correctly, so use
the inherited value to make it easier to make global
changes.

Bug: 144149403
Test: m
Change-Id: I3e9e3cca6fe0b6dfc7645b91f5cab645350c0f9a
2020-04-08 16:25:38 +01:00
Sungsoo Lim
895f4f6914 Do not export private AIDL files of the media module
The current directory contains public and private AIDL types in the same place.
This CL separates into two directories and makes the directory having the
public types should be exported.

Bug: 148660295
Test: build
Change-Id: Ib2632afa00f7fa7f992690e68684464928cd3c61
2020-04-08 15:05:26 +09:00
TreeHugger Robot
8e71a19509 Merge "Document PARSER_NAME constants." into rvc-dev 2020-04-03 11:40:21 +00:00
Santiago Seifert
98f1e06563 Document PARSER_NAME constants.
Bug: 150854787
Test: atest CtsMediaParserTestCases
Change-Id: Ic5736b8be54a6eedca549e798ec58a853b9599b9
2020-04-02 15:27:00 +01:00
Santiago Seifert
c648f4eccb Add sample flags to MediaParser
Bug: 152757624
Test: atest CtsMediaParserTestCases
Change-Id: I080b759656e160aba2c378fe72790b1a9d10ad81
2020-03-31 15:52:59 +01:00
Santiago Seifert
d5f7966370 Document onSampleCompleted.cryptoInfo
Bug: 152766234
Test: atest CtsMediaParserTestCases
Change-Id: Ic8182671c1521f5d6db346a6c4a44c5be273db32
2020-03-30 18:18:09 +01:00
Santiago Seifert
5874e1afbf Implement MediaParser.setParameter
Bug: 152552546
Test: atest CtsMediaParserTests
Change-Id: Ie5b53a55479b8656e61562b7a547723797c25fa1
2020-03-27 15:12:15 +00:00
Santiago Seifert
fc5e4f9f58 Add special value for unknown current parser name
Bug: 150855259
Test: atest CtsMediaParserTestCases
Change-Id: I9328104875e3daeeb1a9f0ac3e47ca5df8acea14
2020-03-26 13:10:51 +00:00
Anton Hansson
19b40d5beb Merge "Make framework-media stubs use the new defaults" into rvc-dev 2020-03-25 13:45:22 +00:00
Anton Hansson
94e234147b Make framework-media stubs use the new defaults
Makes it convenient to change all stubs from a central place.

Bug: 149293194
Test: m framework-media-stubs{public,system,module_libs_}api
Change-Id: Ic4f7340090e8daf6cc77350f1f711467da5a7502
2020-03-24 19:45:41 +00:00
Santiago Seifert
a4bc3a52e0 Implement getParserNames
Bug: 152189569
Test: atest CtsMediaParserTestCases
Change-Id: Ie73b2d0f51597ce554f114edb852ff727cf4587c
2020-03-24 17:25:58 +00:00
TreeHugger Robot
054a8136bd Merge "Add MediaParser test cases to apex media presubmit" into rvc-dev 2020-03-20 19:01:09 +00:00
TreeHugger Robot
d3e9c716eb Merge "Add StringDef for parameter names" into rvc-dev 2020-03-20 18:37:18 +00:00
TreeHugger Robot
1e9da0f457 Merge "Add parser name constants and a StringDef for them" into rvc-dev 2020-03-20 18:36:58 +00:00
Santiago Seifert
2068b63cca Add StringDef for parameter names
Bug: 150854787
Test: CTS.
Change-Id: I37bb32607094efd81b52daad59b2f595a4e5cf33
2020-03-20 16:42:26 +00:00
Santiago Seifert
5f0547f84f Add parser name constants and a StringDef for them
Bug: 150854787
Test: CTS.
Change-Id: Ie16526d81decb660f6a96f7ad3a82e3b0e3d0de5
2020-03-20 16:42:21 +00:00
Santiago Seifert
c899843882 Add MediaParser test cases to apex media presubmit
Bug: 147308781
Test: CTS.
Change-Id: Ib2d9a181d55913f105005554ac26938b5403c761
2020-03-19 18:33:04 +00:00
Santiago Seifert
c580d458c3 Fix javadoc which was broken with renames
Bug: 150855597
Test: Not applicable.
Change-Id: I3f168736b612d65000d94314665b50c82adaa7f5
2020-03-18 18:09:43 +00:00
TreeHugger Robot
7987ac8045 Merge "Add aquilescanta to media apex module owners" into rvc-dev 2020-03-18 16:27:19 +00:00
Anton Hansson
dc033c35c0 Add individual API tracking files for modules
This adds metalava api tracking generation to the module
stub rules, to make sure we know exactly what API a
particular module stub exports.

Bug: 147768409
Test: m update-api
Exempt-From-Owner-Approval: Approved in master
Change-Id: Iaf2ef5b5751eb208d119ddbc74481239366fe581
Merged-In: Iaf2ef5b5751eb208d119ddbc74481239366fe581
2020-03-18 11:03:12 +00:00
TreeHugger Robot
6beb092933 Merge "Make parameters parser-implementation independent" into rvc-dev 2020-03-18 08:29:38 +00:00
Santiago Seifert
2d77b72209 Add aquilescanta to media apex module owners
Bug: 151660312
Test: Not applicable.
Change-Id: I990add27febdbdffe11ca5d931dd60bcca4d93be
2020-03-16 21:02:25 +00:00
Santiago Seifert
b04d807696 Make parameters parser-implementation independent
Bug: 150855305
Test: CTS.
Change-Id: Ib83c4a9c92c50d6408f5a893dbcb2ebf7eb5cf73
2020-03-16 19:53:10 +00:00
Santiago Seifert
cb2e8d8ed0 Wrap exoplayer ParserException
Bug: 150855305
Test: CTS.
Change-Id: Ied68cfa1fb6a687c76626d36828594b6c69d7ebc
2020-03-13 12:32:07 +00:00
Santiago Seifert
8e7b066a10 Address API renaming suggestions
Bug: 150855597
Test: CTS.
Change-Id: Id2154df12456bd0045e28f32fbe5483c9e87b67f
2020-03-12 13:42:29 +00:00
Santiago Seifert
dd099a93ee Remove InterruptedException from MediaParser
ExoPlayer is replacing it with
InterruptedIOException.

Bug: 149906115
Test: CTS.
Change-Id: I83c5a46ec9206915f31d0adeb20954d6f2e72e57
2020-03-03 19:44:55 +00:00
TreeHugger Robot
ae5a3ee6df Merge "Fix some javadoc issues." into rvc-dev 2020-02-28 20:18:28 +00:00