Page MenuHomePhabricator
Differential D14471

[native] Use getVideoInfo from MediaModule instead of ffmpeg
ClosedPublic
Actions

Authored by angelika on Thu, Mar 20, 4:34 AM.
Tags
None
Referenced Files
F5123060: D14471.id47549.diff
Thu, Apr 3, 2:27 PM
Unknown Object (File)
Wed, Apr 2, 10:00 AM
Unknown Object (File)
Mon, Mar 31, 1:32 PM
Unknown Object (File)
Mon, Mar 31, 11:54 AM
Unknown Object (File)
Mon, Mar 31, 10:51 AM
Unknown Object (File)
Mon, Mar 31, 3:02 AM
Unknown Object (File)
Sun, Mar 30, 10:16 PM
Unknown Object (File)
Sun, Mar 30, 4:51 PM
View All 22 Files
Subscribers
ashoat
tomek

Details

Reviewers
bartek
Commits
rCOMMe75c93028829: [native] Use getVideoInfo from MediaModule instead of ffmpeg
Summary

https://linear.app/comm/issue/ENG-10314/migrate-comm-app-to-use-new-media-module

Depends on D14470

Test Plan

Try to send a video and see video info

Diff Detail

Repository
rCOMM Comm
Lint
No Lint Coverage
Unit
No Test Coverage

Event Timeline

