57 Commits

Author SHA1 Message Date
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
Santiago Seifert
5a8c52786e Fix some javadoc issues.
Bug: 150289352
Test: Javadoc change only.
Change-Id: Ifd5fc13072c3a30bdd36b960371339a86ebb13bb
2020-02-28 16:50:33 +00:00
TreeHugger Robot
881b688f68 Merge "Fix CTS tests" into rvc-dev 2020-02-28 14:50:41 +00:00
Santiago Seifert
51e12d6c29 Fix CTS tests
Broken since behavioral parameters were added.

Test: CTS.
Bug: 150321580
Bug: 147308781
Bug: 149906115
Change-Id: I8629a78e547cba3552bcc73c0dd55b9317611156
2020-02-28 12:54:19 +00:00
Santiago Seifert
98127bca05 Make MediaParser match ExoPlayer's sniffing order
Bug: 148940600
Test: CTS.
Change-Id: I7c867f476e1e0b9ef1d7fc9d6779b56b739f5a01
2020-02-25 16:37:10 +00:00
Santiago Seifert
561ffc3008 Add behavioral parameters to MediaParser
Test: CTS.
Bug: 132153067
Change-Id: Ic1c3fe32382e298fa14d81c7a3b5d1f9271f30ee
2020-02-20 15:17:31 +00:00
Santiago Seifert
970c72882c Consolidate API naming to use Parser everywhere
Bug: 132153067
Test: CTS.
Change-Id: Ie274518683ffabff207dd845f3107e3313a5dfd7
2020-02-19 15:26:41 +00:00
Santiago Seifert
111048ad8f Add pixelWidthHeightRatio to MediaParser
Bug: 132153067
Test: CTS.
Change-Id: I6603fdba0eff9a37016678e57345cf5763747fa2
2020-02-13 18:04:20 +00:00
Santiago Seifert
4ea6fce129 Extract method in MediaParser
Also set selection flags unconditionally.

Bug: 132153067
Test: CTS.
Change-Id: Id325040db7946f60c59eeaeaf8508424b390b813
2020-02-13 16:51:01 +00:00
Anton Hansson
85231d53b4 Merge "Build updatable media against the module SDK" 2020-02-12 16:56:23 +00:00
Santiago Seifert
c95839d66f Add some missing MediaFormat fields in MediaParser
Also avoid populating MediaFormat fiels with
absent ExoPlayer Format fields.

Bug: 132153067
Test: CTS.
Change-Id: I49f897af9b97f834e8a71f77c93beb5848c8fd01
2020-02-12 14:13:42 +00:00
Anton Hansson
2ce92a9d82 Build updatable media against the module SDK
Bug: 146757305
Test: m
Change-Id: Id81e487ae28cc93cd5899cd5354ed9900567d415
2020-02-08 13:11:44 +00:00
Santiago Seifert
dc08a3781e Merge "Shrink updatable-media" 2020-02-06 20:02:58 +00:00
TreeHugger Robot
d73366e397 Merge changes I4a53a0cc,I053d0686
* changes:
  Add FlacExtractor to MediaParser
  Fix MediaParser sniffing
2020-02-06 09:19:15 +00:00
Santiago Seifert
f1076aa80a Add FlacExtractor to MediaParser
Test: Pending
Bug: 132153067
Change-Id: I4a53a0ccd652bf505708eed521ea45e52826a084
2020-02-05 17:46:51 +00:00
Santiago Seifert
7e9a970d1a Fix MediaParser sniffing
Change-Id: I053d06866b41925a04bb7ca506e30a4a6cb0c3ed
Test: Pending
Bug: 132153067
2020-02-05 17:46:46 +00:00
Santiago Seifert
1b4a7f8aed Shrink updatable-media
Removes dead ExoPlayer code brought in by MediaParser.

Bug: 148174369
Bug: 147324074
Test: Not applicable.
Change-Id: I7edcd1d532f6aaf4032576a6f73f371dcc11788f
2020-02-04 11:03:55 +00:00
Anton Hansson
12a07676ed Create all variants of stubs for media
Add separate publicapi, systemapi and module_libs stubs for media,
and rename the updatable_media stubs to framework-media to match
the others. The impl jar still has the name updatable_media.

Bug: 147768409
Test: m
Test: m framework-media-stubs-{public,system,module_libs_}api
Change-Id: I498823de7315f78121975d36d6dc7667a8245085
2020-02-03 19:03:21 +00:00
TreeHugger Robot
5d76edcd91 Merge "Rename exoplayer2-core to exoplayer2-extractor" 2020-01-28 12:57:05 +00:00