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

Rtsp #615

Merged
merged 5 commits into from
Dec 4, 2014
Merged

Rtsp #615

merged 5 commits into from
Dec 4, 2014

Conversation

knight-of-ni
Copy link
Member

Fixes three of the items identified in #612.

@knight-of-ni
Copy link
Member Author

commit 97ee989 fixes the last item identified in #612.

@connortechnology Can you test your camera on this pr?

My Foscam 9821 now works perfectly, with no warnings. I have two additional cameras I plan to test as well.

@knight-of-ni
Copy link
Member Author

Apparently the custom "split" function found in zm_utils.cpp does not return anything if it does not find the split character. I need to push a small change this evening to account for that.

if ( streams.size() < 1 )
    streams.push_back(rtpInfo.c_str());

@connortechnology
Copy link
Member

Um, in regards to the split function... seems like it should, perhaps we need to fix that... and test to make sure it hasn't been causing other problems.

@connortechnology
Copy link
Member

Tested, works good.

@connortechnology
Copy link
Member

I'm happy to merge if you want me to. Would like to see this split issue addressed sometime in future though, but that's not really anything to do with this PR.

@knight-of-ni
Copy link
Member Author

Let me look into the split function situation tonight. I need to test against some live equipment, which I am not set up to do here at my dayjob.

If this is the case with the split function, that means there is a bug in the handling of the ffmpeg & libvlc options. One would currently need to have at least two options in order for either option to take effect. This might explain why I've never noticed any extra output coming from ffmpeg after adding loglevel=debug to the options field.

@knight-of-ni
Copy link
Member Author

I ran a couple tests on the split function last night, and it appears I was mistaken.
I'm ready to merge if you are.

connortechnology added a commit that referenced this pull request Dec 4, 2014
@connortechnology connortechnology merged commit ba7230e into ZoneMinder:master Dec 4, 2014
connortechnology added a commit that referenced this pull request Dec 29, 2014
Rtsp
Conflicts:
	src/zm_rtsp.cpp
@knight-of-ni knight-of-ni deleted the rtsp branch December 23, 2016 15:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants