[prev in list] [next in list] [prev in thread] [next in thread]
List: helix-server-cvs
Subject: [Server-cvs] broadcast/transport/rtp/recv rtpdirmgr.cpp, 1.5, 1.5.4.1
From: tniu () helixcommunity ! org
Date: 2013-06-26 10:42:22
[Download RAW message or body]
Update of /cvsroot/server/broadcast/transport/rtp/recv
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv25867
Modified Files:
Tag: SERVER_15_1_0
rtpdirmgr.cpp
Log Message:
Synopsis
========
This CR fix bug: (HLXSRV-313) [vhost][RTP] The SDP file will be scaned for once only.
(http://jira.real.com/browse/HLXSRV-313)
Branch : SERVER_15_1_0_RN, HEAD
Suggested Reviewer : Anyone
Description
===========
Repro Steps:
In vhost mode, define the DirectoryScanInterval="60".
1.Start the RTP encoder.
2.Push the SDP file under /rtpencodersdp/.
3.After a while, the server will scan out the SDP file, and it will be checked on \
monitor. 4.Creat a sub-folder under rtpencoder, named "123".
5.Move the SDP file to folder 123, so that the path of SDP file is \
"/rtpencodersdp/123/0529.sdp"
Actual:
After 60 seconds or more, the monitor on server admin page showed the encoder path \
still is "/rtpencodersdp/0529.sdp", and the stream can be playback.
Expected:
In fact, the path had be changed, and if we request the unchanged path, the stream \
can not be playback, and the monitor should show the new path of RTP encoder.
Root cause:
Incorrect to get SDP file key.
My solution:
Get vhost account.
Files Affected
==============
server/broadcast/transport/rtp/recv/rtpdirmgr.cpp
Test perform
================
Integration Tests:
N/A.
Performance Tests:
N/A
QA Hints
========
None.
Index: rtpdirmgr.cpp
===================================================================
RCS file: /cvsroot/server/broadcast/transport/rtp/recv/rtpdirmgr.cpp,v
retrieving revision 1.5
retrieving revision 1.5.4.1
diff -u -d -r1.5 -r1.5.4.1
--- rtpdirmgr.cpp 29 May 2013 10:45:34 -0000 1.5
+++ rtpdirmgr.cpp 26 Jun 2013 10:42:14 -0000 1.5.4.1
@@ -771,7 +771,7 @@
if( m_pVhostInfo && HXR_OK == \
m_pVhostInfo->GetPropertyBuffer("VhostAccount", pBuf) ) {
sKey += "_";
- sKey += (*it)->key;
+ sKey += (const char*)pBuf->GetBuffer();
}
HX_RELEASE(pBuf);
_______________________________________________
Server-cvs mailing list
Server-cvs@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/server-cvs
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic