Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

fix(photos): reuse source bytes for image fallback

laurenspriem01d475a08b1a
diff --git a/web/packages/new/photos/services/ml/blob.ts b/web/packages/new/photos/services/ml/blob.ts
index 7ac6a8e4b0..d6166482ea 100644
--- a/web/packages/new/photos/services/ml/blob.ts
+++ b/web/packages/new/photos/services/ml/blob.ts
@@ -22,7 +22,7 @@ import { decodeLivePhoto } from "ente-media/live-photo";
* {@link fetchRenderableBlob} there is no JPEG conversion involved.
*/
export interface IndexableImageSource {
- bytes: Uint8Array;
+ bytes: Uint8Array<ArrayBuffer>;
}
/**
@@ -104,6 +104,24 @@ export const fetchIndexableImageSource = async (
}
};
+/**
+ * Return renderable image bytes derived from an already fetched source.
+ *
+ * This is used when the native decoder rejects a format that the desktop app
+ * can convert to JPEG. Keeping conversion separate from fetching ensures the
+ * fallback uses the same stable bytes as the initial analysis attempt.
+ */
+export const renderableImageBytes = async (
+ file: EnteFile,
+ source: IndexableImageSource,
+): Promise<Uint8Array> => {
+ const blob = await renderableImageBlob(
+ new Blob([source.bytes]),
+ fileFileName(file),
+ );
+ return new Uint8Array(await blob.arrayBuffer());
+};
+
/**
* Return a renderable blob (converting to JPEG if needed) for the given data.
*
diff --git a/web/packages/new/photos/services/ml/worker.ts b/web/packages/new/photos/services/ml/worker.ts
index 8ae7640831..881cafbc07 100644
--- a/web/packages/new/photos/services/ml/worker.ts
+++ b/web/packages/new/photos/services/ml/worker.ts
@@ -22,7 +22,7 @@ import { wait } from "ente-utils/promise";
import { savedCollectionFiles } from "../photos-fdb";
import {
fetchIndexableImageSource,
- fetchRenderableBlob,
+ renderableImageBytes,
type IndexableImageSource,
} from "./blob";
import {
@@ -650,7 +650,6 @@ const index = async (
try {
result = await analyzeImageWithConversionFallback(
file,
- processableUploadItem,
source,
{ runFaces, runClip },
electron,
@@ -765,7 +764,6 @@ const petsIndexingEnabled = false;
*/
const analyzeImageWithConversionFallback = async (
file: EnteFile,
- processableUploadItem: ProcessableUploadItem | undefined,
source: IndexableImageSource,
{ runFaces, runClip }: { runFaces: boolean; runClip: boolean },
electron: ElectronMLWorker,
@@ -790,17 +788,8 @@ const analyzeImageWithConversionFallback = async (
);
let bytes: Uint8Array;
try {
- const blob = await fetchRenderableBlob(
- file,
- processableUploadItem,
- electron,
- );
- bytes = new Uint8Array(await blob.arrayBuffer());
+ bytes = await renderableImageBytes(file, source);
} catch (conversionError) {
- // Fetching the source for conversion can still fail transiently.
- // Do not turn such a download error into a permanent image error.
- if (isNetworkDownloadError(conversionError)) throw conversionError;
-
const message =
conversionError instanceof Error
? conversionError.message