Skip to content

Commit ad74d1c

Browse files
committed
move Bitmap and BufferVideo sources to encoder module
1 parent 97dc35c commit ad74d1c

File tree

5 files changed

+8
-11
lines changed

5 files changed

+8
-11
lines changed

app/src/main/java/com/pedro/streamer/rotation/RotationActivity.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ import androidx.annotation.RequiresApi
3030
import androidx.appcompat.app.AppCompatActivity
3131
import androidx.core.graphics.scale
3232
import com.pedro.encoder.input.sources.audio.MicrophoneSource
33-
import com.pedro.extrasources.BufferVideoSource
33+
import com.pedro.encoder.input.sources.video.BufferVideoSource
3434
import com.pedro.encoder.input.sources.video.Camera1Source
3535
import com.pedro.encoder.input.sources.video.Camera2Source
36-
import com.pedro.extrasources.BitmapSource
36+
import com.pedro.encoder.input.sources.video.BitmapSource
3737
import com.pedro.extrasources.CameraUvcSource
3838
import com.pedro.extrasources.CameraXSource
3939
import com.pedro.streamer.R

docs/extra-sources/com.pedro.extrasources/-buffer-video-source/-buffer-video-source.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
</div>
9191
</div>
9292
<div id="main">
93-
<div class="main-content" data-page-type="member" id="content" pageids="extra-sources::com.pedro.extrasources/BufferVideoSource/BufferVideoSource/#com.pedro.extrasources.BufferVideoSource.Format#kotlin.Int/PointingToDeclaration//-466499126">
93+
<div class="main-content" data-page-type="member" id="content" pageids="extra-sources::com.pedro.extrasources/BufferVideoSource/BufferVideoSource/#com.pedro.encoder.input.sources.video.BufferVideoSource.Format#kotlin.Int/PointingToDeclaration//-466499126">
9494
<div class="breadcrumbs"><a href="../../index.html">extra-sources</a><span class="delimiter">/</span><a href="../index.html">com.pedro.extrasources</a><span class="delimiter">/</span><a href="index.html">BufferVideoSource</a><span class="delimiter">/</span><span class="current">BufferVideoSource</span></div>
9595
<div class="cover ">
9696
<h1 class="cover"><span>Buffer</span><wbr><span>Video</span><wbr><span><span>Source</span></span></h1>

extra-sources/src/main/java/com/pedro/extrasources/BufferDecoder.kt renamed to encoder/src/main/java/com/pedro/encoder/input/decoder/BufferDecoder.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.pedro.extrasources
1+
package com.pedro.encoder.input.decoder
22

33
import android.media.MediaCodec
44
import android.media.MediaCodec.BufferInfo

extra-sources/src/main/java/com/pedro/extrasources/BitmapSource.kt renamed to encoder/src/main/java/com/pedro/encoder/input/sources/video/BitmapSource.kt

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,15 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.pedro.extrasources
17+
package com.pedro.encoder.input.sources.video
1818

1919
import android.graphics.Bitmap
2020
import android.graphics.Paint
2121
import android.graphics.SurfaceTexture
2222
import android.view.Surface
23-
import androidx.core.graphics.scale
24-
import com.pedro.encoder.input.sources.video.VideoSource
2523
import kotlinx.coroutines.CoroutineScope
2624
import kotlinx.coroutines.Dispatchers
2725
import kotlinx.coroutines.Job
28-
import kotlinx.coroutines.cancel
2926
import kotlinx.coroutines.cancelAndJoin
3027
import kotlinx.coroutines.delay
3128
import kotlinx.coroutines.launch
@@ -47,7 +44,7 @@ class BitmapSource(private val bitmap: Bitmap): VideoSource() {
4744
}
4845

4946
override fun start(surfaceTexture: SurfaceTexture) {
50-
val scaledBitmap = bitmap.scale(width, height)
47+
val scaledBitmap = Bitmap.createScaledBitmap(bitmap, width, height, true)
5148
surfaceTexture.setDefaultBufferSize(width, height)
5249
surface = Surface(surfaceTexture)
5350
running = true

extra-sources/src/main/java/com/pedro/extrasources/BufferVideoSource.kt renamed to encoder/src/main/java/com/pedro/encoder/input/sources/video/BufferVideoSource.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.pedro.extrasources
1+
package com.pedro.encoder.input.sources.video
22

33
import android.graphics.SurfaceTexture
44
import android.media.MediaCodec
@@ -8,7 +8,7 @@ import com.pedro.common.TimeUtils
88
import com.pedro.common.VideoCodec
99
import com.pedro.common.toByteArray
1010
import com.pedro.encoder.Frame
11-
import com.pedro.encoder.input.sources.video.VideoSource
11+
import com.pedro.encoder.input.decoder.BufferDecoder
1212
import com.pedro.encoder.utils.yuv.NV21Utils
1313
import com.pedro.encoder.utils.yuv.YUVUtil
1414
import com.pedro.encoder.video.FormatVideoEncoder

0 commit comments

Comments
 (0)