loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-05-04 06:00:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
18,240 Commits 4 Branches 47 Tags
Commit Graph

18240 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
tofunmi
e8c86e1bae Remove effect/SimpleBitmapLoader & replace with DataSourceBitmapLoader 
PiperOrigin-RevId: 513824487
 2023-03-07 12:01:50 +00:00
huangdarwin
fe7f3d51df GL: Reduce visibility of GlProgram.loadAsset. 
This is only used within the same class, so can be private.

PiperOrigin-RevId: 514665000
 2023-03-07 11:57:41 +00:00
kimvde
db540a02b7 Make sure that tracks are transcoded/transmuxed consistently 
All audio tracks should either all be transcoded or all be transmuxed.
Same for video tracks.

To achieve this, simplify the behaviour of transmuxAudio/Video.

PiperOrigin-RevId: 513809287
 2023-03-07 11:57:35 +00:00
samrobinson
3264cb8271 Pass Metadata to Muxer when adding a track. 
PiperOrigin-RevId: 514575400
 2023-03-07 11:56:53 +00:00
tofunmi
7303caffb5 Create GlObjectsProvider 
To create this file TextureInfo has been moved to common and renamed to GLTextureInfo.

We'll look to expand the interface in future to cover more of the methods around GL object maintenance in future as required.

PiperOrigin-RevId: 514445397
 2023-03-07 11:56:08 +00:00
kimvde
5115df1147 Rename CompositeAssetLoader to SequenceAssetLoader 
This clarifies that a SequenceAssetLoader loads data corresponding to an
EditedMediaItemSequence.

PiperOrigin-RevId: 514442681
 2023-03-07 11:55:22 +00:00
tofunmi
fe38901028 ImageAssetLoaderTest minor fixes 
PiperOrigin-RevId: 514436359
 2023-03-07 11:54:36 +00:00
tofunmi
f4b88cd8a2 Add ImageAssetLoader tests. 
PiperOrigin-RevId: 514431184
 2023-03-07 11:53:36 +00:00
samrobinson
93b9cc731d Provide TransformerInternal with the AssetLoader output format. 
TI can use this Format as part of creating the SamplePipelines.

PiperOrigin-RevId: 513777622
 2023-03-07 11:53:03 +00:00
kimvde
0f8b67b875 Make onOutputFormat nullable 
- This is to make sure we know about all the tracks before initializing
the SamplePipelines. This allows to set the muxer and the fallback
listener track count before the SamplePipelines are built.
- As a result, the test files had to be updated because the order in
which the tracks are written has changed.
- The ImageAssetLoader also had to be updated to call onOutputFormat
repeatedly until it returns a non-null SampleConsumer.
- Also fix the trackCount sent to the muxer and fallback listener. The
correct track count can be computed now that we know about all the
tracks before building the SamplePipelines.

PiperOrigin-RevId: 514426123
 2023-03-07 11:52:52 +00:00
huangdarwin
729066fbd6 GL: Delete frame buffers after use. 
Before, we used to never call glDeleteFramebuffers, which could
in theory lead to leaks in the number of frame buffers
available and make releasing the GL context more expensive.

PiperOrigin-RevId: 514387847
 2023-03-07 11:52:01 +00:00
sheenachhabra
a81a5f2699 Create orientation matrix byte array using util method 
PiperOrigin-RevId: 514375835
 2023-03-07 11:51:13 +00:00
ibaker
9c82923094 Update templates to more clearly signpost between exoplayer2 and media3 
Issue: google/ExoPlayer#11031

#minor-release

PiperOrigin-RevId: 514366016
 2023-03-07 11:50:24 +00:00
ibaker
cb7d565fd4 Add missing @param tags 
Dackka generates a warning if a method has at least one `@param` tag,
but not all of them are documented.

#minor-release

PiperOrigin-RevId: 513873453
 2023-03-07 11:49:24 +00:00
ibaker
c0459e6ae1 Exclude test_session_{common,current} from API and Javadoc tests 
We don't publish documentation for these, nor maven artifacts for them -
they only exist as source code on GitHub.

PiperOrigin-RevId: 513863141
 2023-03-07 11:48:38 +00:00
