Chore/merge canary in #74
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The encoder color info [defaults](https://cs.android.com/android/platform/superproject/+/master:frameworks/av/media/libstagefright/foundation/ColorUtils.cpp;l=377;drc=891c19ccfa4953b5e5f7b87118e007b994d8074c) to a value that depends on the input resolution, but when tone-mapping is enabled we should always get BT.709 color space. Hard-code this constant for now to avoid behavior depending on the resolution. A future change should use the decoder output media format to populate the color info. PiperOrigin-RevId: 465070378 (cherry picked from commit 40a28d5)
* OpenGL automatically clamps the output colors to the [0, 1] interval. PiperOrigin-RevId: 465071999 (cherry picked from commit 30fab8c)
Avoids disabling Offload on a write error, and instead relies on this being disabled on the AudioTrack init. It will no longer recover by disabling offload. PiperOrigin-RevId: 465248917 (cherry picked from commit 2fbe1bb)
Adds a new event to AudioOffloadListener to get the offload state of the track, which indicates when software decoding is taking place. PiperOrigin-RevId: 465264362 (cherry picked from commit fe2b846)
PiperOrigin-RevId: 465337074 (cherry picked from commit a1be6d6)
PiperOrigin-RevId: 465360186 (cherry picked from commit e63d594)
* Add RgbaMatrix interface implementation. * Add Builder class for easy adjustments. * Adjust existing RgbaMatrixPixelTests to use new RgbAdjustment class. PiperOrigin-RevId: 465545429 (cherry picked from commit 6502fce)
PiperOrigin-RevId: 465545764 (cherry picked from commit 6da0a35)
PiperOrigin-RevId: 465562260 (cherry picked from commit aafa31e)
Was getting "java.lang.IllegalAccessError: Illegal class access" in debug app. PiperOrigin-RevId: 465562541 (cherry picked from commit c09b34a)
PiperOrigin-RevId: 465563540 (cherry picked from commit 6e4fc47)
`requestCalculateSsim` more clearly represents the intention of the caller. Also rephrase the javadoc to simplify it and make it more precise. PiperOrigin-RevId: 465575578 (cherry picked from commit d90d7d3)
In the case where this check fails, the downstream frame processor chain won't be able to handle the incoming (SDR) data anyway as we've already set it up for HDR. PiperOrigin-RevId: 465584814 (cherry picked from commit 0e99d28)
PiperOrigin-RevId: 466018462 (cherry picked from commit 4725cff)
PiperOrigin-RevId: 466025324 (cherry picked from commit 273cf08)
PiperOrigin-RevId: 466032455 (cherry picked from commit 3aa99d5)
This allows the GlEffectsFrameProcessor to later handle HLG and PQ differently, or limited and full color range differently. No functional change intended in this CL. PiperOrigin-RevId: 466070764 (cherry picked from commit e444eaa)
This simplifies ChainingGlTextureProcessor as it now only connects a consuming and a producing GlTextureProcessor rather than a previous, current, and next GlTextureProcessor. Also use default no-op implementations of the listeners in SingleFrameGlTextureProcessor and MediaPipeProcessor to avoid null-checks. PiperOrigin-RevId: 466301642 (cherry picked from commit a2166a4)
While HDR is most closely tied to the color transfer (ex. COLOR_TRANSFER_SDR is the only one explicitly mentioning dynamic range), technically color spaces may be associated with HDR as well, like BT.2020 commonly being used for HDR rather than BT.709 for SDR. Therefore, it's more specific to mention just that the transfer is HDR. PiperOrigin-RevId: 466316960 (cherry picked from commit 7075f78)
PiperOrigin-RevId: 466324322 (cherry picked from commit 95a7dca)
PiperOrigin-RevId: 466370644 (cherry picked from commit 96a2b14)
Without this permission, files in `/sdcard` or other directories cannot be read by the demo, as they're not in the transformer demo's scoped storage container. For more information, see https://developer.android.com/training/data-storage/use-cases Tested by uninstalling and re-installing the demo app, granting permission by starting a transformation, and launching an intent using a local file in `/sdcard` to start another transformation. Without this CL, this threw an error, and with this CL it succeeded. PiperOrigin-RevId: 466399023 (cherry picked from commit 051dee6)
Previously, this feature interpreted SDR signals as HDR when called. Now, only HDR streams are interpreted as HDR, so the javadoc should be updated. Not yet removing this method, as there are still some loose ends to finish up (ex. PQ support, e2e tests). PiperOrigin-RevId: 466425738 (cherry picked from commit 2d2926b)
This change adds a new method onReadyToAcceptInputFrame to GlTextureProcesssor.InputListener and changes maybeQueueInputFrame to queueInputFrame, removing the boolean return value. This avoids the re-trying in ChainingGlTextureProcessorListener by allowing it to only feed frames from the producing to the consuming GlTextureProcessor when there is capacity. MediaPipeProcessor still needs re-trying when processing isn't 1:1. PiperOrigin-RevId: 466626369 (cherry picked from commit 9c366b3)
createSupportedTransformationRequest is more accurate than createFallbackTransformationRequest, as a TransformationRequest will be returned regardless of whether any fallback is applied. PiperOrigin-RevId: 466641277 (cherry picked from commit 70972bb)
PiperOrigin-RevId: 466735554 (cherry picked from commit 43aa89a)
In some cases, the IMA SDK fails to call the expected loadAd event to load the next ad to play. This is (potentially) the only remaining case where playback can get stuck due to missing calls from IMA as the player doesn't even have a MediaSource at this stage and is only waiting for IMA to provide the ad URL. We can reuse the existing adPreloadTimeoutMs that was added for a similar purpose (when preloading the first ad in the group). The JavaDoc matches this purpose as well and the default timeout is appropriate since we expect to get the loadAd call immediately. Issue: google#10510 PiperOrigin-RevId: 466953617 (cherry picked from commit 91fc5c4)
From NDK 23.1.7779620 and above, the arm64-v8a ABI needs additional build flags to correctly link the ffmpeg libraries. Issue: google#9933 PiperOrigin-RevId: 467161973 (cherry picked from commit 6ea1d0e)
This change adds ExternalTextureManager which implements InputListener to only queue input frames to the ExternalTextureProcessor when it is ready to accept an input frame. This replaces the old retry-logic in GlEffectsFrameProcessor. Before this change, the retrying in GlEffectFrameProcessor wasted CPU time if input becomes available faster than the ExternalTextureProcessor can process it. PiperOrigin-RevId: 467177659 (cherry picked from commit 06ce5ec)
This uses `@hide` on `protected final` methods to hide them from Dackka javadoc generation, since these methods are inaccessible to developers anyway. These symbols will still (currently) be included in artefacts distributed on Maven (because we don't run Metalava as part of generating these artefacts). In some cases I had to change the visibility/finality of methods to make them `protected final` before adding the `@hide` annotation (but the impact should be very low, since most of these methods were either already unusable by app developers, or they shouldn't have been used). #minor-release PiperOrigin-RevId: 487472907 (cherry picked from commit 1cd488a)
This involves reducing the visibility of methods/constructors that are already unusable outside the `androidx.media3.test.utils` package. #minor-release PiperOrigin-RevId: 487473005 (cherry picked from commit ca8de0e)
These aren't caught by presubmit because the classes are annotated `@VisibleForTesting` and are therefore stripped out by Metalava. However Metalava doesn't run when we're generating javadoc for real. #minor-release PiperOrigin-RevId: 487476260 (cherry picked from commit 14e23d3)
#minor-release PiperOrigin-RevId: 487479366 (cherry picked from commit 09bee98)
It's not clear to me why presubmit didn't catch this, I briefly investigated but couldn't work it out - so I'm just going to fix it and move on. #minor-release PiperOrigin-RevId: 487497827 (cherry picked from commit 13ee34f)
#minor-release PiperOrigin-RevId: 487497923 (cherry picked from commit 7cb2e11)
Without this the annotation isn't shown in javadoc (same in Dackka) No annotation: https://exoplayer.dev/doc/reference/com/google/android/exoplayer2/source/DefaultMediaSourceFactory.html#getSupportedTypes() Annotation present: https://exoplayer.dev/doc/reference/com/google/android/exoplayer2/source/MediaSource.Factory.html#getSupportedTypes() #minor-release PiperOrigin-RevId: 487498450 (cherry picked from commit 4949fbe)
PiperOrigin-RevId: 487539107 (cherry picked from commit 0383b72)
PiperOrigin-RevId: 487779266 (cherry picked from commit a34fdcf)
PiperOrigin-RevId: 488376715 (cherry picked from commit 30b73c8)
We currently skip this calculation entirely, but it can be added by calculating the window duration using the wrapped window's duration and the provided AdPlaybackState. Issue: google#10764 PiperOrigin-RevId: 488614767 (cherry picked from commit 20151b9)
When we currently trigger the iteration finished event during the release, we don't mark the event as triggered. This means that someone can trigger another release from within the callback, which then tries to resend the event. Issue: google#10758 #minor-release PiperOrigin-RevId: 488645089 (cherry picked from commit 3e5103a)
Util.getAudioTrackChannelConfig() maps a channel count to a channel mask that is passed to AudioTrack. The method expected that playback of 8-channel audio is possible from Android 5.1 and playback of 12-channel audio is only possible from Android 12L. However, there is no restriction on the upper number of channels that can be passed to the AudioTrack. google#10701 is an example where the audio decoder outputs 12 channels on an Android 10. This change removes the restrictions for 8 and 12 channels. Note, we still do not support playback of arbitrary number of channels as it would require further changes to DefaultAudioSink. #minor-release Issue: google#10701 PiperOrigin-RevId: 488659831 (cherry picked from commit 1b24e6f)
This better matches the callback name (onSurfaceSizeChanged) and probably cause less confusion with getVideoSize. PiperOrigin-RevId: 488669786 (cherry picked from commit 8438dac)
#minor-release PiperOrigin-RevId: 489202167 (cherry picked from commit 7e82d4e)
This tag is only understood by Dackka, which is used to generate the media3 javadoc. PiperOrigin-RevId: 489233200 (cherry picked from commit 058cba9)
#minor-release PiperOrigin-RevId: 489959918 (cherry picked from commit ca190c0)
#minor-release PiperOrigin-RevId: 490202192 (cherry picked from commit 6f1cf6d)
#minor-release PiperOrigin-RevId: 490224795 (cherry picked from commit e567594)
PiperOrigin-RevId: 490263003 (cherry picked from commit 202e03f)
szaboa
approved these changes
Feb 23, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.