Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix animated webp playback #8120

Merged
merged 9 commits into from
May 26, 2023
Merged

Fix animated webp playback #8120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9fb0eee
fix: add webp as playable image type
alexmaras Feb 12, 2023
3b7aaf2
fix: make glide transformations optional to prevent rendering webp th…
alexmaras Feb 12, 2023
56f541c
chore: add changelog.d file
alexmaras Feb 12, 2023
62c3540
sign-off
alexmaras Feb 12, 2023
2a557e2
fix: stop marking webp as playable by default
alexmaras Feb 22, 2023
13a5b62
Merge branch 'develop' of https://github.com/vector-im/element-androi…
alexmaras Feb 22, 2023
1827038
fix: play animated Webp in attachment view
alexmaras Feb 22, 2023
b3511e2
feat: autoplay webp if autoplay is enabled
alexmaras Feb 22, 2023
07c6394
Merge remote-tracking branch 'origin/develop' into fix/animated-webp-…
jmartinesp May 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/8120.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Marks WebP files as Animated and allows them to play
1 change: 1 addition & 0 deletions matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/MimeTypes.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ object MimeTypes {
const val BadJpg = "image/jpg"
const val Jpeg = "image/jpeg"
const val Gif = "image/gif"
const val Webp = "image/webp"

const val Ogg = "audio/ogg"

Expand Down
4 changes: 3 additions & 1 deletion .../main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -528,6 +528,8 @@ class MessageItemFactory @Inject constructor(
)

val playable = messageContent.mimeType == MimeTypes.Gif
// don't show play button because detecting animated webp isn't possible via mimetype
val playableIfAutoplay = playable || messageContent.mimeType == MimeTypes.Webp
Copy link
Contributor Author

@alexmaras alexmaras Feb 22, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This works to autoplay animated WebP in the timeline if autoplay is enabled. If it isn't enabled, no play button shows (because playable is false) which will prevent confusion with static WebP. Static WebP functions fine in autoplay mode still.

This workaround is fairly effective. I've added a comment to try to explain what's going on here.

Ideally I'd like to look at doing another PR to determine conclusively whether a Gif or a WebP is actually animated via headers, therefore allowing the play button to appear on animated WebP too, and take away the play button on static Gifs, but that would be a longer exercise.


return MessageImageVideoItem_()
.attributes(attributes)
Expand All @@ -549,7 +551,7 @@ class MessageItemFactory @Inject constructor(
}
}
}.apply {
if (playable && vectorPreferences.autoplayAnimatedImages()) {
if (playableIfAutoplay && vectorPreferences.autoplayAnimatedImages()) {
mode(ImageContentRenderer.Mode.ANIMATED_THUMBNAIL)
}
}
Expand Down
2 changes: 1 addition & 1 deletion vector/src/main/java/im/vector/app/features/media/DataAttachmentRoomProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class DataAttachmentRoomProvider(
return getItem(position).let {
when (it) {
is ImageContentRenderer.Data -> {
if (it.mimeType == MimeTypes.Gif) {
if (it.mimeType == MimeTypes.Gif || it.mimeType == MimeTypes.Webp) {
AttachmentInfo.AnimatedImage(
uid = it.eventId,
url = it.url ?: "",
Expand Down
6 changes: 3 additions & 3 deletions vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ class ImageContentRenderer @Inject constructor(
if (mode == Mode.ANIMATED_THUMBNAIL) it
else it.dontAnimate()
}
.transform(cornerTransformation)
.optionalTransform(cornerTransformation)
.into(imageView)
}

Expand Down Expand Up @@ -167,7 +167,7 @@ class ImageContentRenderer @Inject constructor(
}

req
.fitCenter()
.optionalFitCenter()
.into(target)
}

Expand Down Expand Up @@ -211,7 +211,7 @@ class ImageContentRenderer @Inject constructor(
return false
}
})
.fitCenter()
.optionalFitCenter()
.into(imageView)
}

Expand Down
2 changes: 1 addition & 1 deletion vector/src/main/java/im/vector/app/features/media/RoomEventsAttachmentProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ class RoomEventsAttachmentProvider(
allowNonMxcUrls = it.root.sendState.isSending()

)
if (content.mimeType == MimeTypes.Gif) {
if (content.mimeType == MimeTypes.Gif || content.mimeType == MimeTypes.Webp) {
AttachmentInfo.AnimatedImage(
uid = it.eventId,
url = content.url ?: "",
Expand Down