214 Commits

Author SHA1 Message Date
Santiago Seifert
b52102743a Make the output CryptoInfo.iv non-null
Bug: 154120292
Bug: 149906115
Test: Manually.
Test: atest CtsMediaParserTestCases
Change-Id: Icca0c5806f3c38afc22597c612b224fa6d37ca65
2020-06-24 18:37:38 +01:00
TreeHugger Robot
0d83a21797 Merge "Add parameter for sideloaded caption formats" into rvc-dev am: a99dba8be0 am: 4570870c2b am: 6e0bb4a53f am: 4c250882ed
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11971039

Change-Id: I1ce1518cd14a23e4210444f19cce54831d0be99c
2020-06-24 15:20:26 +00:00
Santiago Seifert
4aa539485d Add parameter for sideloaded caption formats
Bug: 154120292
Bug: 149906115
Test: Manually.
Test: atest CtsMediaParserTestCases
Change-Id: I5dd3117884965786731ac2e475b34e4a9ce36d47
2020-06-24 13:01:43 +01:00
TreeHugger Robot
15823bcb66 Merge "Allow exposing ChunkIndex as MediaFormat" into rvc-dev am: e9db363b54 am: 6f3b411b21 am: 5ca8855b7c am: 80a77c454b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11808679

Change-Id: Ie9f6aa74944967b1b8d8a625db53ed286dd4d6f7
2020-06-19 19:05:52 +00:00
Santiago Seifert
d58414732a Allow exposing ChunkIndex as MediaFormat
Adds a parameter for exposing chunk indices as MediaFormats.
The parameter is disabled by default.

Bug: 149906115
Bug: 154120292
Test: atest CtsMediaParserTestCases
Change-Id: I2b64cab71edf0496c1ea730b4833fa2f4dbb6aad
2020-06-19 17:27:06 +01:00
Santiago Seifert
2aeb954b9b Merge "Add parameter for exposing a dummy seekmap." into rvc-dev am: db853ad3fd am: ac2660f38a am: 386be1ab15 am: ca9c8bdcc8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11712603

Change-Id: I1fae80122db889ca936d94457abc43aea380ca78
2020-06-09 20:14:54 +00:00
Santiago Seifert
45d8f79127 Add parameter for exposing a dummy seekmap.
Allows integration with ExoPlayer-DASH module. Before extracting
each chunk, ExoPlayer makes a seek call with the start time of
the chunk and position 0. It's not possible to perform this early
seek using MediaParser:
- Before a seek map is exposed by MediaParser, only seeking to
  (0, 0) is possible.
- Once a seek map is exposed, there's no guarantee that the
  required position is a legal position.

Bug: 149906115
Bug: 154120292
Test: Manual
Test: atest CtsMediaParserTestCases
Change-Id: I5986170cba4ec1b9f8b902809a9845f93550d103
2020-06-09 16:39:49 +01:00
TreeHugger Robot
d1ded06ccc Merge "Use MediaParser SeekMap unknown duration constant" into rvc-dev am: 7c41c8152c am: 3130b3f66b am: 122596fe90 am: 699aecffab
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11744204

Change-Id: Ice28b17637543b01a8efe9e56f535e78c4e80d58
2020-06-05 18:52:15 +00:00
Santiago Seifert
0caa975faa Use MediaParser SeekMap unknown duration constant
Bug: 154120292
Test: atest CtsMediaParserTestCases
Change-Id: I08f0c6e278abd7827d67550351cb3258d9614bae
2020-06-05 12:40:05 +01:00
Paul Duffin
abebc6a897 Switch to standard naming scheme
Removes use of the special framework-modules naming scheme.