sheenachhabra
b9ade43a19 Fix nit issues in muxer end to end tests 
Renamed MuxerEndToEndTest.java to Mp4MuxerEndToEndTest.java to align it with class under test.
Removed muxed prefix from dump file name because Mp4 implicitely means muxed only.

PiperOrigin-RevId: 513574681
 2023-03-07 11:48:32 +00:00
ibaker
5d23a92923 Ensure ForwardingPlayer users do listener registration correctly 
The `@CallSuper` annotation should help catch cases where subclasses are
calling `delegate.addListener` instead of `super.addListener` but it
will also (unintentionally) prevent subclasses from either completely
no-opping the listener registration, or implementing it themselves in a
very custom way. I think that's probably OK, since these cases are
probably unusual, and they should be able to suppress the warning/error.

Issue: androidx/media#258

#minor-release

PiperOrigin-RevId: 513848402
 2023-03-07 11:47:49 +00:00
tofunmi
efaf4e3f33 Remove effect/SimpleBitmapLoader & replace with DataSourceBitmapLoader 
PiperOrigin-RevId: 513824487
 2023-03-07 11:46:58 +00:00
kimvde
71fb4f9a5c Make sure that tracks are transcoded/transmuxed consistently 
All audio tracks should either all be transcoded or all be transmuxed.
Same for video tracks.

To achieve this, simplify the behaviour of transmuxAudio/Video.

PiperOrigin-RevId: 513809287
 2023-03-07 11:46:07 +00:00
samrobinson
07ba24ab1a Provide TransformerInternal with the AssetLoader output format. 
TI can use this Format as part of creating the SamplePipelines.

PiperOrigin-RevId: 513777622
 2023-03-07 11:45:16 +00:00
sheenachhabra
f23d6c1dc1 Fix nit issues in muxer end to end tests 
Renamed MuxerEndToEndTest.java to Mp4MuxerEndToEndTest.java to align it with class under test.
Removed muxed prefix from dump file name because Mp4 implicitely means muxed only.

PiperOrigin-RevId: 513574681
 2023-03-07 11:44:26 +00:00
tonihei
0f85157a0d Merge branch 'release-v2' into dev-v2 2023-03-03 10:45:21 +00:00
tonihei
eb9e9eb841 Merge branch 'release' 2023-03-03 10:44:46 +00:00
tonihei
1ef427f640
Merge pull request #261 from androidx/release-1.0.0-rc02 
1.0.0-rc02
1.0.0-rc02 		2023-03-03 10:02:19 +00:00
tonihei
bc3537260b
Merge pull request #11034 from google/release-v2-r2.18.4 
r2.18.4
 2023-03-03 10:01:45 +00:00
tonihei
86013bdc36 Update release notes for ExoPlayer 2.18.4 
#minor-release

PiperOrigin-RevId: 513555559
(cherry picked from commit 4f68f891bca4d506ea552e1389060286474a6aae)
 2023-03-02 17:58:16 +00:00
tonihei
c459b08b81 Fix lint-baseline.xml for latest UI translations 
#minor-release

PiperOrigin-RevId: 513533248
(cherry picked from commit af6807d959ff7bb3166177b6d687d41bf937b650)
 2023-03-02 17:58:16 +00:00
tonihei
05ac6ab15d Update Javadoc for 2.18.4 
PiperOrigin-RevId: 513516267
(cherry picked from commit 658b5030e45435472d490fe7280a70c0196744d4)
 2023-03-02 17:58:15 +00:00
tonihei
af30f00ee6 Add missing RELEASENOTES line 
PiperOrigin-RevId: 513556883
(cherry picked from commit e2cb32f34ce016877fa7d2f4acc38511e7c261c0)
 2023-03-02 17:58:04 +00:00
tonihei
7958737655 Fix lint-baseline.xml for latest UI translations 
#minor-release

PiperOrigin-RevId: 513533248
(cherry picked from commit 8498e4b4445ae88665c6cdbc4e47e8e6ca7b7303)
 2023-03-02 17:58:04 +00:00
tonihei
4f68f891bc Update release notes for ExoPlayer 2.18.4 
#minor-release

