Skip to content
This repository was archived by the owner on Sep 11, 2024. It is now read-only.

Commit 9d151a3

Browse files
committed
clobber mimetype on receive, not send
1 parent 6a46c7a commit 9d151a3

File tree

2 files changed

+11
-8
lines changed

2 files changed

+11
-8
lines changed

src/ContentMessages.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -595,12 +595,6 @@ export default class ContentMessages {
595595
// if we have a mime type for the file, add it to the message metadata
596596
if (file.type) {
597597
content.info.mimetype = file.type;
598-
599-
// clobber quicktime muxed files to be considered MP4 so browsers
600-
// are willing to play them
601-
if (content.info.mimetype == "video/quicktime") {
602-
content.info.mimetype = "video/mp4";
603-
}
604598
}
605599

606600
const prom = new Promise<void>((resolve) => {

src/components/views/messages/MVideoBody.tsx

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,12 +190,21 @@ export default class MVideoBody extends React.PureComponent<IBodyProps, IState>
190190
} else {
191191
logger.log("NOT preloading video");
192192
const content = this.props.mxEvent.getContent<IMediaEventContent>();
193+
194+
let mimetype = content?.info?.mimetype;
195+
196+
// clobber quicktime muxed files to be considered MP4 so browsers
197+
// are willing to play them
198+
if (mimetype == "video/quicktime") {
199+
mimetype = "video/mp4";
200+
}
201+
193202
this.setState({
194203
// For Chrome and Electron, we need to set some non-empty `src` to
195204
// enable the play button. Firefox does not seem to care either
196205
// way, so it's fine to do for all browsers.
197-
decryptedUrl: `data:${content?.info?.mimetype},`,
198-
decryptedThumbnailUrl: thumbnailUrl || `data:${content?.info?.mimetype},`,
206+
decryptedUrl: `data:${mimetype},`,
207+
decryptedThumbnailUrl: thumbnailUrl || `data:${mimetype},`,
199208
decryptedBlob: null,
200209
});
201210
}

0 commit comments

Comments
 (0)