angelika created this revision.Thu, Mar 20, 4:34 AM
angelika held this revision as a draft.
Herald added subscribers: tomek, ashoat. · View Herald TranscriptThu, Mar 20, 4:34 AM
angelika added a child revision: D14472: [android] Implement hasMultipleFrames() function on Android.Thu, Mar 20, 4:38 AM
Harbormaster completed remote builds in B33778: Diff 47482.Thu, Mar 20, 4:52 AM
angelika added inline comments.Thu, Mar 20, 5:01 AM
lib/types/media-types.js
135 ↗(On Diff #47482)

I don't know what format is in the original ffmpeg implementation. It's not documented anywhere and when I've tested it the ffmpeg implementation didn't even return it. Because it's later compared to "mp4" to check if format is correct I'm just returning the file extension. We can run more complicated checks but I think it's good enough for our usecase.

native/media/video-utils.js
261 ↗(On Diff #47482)

The native code can return all those values depending on a platform and a video and they're all h264.

angelika published this revision for review.Thu, Mar 20, 5:55 AM
bartek accepted this revision.Fri, Mar 21, 1:50 AM

Looking at this diff, the thing you did with format seems right

This revision is now accepted and ready to land.Fri, Mar 21, 1:50 AM
ashoat added inline comments.Fri, Mar 21, 10:08 AM
native/media/video-utils.js
261 ↗(On Diff #47482)

If format wasn’t being set by ffmpeg, wouldn’t this check always fail? What happens if the check fails? If it’s not failing, then perhaps it’s worth understanding what ffmpeg is actually returning. Not sure it matters a lot though

262 ↗(On Diff #47482)

Should this and the above one be factored out to the root level to avoid redeclaring on every invocation?

angelika updated this revision to Diff 47547.Tue, Mar 25, 10:01 PM

Rebase

angelika marked an inline comment as done.Tue, Mar 25, 10:12 PM
angelika added inline comments.
native/media/video-utils.js
261 ↗(On Diff #47482)

I checked it and I must have printed a wrong thing because now I can see the format. But still it doesn't tell me much, for mp4 video I've got an array like [mov, mp4, ... a bunch of formats I don't know...]. So I'm leaving it as it is.

Harbormaster completed remote builds in B33829: Diff 47547.Tue, Mar 25, 10:20 PM
Closed by commit rCOMMe75c93028829: [native] Use getVideoInfo from MediaModule instead of ffmpeg (authored by angelika). · Explain WhyThu, Mar 27, 12:21 PM
This revision was automatically updated to reflect the committed changes.
angelika added a commit: rCOMMe75c93028829: [native] Use getVideoInfo from MediaModule instead of ffmpeg.

Revision Contents
Changeset List

PathSize
lib/
types/
8 lines
native/
media/
40 lines
5 lines
utils/
17 lines

Diff 47547

View Options

lib/types/media-types.js

// @flow // @flow
import invariant from 'invariant'; import invariant from 'invariant';
import { specialRoles } from 'lib/permissions/special-roles.js'; import { specialRoles } from 'lib/permissions/special-roles.js';
import { getAllThreadPermissions } from 'lib/permissions/thread-permissions.js'; import { getAllThreadPermissions } from 'lib/permissions/thread-permissions.js';
import { import {
rawThreadInfoFromServerThreadInfo, rawThreadInfoFromServerThreadInfo,
getContainingThreadID, getContainingThreadID,
getCommunity, getCommunity,
} from 'lib/shared/thread-utils.js'; } from 'lib/shared/thread-utils.js';
import { hasMinCodeVersion } from 'lib/shared/version-utils.js'; import {
FUTURE_CODE_VERSION,
hasMinCodeVersion,
} from 'lib/shared/version-utils.js';
import type { AvatarDBContent, ClientAvatar } from 'lib/types/avatar-types.js'; import type { AvatarDBContent, ClientAvatar } from 'lib/types/avatar-types.js';
import type { RawMessageInfo, MessageInfo } from 'lib/types/message-types.js'; import type { RawMessageInfo, MessageInfo } from 'lib/types/message-types.js';
import type { RawThreadInfo } from 'lib/types/minimally-encoded-thread-permissions-types.js'; import type { RawThreadInfo } from 'lib/types/minimally-encoded-thread-permissions-types.js';
import { threadTypes, type ThreadType } from 'lib/types/thread-types-enum.js'; import { threadTypes, type ThreadType } from 'lib/types/thread-types-enum.js';
import { import {
type ServerThreadInfo, type ServerThreadInfo,
type MixedRawThreadInfos, type MixedRawThreadInfos,
type LegacyRawThreadInfo, type LegacyRawThreadInfo,
▲ Show 20 Lines • Show All 259 Lines • ▼ Show 20 Lines): FetchThreadInfosResult {
}); });
const codeVersionBelow283 = !hasMinCodeVersion(viewer.platformDetails, { const codeVersionBelow283 = !hasMinCodeVersion(viewer.platformDetails, {
native: 285, native: 285,
}); });
const minimallyEncodedPermissionsSupported = hasMinCodeVersion( const minimallyEncodedPermissionsSupported = hasMinCodeVersion(
viewer.platformDetails, viewer.platformDetails,
{ native: 301, web: 56 }, { native: 301, web: 56 },
); );
const futureCodeVersion = hasMinCodeVersion(viewer.platformDetails, {
native: FUTURE_CODE_VERSION,
web: FUTURE_CODE_VERSION,
majorDesktop: FUTURE_CODE_VERSION,
});
const threadInfos: { const threadInfos: {
[string]: LegacyRawThreadInfo | RawThreadInfo, [string]: LegacyRawThreadInfo | RawThreadInfo,
} = {}; } = {};
for (const threadID in serverResult.threadInfos) { for (const threadID in serverResult.threadInfos) {
const serverThreadInfo = serverResult.threadInfos[threadID]; const serverThreadInfo = serverResult.threadInfos[threadID];
const threadInfo = rawThreadInfoFromServerThreadInfo( const threadInfo = rawThreadInfoFromServerThreadInfo(
serverThreadInfo, serverThreadInfo,
viewerID, viewerID,
{ {
filterThreadEditAvatarPermission: codeVersionBelow213, filterThreadEditAvatarPermission: codeVersionBelow213,
excludePinInfo: codeVersionBelow209, excludePinInfo: codeVersionBelow209,
filterManageInviteLinksPermission: codeVersionBelow221, filterManageInviteLinksPermission: codeVersionBelow221,
filterVoicedInAnnouncementChannelsPermission: codeVersionBelow283, filterVoicedInAnnouncementChannelsPermission: codeVersionBelow283,
minimallyEncodePermissions: minimallyEncodedPermissionsSupported, minimallyEncodePermissions: minimallyEncodedPermissionsSupported,
includeSpecialRoleFieldInRoles: futureCodeVersion,
}, },
); );
if (threadInfo) { if (threadInfo) {
threadInfos[threadID] = threadInfo; threadInfos[threadID] = threadInfo;
} }
} }
return { threadInfos }; return { threadInfos };
} }
▲ Show 20 Lines • Show All 116 Lines • Show Last 20 Lines
View Options

native/media/ffmpeg.js

// @flow // @flow
import invariant from 'invariant'; import invariant from 'invariant';
import { specialRoles } from 'lib/permissions/special-roles.js'; import { specialRoles } from 'lib/permissions/special-roles.js';
import { getAllThreadPermissions } from 'lib/permissions/thread-permissions.js'; import { getAllThreadPermissions } from 'lib/permissions/thread-permissions.js';
import { import {
rawThreadInfoFromServerThreadInfo, rawThreadInfoFromServerThreadInfo,
getContainingThreadID, getContainingThreadID,
getCommunity, getCommunity,
} from 'lib/shared/thread-utils.js'; } from 'lib/shared/thread-utils.js';
import { hasMinCodeVersion } from 'lib/shared/version-utils.js'; import {
FUTURE_CODE_VERSION,
hasMinCodeVersion,
} from 'lib/shared/version-utils.js';
import type { AvatarDBContent, ClientAvatar } from 'lib/types/avatar-types.js'; import type { AvatarDBContent, ClientAvatar } from 'lib/types/avatar-types.js';
import type { RawMessageInfo, MessageInfo } from 'lib/types/message-types.js'; import type { RawMessageInfo, MessageInfo } from 'lib/types/message-types.js';
import type { RawThreadInfo } from 'lib/types/minimally-encoded-thread-permissions-types.js'; import type { RawThreadInfo } from 'lib/types/minimally-encoded-thread-permissions-types.js';
import { threadTypes, type ThreadType } from 'lib/types/thread-types-enum.js'; import { threadTypes, type ThreadType } from 'lib/types/thread-types-enum.js';
import { import {
type ServerThreadInfo, type ServerThreadInfo,
type MixedRawThreadInfos, type MixedRawThreadInfos,
type LegacyRawThreadInfo, type LegacyRawThreadInfo,
▲ Show 20 Lines • Show All 259 Lines • ▼ Show 20 Lines): FetchThreadInfosResult {
}); });
const codeVersionBelow283 = !hasMinCodeVersion(viewer.platformDetails, { const codeVersionBelow283 = !hasMinCodeVersion(viewer.platformDetails, {
native: 285, native: 285,
}); });
const minimallyEncodedPermissionsSupported = hasMinCodeVersion( const minimallyEncodedPermissionsSupported = hasMinCodeVersion(
viewer.platformDetails, viewer.platformDetails,
{ native: 301, web: 56 }, { native: 301, web: 56 },
); );
const futureCodeVersion = hasMinCodeVersion(viewer.platformDetails, {
native: FUTURE_CODE_VERSION,
web: FUTURE_CODE_VERSION,
majorDesktop: FUTURE_CODE_VERSION,
});
const threadInfos: { const threadInfos: {
[string]: LegacyRawThreadInfo | RawThreadInfo, [string]: LegacyRawThreadInfo | RawThreadInfo,
} = {}; } = {};
for (const threadID in serverResult.threadInfos) { for (const threadID in serverResult.threadInfos) {
const serverThreadInfo = serverResult.threadInfos[threadID]; const serverThreadInfo = serverResult.threadInfos[threadID];
const threadInfo = rawThreadInfoFromServerThreadInfo( const threadInfo = rawThreadInfoFromServerThreadInfo(
serverThreadInfo, serverThreadInfo,
viewerID, viewerID,
{ {
filterThreadEditAvatarPermission: codeVersionBelow213, filterThreadEditAvatarPermission: codeVersionBelow213,
excludePinInfo: codeVersionBelow209, excludePinInfo: codeVersionBelow209,
filterManageInviteLinksPermission: codeVersionBelow221, filterManageInviteLinksPermission: codeVersionBelow221,
filterVoicedInAnnouncementChannelsPermission: codeVersionBelow283, filterVoicedInAnnouncementChannelsPermission: codeVersionBelow283,
minimallyEncodePermissions: minimallyEncodedPermissionsSupported, minimallyEncodePermissions: minimallyEncodedPermissionsSupported,
includeSpecialRoleFieldInRoles: futureCodeVersion,
}, },
); );
if (threadInfo) { if (threadInfo) {
threadInfos[threadID] = threadInfo; threadInfos[threadID] = threadInfo;
} }
} }
return { threadInfos }; return { threadInfos };
} }
▲ Show 20 Lines • Show All 116 Lines • Show Last 20 Lines
View Options

