diff --git a/.github/CODE_OF_CONDUCT.md b/.github/CODE_OF_CONDUCT.md
index 0df8b1dc..7cfaf5e8 100644
--- a/.github/CODE_OF_CONDUCT.md
+++ b/.github/CODE_OF_CONDUCT.md
@@ -34,7 +34,7 @@ This Code of Conduct applies both within project spaces and in public spaces whe
## Enforcement
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at mat.iavarone@gmail.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at contact@deepmedia.io. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 89da4fab..b9763c60 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -1 +1,30 @@
-Contributing guidelines are [hosted here](https://natario1.github.io/Transcoder/extra/contributing).
\ No newline at end of file
+
+Everyone is welcome to contribute with suggestions or pull requests. We are grateful to anyone who will contribute with fixes, features or feature requests.
+
+### Bug reports
+
+Please make sure to fill the bug report issue template on GitHub, if applicable.
+We highly recommend to try to reproduce the bug in the demo app, as this helps a lot in debugging
+and excludes programming errors from your side.
+
+Make sure to include:
+
+- A clear and concise description of what the bug is
+- Transcoder version, device type, Android API level
+- Exact steps to reproduce the issue
+- Description of the expected behavior
+- The original media file(s) that manifest the problem
+
+Recommended extras:
+
+- LogCat logs (use `Logger.setLogLevel(LEVEL_VERBOSE)` to print all)
+- Link to a GitHub repo where the bug is reproducible
+
+### Pull Requests
+
+Please open an issue first!
+
+Unless your PR is a simple fix (typos, documentation, bugs with obvious solution), opening an issue
+will let us discuss the problem, take design decisions and have a reference to the issue description.
+
+If you can, please write tests. We are planning to work on improving the library test coverage soon.
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
deleted file mode 100644
index 47471b0d..00000000
--- a/.github/FUNDING.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-# These are supported funding model platforms
-
-github: [natario1]
-patreon: # Replace with a single Patreon username
-open_collective: # Replace with a single Open Collective username
-ko_fi: # Replace with a single Ko-fi username
-tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
-community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
-liberapay: # Replace with a single Liberapay username
-issuehunt: # Replace with a single IssueHunt username
-otechie: # Replace with a single Otechie username
-custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 57b927e1..5744e083 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,56 +1,64 @@
# https://help.github.com/en/actions/automating-your-workflow-with-github-actions/workflow-syntax-for-github-actions
-# Renaming ? Change the README badge.
name: Build
on:
push:
branches:
- - master
+ - main
pull_request:
-env:
- TRAVIS: true
jobs:
ANDROID_BASE_CHECKS:
name: Base Checks
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v1
- - uses: actions/setup-java@v1
+ - uses: actions/checkout@v4
+ - uses: actions/setup-java@v4
with:
- java-version: 1.8
+ java-version: 17
+ distribution: temurin
+ cache: gradle
- name: Perform base checks
- run: ./gradlew demo:assembleDebug lib:javadoc
+ run: ./gradlew demo:assembleDebug lib:deployLocal --stacktrace
ANDROID_EMULATOR_TESTS:
name: Emulator Tests
- runs-on: macOS-latest
+ runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
- EMULATOR_API: [22, 25, 28]
- include:
- - EMULATOR_API: 28
- EMULATOR_ARCH: x86_64
- - EMULATOR_API: 25
- EMULATOR_ARCH: x86
- - EMULATOR_API: 22
- EMULATOR_ARCH: x86
+ EMULATOR_API: [24, 27, 29, 31, 34]
steps:
- - uses: actions/checkout@v1
- - uses: actions/setup-java@v1
+ - uses: actions/checkout@v4
+ - uses: actions/setup-java@v4
with:
- java-version: 1.8
+ java-version: 17
+ distribution: temurin
+ cache: gradle
+
+ - name: Enable KVM group perms
+ run: |
+ echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+ sudo udevadm control --reload-rules
+ sudo udevadm trigger --name-match=kvm
+
- name: Execute emulator tests
timeout-minutes: 30
- uses: reactivecircus/android-emulator-runner@v2.2.0
+ uses: reactivecircus/android-emulator-runner@v2
with:
api-level: ${{ matrix.EMULATOR_API }}
- arch: ${{ matrix.EMULATOR_ARCH }}
- disable-animations: true
- profile: Nexus 5X
+ arch: x86_64
+ profile: Nexus 6
emulator-options: -no-snapshot -no-window -no-boot-anim -camera-back none -camera-front none -gpu swiftshader_indirect
- emulator-build: 6031357
- script: ./.github/workflows/emulator_script.sh
+ script: ./.github/workflows/emulator_script.sh logcat_${{ matrix.EMULATOR_API }}.txt
+
+ - name: Upload emulator logs
+ uses: actions/upload-artifact@v4
+ if: always()
+ with:
+ name: emulator_logs_${{ matrix.EMULATOR_API }}
+ path: ./logcat_${{ matrix.EMULATOR_API }}.txt
+
- name: Upload emulator tests artifact
- uses: actions/upload-artifact@v1
+ uses: actions/upload-artifact@v4
+ if: always()
with:
name: emulator_tests_${{ matrix.EMULATOR_API }}
- path: ./lib/build/outputs/code_coverage/debugAndroidTest/connected
\ No newline at end of file
+ path: ./lib/build/reports/androidTests/connected/debug/
\ No newline at end of file
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 21307445..812d3844 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -4,17 +4,24 @@ on:
release:
types: [published]
jobs:
- BINTRAY_UPLOAD:
- name: Bintray Upload
+ MAVEN_UPLOAD:
+ name: Maven Central Upload
runs-on: ubuntu-latest
env:
- TRAVIS: true
- BINTRAY_USER: ${{ secrets.BINTRAY_USER }}
- BINTRAY_KEY: ${{ secrets.BINTRAY_KEY }}
+ SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
+ SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
+ SONATYPE_USER: ${{ secrets.SONATYPE_USER }}
+ SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
+ GHUB_USER: ${{ secrets.GHUB_USER }}
+ GHUB_PERSONAL_ACCESS_TOKEN: ${{ secrets.GHUB_PERSONAL_ACCESS_TOKEN }}
steps:
- - uses: actions/checkout@v1
- - uses: actions/setup-java@v1
+ - uses: actions/checkout@v4
+ - uses: actions/setup-java@v4
with:
- java-version: 1.8
- - name: Perform bintray upload
- run: ./gradlew bintrayUpload
+ java-version: 17
+ distribution: temurin
+ cache: gradle
+ - name: Publish to Maven Central
+ run: ./gradlew deployNexus --stacktrace
+ - name: Publish to GitHub Packages
+ run: ./gradlew deployGithub --stacktrace
diff --git a/.github/workflows/emulator_script.sh b/.github/workflows/emulator_script.sh
index 921467b1..58a57fb1 100755
--- a/.github/workflows/emulator_script.sh
+++ b/.github/workflows/emulator_script.sh
@@ -1,8 +1,6 @@
#!/usr/bin/env bash
-ADB_TAGS="Transcoder:I Engine:I"
-ADB_TAGS="$ADB_TAGS DefaultVideoStrategy:I DefaultAudioStrategy:I"
-ADB_TAGS="$ADB_TAGS VideoDecoderOutput:I VideoFrameDropper:I"
-ADB_TAGS="$ADB_TAGS AudioEngine:I"
adb logcat -c
-adb logcat $ADB_TAGS *:E -v color &
-./gradlew lib:connectedCheck
\ No newline at end of file
+adb logcat *:V > "$1" &
+LOGCAT_PID=$!
+trap "kill $LOGCAT_PID" EXIT
+./gradlew lib:connectedCheck --stacktrace
\ No newline at end of file
diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml
new file mode 100644
index 00000000..e1914ec5
--- /dev/null
+++ b/.github/workflows/snapshot.yml
@@ -0,0 +1,27 @@
+# https://help.github.com/en/actions/automating-your-workflow-with-github-actions/workflow-syntax-for-github-actions
+# Renaming ? Change the README badge.
+name: Snapshot
+on:
+ push:
+ branches:
+ - main
+jobs:
+ SNAPSHOT:
+ name: Publish Snapshot
+ runs-on: ubuntu-latest
+ env:
+ SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
+ SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
+ SONATYPE_USER: ${{ secrets.SONATYPE_USER }}
+ SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
+ GHUB_USER: ${{ secrets.GHUB_USER }}
+ GHUB_PERSONAL_ACCESS_TOKEN: ${{ secrets.GHUB_PERSONAL_ACCESS_TOKEN }}
+ steps:
+ - uses: actions/checkout@v4
+ - uses: actions/setup-java@v4
+ with:
+ java-version: 17
+ distribution: temurin
+ cache: gradle
+ - name: Publish nexus snapshot
+ run: ./gradlew deployNexusSnapshot --stacktrace
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 79859d12..d680f1ee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
.gradle
/local.properties
-/.idea
.DS_Store
/build
*.iml
diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 00000000..f0c75ba1
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,5 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+androidTestResultsUserPreferences.xml
+deploymentTargetDropDown.xml
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 00000000..b589d56e
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
new file mode 100644
index 00000000..75ba98d7
--- /dev/null
+++ b/.idea/gradle.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
new file mode 100644
index 00000000..6d0ee1c2
--- /dev/null
+++ b/.idea/kotlinc.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 00000000..2189e580
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,4 @@
+
+
+
+
\ No newline at end of file
diff --git a/.idea/runConfigurations/deployLocal.xml b/.idea/runConfigurations/deployLocal.xml
new file mode 100644
index 00000000..ca2317c2
--- /dev/null
+++ b/.idea/runConfigurations/deployLocal.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
+
+
+
+ true
+ true
+ false
+ false
+
+
+
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 00000000..35eb1ddf
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/LICENSE b/LICENSE
index 8dada3ed..119434ee 100644
--- a/LICENSE
+++ b/LICENSE
@@ -186,7 +186,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.
- Copyright {yyyy} {name of copyright owner}
+ Copyright 2024 DeepMedia Srl
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
diff --git a/README.md b/README.md
index 6b1fccd7..4b553a52 100644
--- a/README.md
+++ b/README.md
@@ -1,93 +1,60 @@
-[](https://github.com/natario1/Transcoder/actions)
-[](https://github.com/natario1/Transcoder/releases)
-[](https://github.com/natario1/Transcoder/issues)
+[](https://github.com/deepmedia/Transcoder/actions)
+[](https://github.com/deepmedia/Transcoder/releases)
+[](https://github.com/deepmedia/Transcoder/issues)
-⠀
-
-
-
-
-
-*Looking for a powerful camera library to take videos? Take a look at our [CameraView](https://github.com/natario1/CameraView).*
-
-*Need support, consulting, or have any other business-related question? Feel free to get in touch.*
-
-*Like the project, make profit from it, or simply want to thank back? Please consider [sponsoring me](https://github.com/sponsors/natario1)!*
+
# Transcoder
-Transcodes and compresses video files into the MP4 format, with audio support, using hardware-accelerated
-Android codecs available on the device. Works on API 18+.
-
-```groovy
-implementation 'com.otaliastudios:transcoder:0.9.0'
-```
+Transcodes and compresses video files into the MP4 format, with audio support, using hardware-accelerated
+Android codecs available on the device. Works on API 21+.
- Fast transcoding to AAC/AVC
- Hardware accelerated
-- Multithreaded
- Convenient, fluent API
-- Concatenate multiple video and audio tracks [[docs]](https://natario1.github.io/Transcoder/docs/concatenation)
-- Clip or trim video segments [[docs]](https://natario1.github.io/Transcoder/docs/clipping)
-- Choose output size, with automatic cropping [[docs]](https://natario1.github.io/Transcoder/docs/track-strategies#video-size)
-- Choose output rotation [[docs]](https://natario1.github.io/Transcoder/docs/advanced-options#video-rotation)
-- Choose output speed [[docs]](https://natario1.github.io/Transcoder/docs/advanced-options#video-speed)
-- Choose output frame rate [[docs]](https://natario1.github.io/Transcoder/docs/track-strategies#other-options)
-- Choose output audio channels [[docs]](https://natario1.github.io/Transcoder/docs/track-strategies#audio-strategies)
-- Choose output audio sample rate [[docs]](https://natario1.github.io/Transcoder/docs/track-strategies#audio-strategies)
-- Override frames timestamp, e.g. to slow down the middle part of the video [[docs]](https://natario1.github.io/Transcoder/docs/advanced-options#time-interpolation)
-- Error handling [[docs]](https://natario1.github.io/Transcoder/docs/events)
-- Configurable validators to e.g. avoid transcoding if the source is already compressed enough [[docs]](https://natario1.github.io/Transcoder/docs/validators)
-- Configurable video and audio strategies [[docs]](https://natario1.github.io/Transcoder/docs/track-strategies)
-
-⠀
-
-
-
-
-
-⠀
+- Thumbnails support
+- Concatenate multiple video and audio tracks [[docs]](https://opensource.deepmedia.io/transcoder/concatenation)
+- Clip or trim video segments [[docs]](https://opensource.deepmedia.io/transcoder/clipping)
+- Choose output size, with automatic cropping [[docs]](https://opensource.deepmedia.io/transcoder/track-strategies#video-size)
+- Choose output rotation [[docs]](https://opensource.deepmedia.io/transcoder/advanced-options#video-rotation)
+- Choose output speed [[docs]](https://opensource.deepmedia.io/transcoder/advanced-options#video-speed)
+- Choose output frame rate [[docs]](https://opensource.deepmedia.io/transcoder/track-strategies#other-options)
+- Choose output audio channels [[docs]](https://opensource.deepmedia.io/transcoder/track-strategies#audio-strategies)
+- Choose output audio sample rate [[docs]](https://opensource.deepmedia.io/transcoder/track-strategies#audio-strategies)
+- Override frames timestamp, e.g. to slow down the middle part of the video [[docs]](https://opensource.deepmedia.io/transcoder/advanced-options#time-interpolation)
+- Error handling [[docs]](https://opensource.deepmedia.io/transcoder/events)
+- Configurable validators to e.g. avoid transcoding if the source is already compressed enough [[docs]](https://opensource.deepmedia.io/transcoder/validators)
+- Configurable video and audio strategies [[docs]](https://opensource.deepmedia.io/transcoder/track-strategies)
+
+```kotlin
+// build.gradle.kts
+dependencies {
+ implementation("io.deepmedia.community:transcoder-android:0.11.2")
+}
+```
*This project started as a fork of [ypresto/android-transcoder](https://github.com/ypresto/android-transcoder).
-With respect to the source project, which misses most of the functionality listed above,
-we have also fixed a huge number of bugs and are much less conservative when choosing options
+With respect to the source project, which misses most of the functionality listed above,
+we have also fixed a huge number of bugs and are much less conservative when choosing options
that might not be supported. The source project will always throw - for example, accepting only 16:9,
AVC Baseline Profile videos - we prefer to try and let the codec fail if it wants to*.
-## Support
-
-If you like the project, make profit from it, or simply want to thank back, please consider
-[sponsoring me](https://github.com/sponsors/natario1) through the GitHub Sponsors program!
-You can have your company logo here, get private support hours or simply help me push this forward.
-
-Transcoder is trusted and supported by [ShareChat](https://sharechat.com/), a social media app with
-over 100 million downloads.
+*Transcoder is trusted and supported by [ShareChat](https://sharechat.com/), a social media app with
+over 100 million downloads.*
-
-
-
+Please check out [the official website](https://opensource.deepmedia.io/transcoder) for setup instructions and documentation.
+You may also check the demo app (under `/demo`) for a complete example.
-Feel free to contact me for support, consulting or any
-other business-related question.
-
-## Setup
-
-Please read the [official website](https://natario1.github.io/Transcoder) for setup instructions and documentation.
-You might also be interested in our [changelog](https://natario1.github.io/Transcoder/about/changelog).
-Using Transcoder is extremely simple:
-
-```java
+```kotlin
Transcoder.into(filePath)
- .addDataSource(context, uri) // or...
- .addDataSource(filePath) // or...
- .addDataSource(fileDescriptor) // or...
- .addDataSource(dataSource)
- .setListener(new TranscoderListener() {
- public void onTranscodeProgress(double progress) {}
- public void onTranscodeCompleted(int successCode) {}
- public void onTranscodeCanceled() {}
- public void onTranscodeFailed(@NonNull Throwable exception) {}
- }).transcode()
+ .addDataSource(context, uri) // or...
+ .addDataSource(filePath) // or...
+ .addDataSource(fileDescriptor) // or...
+ .addDataSource(dataSource)
+ .setListener(object : TranscoderListener {
+ override fun onTranscodeProgress(progress: Double) = Unit
+ override fun onTranscodeCompleted(successCode: Int) = Unit
+ override fun onTranscodeCanceled() = Unit
+ override fun onTranscodeFailed(exception: Throwable) = Unit
+ }).transcode()
```
-
-Take a look at the demo app for a complete example.
\ No newline at end of file
diff --git a/assets/logo-256.png b/assets/logo-256.png
new file mode 100644
index 00000000..932c421a
Binary files /dev/null and b/assets/logo-256.png differ
diff --git a/build.gradle b/build.gradle
deleted file mode 100644
index 031fd919..00000000
--- a/build.gradle
+++ /dev/null
@@ -1,30 +0,0 @@
-buildscript {
-
- repositories {
- google()
- jcenter()
- }
-
- dependencies {
- classpath 'com.android.tools.build:gradle:3.4.2'
- classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
- classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
- }
-}
-
-allprojects {
- repositories {
- google()
- jcenter()
- }
-}
-
-ext {
- compileSdkVersion = 28
- minSdkVersion = 18
- targetSdkVersion = 28
-}
-
-task clean(type: Delete) {
- delete rootProject.buildDir
-}
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
new file mode 100644
index 00000000..5816c9a9
--- /dev/null
+++ b/build.gradle.kts
@@ -0,0 +1,6 @@
+plugins {
+ kotlin("android") version "2.0.0" apply false
+ id("com.android.library") version "8.2.2" apply false
+ id("com.android.application") version "8.2.2" apply false
+ id("io.deepmedia.tools.deployer") version "0.14.0" apply false
+}
\ No newline at end of file
diff --git a/demo/build.gradle b/demo/build.gradle
deleted file mode 100644
index b9f4ee55..00000000
--- a/demo/build.gradle
+++ /dev/null
@@ -1,30 +0,0 @@
-apply plugin: 'com.android.application'
-
-android {
- compileSdkVersion rootProject.ext.compileSdkVersion
-
- defaultConfig {
- applicationId "com.otaliastudios.transcoder.demo"
- minSdkVersion rootProject.ext.minSdkVersion
- targetSdkVersion rootProject.ext.targetSdkVersion
- versionCode 1
- versionName "1.0"
- }
- buildTypes {
- release {
- minifyEnabled false
- proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
- }
- }
-
- compileOptions {
- sourceCompatibility 1.8
- targetCompatibility 1.8
- }
-}
-
-dependencies {
- api project(':lib')
- implementation 'com.google.android.material:material:1.1.0-alpha09'
- implementation 'androidx.appcompat:appcompat:1.1.0-rc01'
-}
diff --git a/demo/build.gradle.kts b/demo/build.gradle.kts
new file mode 100644
index 00000000..93fcf8ac
--- /dev/null
+++ b/demo/build.gradle.kts
@@ -0,0 +1,21 @@
+plugins {
+ id("com.android.application")
+ kotlin("android")
+}
+
+android {
+ namespace = "com.otaliastudios.transcoder.demo"
+ compileSdk = 34
+ defaultConfig {
+ minSdk = 21
+ targetSdk = 34
+ versionCode = 1
+ versionName = "1.0"
+ }
+}
+
+dependencies {
+ implementation(project(":lib"))
+ implementation("com.google.android.material:material:1.12.0")
+ implementation("androidx.appcompat:appcompat:1.7.0")
+}
diff --git a/demo/src/main/AndroidManifest.xml b/demo/src/main/AndroidManifest.xml
index 591d668c..5da9cd95 100644
--- a/demo/src/main/AndroidManifest.xml
+++ b/demo/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
+ xmlns:tools="http://schemas.android.com/tools">
+
+ android:label="Transcoder"
+ android:exported="true">
+
+
+
+
+
+
mTranscodeFuture;
+
+ @SuppressLint("SetTextI18n")
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ Logger.setLogLevel(Logger.LEVEL_VERBOSE);
+ setContentView(R.layout.activity_thumbnailer);
+
+ mThumbnailsView = findViewById(R.id.thumbnails);
+ mButtonView = findViewById(R.id.button);
+ mButtonView.setOnClickListener(v -> {
+ if (!mIsTranscoding) {
+ startActivityForResult(new Intent(Intent.ACTION_GET_CONTENT)
+ .setType("video/*")
+ .putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true), REQUEST_CODE_PICK);
+ } else {
+ mTranscodeFuture.cancel(true);
+ }
+ });
+
+ mProgressView = findViewById(R.id.progress);
+ mTrimStartView = findViewById(R.id.trim_start);
+ mTrimEndView = findViewById(R.id.trim_end);
+ mVideoResolutionGroup = findViewById(R.id.resolution);
+ mVideoAspectGroup = findViewById(R.id.aspect);
+ mVideoRotationGroup = findViewById(R.id.rotation);
+ setIsTranscoding(false, null);
+ }
+
+ @Override
+ protected void onActivityResult(int requestCode, int resultCode, final Intent data) {
+ super.onActivityResult(requestCode, resultCode, data);
+ if (requestCode == REQUEST_CODE_PICK
+ && resultCode == RESULT_OK
+ && data != null) {
+ if (data.getData() != null) {
+ thumbnails(data.getData());
+ } else if (data.getClipData() != null) {
+ ClipData clipData = data.getClipData();
+ List uris = new ArrayList<>();
+ for (int i = 0; i < clipData.getItemCount(); i++) {
+ uris.add(clipData.getItemAt(i).getUri());
+ }
+ thumbnails(uris.toArray(new Uri[0]));
+ }
+ }
+ }
+
+ private void thumbnails(@NonNull Uri... uris) {
+ LOG.e("Building sources...");
+ List sources = ArraysKt.map(uris, uri -> new UriDataSource(this, uri));
+ long trimStart = 0, trimEnd = 0;
+ try {
+ trimStart = Long.parseLong(mTrimStartView.getText().toString());
+ } catch (NumberFormatException e) {
+ LOG.w("Failed to read trimStart value.", e);
+ }
+ try {
+ trimEnd = Long.parseLong(mTrimEndView.getText().toString());
+ } catch (NumberFormatException e) {
+ LOG.w("Failed to read trimEnd value.", e);
+ }
+ trimStart = Math.max(0, trimStart) * 1000000;
+ trimEnd = Math.max(0, trimEnd) * 1000000;
+ sources.set(0, new TrimDataSource(sources.get(0), trimStart, trimEnd));
+
+ LOG.e("Building options...");
+ ThumbnailerOptions.Builder builder = new ThumbnailerOptions.Builder();
+ builder.addThumbnailRequest(new UniformThumbnailRequest(8));
+ builder.setListener(this);
+ for (DataSource source : sources) {
+ builder.addDataSource(source);
+ }
+
+ float aspectRatio = 0F;
+ int aspectRatioId = mVideoAspectGroup.getCheckedRadioButtonId();
+ if (aspectRatioId == R.id.aspect_169) aspectRatio = 16F / 9F;
+ else if (aspectRatioId == R.id.aspect_43) aspectRatio = 4F / 3F;
+ else if (aspectRatioId == R.id.aspect_square) aspectRatio = 1F;
+ if (aspectRatio > 0) {
+ builder.addResizer(new AspectRatioResizer(aspectRatio));
+ }
+
+ float fraction = 1F;
+ int fractionId = mVideoResolutionGroup.getCheckedRadioButtonId();
+ if (fractionId == R.id.resolution_half) fraction = 0.5F;
+ else if (fractionId == R.id.resolution_third) fraction = 1F / 3F;
+ builder.addResizer(new FractionResizer(fraction));
+
+
+ int rotation = 0;
+ int rotationId = mVideoRotationGroup.getCheckedRadioButtonId();
+ if (rotationId == R.id.rotation_90) rotation = 90;
+ else if (rotationId == R.id.rotation_180) rotation = 180;
+ else if (rotationId == R.id.rotation_270) rotation = 270;
+ builder.setRotation(rotation);
+
+ // Launch the transcoding operation.
+ LOG.e("Starting transcoding!");
+ setIsTranscoding(true, null);
+ mTranscodeFuture = builder.thumbnails();
+ }
+
+ @Override
+ public void onThumbnail(@NotNull Thumbnail thumbnail) {
+ float size = TypedValue.applyDimension(COMPLEX_UNIT_DIP, 96, getResources().getDisplayMetrics());
+ ImageView view = new ImageView(this);
+ view.setLayoutParams(new ViewGroup.LayoutParams((int) size, (int) size));
+ view.setScaleType(ImageView.ScaleType.CENTER_INSIDE);
+ view.setBackgroundColor(getResources().getColor(R.color.colorPrimary));
+ view.setImageBitmap(thumbnail.getBitmap());
+ mThumbnailsView.addView(view);
+ double progress = (float) mThumbnailsView.getChildCount() / 8;
+ mProgressView.setIndeterminate(false);
+ mProgressView.setProgress((int) Math.round(progress * PROGRESS_BAR_MAX));
+ }
+
+ @Override
+ public void onThumbnailsCanceled() {
+ setIsTranscoding(false, "Operation canceled.");
+ }
+
+ @Override
+ public void onThumbnailsFailed(@NotNull Throwable exception) {
+ setIsTranscoding(false, "Error occurred. " + exception.getMessage());
+ }
+
+ @Override
+ public void onThumbnailsCompleted(@NotNull List thumbnails) {
+ setIsTranscoding(false, "Extracted " + thumbnails.size() + " thumbnails.");
+ }
+
+ private void setIsTranscoding(boolean isTranscoding, @Nullable String message) {
+ mProgressView.setMax(PROGRESS_BAR_MAX);
+ mProgressView.setProgress(0);
+ if (isTranscoding) {
+ mThumbnailsView.removeAllViews();
+ }
+ if (message != null) {
+ Toast.makeText(this, message, Toast.LENGTH_LONG).show();
+ }
+ mIsTranscoding = isTranscoding;
+ mButtonView.setText(mIsTranscoding ? "Cancel Thumbnails" : "Select Videos & Transcode");
+ }
+}
diff --git a/demo/src/main/java/com/otaliastudios/transcoder/demo/TranscoderActivity.java b/demo/src/main/java/com/otaliastudios/transcoder/demo/TranscoderActivity.java
index f5e70b86..c07ef4bb 100644
--- a/demo/src/main/java/com/otaliastudios/transcoder/demo/TranscoderActivity.java
+++ b/demo/src/main/java/com/otaliastudios/transcoder/demo/TranscoderActivity.java
@@ -6,6 +6,7 @@
import android.net.Uri;
import android.os.Bundle;
import android.os.SystemClock;
+import android.provider.MediaStore;
import android.text.Editable;
import android.text.TextWatcher;
import android.widget.EditText;
@@ -17,11 +18,9 @@
import com.otaliastudios.transcoder.Transcoder;
import com.otaliastudios.transcoder.TranscoderListener;
import com.otaliastudios.transcoder.TranscoderOptions;
-import com.otaliastudios.transcoder.engine.TrackStatus;
-import com.otaliastudios.transcoder.engine.TrackType;
-import com.otaliastudios.transcoder.internal.Logger;
-import com.otaliastudios.transcoder.sink.DataSink;
-import com.otaliastudios.transcoder.sink.DefaultDataSink;
+import com.otaliastudios.transcoder.common.TrackStatus;
+import com.otaliastudios.transcoder.common.TrackType;
+import com.otaliastudios.transcoder.internal.utils.Logger;
import com.otaliastudios.transcoder.source.DataSource;
import com.otaliastudios.transcoder.source.TrimDataSource;
import com.otaliastudios.transcoder.source.UriDataSource;
@@ -29,25 +28,28 @@
import com.otaliastudios.transcoder.strategy.DefaultVideoStrategy;
import com.otaliastudios.transcoder.strategy.RemoveTrackStrategy;
import com.otaliastudios.transcoder.strategy.TrackStrategy;
-import com.otaliastudios.transcoder.strategy.size.AspectRatioResizer;
-import com.otaliastudios.transcoder.strategy.size.FractionResizer;
-import com.otaliastudios.transcoder.strategy.size.PassThroughResizer;
+import com.otaliastudios.transcoder.resize.AspectRatioResizer;
+import com.otaliastudios.transcoder.resize.FractionResizer;
+import com.otaliastudios.transcoder.resize.PassThroughResizer;
import com.otaliastudios.transcoder.validator.DefaultValidator;
import java.io.File;
import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
import java.util.concurrent.Future;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity;
import androidx.core.content.FileProvider;
+import kotlin.collections.ArraysKt;
+
public class TranscoderActivity extends AppCompatActivity implements
TranscoderListener {
- private static final String TAG = "DemoApp";
- private static final Logger LOG = new Logger(TAG);
+ private static final Logger LOG = new Logger("TranscoderActivity");
private static final String FILE_PROVIDER_AUTHORITY = "com.otaliastudios.transcoder.demo.fileprovider";
private static final int REQUEST_CODE_PICK = 1;
@@ -72,9 +74,6 @@ public class TranscoderActivity extends AppCompatActivity implements
private boolean mIsTranscoding;
private boolean mIsAudioOnly;
private Future mTranscodeFuture;
- private Uri mTranscodeInputUri1;
- private Uri mTranscodeInputUri2;
- private Uri mTranscodeInputUri3;
private Uri mAudioReplacementUri;
private File mTranscodeOutputFile;
private long mTranscodeStartTime;
@@ -83,15 +82,10 @@ public class TranscoderActivity extends AppCompatActivity implements
private long mTrimStartUs = 0;
private long mTrimEndUs = 0;
- private RadioGroup.OnCheckedChangeListener mRadioGroupListener
- = new RadioGroup.OnCheckedChangeListener() {
- @Override
- public void onCheckedChanged(RadioGroup group, int checkedId) {
- syncParameters();
- }
- };
+ private final RadioGroup.OnCheckedChangeListener mRadioGroupListener
+ = (group, checkedId) -> syncParameters();
- private TextWatcher mTextListener = new TextWatcher() {
+ private final TextWatcher mTextListener = new TextWatcher() {
@Override
public void beforeTextChanged(CharSequence s, int start, int count, int after) { }
@@ -114,9 +108,10 @@ protected void onCreate(Bundle savedInstanceState) {
mButtonView = findViewById(R.id.button);
mButtonView.setOnClickListener(v -> {
if (!mIsTranscoding) {
- startActivityForResult(new Intent(Intent.ACTION_GET_CONTENT)
- .setType("video/*")
- .putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true), REQUEST_CODE_PICK);
+ Intent intent = new Intent(Intent.ACTION_PICK, MediaStore.Video.Media.EXTERNAL_CONTENT_URI)
+ .setDataAndType(MediaStore.Video.Media.EXTERNAL_CONTENT_URI, "video/*")
+ .putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true);
+ startActivityForResult(intent, REQUEST_CODE_PICK);
} else {
mTranscodeFuture.cancel(true);
}
@@ -164,24 +159,21 @@ protected void onCreate(Bundle savedInstanceState) {
}
private void syncParameters() {
- int channels;
- switch (mAudioChannelsGroup.getCheckedRadioButtonId()) {
- case R.id.channels_mono: channels = 1; break;
- case R.id.channels_stereo: channels = 2; break;
- default: channels = DefaultAudioStrategy.CHANNELS_AS_INPUT;
- }
- int sampleRate;
- switch (mAudioSampleRateGroup.getCheckedRadioButtonId()) {
- case R.id.sampleRate_32: sampleRate = 32000; break;
- case R.id.sampleRate_48: sampleRate = 48000; break;
- default: sampleRate = DefaultAudioStrategy.SAMPLE_RATE_AS_INPUT;
- }
- boolean removeAudio;
- switch (mAudioReplaceGroup.getCheckedRadioButtonId()) {
- case R.id.replace_remove: removeAudio = true; break;
- case R.id.replace_yes: removeAudio = false; break;
- default: removeAudio = false;
- }
+ int channels = DefaultAudioStrategy.CHANNELS_AS_INPUT;
+ int channelsId = mAudioChannelsGroup.getCheckedRadioButtonId();
+ if (channelsId == R.id.channels_mono) channels = 1;
+ else if (channelsId == R.id.channels_stereo) channels = 2;
+
+ int sampleRate = DefaultAudioStrategy.SAMPLE_RATE_AS_INPUT;
+ int sampleRateId = mAudioSampleRateGroup.getCheckedRadioButtonId();
+ if (sampleRateId == R.id.sampleRate_32) sampleRate = 32000;
+ else if (sampleRateId == R.id.sampleRate_48) sampleRate = 48000;
+
+ boolean removeAudio = false;
+ int removeAudioId = mAudioReplaceGroup.getCheckedRadioButtonId();
+ if (removeAudioId == R.id.replace_remove) removeAudio = true;
+ else if (removeAudioId == R.id.replace_yes) removeAudio = false;
+
if (removeAudio) {
mTranscodeAudioStrategy = new RemoveTrackStrategy();
} else {
@@ -191,43 +183,41 @@ private void syncParameters() {
.build();
}
- int frames;
- switch (mVideoFramesGroup.getCheckedRadioButtonId()) {
- case R.id.frames_24: frames = 24; break;
- case R.id.frames_30: frames = 30; break;
- case R.id.frames_60: frames = 60; break;
- default: frames = DefaultVideoStrategy.DEFAULT_FRAME_RATE;
- }
- float fraction;
- switch (mVideoResolutionGroup.getCheckedRadioButtonId()) {
- case R.id.resolution_half: fraction = 0.5F; break;
- case R.id.resolution_third: fraction = 1F / 3F; break;
- default: fraction = 1F;
- }
- float aspectRatio;
- switch (mVideoAspectGroup.getCheckedRadioButtonId()) {
- case R.id.aspect_169: aspectRatio = 16F / 9F; break;
- case R.id.aspect_43: aspectRatio = 4F / 3F; break;
- case R.id.aspect_square: aspectRatio = 1F; break;
- default: aspectRatio = 0F;
- }
+ int frames = DefaultVideoStrategy.DEFAULT_FRAME_RATE;
+ int framesId = mVideoFramesGroup.getCheckedRadioButtonId();
+ if (framesId == R.id.frames_24) frames = 24;
+ else if (framesId == R.id.frames_30) frames = 30;
+ else if (framesId == R.id.frames_60) frames = 60;
+
+ float fraction = 1F;
+ int fractionId = mVideoResolutionGroup.getCheckedRadioButtonId();
+ if (fractionId == R.id.resolution_half) fraction = 0.5F;
+ else if (fractionId == R.id.resolution_third) fraction = 1F / 3F;
+
+ float aspectRatio = 0F;
+ int aspectRatioId = mVideoAspectGroup.getCheckedRadioButtonId();
+ if (aspectRatioId == R.id.aspect_169) aspectRatio = 16F / 9F;
+ else if (aspectRatioId == R.id.aspect_43) aspectRatio = 4F / 3F;
+ else if (aspectRatioId == R.id.aspect_square) aspectRatio = 1F;
+
mTranscodeVideoStrategy = new DefaultVideoStrategy.Builder()
.addResizer(aspectRatio > 0 ? new AspectRatioResizer(aspectRatio) : new PassThroughResizer())
.addResizer(new FractionResizer(fraction))
.frameRate(frames)
+ // .keyFrameInterval(4F)
.build();
try {
mTrimStartUs = Long.valueOf(mTrimStartView.getText().toString()) * 1000000;
} catch (NumberFormatException e) {
mTrimStartUs = 0;
- LOG.w("Failed to read trimStart value.");
+ LOG.w("Failed to read trimStart value.", e);
}
try {
mTrimEndUs = Long.valueOf(mTrimEndView.getText().toString()) * 1000000;
} catch (NumberFormatException e) {
mTrimEndUs = 0;
- LOG.w("Failed to read trimEnd value.");
+ LOG.w("Failed to read trimEnd value.", e);
}
if (mTrimStartUs < 0) mTrimStartUs = 0;
if (mTrimEndUs < 0) mTrimEndUs = 0;
@@ -244,17 +234,15 @@ protected void onActivityResult(int requestCode, int resultCode, final Intent da
if (requestCode == REQUEST_CODE_PICK
&& resultCode == RESULT_OK
&& data != null) {
- if (data.getData() != null) {
- mTranscodeInputUri1 = data.getData();
- mTranscodeInputUri2 = null;
- mTranscodeInputUri3 = null;
- transcode();
- } else if (data.getClipData() != null) {
+ if (data.getClipData() != null) {
ClipData clipData = data.getClipData();
- mTranscodeInputUri1 = clipData.getItemAt(0).getUri();
- mTranscodeInputUri2 = clipData.getItemCount() >= 2 ? clipData.getItemAt(1).getUri() : null;
- mTranscodeInputUri3 = clipData.getItemCount() >= 3 ? clipData.getItemAt(2).getUri() : null;
- transcode();
+ List uris = new ArrayList<>();
+ for (int i = 0; i < clipData.getItemCount(); i++) {
+ uris.add(clipData.getItemAt(i).getUri());
+ }
+ transcode(uris.toArray(new Uri[0]));
+ } else if (data.getData() != null) {
+ transcode(data.getData());
}
}
if (requestCode == REQUEST_CODE_PICK_AUDIO
@@ -267,7 +255,7 @@ protected void onActivityResult(int requestCode, int resultCode, final Intent da
}
}
- private void transcode() {
+ private void transcode(@NonNull Uri... uris) {
// Create a temporary file for output.
try {
File outputDir = new File(getExternalFilesDir(null), "outputs");
@@ -281,42 +269,35 @@ private void transcode() {
return;
}
- int rotation;
- switch (mVideoRotationGroup.getCheckedRadioButtonId()) {
- case R.id.rotation_90: rotation = 90; break;
- case R.id.rotation_180: rotation = 180; break;
- case R.id.rotation_270: rotation = 270; break;
- default: rotation = 0;
- }
+ int rotation = 0;
+ int rotationId = mVideoRotationGroup.getCheckedRadioButtonId();
+ if (rotationId == R.id.rotation_90) rotation = 90;
+ else if (rotationId == R.id.rotation_180) rotation = 180;
+ else if (rotationId == R.id.rotation_270) rotation = 270;
- float speed;
- switch (mSpeedGroup.getCheckedRadioButtonId()) {
- case R.id.speed_05x: speed = 0.5F; break;
- case R.id.speed_2x: speed = 2F; break;
- default: speed = 1F;
- }
+ float speed = 1F;
+ int speedId = mSpeedGroup.getCheckedRadioButtonId();
+ if (speedId == R.id.speed_05x) speed = 0.5F;
+ else if (speedId == R.id.speed_2x) speed = 2F;
// Launch the transcoding operation.
mTranscodeStartTime = SystemClock.uptimeMillis();
setIsTranscoding(true);
- DataSink sink = new DefaultDataSink(mTranscodeOutputFile.getAbsolutePath());
- TranscoderOptions.Builder builder = Transcoder.into(sink);
+ LOG.e("Building transcoding options...");
+ TranscoderOptions.Builder builder = Transcoder.into(mTranscodeOutputFile.getAbsolutePath());
+ List sources = ArraysKt.map(uris, uri -> new UriDataSource(this, uri));
+ sources.set(0, new TrimDataSource(sources.get(0), mTrimStartUs, mTrimEndUs));
if (mAudioReplacementUri == null) {
- if (mTranscodeInputUri1 != null) {
- DataSource source = new UriDataSource(this, mTranscodeInputUri1);
- builder.addDataSource(new TrimDataSource(source, mTrimStartUs, mTrimEndUs));
+ for (DataSource source : sources) {
+ builder.addDataSource(source);
}
- if (mTranscodeInputUri2 != null) builder.addDataSource(this, mTranscodeInputUri2);
- if (mTranscodeInputUri3 != null) builder.addDataSource(this, mTranscodeInputUri3);
} else {
- if (mTranscodeInputUri1 != null) {
- DataSource source = new UriDataSource(this, mTranscodeInputUri1);
- builder.addDataSource(TrackType.VIDEO, new TrimDataSource(source, mTrimStartUs, mTrimEndUs));
+ for (DataSource source : sources) {
+ builder.addDataSource(TrackType.VIDEO, source);
}
- if (mTranscodeInputUri2 != null) builder.addDataSource(TrackType.VIDEO, this, mTranscodeInputUri2);
- if (mTranscodeInputUri3 != null) builder.addDataSource(TrackType.VIDEO, this, mTranscodeInputUri3);
builder.addDataSource(TrackType.AUDIO, this, mAudioReplacementUri);
}
+ LOG.e("Starting transcoding!");
mTranscodeFuture = builder.setListener(this)
.setAudioTrackStrategy(mTranscodeAudioStrategy)
.setVideoTrackStrategy(mTranscodeVideoStrategy)
diff --git a/demo/src/main/res/layout/activity_thumbnailer.xml b/demo/src/main/res/layout/activity_thumbnailer.xml
new file mode 100644
index 00000000..1c20e3ca
--- /dev/null
+++ b/demo/src/main/res/layout/activity_thumbnailer.xml
@@ -0,0 +1,229 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/demo/src/main/res/values/strings.xml b/demo/src/main/res/values/strings.xml
index c5565be5..a98df502 100644
--- a/demo/src/main/res/values/strings.xml
+++ b/demo/src/main/res/values/strings.xml
@@ -1,4 +1,4 @@
- Transcoder Demo
+ Transcoder
diff --git a/docs/.gitignore b/docs/.gitignore
deleted file mode 100644
index d8a620e8..00000000
--- a/docs/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-_site
-_pages
-*.sw?
-.sass-cache
-.jekyll-metadata
diff --git a/docs/Gemfile b/docs/Gemfile
deleted file mode 100644
index 37f5eaa4..00000000
--- a/docs/Gemfile
+++ /dev/null
@@ -1,2 +0,0 @@
-source 'https://rubygems.org'
-gem 'github-pages', group: :jekyll_plugins
diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock
deleted file mode 100644
index e26c1aa1..00000000
--- a/docs/Gemfile.lock
+++ /dev/null
@@ -1,248 +0,0 @@
-GEM
- remote: https://rubygems.org/
- specs:
- activesupport (4.2.10)
- i18n (~> 0.7)
- minitest (~> 5.1)
- thread_safe (~> 0.3, >= 0.3.4)
- tzinfo (~> 1.1)
- addressable (2.5.2)
- public_suffix (>= 2.0.2, < 4.0)
- coffee-script (2.4.1)
- coffee-script-source
- execjs
- coffee-script-source (1.11.1)
- colorator (1.1.0)
- commonmarker (0.17.13)
- ruby-enum (~> 0.5)
- concurrent-ruby (1.1.4)
- dnsruby (1.61.2)
- addressable (~> 2.5)
- em-websocket (0.5.1)
- eventmachine (>= 0.12.9)
- http_parser.rb (~> 0.6.0)
- ethon (0.11.0)
- ffi (>= 1.3.0)
- eventmachine (1.2.7)
- execjs (2.7.0)
- faraday (0.15.4)
- multipart-post (>= 1.2, < 3)
- ffi (1.9.25)
- forwardable-extended (2.6.0)
- gemoji (3.0.0)
- github-pages (193)
- activesupport (= 4.2.10)
- github-pages-health-check (= 1.8.1)
- jekyll (= 3.7.4)
- jekyll-avatar (= 0.6.0)
- jekyll-coffeescript (= 1.1.1)
- jekyll-commonmark-ghpages (= 0.1.5)
- jekyll-default-layout (= 0.1.4)
- jekyll-feed (= 0.11.0)
- jekyll-gist (= 1.5.0)
- jekyll-github-metadata (= 2.9.4)
- jekyll-mentions (= 1.4.1)
- jekyll-optional-front-matter (= 0.3.0)
- jekyll-paginate (= 1.1.0)
- jekyll-readme-index (= 0.2.0)
- jekyll-redirect-from (= 0.14.0)
- jekyll-relative-links (= 0.5.3)
- jekyll-remote-theme (= 0.3.1)
- jekyll-sass-converter (= 1.5.2)
- jekyll-seo-tag (= 2.5.0)
- jekyll-sitemap (= 1.2.0)
- jekyll-swiss (= 0.4.0)
- jekyll-theme-architect (= 0.1.1)
- jekyll-theme-cayman (= 0.1.1)
- jekyll-theme-dinky (= 0.1.1)
- jekyll-theme-hacker (= 0.1.1)
- jekyll-theme-leap-day (= 0.1.1)
- jekyll-theme-merlot (= 0.1.1)
- jekyll-theme-midnight (= 0.1.1)
- jekyll-theme-minimal (= 0.1.1)
- jekyll-theme-modernist (= 0.1.1)
- jekyll-theme-primer (= 0.5.3)
- jekyll-theme-slate (= 0.1.1)
- jekyll-theme-tactile (= 0.1.1)
- jekyll-theme-time-machine (= 0.1.1)
- jekyll-titles-from-headings (= 0.5.1)
- jemoji (= 0.10.1)
- kramdown (= 1.17.0)
- liquid (= 4.0.0)
- listen (= 3.1.5)
- mercenary (~> 0.3)
- minima (= 2.5.0)
- nokogiri (>= 1.8.2, < 2.0)
- rouge (= 2.2.1)
- terminal-table (~> 1.4)
- github-pages-health-check (1.8.1)
- addressable (~> 2.3)
- dnsruby (~> 1.60)
- octokit (~> 4.0)
- public_suffix (~> 2.0)
- typhoeus (~> 1.3)
- html-pipeline (2.9.1)
- activesupport (>= 2)
- nokogiri (>= 1.4)
- http_parser.rb (0.6.0)
- i18n (0.9.5)
- concurrent-ruby (~> 1.0)
- jekyll (3.7.4)
- addressable (~> 2.4)
- colorator (~> 1.0)
- em-websocket (~> 0.5)
- i18n (~> 0.7)
- jekyll-sass-converter (~> 1.0)
- jekyll-watch (~> 2.0)
- kramdown (~> 1.14)
- liquid (~> 4.0)
- mercenary (~> 0.3.3)
- pathutil (~> 0.9)
- rouge (>= 1.7, < 4)
- safe_yaml (~> 1.0)
- jekyll-avatar (0.6.0)
- jekyll (~> 3.0)
- jekyll-coffeescript (1.1.1)
- coffee-script (~> 2.2)
- coffee-script-source (~> 1.11.1)
- jekyll-commonmark (1.2.0)
- commonmarker (~> 0.14)
- jekyll (>= 3.0, < 4.0)
- jekyll-commonmark-ghpages (0.1.5)
- commonmarker (~> 0.17.6)
- jekyll-commonmark (~> 1)
- rouge (~> 2)
- jekyll-default-layout (0.1.4)
- jekyll (~> 3.0)
- jekyll-feed (0.11.0)
- jekyll (~> 3.3)
- jekyll-gist (1.5.0)
- octokit (~> 4.2)
- jekyll-github-metadata (2.9.4)
- jekyll (~> 3.1)
- octokit (~> 4.0, != 4.4.0)
- jekyll-mentions (1.4.1)
- html-pipeline (~> 2.3)
- jekyll (~> 3.0)
- jekyll-optional-front-matter (0.3.0)
- jekyll (~> 3.0)
- jekyll-paginate (1.1.0)
- jekyll-readme-index (0.2.0)
- jekyll (~> 3.0)
- jekyll-redirect-from (0.14.0)
- jekyll (~> 3.3)
- jekyll-relative-links (0.5.3)
- jekyll (~> 3.3)
- jekyll-remote-theme (0.3.1)
- jekyll (~> 3.5)
- rubyzip (>= 1.2.1, < 3.0)
- jekyll-sass-converter (1.5.2)
- sass (~> 3.4)
- jekyll-seo-tag (2.5.0)
- jekyll (~> 3.3)
- jekyll-sitemap (1.2.0)
- jekyll (~> 3.3)
- jekyll-swiss (0.4.0)
- jekyll-theme-architect (0.1.1)
- jekyll (~> 3.5)
- jekyll-seo-tag (~> 2.0)
- jekyll-theme-cayman (0.1.1)
- jekyll (~> 3.5)
- jekyll-seo-tag (~> 2.0)
- jekyll-theme-dinky (0.1.1)
- jekyll (~> 3.5)
- jekyll-seo-tag (~> 2.0)
- jekyll-theme-hacker (0.1.1)
- jekyll (~> 3.5)
- jekyll-seo-tag (~> 2.0)
- jekyll-theme-leap-day (0.1.1)
- jekyll (~> 3.5)
- jekyll-seo-tag (~> 2.0)
- jekyll-theme-merlot (0.1.1)
- jekyll (~> 3.5)
- jekyll-seo-tag (~> 2.0)
- jekyll-theme-midnight (0.1.1)
- jekyll (~> 3.5)
- jekyll-seo-tag (~> 2.0)
- jekyll-theme-minimal (0.1.1)
- jekyll (~> 3.5)
- jekyll-seo-tag (~> 2.0)
- jekyll-theme-modernist (0.1.1)
- jekyll (~> 3.5)
- jekyll-seo-tag (~> 2.0)
- jekyll-theme-primer (0.5.3)
- jekyll (~> 3.5)
- jekyll-github-metadata (~> 2.9)
- jekyll-seo-tag (~> 2.0)
- jekyll-theme-slate (0.1.1)
- jekyll (~> 3.5)
- jekyll-seo-tag (~> 2.0)
- jekyll-theme-tactile (0.1.1)
- jekyll (~> 3.5)
- jekyll-seo-tag (~> 2.0)
- jekyll-theme-time-machine (0.1.1)
- jekyll (~> 3.5)
- jekyll-seo-tag (~> 2.0)
- jekyll-titles-from-headings (0.5.1)
- jekyll (~> 3.3)
- jekyll-watch (2.1.2)
- listen (~> 3.0)
- jemoji (0.10.1)
- gemoji (~> 3.0)
- html-pipeline (~> 2.2)
- jekyll (~> 3.0)
- kramdown (1.17.0)
- liquid (4.0.0)
- listen (3.1.5)
- rb-fsevent (~> 0.9, >= 0.9.4)
- rb-inotify (~> 0.9, >= 0.9.7)
- ruby_dep (~> 1.2)
- mercenary (0.3.6)
- mini_portile2 (2.4.0)
- minima (2.5.0)
- jekyll (~> 3.5)
- jekyll-feed (~> 0.9)
- jekyll-seo-tag (~> 2.1)
- minitest (5.11.3)
- multipart-post (2.0.0)
- nokogiri (1.10.8)
- mini_portile2 (~> 2.4.0)
- octokit (4.13.0)
- sawyer (~> 0.8.0, >= 0.5.3)
- pathutil (0.16.2)
- forwardable-extended (~> 2.6)
- public_suffix (2.0.5)
- rb-fsevent (0.10.3)
- rb-inotify (0.10.0)
- ffi (~> 1.0)
- rouge (2.2.1)
- ruby-enum (0.7.2)
- i18n
- ruby_dep (1.5.0)
- rubyzip (2.0.0)
- safe_yaml (1.0.4)
- sass (3.7.2)
- sass-listen (~> 4.0.0)
- sass-listen (4.0.0)
- rb-fsevent (~> 0.9, >= 0.9.4)
- rb-inotify (~> 0.9, >= 0.9.7)
- sawyer (0.8.1)
- addressable (>= 2.3.5, < 2.6)
- faraday (~> 0.8, < 1.0)
- terminal-table (1.8.0)
- unicode-display_width (~> 1.1, >= 1.1.1)
- thread_safe (0.3.6)
- typhoeus (1.3.1)
- ethon (>= 0.9.0)
- tzinfo (1.2.5)
- thread_safe (~> 0.1)
- unicode-display_width (1.4.0)
-
-PLATFORMS
- ruby
-
-DEPENDENCIES
- github-pages
-
-BUNDLED WITH
- 1.17.2
diff --git a/docs/README.md b/docs/README.md
index 9312dc35..995fe576 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -1 +1 @@
-Read the docs at https://natario1.github.io/Transcoder .
+Read the docs at https://opensource.deepmedia.io/transcoder.
diff --git a/docs/_about/changelog.md b/docs/_about/changelog.md
deleted file mode 100644
index 4b0e7080..00000000
--- a/docs/_about/changelog.md
+++ /dev/null
@@ -1,119 +0,0 @@
----
-layout: page
-title: "Changelog"
-order: 3
----
-
-New versions are released through GitHub, so the reference page is the [GitHub Releases](https://github.com/natario1/Transcoder/releases) page.
-
-> Starting from 0.7.0, you can now [support development](https://github.com/sponsors/natario1) through the GitHub Sponsors program.
-Companies can share a tiny part of their revenue and get private support hours in return. Thanks!
-
-### v0.9.0
-
-- New: `BlankAudioDataSource` can be used to add muted audio to a video-only track, thanks to [@mudar][mudar] ([#64][64])
-- Enhancement: you can now concatenate multiple files even if some of them have no audio, thanks to [@mudar][mudar] ([#64][64])
-- Enhancement: you can now concatenate multiple files without audio track, thanks to [@cbernier2][cbernier2] ([#61][61])
-
-
-
-### v0.8.0
-
-- New: `TrimDataSource` to trim segments. Use it to wrap your original source. Thanks to [@mudar][mudar] ([#50][50])
-- New: `ClipDataSource`, just likes `TrimDataSource` but selects trim values with respect to video start ([#54][54])
-
-> Transcoder will trim video segments only at the closest video sync frame. If your video has few sync
-frames, the trim timestamp might be different than what was selected.
-
-
-
-##### v0.7.4
-
-- Fix: fixed Xamarin incompatibility, thanks to [@aweck][aweck] ([#41][41])
-- Fix: fixed small bugs with specific API versions / media files ([#47][47])
-- Fix: fixed issues with specific media files, ensure consistent onProgress callback ([#48][48])
-
-
-
-##### v0.7.3
-
-- Fix: fixed bug with files that do not have an audio track, thanks to [@pawegio][pawegio] ([#31][31])
-- Fix: fixed possible issues with FilePathDataSource ([#32][32])
-
-
-
-##### v0.7.2
-
-- Improvement: better input format detection. Fixes bugs with certain files ([#29][29])
-- Improvement: added `DefaultAudioStrategy.Builder.bitRate()` option ([#29][29])
-
-
-
-##### v0.7.1
-
-- Improvement: update the underlying OpenGL library ([#20][20])
-
-
-
-### v0.7.0
-
-- New: video concatenation to stitch together multiple media ([#14][14])
-- New: select a specific track type (`VIDEO` or `AUDIO`) for sources ([#14][14])
-- New: audio resampling through `DefaultAudioStrategy` ([#16][16])
-- New: custom resampling through `TranscoderOptions.setAudioResampler()` ([#16][16])
-- Breaking change: `TranscoderOptions.setDataSource()` renamed to `addDataSource()` ([#14][14])
-- Breaking change: `TranscoderOptions.setRotation()` renamed to `setVideoRotation()` ([#14][14])
-- Breaking change: `DefaultVideoStrategy.iFrameInterval()` renamed to `keyFrameInterval()` ([#14][14])
-- Breaking change: `DefaultAudioStrategy` now uses a builder - removed old constructor ([#16][16])
-- Improvement: rotate videos through OpenGL instead of using metadata ([#14][14])
-- Improvement: when concatenating multiple sources, automatically clip the longer track (audio or video) ([#17][17])
-- Improvement: various bug fixed ([#18][18])
-
-
-
-### v0.6.0
-
-- New: ability to change video/audio speed and change each frame timestamp ([#10][10])
-- New: ability to set the video output rotation ([#8][8])
-- Improvement: new frame dropping algorithm, thanks to [@Saqrag][Saqrag] ([#9][9])
-- Improvement: avoid format validation on tracks coming from PassThroughTrackTranscoder, thanks to [@Saqrag][Saqrag] ([#11][11])
-
-
-
-### v0.5.0
-
-- New: video cropping to any dimension. Encoder will crop the exceeding size. ([#6][6])
-- New: `AspectRatioResizer` to crop to a given aspect ratio. ([#6][6])
-- Breaking change: `MediaTranscoder` renamed to `Transcoder`. ([#6][6])
-- Breaking change: `MediaTranscoderOptions` renamed to `TranscoderOptions`. ([#6][6])
-- Breaking change: `MediaTranscoder.Listener` renamed to `TranscoderListener`. ([#6][6])
-- Improvement: use [EglCore](https://github.com/natario1/EglCore) to replace GL logic. ([#5][5])
-- Improvement: bug fixes and a new demo app to test transcoding options easily ([#4][4])
-
-[Saqrag]: https://github.com/Saqrag
-[pawegio]: https://github.com/pawegio
-[aweck]: https://github.com/aweck
-[mudar]: https://github.com/mudar
-[cbernier2]: https://github.com/cbernier2
-
-[4]: https://github.com/natario1/Transcoder/pull/4
-[5]: https://github.com/natario1/Transcoder/pull/5
-[6]: https://github.com/natario1/Transcoder/pull/6
-[8]: https://github.com/natario1/Transcoder/pull/8
-[9]: https://github.com/natario1/Transcoder/pull/9
-[10]: https://github.com/natario1/Transcoder/pull/10
-[14]: https://github.com/natario1/Transcoder/pull/14
-[16]: https://github.com/natario1/Transcoder/pull/16
-[17]: https://github.com/natario1/Transcoder/pull/17
-[18]: https://github.com/natario1/Transcoder/pull/18
-[20]: https://github.com/natario1/Transcoder/pull/20
-[29]: https://github.com/natario1/Transcoder/pull/29
-[31]: https://github.com/natario1/Transcoder/pull/31
-[32]: https://github.com/natario1/Transcoder/pull/32
-[41]: https://github.com/natario1/Transcoder/pull/41
-[47]: https://github.com/natario1/Transcoder/pull/47
-[48]: https://github.com/natario1/Transcoder/pull/48
-[50]: https://github.com/natario1/Transcoder/pull/50
-[54]: https://github.com/natario1/Transcoder/pull/54
-[61]: https://github.com/natario1/Transcoder/pull/61
-[64]: https://github.com/natario1/Transcoder/pull/64
diff --git a/docs/_about/getting-started.md b/docs/_about/getting-started.md
deleted file mode 100644
index 826130d9..00000000
--- a/docs/_about/getting-started.md
+++ /dev/null
@@ -1,42 +0,0 @@
----
-layout: page
-title: "Getting Started"
-description: "Simple guide to transcode your first video"
-order: 2
-disqus: 1
----
-
-### Before you start
-
-If your app targets versions older than API 18, you can override the minSdkVersion by
-adding this line to your manifest file:
-
-```xml
-
-```
-
-In this case you should check at runtime that API level is at least 18, before
-calling any method here.
-
-### Transcoding your first video
-
-Transcoding happens through the `Transcoder` class by passing it an output file path,
-and one of more input data sources. It's pretty simple:
-
-```java
-Transcoder.into(filePath)
- .addDataSource(context, uri) // or...
- .addDataSource(filePath) // or...
- .addDataSource(fileDescriptor) // or...
- .addDataSource(dataSource)
- .setListener(new TranscoderListener() {
- public void onTranscodeProgress(double progress) {}
- public void onTranscodeCompleted(int successCode) {}
- public void onTranscodeCanceled() {}
- public void onTranscodeFailed(@NonNull Throwable exception) {}
- }).transcode()
-```
-
-However, we offer many APIs and additional features on top that you can read about in the
-in-depth documentation.
-
diff --git a/docs/_about/install.md b/docs/_about/install.md
deleted file mode 100644
index b55ed375..00000000
--- a/docs/_about/install.md
+++ /dev/null
@@ -1,27 +0,0 @@
----
-layout: page
-title: "Install"
-description: "Integrate in your project"
-order: 1
----
-
-The library works on API 18+, which is the only requirement and should be met by many projects nowadays.
-
-The project is publicly hosted on [JCenter](https://bintray.com/natario/android/Transcoder), where you
-can download the AAR package. To fetch with Gradle, make sure you add the JCenter repository in your root projects `build.gradle` file:
-
-```groovy
-allprojects {
- repositories {
- jcenter()
- }
-}
-```
-
-Then simply download the latest version:
-
-```groovy
-api 'com.otaliastudios:transcoder:{{ site.github_version }}'
-```
-
-No other configuration steps are needed.
\ No newline at end of file
diff --git a/docs/_config.yml b/docs/_config.yml
deleted file mode 100644
index 7a0fbeb5..00000000
--- a/docs/_config.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-# Glide: https://github.com/bumptech/glide/blob/gh-pages/_config.yml
-# Source repo: https://github.com/bruth/jekyll-docs-template
-# Source site: http://bruth.github.io/jekyll-docs-template/
-# Ref guide: https://visualstudiomagazine.com/Articles/2015/03/01/GitHub-Pages.aspx?Page=2
-
-# Used by us
-title: Transcoder
-color: '#f8f8f8'
-description: A well documented Android library providing hardware-accelerated video transcoding, using MediaCodec APIs instead of native code (no FFMPEG patent issues). Supports cropping to any dimension, concatenation, clipping, audio processing, video speed and much more. # used by ourselves and by seo tag.
-disqus_shortname: 'natario1-transcoder'
-google_analytics_id: 'UA-155077779-2'
-google_site_verification: '4x49i17ABIrSvUl52SeL0-t0341aTnWWaC62-FYCRT4'
-github: [metadata] # TODO What's this?
-github_repo: Transcoder
-github_version: 0.9.0
-github_branch: master
-baseurl: '/Transcoder' # Keep as an empty string if served up at the root
-collections:
- about:
- name: Overview
- output: true
- docs:
- name: Documentation
- output: true
- extra:
- name: More
- output: true
-screenshots:
- - 'screenshot-1.png'
- - 'screenshot-2.png'
-
-# Jekyll specific stuff
-author:
- name: Mattia Iavarone # Should appear in .
- email: mat.iavarone@gmail.com
- github: natario1
- website: https://natario.dev
-plugins:
- - jekyll-seo-tag # Add SEO tags
-permalink: /:categories/:title # Ensure permalinks have no date nor extension
-exclude: ['script', 'README.md'] # Exclude non-site files
-highlighter: rouge # Syntax highlighting
-markdown: kramdown # Use the kramdown Markdown renderer
-kramdown:
- input: GFM # Use Github Flavored Markdown
\ No newline at end of file
diff --git a/docs/_docs/clipping.md b/docs/_docs/clipping.md
deleted file mode 100644
index 041e3a9b..00000000
--- a/docs/_docs/clipping.md
+++ /dev/null
@@ -1,61 +0,0 @@
----
-layout: page
-title: "Clipping and trimming"
-description: "How to clip each segment individually on both ends"
-order: 2
-disqus: 1
----
-
-Starting from `v0.8.0`, Transcoder offers the option to clip or trim video segments, on one or
-both ends. This is done by using special `DataSource` objects that wrap you original source,
-so that, in case of [concatenation](concatenation) of multiple media files, the trimming values
-can be set individually for each segment.
-
-> When video tracks are involved, Transcoder will always move the clipping position to the
-closest video sync frame. This means that sync frames define the granularity of clipping!
-If the rate of sync frames in your media is very low, there might be a significant difference
-with respect to what you would expect.
-
-For example, if your media has sync frames at seconds 2 and 4 and you try to clip the first 2.5
-seconds, Transcoder will actually only clip the first 2.
-
-### TrimDataSource
-
-The `TrimDataSource` class lets you trim segments by specifying the amount of time to be trimmed
-at both ends. For example, the code below will trim the file by 1 second at the beginning, and
-2 seconds at the end:
-
-```java
-DataSource source = new UriDataSource(context, uri);
-DataSource trim = new TrimDataSource(source, 1000 * 1000, 2 * 1000 * 1000);
-Transcoder.into(filePath)
- .addDataSource(trim)
- .transcode()
-```
-
-It is recommended to always check `source.getDurationUs()` to compute the correct values.
-
-### ClipDataSource
-
-The `ClipDataSource` class lets you clip segments by specifying a time window. For example,
-the code below clip the file from second 1 until second 5:
-
-```java
-DataSource source = new UriDataSource(context, uri);
-DataSource clip = new ClipDataSource(source, 1000 * 1000, 5 * 1000 * 1000);
-Transcoder.into(filePath)
- .addDataSource(clip)
- .transcode()
-```
-
-It is recommended to always check `source.getDurationUs()` to compute the correct values.
-
-### Related APIs
-
-|Method|Description|
-|------|-----------|
-|`new TrimDataSource(source, long)`|Creates a new data source trimmed on start.|
-|`new TrimDataSource(source, long, long)`|Creates a new data source trimmed on both ends.|
-|`new ClipDataSource(source, long)`|Creates a new data source clipped on start.|
-|`new ClipDataSource(source, long, long)`|Creates a new data source clipped on both ends.|
-
diff --git a/docs/_extra/contact.md b/docs/_extra/contact.md
deleted file mode 100644
index 409dfe15..00000000
--- a/docs/_extra/contact.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-layout: page
-title: "Contact"
-order: 3
----
-
-This library is maintained by [Mattia Iavarone](https://github.com/natario1) (@natario1).
-Feel free to contact me privately by sending an email,
-for support, consulting, or have any other business-related question.
-
-To report issues, please use the [project GitHub page](https://github.com/natario1/Transcoder).
-
diff --git a/docs/_extra/contributing.md b/docs/_extra/contributing.md
deleted file mode 100644
index cf62752b..00000000
--- a/docs/_extra/contributing.md
+++ /dev/null
@@ -1,60 +0,0 @@
----
-layout: page
-title: "Contributing & License"
-order: 1
----
-
-Everyone is welcome to contribute with suggestions or pull requests, as the library is under active development.
-
-We are grateful to anyone who will contribute with fixes, features or feature requests. If you don't
-want to get involved but still want to support the project, please [consider donating](donate).
-
-### Bug reports
-
-Please make sure to fill the bug report issue template on GitHub, if applicable.
-We highly recommend to try to reproduce the bug in the demo app, as this helps a lot in debugging
-and excludes programming errors from your side.
-
-Make sure to include:
-
-- A clear and concise description of what the bug is
-- Transcoder version, device type, Android API level
-- Exact steps to reproduce the issue
-- Description of the expected behavior
-- The original media file(s) that manifest the problem
-
-Recommended extras:
-
-- LogCat logs (use `Logger.setLogLevel(LEVEL_VERBOSE)` to print all)
-- Link to a GitHub repo where the bug is reproducible
-
-### Pull Requests
-
-Please open an issue first!
-
-Unless your PR is a simple fix (typos, documentation, bugs with obvious solution), opening an issue
-will let us discuss the problem, take design decisions and have a reference to the issue description.
-
-If you can, please write tests. We are planning to work on improving the library test coverage soon.
-
-### License
-
-This project is licensed under Apache 2.0. It consists of improvements over
-the [ypresto/android-transcoder](https://github.com/ypresto/android-transcoder)
-project which was licensed under Apache 2.0 as well:
-
-```
-Copyright (C) 2014-2016 Yuya Tanaka
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-```
diff --git a/docs/_extra/donate.md b/docs/_extra/donate.md
deleted file mode 100644
index 3400e886..00000000
--- a/docs/_extra/donate.md
+++ /dev/null
@@ -1,16 +0,0 @@
----
-layout: page
-title: "Donate"
-order: 2
----
-
-Transcoder is maintained and, for the most part, developed by Mattia Iavarone ([contact me!](contact)). If you like the project,
-use it with profit, or simply want to thank back, please consider
-[sponsoring me](https://github.com/sponsors/natario1) through the GitHub Sponsors program!
-
-I offer private support hours through the sponsorship program and I'm open to help your
-company with features that are not currently supported by the open source project.
-
-Thank you for any contribution!
-
-
diff --git a/docs/_includes/disqus.html b/docs/_includes/disqus.html
deleted file mode 100644
index b561eef0..00000000
--- a/docs/_includes/disqus.html
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html
deleted file mode 100644
index be732e0b..00000000
--- a/docs/_includes/footer.html
+++ /dev/null
@@ -1,4 +0,0 @@
-
diff --git a/docs/_includes/google_analytics.html b/docs/_includes/google_analytics.html
deleted file mode 100644
index 174548d1..00000000
--- a/docs/_includes/google_analytics.html
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
diff --git a/docs/_includes/head.html b/docs/_includes/head.html
deleted file mode 100644
index d3f33018..00000000
--- a/docs/_includes/head.html
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{% seo %}
-
-{% if site.google_analytics_id != "" %}
-{% include google_analytics.html %}
-{% endif %}
\ No newline at end of file
diff --git a/docs/_includes/header.html b/docs/_includes/header.html
deleted file mode 100644
index 7e135e05..00000000
--- a/docs/_includes/header.html
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
- {{ site.title }}
-
-
-
-
-
-
- {{ site.title }}
-
-
- 
- 
-
- 
-