Skip to content

Refactor portrait zoom to use Matrix transforms #49

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

Merged
Chow411 merged 2 commits into from
Jul 6, 2026
Merged

Refactor portrait zoom to use Matrix transforms #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
64e61b0
cache
Chow411 Jul 6, 2026
b97f521
feat: refactor portrait zoom to use Matrix transforms
Chow411 Jul 6, 2026
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
117 changes: 84 additions & 33 deletions app/src/main/java/com/openterface/AOS/activity/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,8 @@ public int getPreviewHeight() {
// before adding a new one (e.g. in onSurfaceTextureSizeChanged). Without this, the
// RendererHolder accumulates stale surfaces which can cause black screen in portrait.
private android.view.Surface mCurrentPreviewSurface = null;
// Reference to touch/zoom controller in portrait mode, used to update Matrix on surface ready/size change
private CustomTouchListener mCustomTouchListener = null;

private CameraControlsDialogFragment mControlsDialog;
private DeviceListDialogFragment mDeviceListDialog;
Expand Down Expand Up @@ -407,9 +409,9 @@ protected void onCreate(Bundle savedInstanceState) {
getWindowManager().getDefaultDisplay().getMetrics(displayMetrics);

//deal mouse click and button ,you can jump CustomTouchListener java
CustomTouchListener customTouchListener = new CustomTouchListener(this, usbDeviceManager);
mCustomTouchListener = new CustomTouchListener(this, usbDeviceManager);

mBinding.viewMainPreview.setOnTouchListener(customTouchListener);
mBinding.viewMainPreview.setOnTouchListener(mCustomTouchListener);

// Setting up the gesture detector
gestureDetector = new GestureDetector(this, new GestureListener());
Expand Down Expand Up @@ -924,8 +926,8 @@ private void reloadLayoutForOrientation() {
Log.d(TAG, "reloadLayoutForOrientation: views initialized");

// Re-attach CustomTouchListener to the new preview view after layout re-inflation
CustomTouchListener customTouchListener = new CustomTouchListener(this, usbDeviceManager);
mBinding.viewMainPreview.setOnTouchListener(customTouchListener);
mCustomTouchListener = new CustomTouchListener(this, usbDeviceManager);
mBinding.viewMainPreview.setOnTouchListener(mCustomTouchListener);

// Re-setup DrawerLayoutDeal for new layout (only in landscape)
if (!nowPortrait) {
Expand Down Expand Up @@ -1231,8 +1233,18 @@ private void initPreviewView() {
Log.w(TAG, "initPreviewView: mBinding or viewMainPreview is null, skipping");
return;
}
mBinding.viewMainPreview.setAspectRatio(mPreviewWidth, mPreviewHeight);
Log.d(TAG, "initPreviewView: mPreviewWidth=" + mPreviewWidth + " mPreviewHeight=" + mPreviewHeight);
// Portrait mode: disable aspect ratio constraint, TextureView fills container, Matrix handles display transform
// Landscape mode: keep original aspect ratio constraint behavior
if (!isPortraitMode) {
mBinding.viewMainPreview.setAspectRatio(mPreviewWidth, mPreviewHeight);
} else {
mBinding.viewMainPreview.setAspectRatioEnabled(false);
ViewGroup.LayoutParams lp = mBinding.viewMainPreview.getLayoutParams();
lp.width = ViewGroup.LayoutParams.MATCH_PARENT;
lp.height = ViewGroup.LayoutParams.MATCH_PARENT;
mBinding.viewMainPreview.setLayoutParams(lp);
}
Log.d(TAG, "initPreviewView: mPreviewWidth=" + mPreviewWidth + " mPreviewHeight=" + mPreviewHeight + " isPortrait=" + isPortraitMode);
mBinding.viewMainPreview.setSurfaceTextureListener(new TextureView.SurfaceTextureListener() {
@Override
public void onSurfaceTextureAvailable(@NonNull SurfaceTexture surface, int width, int height) {
Expand Down Expand Up @@ -1260,7 +1272,10 @@ public void onSurfaceTextureAvailable(@NonNull SurfaceTexture surface, int width
// fires AFTER this method returns. Setting the buffer here ensures the Surface
// is created with the correct camera resolution.
setSurfaceTextureBufferSize(surface, mPreviewWidth, mPreviewHeight);
mBinding.viewMainPreview.setAspectRatio(mPreviewWidth, mPreviewHeight);
// Portrait mode: skip setAspectRatio, Matrix handles display transform
if (!isPortraitMode) {
mBinding.viewMainPreview.setAspectRatio(mPreviewWidth, mPreviewHeight);
}

// Create Surface from SurfaceTexture
android.view.Surface previewSurface = new android.view.Surface(surface);
Expand All @@ -1280,6 +1295,10 @@ public void onSurfaceTextureAvailable(@NonNull SurfaceTexture surface, int width
mBinding.viewMainPreview.setKeepScreenOn(true);
}
});
// Portrait mode: apply Matrix to correct stretch after surface is ready
if (isPortraitMode && mCustomTouchListener != null) {
mBinding.viewMainPreview.post(() -> mCustomTouchListener.applyPortraitZoomTransform());
}
} else if (mIsCameraConnected && surface == mCurrentPreviewSurfaceTexture) {
Log.d(TAG, "onSurfaceTextureAvailable: surface already configured by onCameraOpen, skipping duplicate setup");
} else if (mIsCameraConnected && mMainSurfaceAdded && surface != mCurrentPreviewSurfaceTexture) {
Expand All @@ -1295,7 +1314,10 @@ public void onSurfaceTextureAvailable(@NonNull SurfaceTexture surface, int width

// Set buffer size BEFORE creating Surface - ensures Surface uses camera resolution
setSurfaceTextureBufferSize(surface, mPreviewWidth, mPreviewHeight);
mBinding.viewMainPreview.setAspectRatio(mPreviewWidth, mPreviewHeight);
// Portrait mode: skip setAspectRatio, Matrix handles display transform
if (!isPortraitMode) {
mBinding.viewMainPreview.setAspectRatio(mPreviewWidth, mPreviewHeight);
}
android.view.Surface previewSurface = new android.view.Surface(surface);
// Use RendererHolder pipeline to enable frame distribution to multiple surfaces (including PIP)
mCameraHelper.addSurface(previewSurface, false);
Expand All @@ -1310,36 +1332,54 @@ public void onSurfaceTextureAvailable(@NonNull SurfaceTexture surface, int width
mBinding.viewMainPreview.setKeepScreenOn(true);
}
});
// Portrait mode: apply Matrix to correct stretch after surface reconnection
if (isPortraitMode && mCustomTouchListener != null) {
mBinding.viewMainPreview.post(() -> mCustomTouchListener.applyPortraitZoomTransform());
}
}
}

@Override
public void onSurfaceTextureSizeChanged(@NonNull SurfaceTexture surface, int width, int height) {
Log.d(TAG, "onSurfaceTextureSizeChanged: " + width + "x" + height +
" mMainSurfaceAdded=" + mMainSurfaceAdded + " mIsCameraConnected=" + mIsCameraConnected);
" mMainSurfaceAdded=" + mMainSurfaceAdded + " mIsCameraConnected=" + mIsCameraConnected +
" isPortrait=" + isPortraitMode);

if (mMainSurfaceAdded && mCameraHelper != null && mIsCameraConnected) {
// Surface was already added by onCameraOpen, but the view size changed
// (e.g. portrait mode where AspectRatioTextureView's setAspectRatio
// triggers onMeasure which changes the view dimensions).
// CRITICAL: Remove the OLD Surface from RendererHolder BEFORE adding
// a new one. Without removing first, the RendererHolder accumulates
// stale Surface objects which causes the preview to render to the
// wrong surface (black screen).
// Both removeSurface and addSurface post to the same async handler,
// so they execute in order: remove first, then add.
Log.d(TAG, "onSurfaceTextureSizeChanged: removing old surface and re-adding with new buffer size");
if (mCurrentPreviewSurface != null) {
mCameraHelper.removeSurface(mCurrentPreviewSurface);
// In portrait mode, TextureView is always MATCH_PARENT, size changes only occur during screen rotation.
// Skip setAspectRatio (portrait uses Matrix), avoid re-triggering onMeasure which causes flickering.
if (!isPortraitMode) {
// Surface was already added by onCameraOpen, but the view size changed
// (e.g. landscape mode where AspectRatioTextureView's setAspectRatio
// triggers onMeasure which changes the view dimensions).
// CRITICAL: Remove the OLD Surface from RendererHolder BEFORE adding
// a new one. Without removing first, the RendererHolder accumulates
// stale Surface objects which causes the preview to render to the
// wrong surface (black screen).
// Both removeSurface and addSurface post to the same async handler,
// so they execute in order: remove first, then add.
Log.d(TAG, "onSurfaceTextureSizeChanged: removing old surface and re-adding with new buffer size");
if (mCurrentPreviewSurface != null) {
mCameraHelper.removeSurface(mCurrentPreviewSurface);
}
setSurfaceTextureBufferSize(surface, mPreviewWidth, mPreviewHeight);
mBinding.viewMainPreview.setAspectRatio(mPreviewWidth, mPreviewHeight);
android.view.Surface previewSurface = new android.view.Surface(surface);
mCameraHelper.addSurface(previewSurface, false);
mCurrentPreviewSurfaceTexture = surface;
mCurrentPreviewSurface = previewSurface;
mCameraHelper.startPreview();
// Keep mMainSurfaceAdded = true — we just re-added it
} else {
// Portrait mode: surface size changes frequently during keyboard animation, skip surface deletion/recreation to avoid crash.
// Still need to set buffer size to camera native resolution to ensure clarity when zoomed.
Log.d(TAG, "onSurfaceTextureSizeChanged: portrait mode, updating buffer size without surface recreation");
setSurfaceTextureBufferSize(surface, mPreviewWidth, mPreviewHeight);
// Update Matrix to recalculate stretch correction
if (mCustomTouchListener != null) {
mBinding.viewMainPreview.post(() -> mCustomTouchListener.applyPortraitZoomTransform());
}
}
setSurfaceTextureBufferSize(surface, mPreviewWidth, mPreviewHeight);
mBinding.viewMainPreview.setAspectRatio(mPreviewWidth, mPreviewHeight);
android.view.Surface previewSurface = new android.view.Surface(surface);
mCameraHelper.addSurface(previewSurface, false);
mCurrentPreviewSurfaceTexture = surface;
mCurrentPreviewSurface = previewSurface;
mCameraHelper.startPreview();
// Keep mMainSurfaceAdded = true — we just re-added it
} else {
// First time or surface was destroyed — set buffer size for later
if (!mMainSurfaceAdded) {
Expand Down Expand Up @@ -1589,7 +1629,10 @@ public void onCameraOpen(UsbDevice device) {
}

// Step 2: Set aspect ratio on the view (controls how the view is measured)
mBinding.viewMainPreview.setAspectRatio(mPreviewWidth, mPreviewHeight);
// Portrait mode: skip setAspectRatio, Matrix handles display transform
if (!isPortraitMode) {
mBinding.viewMainPreview.setAspectRatio(mPreviewWidth, mPreviewHeight);
}

// Step 3: Set SurfaceTexture buffer size to camera resolution BEFORE creating
// the Surface. This is the critical step - the buffer size is read by
Expand Down Expand Up @@ -1619,6 +1662,11 @@ public void onCameraOpen(UsbDevice device) {
// Start preview after adding surfaces to ensure frames flow correctly
mCameraHelper.startPreview();
Log.d(TAG, "onCameraOpen: startPreview called after adding surfaces, preview=" + mPreviewWidth + "x" + mPreviewHeight);

// Portrait mode: apply Matrix to correct stretch after surface is ready
if (isPortraitMode && mCustomTouchListener != null) {
mBinding.viewMainPreview.post(() -> mCustomTouchListener.applyPortraitZoomTransform());
}
});

mIsCameraConnected = true;
Expand Down Expand Up @@ -1729,9 +1777,12 @@ private void resizePreviewView(Size size) {
mPreviewHeight = metrics.heightPixels;
}
}
Log.d(TAG, "resizePreviewView: " + mPreviewWidth + "x" + mPreviewHeight + " (mMainSurfaceAdded=" + mMainSurfaceAdded + ")");
Log.d(TAG, "resizePreviewView: " + mPreviewWidth + "x" + mPreviewHeight + " (mMainSurfaceAdded=" + mMainSurfaceAdded + " isPortrait=" + isPortraitMode + ")");
// Set the aspect ratio of TextureView to match the aspect ratio of the camera
mBinding.viewMainPreview.setAspectRatio(mPreviewWidth, mPreviewHeight);
// Portrait mode: skip setAspectRatio, Matrix handles display transform
if (!isPortraitMode) {
mBinding.viewMainPreview.setAspectRatio(mPreviewWidth, mPreviewHeight);
}
// Update SurfaceTexture buffer to chip resolution for better zoom quality.
// IMPORTANT: Only update buffer size if no Surface has been created from this
// SurfaceTexture yet. Once a Surface is created (mMainSurfaceAdded=true), the
Expand Down Expand Up @@ -3417,7 +3468,7 @@ private void startSend(String text) {
undoSnapshot = sendText;
undoClearEligible = true;
updateClearButtonIcon();
// Do NOT clear editor after send (保留文本)
// Do NOT clear editor after send (keep text)
}

// Reset send button
Expand Down
31 changes: 24 additions & 7 deletions app/src/main/java/com/openterface/AOS/drawerLayout/ZoomLayoutDeal.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -547,11 +547,17 @@ public static void updateIndicatorFromMainView(float zoomScale, float translateX
indicatorWidth = Math.max(20f, Math.min(indicatorWidth, pipWidth));
indicatorHeight = Math.max(20f, Math.min(indicatorHeight, pipHeight));

// Update indicator size
// Update indicator size only when changed significantly (avoid layout thrash during pinch)
final int INDICATOR_SIZE_THRESHOLD = 3;
ViewGroup.LayoutParams params = indicatorView.getLayoutParams();
params.width = (int) indicatorWidth;
params.height = (int) indicatorHeight;
indicatorView.setLayoutParams(params);
int newWidth = (int) indicatorWidth;
int newHeight = (int) indicatorHeight;
if (Math.abs(params.width - newWidth) > INDICATOR_SIZE_THRESHOLD
|| Math.abs(params.height - newHeight) > INDICATOR_SIZE_THRESHOLD) {
params.width = newWidth;
params.height = newHeight;
indicatorView.setLayoutParams(params);
}

if (zoomScale <= 1.0f) {
// Not zoomed, center the indicator
Expand Down Expand Up @@ -691,10 +697,21 @@ private static void syncMainViewPosition(float thumbX, float thumbY) {
normalizedX = Math.max(0, Math.min(normalizedX, 1));
normalizedY = Math.max(0, Math.min(normalizedY, 1));

// Calculate actual content dimensions after stretch correction.
// Stretch correction fills viewWidth, maintains buffer aspect ratio,
// so contentHeight = viewWidth / bufferAspect (may be < viewHeight).
float bufferWidth = activity.getPreviewWidth();
float bufferHeight = activity.getPreviewHeight();
float contentWidth = viewWidth;
float contentHeight = viewWidth * bufferHeight / bufferWidth;
// Clamp: if content is larger than view, cap at view size
if (contentHeight > viewHeight) contentHeight = viewHeight;
if (contentWidth > viewWidth) contentWidth = viewWidth;

// Convert normalized position to main view translation
// Use view's display dimensions for max translation calculation
float maxTranslateX = (viewWidth * (currentZoomScale - 1f)) / 2f;
float maxTranslateY = (viewHeight * (currentZoomScale - 1f)) / 2f;
// Use corrected content dimensions for accurate edge-to-edge mapping
float maxTranslateX = (contentWidth * (currentZoomScale - 1f)) / 2f;
float maxTranslateY = (contentHeight * (currentZoomScale - 1f)) / 2f;

// normalizedX=0 → translateX=+max (left edge visible)
// normalizedX=1 → translateX=-max (right edge visible)
Expand Down
Loading
Loading