Bug: 155164730
Test: m java
Exempt-From-Owner-Approval: Build cleanup.
Change-Id: I3b78fcbcacc3df787e171d6eedeef1e51b087615
Merged-In: I0c31e2183353dfb5bd49f04f3455cb7b10be6866
(cherry picked from 8b864fb45ce79051437f13c2a19510718ea3b7aa)
2020-06-02 06:53:53 +00:00
Paul Duffin
360a485873 Merge "Switch to standard naming scheme" 2020-06-01 21:58:15 +00:00
Santiago Seifert
b09b6b986d Merge "Align CryptoInfo value and identity equality" into rvc-dev am: 9a2fdad064 am: 98269ecfdb am: cf1d2488a1 am: bb192569c5
Change-Id: Id39f265fb4a5da573b6a3b8ca8a7f15fc0d2121b
2020-06-01 17:14:41 +00:00
Santiago Seifert
9a2fdad064 Merge "Align CryptoInfo value and identity equality" into rvc-dev 2020-06-01 16:38:16 +00:00
Paul Duffin
5610e34160 Merge "Clean up the visibility rules for framework modules" into rvc-dev am: 07555b53a5 am: 1320192e5d am: 42b4b242f7 am: acf0078d3e
Change-Id: Ia4c804083f6b0db47585aa6491a8c36c4c8ff0aa
2020-05-31 15:11:17 +00:00
Paul Duffin
8b864fb45c Switch to standard naming scheme
Removes use of the special framework-modules naming scheme.

Bug: 155164730
Test: m java
Exempt-From-Owner-Approval: Build cleanup.
Change-Id: I0c31e2183353dfb5bd49f04f3455cb7b10be6866
2020-05-31 14:19:32 +01:00
Paul Duffin
dde22307b1 Clean up the visibility rules for framework modules
Switching from java_library to java_sdk_library switched the meaning
of the module name from referring to the implementation library to
referring to the stubs. This change updates the visibility rules to
reflect that new meaning.

Visibility rules that were previously set for the java_library have
been moved to the impl_library_visibility property and the special
//visibility:override value has been prepended to prevent it from
inheriting the values from the visibility property.

Visibility rules set for the stubs (via stubs_library_visibility)
property have been moved to the visibility property.

Bug: 155164730
Test: m nothing
Exempt-From-Owner-Approval: Build cleanup
Change-Id: Icc9bc5a9ef86cf7ba0f15c2b2a4abd596ec9f640
2020-05-31 13:45:51 +01:00
Paul Duffin
7559bd0e95 Use java_sdk_library for API for updatable-media am: 289a482fea am: d5cc126091 am: 19515311f3 am: 1497c057c6
Change-Id: I06fddcc2057bfd1372844a7f46df23f696835a49
2020-05-31 07:16:23 +00:00
Paul Duffin
289a482fea Use java_sdk_library for API for updatable-media
The API for the updatable-media library is prefixed with
framework-media so it cannot be switched to use java_sdk_library
directly. Instead a new API only java_sdk_library was added for
framework-media.

The names of the individual modules do not quite follow the pattern
that java_sdk_library uses so this temporarily sets the following:
    naming_scheme: "frameworks-modules"

That causes java_sdk_library to use a naming scheme that matches the
one used by the individual modules of this. It will be cleaned up
later.

Test: m update-api
Bug: 155164730
Change-Id: Ib9dd6d276856146e161578697cc6ba83b26e4ad8
2020-05-30 17:46:07 +01:00
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
e3e98fc24d Merge "Add parameters for HLS usage" into rvc-dev am: 98bcac2e9b am: 511eb2bd52 am: 25501f21f2 am: 40b3bd8182
Change-Id: I4d20224a2a62b16b456e2f2f1c4aec7286f4322c
2020-05-29 13:56:53 +00:00
Santiago Seifert
af36ff05cc Add parameters for HLS usage
HLS requires the following two special behaviors:
- The track type needs to be declared eagerly in order
  to map tracks to the correct sample queue.
- Sample timestamps should not be offset, in order to
  synchronize across tracks.

