acetheking987/bsky-social-app
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

fix videos with an orientation

Browse Source
This commit is contained in:
Samuel Newman
2026-03-11 15:05:30 +02:00
parent 14b74a2986
commit 997f0006a3
2 changed files with 38 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/expo-bluesky-video-compress/android/src/main/java/expo/modules/blueskyvideocompress/VideoCompressor.kt
+22 -14
View File
@@ -168,11 +168,16 @@ class VideoCompressor(
encoder.start()
// Set up video decoder
val decoderFormat = videoFormat
// Strip rotation from decoder format so the decoder outputs frames in storage
// orientation. Some decoders apply rotation themselves when KEY_ROTATION is set,
// which double-rotates since we handle it via muxer.setOrientationHint().
if (videoFormat.containsKey(MediaFormat.KEY_ROTATION)) {
videoFormat.setInteger(MediaFormat.KEY_ROTATION, 0)
}
val decoder = MediaCodec.createDecoderByType(
videoFormat.getString(MediaFormat.KEY_MIME) ?: "video/avc"
)
decoder.configure(decoderFormat, outputSurface.surface, null, 0)
decoder.configure(videoFormat, outputSurface.surface, null, 0)
decoder.start()
extractor.selectTrack(videoTrackIndex)
@@ -411,26 +416,29 @@ class VideoCompressor(
rotation: Int,
maxSize: Int
): Pair<Int, Int> {
// Apply rotation to get display dimensions
// Use display dimensions (rotated) to determine the scale factor,
// but return storage dimensions (unrotated) for the encoder.
// The muxer's orientationHint handles rotation separately.
val isRotated = rotation == 90 || rotation == 270
val sourceWidth = if (isRotated) height else width
val sourceHeight = if (isRotated) width else height
val displayWidth = if (isRotated) height else width
val displayHeight = if (isRotated) width else height
// If within bounds, keep original (rounded to even)
if (sourceWidth <= maxSize && sourceHeight <= maxSize) {
return Pair(roundToEven(sourceWidth), roundToEven(sourceHeight))
// If display dimensions within bounds, keep original storage size (rounded to even)
if (displayWidth <= maxSize && displayHeight <= maxSize) {
return Pair(roundToEven(width), roundToEven(height))
}
// Scale down maintaining aspect ratio
val scale = if (sourceWidth > sourceHeight) {
maxSize.toFloat() / sourceWidth.toFloat()
// Scale based on display dimensions
val scale = if (displayWidth > displayHeight) {
maxSize.toFloat() / displayWidth.toFloat()
} else {
maxSize.toFloat() / sourceHeight.toFloat()
maxSize.toFloat() / displayHeight.toFloat()
}
// Return storage dimensions (unrotated)
return Pair(
roundToEven((sourceWidth * scale).toInt()),
roundToEven((sourceHeight * scale).toInt())
roundToEven((width * scale).toInt()),
roundToEven((height * scale).toInt())
)
}
modules/expo-bluesky-video-compress/ios/VideoCompressor.swift
+16 -13
View File
@@ -316,32 +316,35 @@ class VideoCompressor {
transform: CGAffineTransform,
maxSize: Int
) -> (width: Int, height: Int) {
// Apply transform to get actual display dimensions
// Use display dimensions (rotated) to determine the scale factor,
// but return storage dimensions (unrotated) for the encoder.
// The writer's transform handles rotation separately.
let isRotated = abs(transform.b) == 1.0 && abs(transform.c) == 1.0
let sourceWidth = isRotated ? naturalSize.height : naturalSize.width
let sourceHeight = isRotated ? naturalSize.width : naturalSize.height
let displayWidth = isRotated ? naturalSize.height : naturalSize.width
let displayHeight = isRotated ? naturalSize.width : naturalSize.height
let maxDimension = CGFloat(maxSize)
// If already within bounds, keep original size (rounded to even)
if sourceWidth <= maxDimension && sourceHeight <= maxDimension {
// If display dimensions within bounds, keep original storage size (rounded to even)
if displayWidth <= maxDimension && displayHeight <= maxDimension {
return (
width: roundToEven(Int(sourceWidth)),
height: roundToEven(Int(sourceHeight))
width: roundToEven(Int(naturalSize.width)),
height: roundToEven(Int(naturalSize.height))
)
}
// Scale down maintaining aspect ratio
// Scale based on display dimensions
let scale: CGFloat
if sourceWidth > sourceHeight {
scale = maxDimension / sourceWidth
if displayWidth > displayHeight {
scale = maxDimension / displayWidth
} else {
scale = maxDimension / sourceHeight
scale = maxDimension / displayHeight
}
// Return storage dimensions (unrotated)
return (
width: roundToEven(Int(sourceWidth * scale)),
height: roundToEven(Int(sourceHeight * scale))
width: roundToEven(Int(naturalSize.width * scale)),
height: roundToEven(Int(naturalSize.height * scale))
)
}