jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3078 from eric/librtmp-connect-errors

Browse Source 
obs-outputs: Handle NetStream.Publish.BadName from rtmp server
This commit is contained in:
Jim 2020-07-10 17:21:48 -07:00 committed by GitHub
commit 04348871cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
plugins/obs-outputs/librtmp/rtmp.c
View File

@ -3064,6 +3064,8 @@ static const AVal av_NetStream_Play_UnpublishNotify =
static const AVal av_NetStream_Publish_Start = AVC("NetStream.Publish.Start");
static const AVal av_NetStream_Publish_Rejected = AVC("NetStream.Publish.Rejected");
static const AVal av_NetStream_Publish_Denied = AVC("NetStream.Publish.Denied");
static const AVal av_NetStream_Publish_BadName = AVC("NetStream.Publish.BadName");
/* Returns 0 for OK/Failed/error, 1 for 'Stop or Complete' */
static int
@ -3314,7 +3316,8 @@ HandleInvoke(RTMP *r, const char *body, unsigned int nBodySize)
|| AVMATCH(&code, &av_NetStream_Play_StreamNotFound)
|| AVMATCH(&code, &av_NetConnection_Connect_InvalidApp)
|| AVMATCH(&code, &av_NetStream_Publish_Rejected)
|| AVMATCH(&code, &av_NetStream_Publish_Denied))
|| AVMATCH(&code, &av_NetStream_Publish_Denied)
|| AVMATCH(&code, &av_NetStream_Publish_BadName))
{
r->m_stream_id = -1;
RTMP_Close(r);
@ -3376,6 +3379,14 @@ HandleInvoke(RTMP *r, const char *body, unsigned int nBodySize)
r->m_pausing = 3;
}
}
else
{
if (description.av_len)
RTMP_Log(RTMP_LOGWARNING, "Unhandled: %s:\n%s (%s)", r->Link.tcUrl.av_val, code.av_val, description.av_val);
else
RTMP_Log(RTMP_LOGWARNING, "Unhandled: %s:\n%s", r->Link.tcUrl.av_val, code.av_val);
}
}
else if (AVMATCH(&method, &av_playlist_ready))
{