diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 96913344..75ba98d7 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -11,6 +11,7 @@ <option value="$PROJECT_DIR$" /> <option value="$PROJECT_DIR$/demo" /> <option value="$PROJECT_DIR$/lib" /> + <option value="$PROJECT_DIR$/lib-legacy" /> </set> </option> </GradleProjectSettings> diff --git a/.idea/runConfigurations/deployLocal.xml b/.idea/runConfigurations/deployLocal.xml index f7ebf23b..ca2317c2 100644 --- a/.idea/runConfigurations/deployLocal.xml +++ b/.idea/runConfigurations/deployLocal.xml @@ -10,7 +10,7 @@ </option> <option name="taskNames"> <list> - <option value=":lib:deployLocal" /> + <option value="deployLocal" /> </list> </option> <option name="vmOptions" /> diff --git a/README.md b/README.md index d6580bbb..eb9401df 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ Android codecs available on the device. Works on API 21+. ```kotlin // build.gradle.kts dependencies { - implementation("com.otaliastudios:transcoder:0.11.0") + implementation("io.deepmedia.community:transcoder-android:0.11.1") } ``` diff --git a/docs/changelog.mdx b/docs/changelog.mdx index 9fa981c8..a3fac8df 100644 --- a/docs/changelog.mdx +++ b/docs/changelog.mdx @@ -8,6 +8,12 @@ New versions are released through GitHub, so the reference page is the [GitHub R ## 0.11.X +### 0.11.1 + +- Fix: add unbounded queue for drifted tracks during initialization, thanks to [@jumperson](https://github.com/jumperson) ([#166](https://github.com/deepmedia/Transcoder/pull/166)) + +[Compare 0.11.0...0.11.1](https://github.com/deepmedia/Transcoder/compare/v0.11.0...v0.11.1). + ### 0.11.0 This release focuses on stability and performance, fixing old bugs that were making the library unstable and unreliable. diff --git a/lib-legacy/build.gradle.kts b/lib-legacy/build.gradle.kts index a62e9b07..aae3c91c 100644 --- a/lib-legacy/build.gradle.kts +++ b/lib-legacy/build.gradle.kts @@ -28,7 +28,7 @@ deployer { projectInfo { groupId = "com.otaliastudios" artifactId = "transcoder" - release.version = "0.11.0" // change :lib and README + release.version = "0.11.1" // change :lib and README description = "Accelerated video compression and transcoding on Android using MediaCodec APIs (no FFMPEG/LGPL licensing issues). Supports cropping to any dimension, concatenation, audio processing and much more." url = "https://opensource.deepmedia.io/transcoder" scm.fromGithub("deepmedia", "Transcoder") diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts index 74dcfcc8..7770af4e 100644 --- a/lib/build.gradle.kts +++ b/lib/build.gradle.kts @@ -63,7 +63,7 @@ deployer { projectInfo { groupId = "io.deepmedia.community" artifactId = "transcoder-android" - release.version = "0.11.0" // change :lib-legacy and README + release.version = "0.11.1" // change :lib-legacy and README description = "Accelerated video compression and transcoding on Android using MediaCodec APIs (no FFMPEG/LGPL licensing issues). Supports cropping to any dimension, concatenation, audio processing and much more." url = "https://opensource.deepmedia.io/transcoder" scm.fromGithub("deepmedia", "Transcoder") diff --git a/lib/src/androidTest/assets/issue_180/party.mp4 b/lib/src/androidTest/assets/issue_180/party.mp4 new file mode 100644 index 00000000..a8c03b6f Binary files /dev/null and b/lib/src/androidTest/assets/issue_180/party.mp4 differ diff --git a/lib/src/androidTest/java/com/otaliastudios/transcoder/integration/IssuesTests.kt b/lib/src/androidTest/java/com/otaliastudios/transcoder/integration/IssuesTests.kt index 6d127813..0cc3ffa9 100644 --- a/lib/src/androidTest/java/com/otaliastudios/transcoder/integration/IssuesTests.kt +++ b/lib/src/androidTest/java/com/otaliastudios/transcoder/integration/IssuesTests.kt @@ -11,6 +11,7 @@ import com.otaliastudios.transcoder.TranscoderOptions import com.otaliastudios.transcoder.common.TrackType import com.otaliastudios.transcoder.internal.utils.Logger import com.otaliastudios.transcoder.source.AssetFileDescriptorDataSource +import com.otaliastudios.transcoder.source.BlankAudioDataSource import com.otaliastudios.transcoder.source.ClipDataSource import com.otaliastudios.transcoder.source.FileDescriptorDataSource import com.otaliastudios.transcoder.strategy.DefaultVideoStrategy @@ -119,4 +120,19 @@ class IssuesTests { } Unit } + + @Test(timeout = 16000) + fun issue180() = with(Helper(180)) { + transcode { + val vds = input("party.mp4") + val duration = run { + vds.initialize() + vds.durationUs.also { vds.deinitialize() } + } + check(duration > 0L) { "Invalid duration: $duration" } + addDataSource(TrackType.VIDEO, vds) + addDataSource(TrackType.AUDIO, BlankAudioDataSource(duration)) + } + Unit + } } \ No newline at end of file