Bug: 154120292
Bug: 149906115
Test: atest CtsMediaParserTestCases
Change-Id: Ida5f0b203746e993e351974b444e4446aa931cd5
2020-05-28 14:09:50 +01:00
Santiago Seifert
671e7c531f Merge "Add parameter for including supplemental data" into rvc-dev am: 3fe718ae20 am: e0c57fe4c1 am: 861e987103 am: 3697cc2f3f
Change-Id: I8bd5c729455c5bec776db328dbf67ab28f3c2c10
2020-05-15 16:14:27 +00:00
TreeHugger Robot
7de4e1ce1e Merge "Throw when trying to create MediaParser before R" into rvc-dev am: de2d4c29ef am: 6fe0ed2920 am: 83b380c999 am: 49d41bfc91
Change-Id: Iff61f1cb575118cd6fb2f13d38d43cbb73d1a581
2020-05-15 16:06:07 +00: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
15a95f8a6d Merge "Fill crypto data in MediaParser" into rvc-dev am: b7cc9681ff am: 2c900aa4f1 am: 9e83dd8305 am: 68911aa249
Change-Id: Idc108ad086dd0d3eb07ac900e5cd23be62354497
2020-05-11 15:25:19 +00: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
1375a88c55 Merge "Enable api lint and check_last_api for modules" into rvc-dev am: b97976134c am: c5bd9daf87 am: 4c0f414452 am: 2b832cd50b
Change-Id: I2fed16e195880a4ecb03dacf1aa3787d2f7794d3
2020-05-06 10:24:21 +00: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
be2037d573 Merge changes I82cecd20,I2b4e41a4 into rvc-dev am: cbbc9c5c21 am: 0b80c491ae am: b057c6ec81 am: 9c165d3270
Change-Id: I6e03a644faa48ffcd53b3ba21aa90fa68fbb9e2b
2020-05-02 16:46:35 +00: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
d405d3e81a Merge "Add sample data part to TrackOutput implementation" into rvc-dev am: f09d6319a8 am: d678d57ea3 am: 308a746f0e am: 90a8cac4f0
Change-Id: Idffa60d5f97db7436d194985aa318ddef6a02adf
2020-05-01 13:41:13 +00: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
c2f9950593 Merge "Rename module dist files" into rvc-dev am: 7e0949732f am: 134f23ee9e am: d8022cb720 am: fadad5d611
Change-Id: Icfe69c6ac573de1f78ac97eb50ea1ce61a83d0a5
2020-05-01 09:13:25 +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
TreeHugger Robot
a48b0f2e8a Merge "Replace some javadoc symbols with HTML encoding" into rvc-dev am: edea65c7bd am: 78a7bcaf82 am: 09e6c25e5f am: 4bf4a0f84b
Change-Id: I3c232a1068635010a008b4dda053933cbde35ca8
2020-04-29 10:14:07 +00: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
c7d804ddb9 Merge "Defer extractor init until after sniff" into rvc-dev am: be0b165b6e am: 79f5400823 am: 9f222b6fe3 am: e057110bfe
Change-Id: I1132353a62b97afdbe246d7ae58c1f843a063902
2020-04-24 17:53:13 +00: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
TreeHugger Robot
5e9460a4e8 Merge "Derive PCM encoding from ExoPlayer's format" into rvc-dev am: 4695d593ee am: b15afb781a am: 34e05ff074 am: ff784fd530
Change-Id: I843b573ab0e9fa3f692ea5dde797055dd6d861dd
2020-04-20 17:56:46 +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
2a3f08f3f3 Merge "Make schemeInitData constructor ref non-static" into rvc-dev am: 60c677150b am: 0f64fafe14 am: 97144c5a8a am: 32d40bb4dd
Change-Id: I411092fcd74bd113bd8610d925b755629f3d7948
2020-04-20 10:24:16 +00: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
Automerger Merge Worker
47a81c07cf Merge "Merge "Populate some missing fields in TrackData" into rvc-dev am: 26e55eb8ab am: c55de45216" into rvc-d1-dev-plus-aosp am: 0239772573 am: 88ac1fb781
Change-Id: I05ad2cdd420ae298234fd3d9443ac6cfa80ef114
2020-04-17 18:37:45 +00:00
Santiago Seifert
26e55eb8ab Merge "Populate some missing fields in TrackData" into rvc-dev 2020-04-17 17:36:26 +00:00
Automerger Merge Worker
411251d7f3 Merge "Merge "Replace data source with data reader" into rvc-dev am: edaedb06ee am: bd60b7b7e8" into rvc-d1-dev-plus-aosp am: c662ca79e9 am: a77e41a2cc
Change-Id: Id5f9e050f361788c3ce0dd591c0ed598549920e5
2020-04-17 16:27:44 +00:00