Skip to content

Commit

Permalink
Downgrade ExoPlayer to 2.8.2
Browse files Browse the repository at this point in the history
  • Loading branch information
@SungjunApp
SungjunApp committed Nov 12, 2020
1 parent fc09907 commit 59647d0
Show file tree
Hide file tree
Showing 7 changed files with 323 additions and 780 deletions.
5 changes: 4 additions & 1 deletion build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,8 @@ ext {
androidJZVideo="1.0.8"

checkerframeworkVersion = '3.3.0'
exoPlayer="2.12.1"
//exoPlayer="2.12.1"
exoPlayer="2.8.2"

supportLibraryVersion = '27.0.0'
}
4 changes: 2 additions & 2 deletions pixleesdk/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,8 @@ dependencies {
implementation "com.google.android.exoplayer:exoplayer-core:$exoPlayer"
implementation "com.google.android.exoplayer:exoplayer-dash:$exoPlayer"
implementation "com.google.android.exoplayer:exoplayer-ui:$exoPlayer"
implementation "com.google.android.exoplayer:extension-cronet:$exoPlayer"
// implementation "com.google.android.exoplayer:extension-cronet:$exoPlayer"
implementation "com.google.android.exoplayer:extension-ima:$exoPlayer"


implementation 'androidx.annotation:annotation:1.1.0'
}
94 changes: 34 additions & 60 deletions pixleesdk/src/main/java/com/pixlee/pixleesdk/ui/widgets/PXLPhotoView.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import android.content.Context
import android.graphics.Color
import android.graphics.Typeface
import android.graphics.drawable.GradientDrawable
import android.net.Uri
import android.os.Parcelable
import android.util.AttributeSet
import android.util.Log
Expand All @@ -21,18 +22,20 @@ import com.bumptech.glide.Glide
import com.bumptech.glide.request.RequestOptions
import com.bumptech.glide.signature.ObjectKey
import com.google.android.exoplayer2.*
import com.google.android.exoplayer2.audio.AudioAttributes
import com.google.android.exoplayer2.mediacodec.MediaCodecRenderer.DecoderInitializationException
import com.google.android.exoplayer2.mediacodec.MediaCodecUtil.DecoderQueryException
import com.google.android.exoplayer2.source.DefaultMediaSourceFactory
import com.google.android.exoplayer2.source.MediaSourceFactory
import com.google.android.exoplayer2.source.ads.AdsLoader
//import com.google.android.exoplayer2.source.DefaultMediaSourceFactory
import com.google.android.exoplayer2.source.ExtractorMediaSource
import com.google.android.exoplayer2.source.MediaSource
//import com.google.android.exoplayer2.source.MediaSourceFactory
import com.google.android.exoplayer2.trackselection.AdaptiveTrackSelection
import com.google.android.exoplayer2.trackselection.DefaultTrackSelector
import com.google.android.exoplayer2.trackselection.DefaultTrackSelector.ParametersBuilder
import com.google.android.exoplayer2.trackselection.TrackSelection
import com.google.android.exoplayer2.ui.AspectRatioFrameLayout
import com.google.android.exoplayer2.upstream.DataSource
import com.google.android.exoplayer2.upstream.DefaultAllocator
import com.google.android.exoplayer2.util.ErrorMessageProvider
import com.google.android.exoplayer2.util.EventLogger
import com.pixlee.pixleesdk.R
import com.pixlee.pixleesdk.data.PXLPhoto
import com.pixlee.pixleesdk.enums.PXLPhotoSize
Expand All @@ -41,7 +44,6 @@ import com.pixlee.pixleesdk.video.ExoPlayerUtil
import com.pixlee.pixleesdk.video.TransparentStyledPlayerView
import jp.wasabeef.glide.transformations.BlurTransformation
import kotlinx.android.parcel.Parcelize
import java.util.*

/**
* This view is to show a photo of PXLPhoto inside a RecyclerView or a ViewGroup
Expand Down Expand Up @@ -84,7 +86,6 @@ class PXLPhotoView : RelativeLayout {
private var startAutoPlay = true
// Fields used only for ad playback.
private var dataSourceFactory: DataSource.Factory? = null
private var mediaItems: List<MediaItem>? = null
protected var player: SimpleExoPlayer? = null
// ###################################
// ######### End: ExoPlayer ##########
Expand Down Expand Up @@ -117,10 +118,9 @@ class PXLPhotoView : RelativeLayout {
id = ViewCompat.generateViewId()
useController = false
setErrorMessageProvider(PlayerErrorMessageProvider())
dataSourceFactory = ExoPlayerUtil.getDataSourceFactory(context)
dataSourceFactory = ExoPlayerUtil.buildDataSourceFactory(context, true)

val builder = ParametersBuilder( /* context= */context)
trackSelectorParameters = builder.build()
trackSelectorParameters = ParametersBuilder().build()