native/media/video-utils.js

// @flow // @flow
import invariant from 'invariant'; import invariant from 'invariant';
import { specialRoles } from 'lib/permissions/special-roles.js'; import { specialRoles } from 'lib/permissions/special-roles.js';
import { getAllThreadPermissions } from 'lib/permissions/thread-permissions.js'; import { getAllThreadPermissions } from 'lib/permissions/thread-permissions.js';
import { import {
rawThreadInfoFromServerThreadInfo, rawThreadInfoFromServerThreadInfo,
getContainingThreadID, getContainingThreadID,
getCommunity, getCommunity,
} from 'lib/shared/thread-utils.js'; } from 'lib/shared/thread-utils.js';
import { hasMinCodeVersion } from 'lib/shared/version-utils.js'; import {
FUTURE_CODE_VERSION,
hasMinCodeVersion,
} from 'lib/shared/version-utils.js';
import type { AvatarDBContent, ClientAvatar } from 'lib/types/avatar-types.js'; import type { AvatarDBContent, ClientAvatar } from 'lib/types/avatar-types.js';
import type { RawMessageInfo, MessageInfo } from 'lib/types/message-types.js'; import type { RawMessageInfo, MessageInfo } from 'lib/types/message-types.js';
import type { RawThreadInfo } from 'lib/types/minimally-encoded-thread-permissions-types.js'; import type { RawThreadInfo } from 'lib/types/minimally-encoded-thread-permissions-types.js';
import { threadTypes, type ThreadType } from 'lib/types/thread-types-enum.js'; import { threadTypes, type ThreadType } from 'lib/types/thread-types-enum.js';
import { import {
type ServerThreadInfo, type ServerThreadInfo,
type MixedRawThreadInfos, type MixedRawThreadInfos,
type LegacyRawThreadInfo, type LegacyRawThreadInfo,
▲ Show 20 Lines • Show All 259 Lines • ▼ Show 20 Lines): FetchThreadInfosResult {
}); });
const codeVersionBelow283 = !hasMinCodeVersion(viewer.platformDetails, { const codeVersionBelow283 = !hasMinCodeVersion(viewer.platformDetails, {
native: 285, native: 285,
}); });
const minimallyEncodedPermissionsSupported = hasMinCodeVersion( const minimallyEncodedPermissionsSupported = hasMinCodeVersion(
viewer.platformDetails, viewer.platformDetails,
{ native: 301, web: 56 }, { native: 301, web: 56 },
); );
const futureCodeVersion = hasMinCodeVersion(viewer.platformDetails, {
native: FUTURE_CODE_VERSION,
web: FUTURE_CODE_VERSION,
majorDesktop: FUTURE_CODE_VERSION,
});
const threadInfos: { const threadInfos: {
[string]: LegacyRawThreadInfo | RawThreadInfo, [string]: LegacyRawThreadInfo | RawThreadInfo,
} = {}; } = {};
for (const threadID in serverResult.threadInfos) { for (const threadID in serverResult.threadInfos) {
const serverThreadInfo = serverResult.threadInfos[threadID]; const serverThreadInfo = serverResult.threadInfos[threadID];
const threadInfo = rawThreadInfoFromServerThreadInfo( const threadInfo = rawThreadInfoFromServerThreadInfo(
serverThreadInfo, serverThreadInfo,
viewerID, viewerID,
{ {
filterThreadEditAvatarPermission: codeVersionBelow213, filterThreadEditAvatarPermission: codeVersionBelow213,
excludePinInfo: codeVersionBelow209, excludePinInfo: codeVersionBelow209,
filterManageInviteLinksPermission: codeVersionBelow221, filterManageInviteLinksPermission: codeVersionBelow221,
filterVoicedInAnnouncementChannelsPermission: codeVersionBelow283, filterVoicedInAnnouncementChannelsPermission: codeVersionBelow283,
minimallyEncodePermissions: minimallyEncodedPermissionsSupported, minimallyEncodePermissions: minimallyEncodedPermissionsSupported,
includeSpecialRoleFieldInRoles: futureCodeVersion,
}, },
); );
if (threadInfo) { if (threadInfo) {
threadInfos[threadID] = threadInfo; threadInfos[threadID] = threadInfo;
} }
} }
return { threadInfos }; return { threadInfos };
} }
▲ Show 20 Lines • Show All 116 Lines • Show Last 20 Lines
View Options

