Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix indeterminate z-order of EditedMediaItemSequences #1055

Merged
merged 8 commits into from
May 8, 2024
Merged

Fix indeterminate z-order of EditedMediaItemSequences #1055

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
177f1f3
Fix indeterminate z-order of EditedMediaItemSequences by passing sequ…
AradiPatrik Jan 31, 2024
b909162
Use sparse array in MultipleInputVideoGraph, fix formatting
AradiPatrik Jan 31, 2024
84df55c
fix naming and formatting
AradiPatrik Feb 6, 2024
3cccecf
Format with google-java-format
claincly Feb 7, 2024
52adaf8
implement top down approach for passing input source id
AradiPatrik Feb 13, 2024
51a9bcc
Refactor according to reviews.
AradiPatrik Feb 26, 2024
0403e58
Format with google-java-format
claincly Mar 4, 2024
766ff44
Fix review comment
claincly Mar 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Format with google-java-format
  • Loading branch information
@claincly
claincly committed May 8, 2024
commit 3cccecf36866ed0b749bdf90100b2c53fc88b276
1 change: 0 additions & 1 deletion libraries/common/src/main/java/androidx/media3/common/VideoGraph.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ interface Listener {
* <p>If the method throws, the caller must call {@link #release}.
*
* @param sequenceIndex The sequence index of the input which can aid ordering of the inputs.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems it's easier if we require sequence indices start from 0, so please add something like "The index must start from zero"

*
* @return The id of the registered input, which can be used to get the underlying {@link
* VideoFrameProcessor} via {@link #getProcessor(int)}.
*/
Expand Down
3 changes: 2 additions & 1 deletion libraries/effect/src/main/java/androidx/media3/effect/VideoCompositor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,10 @@ interface Listener {
* source, to be used in {@link #queueInputTexture}.
*
* @param sequenceIndex The sequence index of the input source, which is can be used to determine
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please reword: which is used to determine the order of the input sources

* the order of the input sources.
* the order of the input sources.
*/
int registerInputSource(int sequenceIndex);
AradiPatrik marked this conversation as resolved.
Show resolved Hide resolved

/**
* Signals that no more frames will come from the upstream {@link GlTextureProducer.Listener}.
*
Expand Down
2 changes: 1 addition & 1 deletion libraries/transformer/src/main/java/androidx/media3/transformer/SampleExporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public SampleExporter(Format firstInputFormat, MuxerWrapper muxerWrapper) {
* @throws ExportException If an error occurs getting the input.
*/
public abstract GraphInput getInput(
EditedMediaItem editedMediaItem, Format format, int sequenceIndex) throws ExportException;
EditedMediaItem editedMediaItem, Format format, int sequenceIndex) throws ExportException;

/**
* Processes the input data and returns whether it may be possible to process more data by calling
Expand Down
3 changes: 2 additions & 1 deletion libraries/transformer/src/main/java/androidx/media3/transformer/VideoSampleExporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,8 @@ public VideoSampleExporter(
}

@Override
public GraphInput getInput(EditedMediaItem editedMediaItem, Format format, int sequenceIndex) throws ExportException {
public GraphInput getInput(EditedMediaItem editedMediaItem, Format format, int sequenceIndex)
throws ExportException {
try {
return videoGraph.createInput(sequenceIndex);
} catch (VideoFrameProcessingException e) {
Expand Down