screentinker/server/scripts/backfill-rotation-dims.js
screentinker 837f65e634
Some checks are pending
CI / Unit tests (node --test) (push) Waiting to run
CI / OpenAPI spec lint (push) Waiting to run
CI / Android unit tests (Kotlin schedule evaluator vectors) (push) Waiting to run
CI / Boot smoke + version check (push) Waiting to run
fix(content+android): rotation-aware media — portrait upright on dashboard AND player (#170) (#172)
* 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>
2026-07-12 22:05:11 -05:00

81 lines
3.9 KiB
JavaScript

'use strict';
// #170 backfill: correct stored width/height for already-uploaded portrait media that was
// ingested before the rotation-aware fix (coded dims, rotation ignored -> stored landscape).
// Re-probes each content file on disk, recomputes DISPLAY dims via lib/media-orientation, and
// (with --apply) updates the row + regenerates mis-oriented IMAGE thumbnails (old image thumbs
// were written without EXIF auto-orient; old video thumbs were already auto-rotated by ffmpeg).
//
// Idempotent: a second run finds nothing to change. Dry-run by default.
// node scripts/backfill-rotation-dims.js # report only
// node scripts/backfill-rotation-dims.js --apply # write corrections
// node scripts/backfill-rotation-dims.js --apply --limit 50
//
// In Docker: docker exec <container> node scripts/backfill-rotation-dims.js --apply
const path = require('path');
const fs = require('fs');
const { execFileSync } = require('child_process');
const { db } = require('../db/database');
const config = require('../config');
const { videoDisplayDims, imageDisplayDims } = require('../lib/media-orientation');
const APPLY = process.argv.includes('--apply');
const limitArg = process.argv.indexOf('--limit');
const LIMIT = limitArg >= 0 ? parseInt(process.argv[limitArg + 1], 10) || 0 : 0;
function probeVideoDims(filePath) {
const out = execFileSync('ffprobe', ['-v', 'quiet', '-print_format', 'json', '-show_streams', filePath], { timeout: 15000 }).toString();
const stream = (JSON.parse(out).streams || []).find(s => s.codec_type === 'video');
return videoDisplayDims(stream);
}
async function probeImageDims(filePath) {
const sharp = require('sharp');
return imageDisplayDims(await sharp(filePath).metadata());
}
async function regenImageThumb(filePath, thumbName) {
const sharp = require('sharp');
await sharp(filePath).rotate().resize(config.thumbnailWidth).jpeg({ quality: 70 }).toFile(path.join(config.contentDir, thumbName));
}
(async () => {
const rows = db.prepare(
`SELECT id, filepath, thumbnail_path, mime_type, width, height FROM content
WHERE filepath IS NOT NULL AND (mime_type LIKE 'image/%' OR mime_type LIKE 'video/%')
${LIMIT ? 'LIMIT ' + LIMIT : ''}`
).all();
let checked = 0, corrected = 0, missing = 0, probeErr = 0, thumbRegen = 0;
const changes = [];
for (const row of rows) {
const filePath = path.join(config.contentDir, row.filepath);
if (!fs.existsSync(filePath)) { missing++; continue; }
checked++;
let dims;
try {
dims = row.mime_type.startsWith('image/') ? await probeImageDims(filePath) : probeVideoDims(filePath);
} catch (e) { probeErr++; continue; }
if (dims.width == null || dims.height == null) continue;
if (dims.width === row.width && dims.height === row.height) continue; // already correct
corrected++;
changes.push({ id: row.id, from: `${row.width}x${row.height}`, to: `${dims.width}x${dims.height}`, mime: row.mime_type });
if (APPLY) {
db.prepare('UPDATE content SET width = ?, height = ? WHERE id = ?').run(dims.width, dims.height, row.id);
// Regenerate the image thumbnail (video thumbs were already auto-rotated at ingest).
if (row.mime_type.startsWith('image/') && row.thumbnail_path) {
try { await regenImageThumb(filePath, row.thumbnail_path); thumbRegen++; } catch (e) { /* best-effort */ }
}
}
}
console.log(`${APPLY ? 'APPLIED' : 'DRY-RUN'} — content rows: ${rows.length} | on-disk checked: ${checked} | missing file: ${missing} | probe errors: ${probeErr}`);
console.log(`dimension corrections ${APPLY ? 'written' : 'needed'}: ${corrected}${APPLY ? ` | image thumbnails regenerated: ${thumbRegen}` : ''}`);
for (const c of changes.slice(0, 40)) console.log(` ${c.id.slice(0, 8)} ${c.mime} ${c.from} -> ${c.to}`);
if (changes.length > 40) console.log(` … and ${changes.length - 40} more`);
if (!APPLY && corrected) console.log('\nRe-run with --apply to write these corrections.');
})();