requestFocus()
}
Expand Down Expand Up @@ -226,12 +226,7 @@ class PXLPhotoView : RelativeLayout {
return this
}


fun isPlaying(): Boolean {
return player?.isPlaying ?: false
}

fun havePlayer(): Boolean {
fun hasPlayer(): Boolean {
return player!=null
}

Expand All @@ -242,7 +237,7 @@ class PXLPhotoView : RelativeLayout {
Log.e("PXLPhotoViewVP", "======> playVideo()")
if (pxlPhoto?.isVideo ?: false) {
videoView.visibility = View.VISIBLE
val isNotPlaying = !isPlaying()
val isNotPlaying = !hasPlayer()
if(isNotPlaying) initVideoPlayer()
if(isNotPlaying) {
videoView.setShutterBackgroundColor(Color.TRANSPARENT)
Expand All @@ -256,15 +251,15 @@ class PXLPhotoView : RelativeLayout {
// change volume
player?.volume = volume
player?.repeatMode = if (looping) Player.REPEAT_MODE_ONE else Player.REPEAT_MODE_OFF
if(isNotPlaying) videoView.onResume()
//if(isNotPlaying) videoView.onResume()
}
}

fun pauseVideo() {
Log.e("PXLPhotoViewVP", "## pauseVideo()")
if (pxlPhoto?.isVideo ?: false) {
videoView.visibility = View.GONE
videoView.onPause()
//videoView.onPause()
releasePlayer()
}
}
Expand All @@ -277,7 +272,6 @@ class PXLPhotoView : RelativeLayout {
player?.stop()
player?.release()
player = null
mediaItems = emptyList()
trackSelector = null
}
}
Expand Down Expand Up @@ -427,85 +421,65 @@ class PXLPhotoView : RelativeLayout {
}
}


private fun initVideoPlayer() {
Log.e("PXLPhotoViewVP", "## initVideoPlayer() start player: $player")
val mediaSource = createMediaSource()
if (player == null) {
mediaItems = createMediaItems()
if (mediaItems==null && mediaItems!!.isEmpty() ?: true) {

if (mediaSource==null) {
return
}
val preferExtensionDecoders = false
val renderersFactory: RenderersFactory = ExoPlayerUtil.buildRenderersFactory( /* context= */context, preferExtensionDecoders)

val builder = DefaultLoadControl.Builder()
builder.setAllocator(DefaultAllocator(true, 2 * 1024 * 1024))
builder.setBufferDurationsMs(5000, 5000, 5000, 5000)
builder.setPrioritizeTimeOverSizeThresholds(true)

val mediaSourceFactory: MediaSourceFactory = DefaultMediaSourceFactory(dataSourceFactory!!)

trackSelector = DefaultTrackSelector(context)
var trackSelectionFactory: TrackSelection.Factory = AdaptiveTrackSelection.Factory(ExoPlayerUtil.BANDWIDTH_METER)
trackSelector = DefaultTrackSelector(trackSelectionFactory)
trackSelector!!.parameters = trackSelectorParameters!!

player = SimpleExoPlayer.Builder(context, renderersFactory)
.setMediaSourceFactory(mediaSourceFactory)
.setTrackSelector(trackSelector!!)
.setLoadControl(builder.build())
.build()
player = ExoPlayerFactory.newSimpleInstance(renderersFactory, trackSelector)
player?.addAnalyticsListener(EventLogger(trackSelector))

player!!.setAudioAttributes(AudioAttributes.DEFAULT, true)
player!!.playWhenReady = startAutoPlay
videoView.player = player
videoView.setPlayer(player)
videoView.setPlaybackPreparer {
player!!.prepare()
initVideoPlayer()
}
}
val haveStartPosition = startWindow != C.INDEX_UNSET
if (haveStartPosition) {
player?.seekTo(startWindow, startPosition)
}
player!!.setMediaItems(mediaItems!!, !haveStartPosition)
player?.prepare()
player?.prepare(mediaSource, !haveStartPosition, false)
Log.e("PXLPhotoViewVP", "## initVideoPlayer() done player: $player")
return
}

private fun createMediaItems(): List<MediaItem>? {
val mediaItems: ArrayList<MediaItem> = ArrayList()
val item = MediaItem.Builder()
.setUri(pxlPhoto?.videoUrl)
.setMediaMetadata(MediaMetadata.Builder().setTitle("").build())
//.setMimeType(DemoUtil.MIME_TYPE_DASH)
.build()
private fun createMediaSource(): MediaSource? {
if(pxlPhoto?.videoUrl==null)
return null

mediaItems.add(item)
// for (i in mediaItems.indices) {
// val mediaItem = mediaItems[i]
// if (!Util.checkCleartextTrafficPermitted(mediaItem)) {
// return emptyList()
// }
// }
return mediaItems
return ExtractorMediaSource.Factory(dataSourceFactory).createMediaSource(Uri.parse(pxlPhoto?.videoUrl))
}

private class PlayerErrorMessageProvider : ErrorMessageProvider<ExoPlaybackException> {
override fun getErrorMessage(e: ExoPlaybackException): Pair<Int, String> {
override fun getErrorMessage(e: ExoPlaybackException): Pair<Int, String>? {
var errorString: String = "error_generic"
if (e.type == ExoPlaybackException.TYPE_RENDERER) {
val cause = e.rendererException
if (cause is DecoderInitializationException) {
// Special case for decoder initialization failures.
val decoderInitializationException = cause
if (decoderInitializationException.codecInfo == null) {
if (decoderInitializationException.decoderName == null) {
if (decoderInitializationException.cause is DecoderQueryException) {
errorString = "error_querying_decoders"
} else if (decoderInitializationException.secureDecoderRequired) {
errorString = "error_no_secure_decoder: " + decoderInitializationException.mimeType
errorString = "error_no_secure_decoder " + decoderInitializationException.mimeType
} else {
errorString = "error_no_decoder: " + decoderInitializationException.mimeType
errorString = "error_no_decoder " + decoderInitializationException.mimeType
}
} else {
errorString = "error_instantiating_decoder: " + decoderInitializationException.codecInfo!!.name
errorString = "error_instantiating_decoder " + decoderInitializationException.decoderName
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion pixleesdk/src/main/java/com/pixlee/pixleesdk/ui/widgets/list/PXLPhotoRecyclerView.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ class PXLPhotoRecyclerView : BaseRecyclerView, LifecycleObserver, CoroutineScope

override fun onChildViewDetachedFromWindow(view: View) {
val pxlPhotoView = view.findViewById<PXLPhotoView>(R.id.pxlPhotoView)
if (pxlPhotoView.havePlayer()) {
if (pxlPhotoView.hasPlayer()) {
view.alpha = alphaForStoppedVideos
pxlPhotoView.pauseVideo()
}
Expand Down
9 changes: 4 additions & 5 deletions pixleesdk/src/main/java/com/pixlee/pixleesdk/util/AutoPlayUtils.kt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package com.pixlee.pixleesdk.util

import android.graphics.Rect
import android.util.Log
import android.view.View
import androidx.recyclerview.widget.RecyclerView
import com.pixlee.pixleesdk.ui.widgets.PXLPhotoView
Expand Down Expand Up @@ -62,11 +61,11 @@ object AutoPlayUtils {
for (i in 0..lastVisiblePosition - firstVisiblePosition) {
recyclerView.getChildAt(i)?.let { child ->
val pxlPhotoView = child.findViewById<PXLPhotoView>(pxlPhotoViewId)
if (pxlPhotoView!=null && pxlPhotoView.havePlayer() && getViewVisiblePercent(pxlPhotoView) < percent) {
if (pxlPhotoView!=null && pxlPhotoView.hasPlayer() && getViewVisiblePercent(pxlPhotoView) < percent) {
pxlPhotoView.pauseVideo()
}

if(pxlPhotoView==null || !pxlPhotoView.havePlayer()){
if(pxlPhotoView==null || !pxlPhotoView.hasPlayer()){
child.alpha = alphaForStoppedVideos
}
}
Expand All @@ -77,7 +76,7 @@ object AutoPlayUtils {
for (i in 0..lastVisiblePosition - firstVisiblePosition) {
recyclerView.getChildAt(i)?.let { child ->
val pxlPhotoView = child.findViewById<PXLPhotoView>(pxlPhotoViewId)
if (pxlPhotoView!=null && pxlPhotoView.havePlayer()) {
if (pxlPhotoView!=null && pxlPhotoView.hasPlayer()) {
pxlPhotoView.pauseVideo()
}
child.alpha = alphaForStoppedVideos
Expand All @@ -90,7 +89,7 @@ object AutoPlayUtils {
recyclerView.getChildAt(i)?.let { child ->
val pxlPhotoView = child.findViewById<PXLPhotoView>(pxlPhotoViewId)
pxlPhotoView.changeVolume(if(muted) 0f else 1f)
if (pxlPhotoView!=null && pxlPhotoView.havePlayer()) {
if (pxlPhotoView!=null && pxlPhotoView.hasPlayer()) {
child.alpha = 1f
}else{
child.alpha = alphaForStoppedVideos
Expand Down
Loading

0 comments on commit 59647d0

Please sign in to comment.