Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "web app rebuild" #971

Merged
merged 1 commit into from
Nov 13, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions mythtv/libs/libmythupnp/upnphelpers.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -108,12 +108,10 @@ QString DLNAProfileName(const QString &mimeType, const QSize resolution,
// HACK This is just temporary until we start storing more video
// information in the database for each file and can determine this
// stuff 'properly'
QString sCountryCode = gCoreContext->GetLocale()->GetCountryCode().toLower();
QString sCountryCode = gCoreContext->GetLocale()->GetCountryCode();
bool isNorthAmerica = (sCountryCode == "us" || sCountryCode == "ca" ||
sCountryCode == "mx"); // North America (NTSC/ATSC)

bool isSweden = (sCountryCode == "se"); //Sweden dvb svt1/2 use MPEG_TS_SD_EU_ISO also for HD

if (container == "MPEG2-PS")
{
if (isHD && audioCodec == "DTS")
Expand Down Expand Up @@ -147,7 +145,7 @@ QString DLNAProfileName(const QString &mimeType, const QSize resolution,
}
else // Europe standard (DVB)
{
if ((vidCodec == "H264" || isHD) && !isSweden ) // All HD is AVC with DVB except for Sweden
if (vidCodec == "H264" || isHD) // All HD is AVC with DVB
sProfileName = "AVC_TS_EU_ISO";
else // if (videoCodec == "MPEG2VIDEO")
sProfileName = "MPEG_TS_SD_EU_ISO";
Expand Down