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.

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

Jump to bottom

Fix auto restart video stream to ensure hmi level is streamable #1808

Merged
merged 6 commits into from
Apr 11, 2022
Merged

Fix auto restart video stream to ensure hmi level is streamable #1808

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
188ce55
Fix auto restart video stream to ensure hmi level is streamable
JulianKast Apr 8, 2022
c67fd74
Changed a log error to a log info, This appears to not be an error.
JulianKast Apr 11, 2022
3260eac
Kept getting a error message form core "WARNING: EglCore was not expl…
JulianKast Apr 11, 2022
4081f83
Add behavior that video streaming will start back up if the app went …
JulianKast Apr 11, 2022
eabf5cc
Remove added space
JulianKast Apr 11, 2022
eea49e9
Add mEglCore release and set it to null in shutdown of VDE. And rever…
JulianKast Apr 11, 2022
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
7 changes: 7 additions & 0 deletions android/sdl_android/src/main/java/com/smartdevicelink/encoder/VirtualDisplayEncoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,10 @@ public void shutDown() {
inputSurface.release();
inputSurface = null;
}
if (mEglCore != null) {
mEglCore.release();
mEglCore = null;
}
} catch (Exception ex) {
DebugTool.logError(TAG, "shutDown() failed");
}
Expand All @@ -262,6 +266,9 @@ public void shutDown() {
* @param Height
*/
private void setupGLES(int Width, int Height) {
if (mEglCore != null) {
mEglCore.release();
}
mEglCore = new EglCore(null, 0);

// This 1x1 offscreen is created just to get the texture name (mTextureId).
Expand Down
13 changes: 10 additions & 3 deletions android/sdl_android/src/main/java/com/smartdevicelink/managers/video/VideoStreamManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,12 +154,15 @@ public void onServiceStarted(SdlSession session, SessionType type, boolean isEnc
public void onServiceEnded(SdlSession session, SessionType type) {
if (SessionType.NAV.equals(type)) {
if (remoteDisplay != null) {
stopStreaming(withPendingRestart);
if (withPendingRestart && isHMIStateVideoStreamCapable(currentOnHMIStatus)) {
stopStreaming(withPendingRestart);
} else {
stopStreaming();
}
}
stateMachine.transitionToState(StreamingStateMachine.NONE);
transitionToState(SETTING_UP);

if (withPendingRestart) {
if (withPendingRestart && isHMIStateVideoStreamCapable(currentOnHMIStatus)) {
VideoStreamManager manager = VideoStreamManager.this;
manager.internalInterface.startVideoService(manager.getLastCachedStreamingParameters(), manager.isEncrypted, withPendingRestart);
}
Expand Down Expand Up @@ -198,6 +201,10 @@ public void onNotified(RPCNotification notification) {
if (hasStarted && (isHMIStateVideoStreamCapable(prevOnHMIStatus)) && (!isHMIStateVideoStreamCapable(currentOnHMIStatus))) {
stopVideoStream();
}
if (withPendingRestart && hasStarted && (!isHMIStateVideoStreamCapable(prevOnHMIStatus)) && (isHMIStateVideoStreamCapable(currentOnHMIStatus))) {
VideoStreamManager manager = VideoStreamManager.this;
manager.internalInterface.startVideoService(manager.getLastCachedStreamingParameters(), manager.isEncrypted, withPendingRestart);
}
}
}
};
Expand Down