コード整形
This commit is contained in:
parent
683fa3725e
commit
03a28791d9
|
@ -329,12 +329,13 @@ class ColumnViewHolder(
|
||||||
)
|
)
|
||||||
|
|
||||||
when (streamStatus) {
|
when (streamStatus) {
|
||||||
StreamStatus.Missing, StreamStatus.Closed ,StreamStatus.ClosedNoRetry -> {
|
StreamStatus.Missing, StreamStatus.Closed, StreamStatus.ClosedNoRetry -> Unit
|
||||||
}
|
|
||||||
StreamStatus.Connecting, StreamStatus.Open -> {
|
StreamStatus.Connecting, StreamStatus.Open -> {
|
||||||
sb.appendColorShadeIcon(activity, R.drawable.ic_pulse, "Streaming")
|
sb.appendColorShadeIcon(activity, R.drawable.ic_pulse, "Streaming")
|
||||||
sb.append("?")
|
sb.append("?")
|
||||||
}
|
}
|
||||||
|
|
||||||
StreamStatus.Subscribed -> {
|
StreamStatus.Subscribed -> {
|
||||||
sb.appendColorShadeIcon(activity, R.drawable.ic_pulse, "Streaming")
|
sb.appendColorShadeIcon(activity, R.drawable.ic_pulse, "Streaming")
|
||||||
}
|
}
|
||||||
|
|
|
@ -47,8 +47,6 @@ private class ErrorFlickListener(
|
||||||
velocityX: Float,
|
velocityX: Float,
|
||||||
velocityY: Float,
|
velocityY: Float,
|
||||||
): Boolean {
|
): Boolean {
|
||||||
|
|
||||||
|
|
||||||
val vx = abs(velocityX)
|
val vx = abs(velocityX)
|
||||||
val vy = abs(velocityY)
|
val vy = abs(velocityY)
|
||||||
if (vy < vx * 1.5f) {
|
if (vy < vx * 1.5f) {
|
||||||
|
|
|
@ -298,7 +298,7 @@ fun Intent.handleGetContentResult(contentResolver: ContentResolver): ArrayList<G
|
||||||
}
|
}
|
||||||
// 複数選択
|
// 複数選択
|
||||||
this.clipData?.let { clipData ->
|
this.clipData?.let { clipData ->
|
||||||
(0 until clipData.itemCount).mapNotNull { clipData.getItemAt(it)?.uri }.forEach { uri ->
|
for (uri in (0 until clipData.itemCount).mapNotNull { clipData.getItemAt(it)?.uri }) {
|
||||||
if (urlList.none { it.uri == uri }) {
|
if (urlList.none { it.uri == uri }) {
|
||||||
urlList.add(GetContentResultEntry(uri))
|
urlList.add(GetContentResultEntry(uri))
|
||||||
}
|
}
|
||||||
|
|
|
@ -22,7 +22,6 @@ import com.otaliastudios.transcoder.strategy.DefaultAudioStrategy
|
||||||
import com.otaliastudios.transcoder.strategy.DefaultVideoStrategy
|
import com.otaliastudios.transcoder.strategy.DefaultVideoStrategy
|
||||||
import jp.juggler.util.coroutine.AppDispatchers
|
import jp.juggler.util.coroutine.AppDispatchers
|
||||||
import jp.juggler.util.data.clip
|
import jp.juggler.util.data.clip
|
||||||
import jp.juggler.util.data.notZero
|
|
||||||
import jp.juggler.util.log.LogCategory
|
import jp.juggler.util.log.LogCategory
|
||||||
import kotlinx.coroutines.*
|
import kotlinx.coroutines.*
|
||||||
import kotlinx.coroutines.channels.Channel
|
import kotlinx.coroutines.channels.Channel
|
||||||
|
@ -91,7 +90,7 @@ data class MovieResizeConfig(
|
||||||
/**
|
/**
|
||||||
* レシーバが奇数なら+1した値を返す
|
* レシーバが奇数なら+1した値を返す
|
||||||
*
|
*
|
||||||
* `[OMX.qcom.video.encoder.avc] video encoder does not support odd resolution 1018x2263`
|
* `OMX.qcom.video.encoder.avc video encoder does not support odd resolution 1018x2263`
|
||||||
*/
|
*/
|
||||||
private fun Int.fixOdd() = if (and(1) == 0) this else this + 1
|
private fun Int.fixOdd() = if (and(1) == 0) this else this + 1
|
||||||
|
|
||||||
|
@ -172,6 +171,7 @@ suspend fun transcodeVideoMedia3Transformer(
|
||||||
sqPixel -= srcLongerSide
|
sqPixel -= srcLongerSide
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
val scale = calcScale(
|
val scale = calcScale(
|
||||||
srcLongerSide = max(info.size.w, info.size.h),
|
srcLongerSide = max(info.size.w, info.size.h),
|
||||||
aspect = info.size.w.toFloat() / info.size.h.toFloat(),
|
aspect = info.size.w.toFloat() / info.size.h.toFloat(),
|
||||||
|
|
Loading…
Reference in New Issue