New transcoding pipeline

.github/workflows/build.yml

@@ -4,10 +4,8 @@ name: Build
 on:
   push:
     branches:
-      - master
+      - main
   pull_request:
-env:
-  TRAVIS: true
 jobs:
   ANDROID_BASE_CHECKS:
     name: Base Checks
@@ -18,7 +16,7 @@ jobs:
         with:
           java-version: 1.8
       - name: Perform base checks
-        run: ./gradlew demo:assembleDebug lib:javadoc
+        run: ./gradlew demo:assembleDebug lib:publishToDirectory
   ANDROID_EMULATOR_TESTS:
     name: Emulator Tests
     runs-on: macOS-latest

.github/workflows/deploy.yml

@@ -4,17 +4,18 @@ on:
   release:
     types: [published]
 jobs:
-  BINTRAY_UPLOAD:
-    name: Bintray Upload
+  MAVEN_UPLOAD:
+    name: Maven 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 }}
     steps:
       - uses: actions/checkout@v1
       - uses: actions/setup-java@v1
         with:
           java-version: 1.8
-      - name: Perform bintray upload
-        run: ./gradlew bintrayUpload
+      - name: Perform maven upload
+        run: ./gradlew publishToSonatype

.github/workflows/snapshot.yml

@@ -0,0 +1,23 @@
+# 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 }}
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      - name: Publish sonatype snapshot
+        run: ./gradlew publishToSonatypeSnapshot

build.gradle.kts

@@ -0,0 +1,31 @@
+buildscript {
+
+    extra["minSdkVersion"] = 18
+    extra["compileSdkVersion"] = 30
+    extra["targetSdkVersion"] = 30
+
+    repositories {
+        google()
+        mavenCentral()
+        jcenter()
+    }
+
+    dependencies {
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.31")
+        classpath("com.android.tools.build:gradle:4.1.2")
+        classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.4.30") // publisher uses 1.4.20 which goes OOM
+        classpath("io.deepmedia.tools:publisher:0.5.0")
+    }
+}
+
+allprojects {
+    repositories {
+        google()
+        mavenCentral()
+        jcenter()
+    }
+}
+
+tasks.register("clean", Delete::class) {
+    delete(buildDir)
+}

demo/build.gradle.kts

@@ -0,0 +1,27 @@
+plugins {
+    id("com.android.application")
+    id("kotlin-android")
+}
+
+android {
+    setCompileSdkVersion(property("compileSdkVersion") as Int)
+
+    defaultConfig {
+        applicationId = "com.otaliastudios.transcoder.demo"
+        setMinSdkVersion(property("minSdkVersion") as Int)
+        setTargetSdkVersion(property("targetSdkVersion") as Int)
+        versionCode = 1
+        versionName = "1.0"
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+}
+
+dependencies {
+    implementation(project(":lib"))
+    implementation("com.google.android.material:material:1.3.0")
+    implementation("androidx.appcompat:appcompat:1.2.0")
+}

demo/src/main/java/com/otaliastudios/transcoder/demo/TranscoderActivity.java

@@ -17,9 +17,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.common.TrackStatus;
+import com.otaliastudios.transcoder.common.TrackType;
+import com.otaliastudios.transcoder.internal.utils.Logger;
 import com.otaliastudios.transcoder.sink.DataSink;
 import com.otaliastudios.transcoder.sink.DefaultDataSink;
 import com.otaliastudios.transcoder.source.DataSource;
@@ -29,9 +29,9 @@
 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;
@@ -46,8 +46,7 @@
 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("DemoApp");
 
     private static final String FILE_PROVIDER_AUTHORITY = "com.otaliastudios.transcoder.demo.fileprovider";
     private static final int REQUEST_CODE_PICK = 1;
@@ -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) { }
 
@@ -215,19 +209,20 @@ private void syncParameters() {
                 .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;
@@ -300,6 +295,7 @@ private void transcode() {
         mTranscodeStartTime = SystemClock.uptimeMillis();
         setIsTranscoding(true);
         DataSink sink = new DefaultDataSink(mTranscodeOutputFile.getAbsolutePath());
+        LOG.e("Building transcoding options...");
         TranscoderOptions.Builder builder = Transcoder.into(sink);
         if (mAudioReplacementUri == null) {
             if (mTranscodeInputUri1 != null) {
@@ -317,6 +313,7 @@ private void transcode() {
             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)

docs/.gitignore

@@ -3,3 +3,4 @@ _pages
 *.sw?
 .sass-cache
 .jekyll-metadata
+Gemfile.lock