Skip to content

refactor: shared RtspSession for single view and Quad (#33, #9, #18, #19, #27) #45

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
compot-dev merged 3 commits into from
Oct 12, 2026
Merged

refactor: shared RtspSession for single view and Quad (#33, #9, #18, #19, #27) #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
435c4fb
feat: shared RtspSession and Sdp parser with tests
compot-dev Oct 12, 2026
4261b31
refactor: single view and Quad cells use RtspSession
compot-dev Oct 12, 2026
57d661a
fix: address review findings for RtspSession
compot-dev Oct 12, 2026
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
22 changes: 3 additions & 19 deletions android/app/lint-baseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,26 +8,10 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/main/java/com/openipc/decoder/Decoder.java"
line="802"
line="799"
column="18"/>
</issue>

<issue
id="SuspiciousIndentation"
message="Suspicious indentation: This is indented but is not nested under the previous expression (`if (listenerCb != nu`...)"
errorLine1=" s.setSoTimeout(0);"
errorLine2=" ~~~~~~~~~~~~~~~~~">
<location
file="src/main/java/com/openipc/decoder/RtspClient.java"
line="303"
column="13"/>
<location
file="src/main/java/com/openipc/decoder/RtspClient.java"
line="301"
column="9"
message="Previous statement here"/>
</issue>

<issue
id="UnusedAttribute"
message="Attribute `usesCleartextTraffic` is only used in API level 23 and higher (current min is 21)"
Expand Down Expand Up @@ -156,7 +140,7 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/main/java/com/openipc/decoder/Decoder.java"
line="419"
line="418"
column="28"/>
</issue>

Expand All @@ -167,7 +151,7 @@
errorLine2=" ~~~~~~~~~~~~~~">
<location
file="src/main/java/com/openipc/decoder/Decoder.java"
line="419"
line="418"
column="28"/>
</issue>

Expand Down
4 changes: 2 additions & 2 deletions android/app/src/main/java/com/openipc/decoder/AudioManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,9 @@ void configure(AudioConfig audio) {
/** Called from the network thread to deliver an audio RTP packet. */
void onAudioFrame(Frame frame) {
byte[] data = frame.data();
int start = RtspClient.rtpHeaderLength(data, frame.length());
int start = RtspSession.rtpHeaderLength(data, frame.length());
if (start < 0) return;
int end = RtspClient.rtpPayloadEnd(data, frame.length());
int end = RtspSession.rtpPayloadEnd(data, frame.length());
if (end <= start) return;

AudioConfig c = config;
Expand Down
3 changes: 0 additions & 3 deletions android/app/src/main/java/com/openipc/decoder/Decoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,6 @@ private void saveSettings() {

listenerGen++;
if (rtspClient != null) {
rtspClient.invalidateGen();
rtspClient.stop();
}
audioManager.closeAudio();
Expand Down Expand Up @@ -460,7 +459,6 @@ private void updateStatus(String status) {

private void startQuad() {
if (rtspClient != null) {
rtspClient.invalidateGen();
rtspClient.stop();
}
closeDecoder();
Expand Down Expand Up @@ -725,7 +723,6 @@ protected void onPause() {

listenerGen++;
if (rtspClient != null) {
rtspClient.invalidateGen();
rtspClient.stop();
}
if (executor != null) {
Expand Down
Loading
Loading