Skip to content
Merged
Changes from 1 commit
Commits
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
Revert Stories lib ref change
The ref was accidentally changed when resolving conflicts with develop branch.
  • Loading branch information
fluiddot committed May 26, 2021
commit 2632da080497616e7331dd9adc08869441c40e1a
2 changes: 1 addition & 1 deletion libs/stories-android
Submodule stories-android updated 20 files
+37 −36 README.md
+1 −0 mp4compose/src/main/java/com/daasuu/mp4compose/Rotation.kt
+22 −0 mp4compose/src/main/java/com/daasuu/mp4compose/VideoFormatMimeType.java
+209 −0 mp4compose/src/main/java/com/daasuu/mp4compose/composer/AudioChannelWithSP.java
+21 −5 mp4compose/src/main/java/com/daasuu/mp4compose/composer/AudioComposer.kt
+75 −0 mp4compose/src/main/java/com/daasuu/mp4compose/composer/BaseAudioChannel.java
+68 −0 mp4compose/src/main/java/com/daasuu/mp4compose/composer/ComposerProvider.kt
+24 −0 mp4compose/src/main/java/com/daasuu/mp4compose/composer/Listener.kt
+7 −28 mp4compose/src/main/java/com/daasuu/mp4compose/composer/Mp4Composer.kt
+453 −0 mp4compose/src/main/java/com/daasuu/mp4compose/composer/Mp4ComposerBasic.java
+424 −0 mp4compose/src/main/java/com/daasuu/mp4compose/composer/Mp4ComposerEngineBasic.java
+1 −1 mp4compose/src/main/java/com/daasuu/mp4compose/composer/RemixAudioComposer.kt
+235 −0 mp4compose/src/main/java/com/daasuu/mp4compose/composer/RemixAudioComposerBasic.java
+975 −0 mp4compose/src/main/java/com/daasuu/mp4compose/composer/SonicAudioProcessor.java
+3 −0 mp4compose/src/main/java/com/daasuu/mp4compose/composer/VideoComposer.kt
+23 −0 mp4compose/src/main/java/com/daasuu/mp4compose/logger/AndroidLogger.java
+32 −0 mp4compose/src/main/java/com/daasuu/mp4compose/logger/Logger.java
+14 −0 mp4compose/src/main/java/com/daasuu/mp4compose/source/DataSource.java
+43 −0 mp4compose/src/main/java/com/daasuu/mp4compose/source/FilePathDataSource.java
+29 −10 photoeditor/src/main/java/com/automattic/photoeditor/PhotoEditor.kt