Skip to content

Fix sizing on resize #69

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

Open
edde746 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix sizing on resize #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 0 additions & 3 deletions lib_ass_media/src/main/java/io/github/peerless2012/ass/media/AssHandler.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,9 +191,6 @@ class AssHandler(
Log.i("AssHandler", "onSurfaceSizeChanged: width = $width, height = $height")
if (surfaceSize.width == width && surfaceSize.height == height) return
surfaceSize = Size(width, height)
if ((renderType == AssRenderType.OVERLAY_CANVAS || renderType == AssRenderType.OVERLAY_OPEN_GL) && surfaceSize.isValid) {
render?.setFrameSize(surfaceSize.width, surfaceSize.height)
}
}

override fun onVideoSizeChanged(videoSize: VideoSize) {
Expand Down
17 changes: 16 additions & 1 deletion ...ass_media/src/main/java/io/github/peerless2012/ass/media/widget/AssSubtitleTextureView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ class AssSubtitleTextureView : TextureView, AssSubtitleRender, TextureView.Surfa
private var eglDisplay: EGLDisplay = EGL14.EGL_NO_DISPLAY
private var eglContext: EGLContext = EGL14.EGL_NO_CONTEXT
private var eglSurface: EGLSurface = EGL14.EGL_NO_SURFACE
private var lastDrawTimestampNanos: Long = 0L

override fun start() {
super.start()
Expand All @@ -126,6 +127,7 @@ class AssSubtitleTextureView : TextureView, AssSubtitleRender, TextureView.Surfa

fun onSurfaceSizeChanged(width: Int, height: Int) {
this.width = width
this.height = height
handler.sendEmptyMessage(MSG_SURFACE_SIZE_CHANGED)
}

Expand Down Expand Up @@ -164,9 +166,17 @@ class AssSubtitleTextureView : TextureView, AssSubtitleRender, TextureView.Surfa

private fun sizeChangedInternal(width: Int, height: Int) {
render.onSurfaceChanged(width, height)
if (eglDisplay != EGL14.EGL_NO_DISPLAY) {
GlUtil.clearFocusedBuffers()
EGL14.eglSwapBuffers(eglDisplay, eglSurface)
}
if (lastDrawTimestampNanos != 0L) {
drawInternal(lastDrawTimestampNanos)
}
}

private fun drawInternal(timestampNanos: Long) {
lastDrawTimestampNanos = timestampNanos
if (eglDisplay == EGL14.EGL_NO_DISPLAY) return
if (render.onDrawFrame(timestampNanos)) {
EGL14.eglSwapBuffers(eglDisplay, eglSurface)
Expand Down Expand Up @@ -232,6 +242,8 @@ class AssSubtitleTextureView : TextureView, AssSubtitleRender, TextureView.Surfa

private var surfaceDirty = true

private var forceNextRender = false

private var surfaceSize = Size.ZERO

private lateinit var glProgram: GlProgram
Expand Down Expand Up @@ -281,13 +293,16 @@ class AssSubtitleTextureView : TextureView, AssSubtitleRender, TextureView.Surfa
surfaceSize = Size(width, height)
assHandler.render?.setFrameSize(width, height)
GLES20.glViewport(0, 0, width, height)
forceNextRender = true
}

override fun onDrawFrame(timestampNanos: Long): Boolean {
val assFrame = assHandler.render?.renderFrame(timestampNanos / 1000, AssTexType.TEXTURE)

// if content not change, just return the tex
if (assFrame != null && assFrame.changed == 0) {
val force = forceNextRender
forceNextRender = false
if (assFrame != null && assFrame.changed == 0 && !force) {
return false
}

Expand Down