native/utils/media-module.js

// @flow // @flow
import invariant from 'invariant'; import invariant from 'invariant';
import { specialRoles } from 'lib/permissions/special-roles.js'; import { specialRoles } from 'lib/permissions/special-roles.js';
import { getAllThreadPermissions } from 'lib/permissions/thread-permissions.js'; import { getAllThreadPermissions } from 'lib/permissions/thread-permissions.js';
import { import {
rawThreadInfoFromServerThreadInfo, rawThreadInfoFromServerThreadInfo,
getContainingThreadID, getContainingThreadID,
getCommunity, getCommunity,
} from 'lib/shared/thread-utils.js'; } from 'lib/shared/thread-utils.js';
import { hasMinCodeVersion } from 'lib/shared/version-utils.js'; import {
FUTURE_CODE_VERSION,
hasMinCodeVersion,
} from 'lib/shared/version-utils.js';
import type { AvatarDBContent, ClientAvatar } from 'lib/types/avatar-types.js'; import type { AvatarDBContent, ClientAvatar } from 'lib/types/avatar-types.js';
import type { RawMessageInfo, MessageInfo } from 'lib/types/message-types.js'; import type { RawMessageInfo, MessageInfo } from 'lib/types/message-types.js';
import type { RawThreadInfo } from 'lib/types/minimally-encoded-thread-permissions-types.js'; import type { RawThreadInfo } from 'lib/types/minimally-encoded-thread-permissions-types.js';
import { threadTypes, type ThreadType } from 'lib/types/thread-types-enum.js'; import { threadTypes, type ThreadType } from 'lib/types/thread-types-enum.js';
import { import {
type ServerThreadInfo, type ServerThreadInfo,
type MixedRawThreadInfos, type MixedRawThreadInfos,
type LegacyRawThreadInfo, type LegacyRawThreadInfo,
▲ Show 20 Lines • Show All 259 Lines • ▼ Show 20 Lines): FetchThreadInfosResult {
}); });
const codeVersionBelow283 = !hasMinCodeVersion(viewer.platformDetails, { const codeVersionBelow283 = !hasMinCodeVersion(viewer.platformDetails, {
native: 285, native: 285,
}); });
const minimallyEncodedPermissionsSupported = hasMinCodeVersion( const minimallyEncodedPermissionsSupported = hasMinCodeVersion(
viewer.platformDetails, viewer.platformDetails,
{ native: 301, web: 56 }, { native: 301, web: 56 },
); );
const futureCodeVersion = hasMinCodeVersion(viewer.platformDetails, {
native: FUTURE_CODE_VERSION,
web: FUTURE_CODE_VERSION,
majorDesktop: FUTURE_CODE_VERSION,
});
const threadInfos: { const threadInfos: {
[string]: LegacyRawThreadInfo | RawThreadInfo, [string]: LegacyRawThreadInfo | RawThreadInfo,
} = {}; } = {};
for (const threadID in serverResult.threadInfos) { for (const threadID in serverResult.threadInfos) {
const serverThreadInfo = serverResult.threadInfos[threadID]; const serverThreadInfo = serverResult.threadInfos[threadID];
const threadInfo = rawThreadInfoFromServerThreadInfo( const threadInfo = rawThreadInfoFromServerThreadInfo(
serverThreadInfo, serverThreadInfo,
viewerID, viewerID,
{ {
filterThreadEditAvatarPermission: codeVersionBelow213, filterThreadEditAvatarPermission: codeVersionBelow213,
excludePinInfo: codeVersionBelow209, excludePinInfo: codeVersionBelow209,
filterManageInviteLinksPermission: codeVersionBelow221, filterManageInviteLinksPermission: codeVersionBelow221,
filterVoicedInAnnouncementChannelsPermission: codeVersionBelow283, filterVoicedInAnnouncementChannelsPermission: codeVersionBelow283,
minimallyEncodePermissions: minimallyEncodedPermissionsSupported, minimallyEncodePermissions: minimallyEncodedPermissionsSupported,
includeSpecialRoleFieldInRoles: futureCodeVersion,
}, },
); );
if (threadInfo) { if (threadInfo) {
threadInfos[threadID] = threadInfo; threadInfos[threadID] = threadInfo;
} }
} }
return { threadInfos }; return { threadInfos };
} }
▲ Show 20 Lines • Show All 116 Lines • Show Last 20 Lines