mirror of
https://github.com/screentinker/screentinker.git
synced 2026-08-13 13:53:12 -06:00
837f65e634
* fix(content): rotation-aware media dimensions — portrait no longer stored landscape (#170) Ingest recorded CODED width/height and ignored rotation, so a portrait phone video (coded 1920x1080 + 90° Display-Matrix) or a portrait photo (EXIF orientation 6) was stored LANDSCAPE. The player then rendered it wrong-aspect and letterboxed — the "portrait content degraded + blue bar at the bottom" symptom in #170. The reporter's workaround (pre-rotate + mark Landscape) is exactly what this bug forces. - lib/media-orientation.js (new): pure, unit-tested display-dimension helpers = single source of truth for ingest AND the backfill. videoDisplayDims() reads the modern Display-Matrix side_data rotation (falls back to the legacy tags.rotate, sign-normalized); imageDisplayDims() honors EXIF orientation 5..8. Odd quarter-turns swap W/H. - lib/content-ingest.js: use the helpers for stored dims; add sharp .rotate() so image THUMBNAILS are auto-oriented too (video thumbs were already auto-rotated by ffmpeg). - scripts/backfill-rotation-dims.js (new): idempotent, dry-run-by-default maintenance to correct already-uploaded portrait media (re-probe -> fix dims -> regenerate image thumbs). - test/media-orientation.test.js: 5 bites (tag + Display-Matrix, sign/normalize, EXIF 5..8, the blue-bar landscape->portrait case, null-safety). Scopes #170 to its residual-on-1.9.4 issues; the 1.9.3 "never displays" slice was #162 + the remote_url-null download fix, already shipped in 1.9.4. The slow low-res/orientation- cycling first load is tracked separately in #170 pending repro data. Refs #170. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> * fix(android): honor EXIF orientation in ImageLoader so portrait photos render upright (#170) Completes the rotation-aware media fix on the PLAYER side. The server ingest fix (this branch) corrects stored dimensions + auto-orients the thumbnail, but the panel draws the full-res original via BitmapFactory, which ignores EXIF — so a portrait photo (landscape pixels tagged "rotate 90") still rendered sideways on the screen. QA root-cause pass on #170 caught this gap: the Android player reads no stored dims and applied no EXIF. ImageLoader now reads the EXIF orientation (from the file for cached content, from the byte stream for remote_url images — ExifInterface(stream) is API 24+, minSdk is 24) and rotates/ flips the decoded bitmap via a Matrix (all 8 orientations). NORMAL/UNDEFINED is a no-op (no extra allocation); a transformed copy recycles the source; OOM falls back to the source rather than crashing. Videos were already correct (ExoPlayer honors the rotation matrix). Verified: :app:compileDebugKotlin clean. Refs #170. Rides with the server rotation-dims fix on this branch. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
58 lines
3.5 KiB
JavaScript
58 lines
3.5 KiB
JavaScript
'use strict';
|
|
|
|
// #170: portrait media was stored with swapped W/H because ingest read CODED dimensions and
|
|
// ignored rotation (video Display-Matrix / rotate tag; image EXIF orientation) -> wrong aspect
|
|
// + blue letterbox bar on the player. These bites pin the display-dimension logic that fixes it.
|
|
|
|
const { test } = require('node:test');
|
|
const assert = require('node:assert/strict');
|
|
const {
|
|
rotationSwapsWH, videoRotationDegrees, videoDisplayDims, exifSwapsWH, imageDisplayDims,
|
|
} = require('../lib/media-orientation');
|
|
|
|
test('#170 rotationSwapsWH: only odd quarter-turns swap', () => {
|
|
assert.equal(rotationSwapsWH(0), false);
|
|
assert.equal(rotationSwapsWH(90), true);
|
|
assert.equal(rotationSwapsWH(180), false);
|
|
assert.equal(rotationSwapsWH(270), true);
|
|
assert.equal(rotationSwapsWH(360), false);
|
|
assert.equal(rotationSwapsWH(-90), true); // normalizes to 270
|
|
assert.equal(rotationSwapsWH(450), true); // normalizes to 90
|
|
assert.equal(rotationSwapsWH(91), false); // not a clean quarter-turn
|
|
assert.equal(rotationSwapsWH(undefined), false);
|
|
});
|
|
|
|
test('#170 videoRotationDegrees: reads tag and Display Matrix, normalizes sign', () => {
|
|
assert.equal(videoRotationDegrees({ tags: { rotate: '90' } }), 90);
|
|
assert.equal(videoRotationDegrees({ tags: { rotate: '-90' } }), 270, 'negative tag normalized');
|
|
assert.equal(videoRotationDegrees({ side_data_list: [{ side_data_type: 'Display Matrix', rotation: -90 }] }), 270);
|
|
assert.equal(videoRotationDegrees({ side_data_list: [{ side_data_type: 'Display Matrix', rotation: 90 }] }), 90);
|
|
// Display Matrix wins over a (possibly stale) legacy tag
|
|
assert.equal(videoRotationDegrees({ tags: { rotate: '0' }, side_data_list: [{ side_data_type: 'Display Matrix', rotation: -90 }] }), 270);
|
|
assert.equal(videoRotationDegrees({}), 0, 'no rotation info -> 0');
|
|
assert.equal(videoRotationDegrees(null), 0);
|
|
});
|
|
|
|
test('#170 videoDisplayDims: portrait video (coded landscape + 90 rotation) reads portrait', () => {
|
|
assert.deepEqual(
|
|
videoDisplayDims({ width: 1920, height: 1080, side_data_list: [{ side_data_type: 'Display Matrix', rotation: -90 }] }),
|
|
{ width: 1080, height: 1920 }, 'the blue-bar case: stored landscape -> display portrait');
|
|
assert.deepEqual(videoDisplayDims({ width: 1920, height: 1080 }), { width: 1920, height: 1080 }, 'no rotation -> unchanged');
|
|
assert.deepEqual(videoDisplayDims({ width: 1080, height: 1920, tags: { rotate: '180' } }), { width: 1080, height: 1920 }, '180 does not swap');
|
|
assert.deepEqual(videoDisplayDims(null), { width: null, height: null });
|
|
assert.deepEqual(videoDisplayDims({ width: null, height: null }), { width: null, height: null });
|
|
});
|
|
|
|
test('#170 exifSwapsWH: EXIF 5..8 imply a quarter-turn', () => {
|
|
for (const o of [1, 2, 3, 4]) assert.equal(exifSwapsWH(o), false, `orientation ${o} no swap`);
|
|
for (const o of [5, 6, 7, 8]) assert.equal(exifSwapsWH(o), true, `orientation ${o} swaps`);
|
|
assert.equal(exifSwapsWH(undefined), false, 'no EXIF -> no swap');
|
|
});
|
|
|
|
test('#170 imageDisplayDims: portrait photo with EXIF 6 reads portrait', () => {
|
|
assert.deepEqual(imageDisplayDims({ width: 4032, height: 3024, orientation: 6 }), { width: 3024, height: 4032 });
|
|
assert.deepEqual(imageDisplayDims({ width: 3024, height: 4032, orientation: 1 }), { width: 3024, height: 4032 });
|
|
assert.deepEqual(imageDisplayDims({ width: 3024, height: 4032 }), { width: 3024, height: 4032 }, 'no orientation tag -> unchanged');
|
|
assert.deepEqual(imageDisplayDims(null), { width: null, height: null });
|
|
});
|