Skip to content

Commit 3711b99

Browse files
kibotukibotu
committed
namespace
1 parent 4ab44f8 commit 3711b99

31 files changed

+96
-82
lines changed

‎Android-Dependencies

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎README.md

Lines changed: 33 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,39 @@ Features
99

1010
[![Screenshot](screenshot.png)](screenshot.png)
1111

12+
13+
# How to install
14+
15+
## MavenCentral
16+
17+
```groovy
18+
allprojects {
19+
repositories {
20+
mavenCentral()
21+
}
22+
}
23+
24+
dependencies {
25+
implementation 'net.kibotu:FreedomPlayer:{latest-version}'
26+
}
27+
28+
```
29+
30+
## Jitpack
31+
32+
```groovy
33+
allprojects {
34+
repositories {
35+
...
36+
maven { url 'https://jitpack.io' }
37+
}
38+
}
39+
40+
dependencies {
41+
implementation 'com.github.kibotu:FreedomPlayer:{latest-version}'
42+
}
43+
```
44+
1245
# How to use FFMpeg Part
1346

1447
### Extracting frames
@@ -91,31 +124,6 @@ MediaCodecTranscoder.createVideoFromFrames(
91124
).addTo(subscription)
92125
```
93126

94-
# How to install
95-
96-
Step 1. Add the JitPack repository to your build file
97-
98-
Add it in your root build.gradle at the end of repositories:
99-
100-
```groovy
101-
allprojects {
102-
repositories {
103-
...
104-
maven { url 'https://dl.bintray.com/exozetag/maven' }
105-
}
106-
}
107-
```
108-
109-
Step 2. Add the dependency
110-
111-
```groovy
112-
dependencies {
113-
implementation 'com.exozet:transcoder:{version}'
114-
115-
//Need to add ffmpeg dependencies if want to use FFMpegTranscoder(tested version 4.3.1.LTS)
116-
implementation 'com.arthenica:mobile-ffmpeg-full-gpl:{version}'
117-
}
118-
```
119127

120128
### License
121129

‎transcoder/.gitignore renamed to ‎android-ffmpeg-transcoder/.gitignore

File renamed without changes.

‎transcoder/build.gradle renamed to ‎android-ffmpeg-transcoder/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
22
apply plugin: 'kotlin-android'
33

44
android {
5-
namespace "com.exozet.transcoder"
5+
namespace "net.kibotu.androidffmpegtranscoder"
66

77
compileSdk compileSdkVer
88
buildToolsVersion = buildToolsVer

‎transcoder/proguard-rules.pro renamed to ‎android-ffmpeg-transcoder/proguard-rules.pro

File renamed without changes.

‎transcoder/src/main/AndroidManifest.xml renamed to ‎android-ffmpeg-transcoder/src/main/AndroidManifest.xml

File renamed without changes.

‎transcoder/src/main/java/com/exozet/transcoder/ffmpeg/DebugExtensions.kt renamed to ‎android-ffmpeg-transcoder/src/main/java/net/kibotu/androidffmpegtranscoder/ffmpeg/DebugExtensions.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* Created by [Jan Rabe](https://about.me/janrabe).
33
*/
4-
package com.exozet.transcoder.ffmpeg
4+
package net.kibotu.androidffmpegtranscoder.ffmpeg
55

66
import android.util.Log
77
//import com.exozet.transcoder.BuildConfig

‎android-ffmpeg-transcoder/src/main/java/net/kibotu/androidffmpegtranscoder/ffmpeg/Encoding.kt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
package net.kibotu.androidffmpegtranscoder.ffmpeg
2+
3+
enum class Encoding {
4+
libx264
5+
}

‎transcoder/src/main/java/com/exozet/transcoder/ffmpeg/EncodingConfig.kt renamed to ‎android-ffmpeg-transcoder/src/main/java/net/kibotu/androidffmpegtranscoder/ffmpeg/EncodingConfig.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.exozet.transcoder.ffmpeg
1+
package net.kibotu.androidffmpegtranscoder.ffmpeg
22

33
import androidx.annotation.IntRange
44

‎transcoder/src/main/java/com/exozet/transcoder/ffmpeg/FFMpegTranscoder.kt renamed to ‎android-ffmpeg-transcoder/src/main/java/net/kibotu/androidffmpegtranscoder/ffmpeg/FFMpegTranscoder.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.exozet.transcoder.ffmpeg
1+
package net.kibotu.androidffmpegtranscoder.ffmpeg
22

33
import android.content.Context
44
import android.net.Uri

‎transcoder/src/main/java/com/exozet/transcoder/ffmpeg/PixelFormat.kt renamed to ‎android-ffmpeg-transcoder/src/main/java/net/kibotu/androidffmpegtranscoder/ffmpeg/PixelFormat.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.exozet.transcoder.ffmpeg
1+
package net.kibotu.androidffmpegtranscoder.ffmpeg
22

33
enum class PixelFormat {
44
yuv420p, monow, rgb24

‎transcoder/src/main/java/com/exozet/transcoder/ffmpeg/Preset.kt renamed to ‎android-ffmpeg-transcoder/src/main/java/net/kibotu/androidffmpegtranscoder/ffmpeg/Preset.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.exozet.transcoder.ffmpeg
1+
package net.kibotu.androidffmpegtranscoder.ffmpeg
22

33
enum class Preset {
44
ultrafast,

‎transcoder/src/main/java/com/exozet/transcoder/ffmpeg/Progress.kt renamed to ‎android-ffmpeg-transcoder/src/main/java/net/kibotu/androidffmpegtranscoder/ffmpeg/Progress.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.exozet.transcoder.ffmpeg
1+
package net.kibotu.androidffmpegtranscoder.ffmpeg
22

33
import android.net.Uri
44

‎transcoder/src/main/java/com/exozet/transcoder/mcvideoeditor/CodecOutputSurface.java renamed to ‎android-ffmpeg-transcoder/src/main/java/net/kibotu/androidffmpegtranscoder/mcvideoeditor/CodecOutputSurface.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package com.exozet.transcoder.mcvideoeditor;
1+
package net.kibotu.androidffmpegtranscoder.mcvideoeditor;
22

33
import static android.content.ContentValues.TAG;
44

5-
import static com.exozet.transcoder.ffmpeg.DebugExtensionsKt.log;
5+
import static net.kibotu.androidffmpegtranscoder.ffmpeg.DebugExtensionsKt.log;
66

77
import android.graphics.Bitmap;
88
import android.graphics.SurfaceTexture;

‎transcoder/src/main/java/com/exozet/transcoder/mcvideoeditor/MediaCodecCreateVideo.java renamed to ‎android-ffmpeg-transcoder/src/main/java/net/kibotu/androidffmpegtranscoder/mcvideoeditor/MediaCodecCreateVideo.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package com.exozet.transcoder.mcvideoeditor;
1+
package net.kibotu.androidffmpegtranscoder.mcvideoeditor;
22

3-
import static com.exozet.transcoder.ffmpeg.DebugExtensionsKt.log;
3+
import static net.kibotu.androidffmpegtranscoder.ffmpeg.DebugExtensionsKt.log;
44

55
import android.graphics.Bitmap;
66
import android.graphics.BitmapFactory;
@@ -14,7 +14,7 @@
1414

1515
import androidx.annotation.RequiresApi;
1616

17-
import com.exozet.transcoder.ffmpeg.Progress;
17+
import net.kibotu.androidffmpegtranscoder.ffmpeg.Progress;
1818

1919
import java.io.File;
2020
import java.io.IOException;

‎transcoder/src/main/java/com/exozet/transcoder/mcvideoeditor/MediaCodecExtractImages.kt renamed to ‎android-ffmpeg-transcoder/src/main/java/net/kibotu/androidffmpegtranscoder/mcvideoeditor/MediaCodecExtractImages.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.exozet.transcoder.mcvideoeditor
1+
package net.kibotu.androidffmpegtranscoder.mcvideoeditor
22

33
/*
44
* Copyright 2013 The Android Open Source Project
@@ -20,10 +20,10 @@ import android.media.MediaCodec
2020
import android.media.MediaExtractor
2121
import android.media.MediaFormat
2222
import android.net.Uri
23-
import com.exozet.transcoder.ffmpeg.Progress
24-
import com.exozet.transcoder.ffmpeg.log
2523
import io.reactivex.Observable
2624
import io.reactivex.ObservableEmitter
25+
import net.kibotu.androidffmpegtranscoder.ffmpeg.Progress
26+
import net.kibotu.androidffmpegtranscoder.ffmpeg.log
2727
import java.io.File
2828
import java.io.FileNotFoundException
2929
import java.io.IOException

‎transcoder/src/main/java/com/exozet/transcoder/mcvideoeditor/MediaCodecTranscoder.kt renamed to ‎android-ffmpeg-transcoder/src/main/java/net/kibotu/androidffmpegtranscoder/mcvideoeditor/MediaCodecTranscoder.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package com.exozet.transcoder.mcvideoeditor
1+
package net.kibotu.androidffmpegtranscoder.mcvideoeditor
22

33
import android.content.Context
44
import android.graphics.BitmapFactory
55
import android.net.Uri
66
import androidx.annotation.IntRange
7-
import com.exozet.transcoder.ffmpeg.Progress
87
import io.reactivex.Observable
8+
import net.kibotu.androidffmpegtranscoder.ffmpeg.Progress
99
import java.io.File
1010

1111
object MediaCodecTranscoder {

‎transcoder/src/main/java/com/exozet/transcoder/mcvideoeditor/MediaConfig.kt renamed to ‎android-ffmpeg-transcoder/src/main/java/net/kibotu/androidffmpegtranscoder/mcvideoeditor/MediaConfig.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.exozet.transcoder.mcvideoeditor
1+
package net.kibotu.androidffmpegtranscoder.mcvideoeditor
22

33
data class MediaConfig(
44

‎transcoder/src/main/java/com/exozet/transcoder/mcvideoeditor/STextureRender.java renamed to ‎android-ffmpeg-transcoder/src/main/java/net/kibotu/androidffmpegtranscoder/mcvideoeditor/STextureRender.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package com.exozet.transcoder.mcvideoeditor;
1+
package net.kibotu.androidffmpegtranscoder.mcvideoeditor;
22

33
import static android.content.ContentValues.TAG;
44

5-
import static com.exozet.transcoder.ffmpeg.DebugExtensionsKt.log;
5+
import static net.kibotu.androidffmpegtranscoder.ffmpeg.DebugExtensionsKt.log;
66

77
import android.graphics.SurfaceTexture;
88
import android.opengl.GLES11Ext;

‎app/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ apply plugin: 'kotlin-kapt'
44

55
android {
66

7-
namespace "com.exozet.transcoder.ffmpeg.demo"
7+
namespace "net.kibotu.androidffmpegtranscoder.demo"
88
compileSdk compileSdkVer
99
buildToolsVersion = buildToolsVer
1010

1111
defaultConfig {
12-
applicationId "com.exozet.transcoder.ffmpeg.demo"
12+
applicationId "net.kibotu.androidffmpegtranscoder.demo"
1313
minSdk minSdkVer
1414
targetSdk targetSdkVer
1515
versionName version
@@ -98,7 +98,7 @@ android {
9898

9999
dependencies {
100100
coreLibraryDesugaring desugaring.jdk
101-
implementation project(':transcoder')
101+
implementation project(':android-ffmpeg-transcoder')
102102
implementation libs.supportAppCompat
103103
implementation libs.material
104104
implementation libs.numberProgressBar

‎app/src/main/AndroidManifest.xml

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,33 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
xmlns:tools="http://schemas.android.com/tools">
3+
xmlns:tools="http://schemas.android.com/tools">
44

55
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
66
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
77

88
<application
9-
android:icon="@mipmap/ic_launcher"
9+
android:icon="@mipmap/ic_launcher"
10+
android:label="@string/app_name"
1011
android:requestLegacyExternalStorage="true"
11-
android:label="@string/app_name"
12-
android:roundIcon="@mipmap/ic_launcher_round"
13-
android:supportsRtl="true"
14-
android:theme="@style/AppTheme"
15-
tools:ignore="GoogleAppIndexingWarning">
16-
<activity android:name="com.exozet.transcoder.ffmpeg.demo.FFmpegActivity" android:exported="true">
12+
android:roundIcon="@mipmap/ic_launcher_round"
13+
android:supportsRtl="true"
14+
android:theme="@style/AppTheme"
15+
tools:ignore="GoogleAppIndexingWarning">
16+
<activity
17+
android:name=".FFmpegActivity"
18+
android:exported="true">
1719
<intent-filter>
1820
<action android:name="android.intent.action.MAIN" />
1921

2022
<category android:name="android.intent.category.LAUNCHER" />
2123
</intent-filter>
2224
</activity>
25+
26+
<activity
27+
android:name=".DemoActivity"
28+
android:exported="true">
29+
</activity>
30+
2331
</application>
2432

2533
</manifest>

‎app/src/main/java/com/exozet/transcoder/ffmpeg/demo/App.kt renamed to ‎app/src/main/java/net/kibotu/androidffmpegtranscoder/demo/App.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.exozet.transcoder.ffmpeg.demo
1+
package net.kibotu.androidffmpegtranscoder.demo
22

33
import android.app.Application
44
import net.kibotu.logger.LogcatLogger

‎app/src/main/java/com/exozet/transcoder/ffmpeg/demo/CompositeDisposable+Extensions.kt renamed to ‎app/src/main/java/net/kibotu/androidffmpegtranscoder/demo/CompositeDisposable+Extensions.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.exozet.transcoder.ffmpeg.demo
1+
package net.kibotu.androidffmpegtranscoder.demo
22

33
import io.reactivex.disposables.CompositeDisposable
44
import io.reactivex.disposables.Disposable

‎app/src/main/java/com/exozet/transcoder/ffmpeg/demo/DemoActivity.kt renamed to ‎app/src/main/java/net/kibotu/androidffmpegtranscoder/demo/DemoActivity.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
package com.exozet.transcoder.ffmpeg.demo
1+
package net.kibotu.androidffmpegtranscoder.demo
22

33
import android.net.Uri
44
import android.os.Bundle
55
import android.os.Environment
66
import androidx.fragment.app.FragmentActivity
7-
import com.exozet.transcoder.ffmpeg.Progress
8-
import com.exozet.transcoder.ffmpeg.demo.databinding.ActivityDemoBinding
9-
import com.exozet.transcoder.mcvideoeditor.MediaCodecTranscoder
7+
import net.kibotu.androidffmpegtranscoder.ffmpeg.Progress
8+
import net.kibotu.androidffmpegtranscoder.mcvideoeditor.MediaCodecTranscoder
109
import io.reactivex.android.schedulers.AndroidSchedulers
1110
import io.reactivex.disposables.CompositeDisposable
1211
import io.reactivex.schedulers.Schedulers
12+
import net.kibotu.androidffmpegtranscoder.demo.databinding.ActivityDemoBinding
1313
import net.kibotu.logger.Logger
1414

1515
class DemoActivity : FragmentActivity() {

‎app/src/main/java/com/exozet/transcoder/ffmpeg/demo/FFmpegActivity.kt renamed to ‎app/src/main/java/net/kibotu/androidffmpegtranscoder/demo/FFmpegActivity.kt

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.exozet.transcoder.ffmpeg.demo
1+
package net.kibotu.androidffmpegtranscoder.demo
22

33
import android.Manifest
44
import android.content.Context
@@ -7,17 +7,16 @@ import android.os.Bundle
77
import android.util.Log
88
import androidx.appcompat.app.AppCompatActivity
99
import androidx.core.view.isVisible
10-
import com.exozet.transcoder.mcvideoeditor.MediaCodecTranscoder
11-
import com.exozet.transcoder.mcvideoeditor.MediaConfig
12-
import com.exozet.transcoder.ffmpeg.EncodingConfig
13-
import com.exozet.transcoder.ffmpeg.FFMpegTranscoder
14-
import com.exozet.transcoder.ffmpeg.Progress
15-
import com.exozet.transcoder.ffmpeg.demo.databinding.ActivityMainBinding
16-
import com.exozet.transcoder.ffmpeg.demo.permissions.RxPermissions
10+
import net.kibotu.androidffmpegtranscoder.mcvideoeditor.MediaCodecTranscoder
11+
import net.kibotu.androidffmpegtranscoder.mcvideoeditor.MediaConfig
12+
import net.kibotu.androidffmpegtranscoder.ffmpeg.EncodingConfig
13+
import net.kibotu.androidffmpegtranscoder.ffmpeg.FFMpegTranscoder
14+
import net.kibotu.androidffmpegtranscoder.ffmpeg.Progress
1715
import io.reactivex.android.schedulers.AndroidSchedulers
1816
import io.reactivex.disposables.CompositeDisposable
1917
import io.reactivex.schedulers.Schedulers
20-
import net.kibotu.logger.LogcatLogger
18+
import net.kibotu.androidffmpegtranscoder.demo.databinding.ActivityMainBinding
19+
import net.kibotu.androidffmpegtranscoder.demo.permissions.RxPermissions
2120
import net.kibotu.logger.Logger
2221
import net.kibotu.logger.TAG
2322
import java.io.File

‎app/src/main/java/com/exozet/transcoder/ffmpeg/demo/permissions/Permission.java renamed to ‎app/src/main/java/net/kibotu/androidffmpegtranscoder/demo/permissions/Permission.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.exozet.transcoder.ffmpeg.demo.permissions;
1+
package net.kibotu.androidffmpegtranscoder.demo.permissions;
22

33

44
import java.util.List;

‎app/src/main/java/com/exozet/transcoder/ffmpeg/demo/permissions/RxPermissions.java renamed to ‎app/src/main/java/net/kibotu/androidffmpegtranscoder/demo/permissions/RxPermissions.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.exozet.transcoder.ffmpeg.demo.permissions;
1+
package net.kibotu.androidffmpegtranscoder.demo.permissions;
22

33

44
import android.annotation.TargetApi;

‎app/src/main/java/com/exozet/transcoder/ffmpeg/demo/permissions/RxPermissionsFragment.java renamed to ‎app/src/main/java/net/kibotu/androidffmpegtranscoder/demo/permissions/RxPermissionsFragment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.exozet.transcoder.ffmpeg.demo.permissions;
1+
package net.kibotu.androidffmpegtranscoder.demo.permissions;
22

33

44
import android.annotation.TargetApi;

‎app/src/main/res/layout/activity_main.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
xmlns:tools="http://schemas.android.com/tools"
55
android:layout_width="match_parent"
66
android:layout_height="match_parent"
7-
tools:context=".FFmpegActivity">
7+
tools:context="net.kibotu.androidffmpegtranscoder.demo.FFmpegActivity">
88

99
<TextView
1010
android:id="@+id/init_ffmpeg"

‎settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
include ':app'
2-
include ':transcoder'
2+
include ':android-ffmpeg-transcoder'

‎transcoder/src/main/java/com/exozet/transcoder/ffmpeg/Encoding.kt

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)