PiperOrigin-RevId: 513555559
 2023-03-02 17:44:11 +00:00
tonihei
af6807d959 Fix lint-baseline.xml for latest UI translations 
#minor-release

PiperOrigin-RevId: 513533248
 2023-03-02 17:39:57 +00:00
andrewlewis
9f0a6f1619 Fix typo 
PiperOrigin-RevId: 513529059
 2023-03-02 17:35:30 +00:00
andrewlewis
389d5ea229 Fix name for FrameCacheGlShaderProgram 
This implements `GlShaderProgram` (and is GL-specific).

PiperOrigin-RevId: 513528160
 2023-03-02 17:31:16 +00:00
tonihei
658b5030e4 Update Javadoc for 2.18.4 
PiperOrigin-RevId: 513516267
 2023-03-02 17:26:57 +00:00
samrobinson
8642594379 Add getNormalizedTrackType, mapping image to video track type. 
PiperOrigin-RevId: 513514142
 2023-03-02 17:22:29 +00:00
tonihei
e2cb32f34c Add missing RELEASENOTES line 
PiperOrigin-RevId: 513556883
 2023-03-02 17:22:01 +00:00
tonihei
8498e4b444 Fix lint-baseline.xml for latest UI translations 
#minor-release

PiperOrigin-RevId: 513533248
 2023-03-02 17:21:16 +00:00
andrewlewis
82119bbbc2 Fix typo 
PiperOrigin-RevId: 513529059
 2023-03-02 17:20:30 +00:00
andrewlewis
a28b691ced Fix name for FrameCacheGlShaderProgram 
This implements `GlShaderProgram` (and is GL-specific).

PiperOrigin-RevId: 513528160
 2023-03-02 17:19:29 +00:00
samrobinson
ae4471debf Add getNormalizedTrackType, mapping image to video track type. 
PiperOrigin-RevId: 513514142
 2023-03-02 17:18:39 +00:00
tonihei
2e6484d53b Remove unreleased changed 2023-03-02 17:15:21 +00:00
tonihei
c641307110 Bump version numbers to Media3 1.0.0-rc02 and ExoPlayer 2.18.4 
#minor-release

PiperOrigin-RevId: 513488487
(cherry picked from commit 3b16231e29e4f952e4f44a179a1e91022f7bad36)
 2023-03-02 13:54:32 +00:00
tonihei
4298cfabc6 Update migration script to 1.0.0-rc02/2.18.4 
PiperOrigin-RevId: 513482096
(cherry picked from commit b634005c5f69f6a5ba47f58534fd41e16e237c25)
 2023-03-02 13:54:30 +00:00
bachinger
d47675f017 Fix some JavaDoc in the Media3 session module 
#minor-release

PiperOrigin-RevId: 513501046
(cherry picked from commit 6042bec18a4b30449a20d1e858bac799cc6d18c3)
 2023-03-02 13:52:12 +00:00
tonihei
67fd41a49d Bump version numbers to Media3 1.0.0-rc02 and ExoPlayer 2.18.4 
#minor-release

PiperOrigin-RevId: 513488487
(cherry picked from commit cd753bd7b8c3206b509949e851f515ca465e4c89)
 2023-03-02 13:52:12 +00:00
tonihei
64c6d8f351 Update release notes for 1.0.0-rc02 
PiperOrigin-RevId: 513483809
(cherry picked from commit df11545ba18f9bf3e6e9c87c3bdb30bfb0723279)
 2023-03-02 13:52:09 +00:00
tonihei
3b16231e29 Bump version numbers to Media3 1.0.0-rc02 and ExoPlayer 2.18.4 
#minor-release

PiperOrigin-RevId: 513488487
 2023-03-02 13:28:55 +00:00
bachinger
6042bec18a Fix some JavaDoc in the Media3 session module 
#minor-release

PiperOrigin-RevId: 513501046
 2023-03-02 13:26:01 +00:00
tonihei
cd753bd7b8 Bump version numbers to Media3 1.0.0-rc02 and ExoPlayer 2.18.4 
#minor-release

PiperOrigin-RevId: 513488487
 2023-03-02 13:25:15 +00:00