From 8137c8b9862689789c023b0f50dcd09ba27db13a Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 3 Apr 2019 11:14:04 +0200 Subject: =?UTF-8?q?Add=20Nederlands=20and=20Portugu=C3=AAs=20(Portugal)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shared/models/i18n/i18n.ts | 8 +++-- shared/models/videos/video-resolution.enum.ts | 42 +++++++++++++-------------- 2 files changed, 27 insertions(+), 23 deletions(-) (limited to 'shared') diff --git a/shared/models/i18n/i18n.ts b/shared/models/i18n/i18n.ts index d7164b73f..347544df3 100644 --- a/shared/models/i18n/i18n.ts +++ b/shared/models/i18n/i18n.ts @@ -9,10 +9,12 @@ export const I18N_LOCALES = { 'eo': 'Esperanto', 'de-DE': 'Deutsch', 'it-IT': 'Italiano', + 'nl-NL': 'Nederlands', 'es-ES': 'Español', 'oc': 'Occitan', 'zh-Hant-TW': '繁體中文(台灣)', 'pt-BR': 'Português (Brasil)', + 'pt-PT': 'Português (Portugal)', 'sv-SE': 'svenska', 'pl-PL': 'Polski', 'ru-RU': 'русский', @@ -27,10 +29,12 @@ const I18N_LOCALE_ALIAS = { 'cs': 'cs-CZ', 'de': 'de-DE', 'es': 'es-ES', - 'pt': 'pt-BR', + 'pt': 'pt-PT', 'sv': 'sv-SE', 'pl': 'pl-PL', - 'ru': 'ru-RU' + 'ru': 'ru-RU', + 'nl': 'nl-NL', + 'zh': 'zh-Hans-CN' } export const POSSIBLE_LOCALES = Object.keys(I18N_LOCALES) diff --git a/shared/models/videos/video-resolution.enum.ts b/shared/models/videos/video-resolution.enum.ts index 5ba2c1faa..7da5e7100 100644 --- a/shared/models/videos/video-resolution.enum.ts +++ b/shared/models/videos/video-resolution.enum.ts @@ -17,27 +17,27 @@ export enum VideoResolution { */ function getBaseBitrate (resolution: VideoResolution) { switch (resolution) { - case VideoResolution.H_240P: - // quality according to Google Live Encoder: 300 - 700 Kbps - // Quality according to YouTube Video Info: 186 Kbps - return 250 * 1000 - case VideoResolution.H_360P: - // quality according to Google Live Encoder: 400 - 1,000 Kbps - // Quality according to YouTube Video Info: 480 Kbps - return 500 * 1000 - case VideoResolution.H_480P: - // quality according to Google Live Encoder: 500 - 2,000 Kbps - // Quality according to YouTube Video Info: 879 Kbps - return 900 * 1000 - case VideoResolution.H_720P: - // quality according to Google Live Encoder: 1,500 - 4,000 Kbps - // Quality according to YouTube Video Info: 1752 Kbps - return 1750 * 1000 - case VideoResolution.H_1080P: // fallthrough - default: - // quality according to Google Live Encoder: 3000 - 6000 Kbps - // Quality according to YouTube Video Info: 3277 Kbps - return 3300 * 1000 + case VideoResolution.H_240P: + // quality according to Google Live Encoder: 300 - 700 Kbps + // Quality according to YouTube Video Info: 186 Kbps + return 250 * 1000 + case VideoResolution.H_360P: + // quality according to Google Live Encoder: 400 - 1,000 Kbps + // Quality according to YouTube Video Info: 480 Kbps + return 500 * 1000 + case VideoResolution.H_480P: + // quality according to Google Live Encoder: 500 - 2,000 Kbps + // Quality according to YouTube Video Info: 879 Kbps + return 900 * 1000 + case VideoResolution.H_720P: + // quality according to Google Live Encoder: 1,500 - 4,000 Kbps + // Quality according to YouTube Video Info: 1752 Kbps + return 1750 * 1000 + case VideoResolution.H_1080P: // fallthrough + default: + // quality according to Google Live Encoder: 3000 - 6000 Kbps + // Quality according to YouTube Video Info: 3277 Kbps + return 3300 * 1000 } } -- cgit v1.2.3