lagertonne/yolobs-studio
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

New upstream version 26.0.0+dfsg1

Browse source
This commit is contained in:
Sebastian Ramacher 2020-10-01 22:15:25 +02:00
parent 8e020cdacb
commit 240080891f
837 changed files with 41275 additions and 9196 deletions
Download patch file Download diff file Expand all files Collapse all files

25
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))
{
@ -5266,13 +5277,11 @@ fail:
return total;
}
static const AVal av_setDataFrame = AVC("@setDataFrame");
int
RTMP_Write(RTMP *r, const char *buf, int size, int streamIdx)
{
RTMPPacket *pkt = &r->m_write;
char *pend, *enc;
char *enc;
int s2 = size, ret, num;
pkt->m_nChannel = 0x04; /* source channel */
@ -5308,8 +5317,6 @@ RTMP_Write(RTMP *r, const char *buf, int size, int streamIdx)
!pkt->m_nTimeStamp) || pkt->m_packetType == RTMP_PACKET_TYPE_INFO)
{
pkt->m_headerType = RTMP_PACKET_SIZE_LARGE;
if (pkt->m_packetType == RTMP_PACKET_TYPE_INFO)
pkt->m_nBodySize += 16;
}
else
{
@ -5322,12 +5329,6 @@ RTMP_Write(RTMP *r, const char *buf, int size, int streamIdx)
return FALSE;
}
enc = pkt->m_body;
pend = enc + pkt->m_nBodySize;
if (pkt->m_packetType == RTMP_PACKET_TYPE_INFO)
{
enc = AMF_EncodeString(enc, pend, &av_setDataFrame);
pkt->m_nBytesRead = enc - pkt->m_body;
}
}
else
{