Skip to content

Improve Android secondary UDP playback handling #798

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.

Sign up for GitHub

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

Merged
raphaelscholle merged 1 commit into from
Dec 1, 2025
Merged

Improve Android secondary UDP playback handling #798

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 22 additions & 6 deletions app/videostreaming/android/qandroidsecondarymediaplayer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,12 @@ QString buildStreamUrl(const QOpenHDVideoHelper::VideoStreamConfigXX &config)
const int port = config.udp_rtp_input_port;

if (ip.isEmpty())
return {};
return QStringLiteral("udp://0.0.0.0:%1").arg(port);

if (ip == QLatin1String("127.0.0.1") || ip == QLatin1String("0.0.0.0"))
return QStringLiteral("udp://@:%1").arg(port);
const QString normalizedIp = ip.toLower();
if (normalizedIp == QLatin1String("127.0.0.1") || normalizedIp == QLatin1String("0.0.0.0") ||
normalizedIp == QLatin1String("localhost"))
return QStringLiteral("udp://0.0.0.0:%1").arg(port);

return QStringLiteral("udp://%1:%2").arg(ip).arg(port);
}
Expand Down Expand Up @@ -160,9 +162,23 @@ void QAndroidSecondaryMediaPlayer::startPlaybackOnAndroidThread(const QString &s
}

const QAndroidJniObject url = QAndroidJniObject::fromString(streamUrl);
that->m_mediaPlayer.callMethod<void>("setDataSource",
"(Ljava/lang/String;)V",
url.object());
const QAndroidJniObject uri = QAndroidJniObject::callStaticObjectMethod(
"android/net/Uri",
"parse",
"(Ljava/lang/String;)Landroid/net/Uri;",
url.object<jstring>());

if (uri.isValid()) {
that->m_mediaPlayer.callMethod<void>("setDataSource",
"(Landroid/content/Context;Landroid/net/Uri;)V",
QtAndroid::androidContext().object(),
uri.object());
} else {
that->m_mediaPlayer.callMethod<void>("setDataSource",
"(Ljava/lang/String;)V",
url.object());
}

if (env->ExceptionCheck()) {
qWarning() << "Secondary Android MediaPlayer failed to set data source" << streamUrl;
env->ExceptionDescribe();
Expand Down
Loading