[prev in list] [next in list] [prev in thread] [next in thread] 

List:       helix-server-cvs
Subject:    [Server-cvs] protocol/rtsp crtspbase.cpp,1.110,1.111
From:       yichen () helixcommunity ! org
Date:       2013-02-27 7:39:21
[Download RAW message or body]

Update of /cvsroot/server/protocol/rtsp
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv22018

Modified Files:
	crtspbase.cpp 
Log Message:
Synopsis:
=========
CR: fix [Bug 270844] [HLS]: m3u8 file has wrong type of EXTINF if request via hls \
timeshifting

Branch : SERVER_15_0_RN, HEAD 

Suggested Reviewer : Anyone

Description: 
===============

------- #EXTM3U
#EXT-X-VERSION:3
#EXT-X-PLAYLIST-TYPE:LIVE
#EXT-X-TARGETDURATION:10.0
#EXT-X-MEDIA-SEQUENCE:3
#EXT-X-KEY:METHOD=AES-128,URI="https://192.168.35.85:443/Segments/HLS_TS/broadcast/rbslive/rbslive.key?shift=_20&GUID=111"
 #EXTINF:10.0,
/Segments/HLS_TS/broadcast/rbslive/3.ts?shift=_20&GUID=111
#EXTINF:10.0,
/Segments/HLS_TS/broadcast/rbslive/4.ts?shift=_20&GUID=111
#EXTINF:10.0,
/Segments/HLS_TS/broadcast/rbslive/5.ts?shift=_20&GUID=111

type of tag "#EXT-X-TARGETDURATION" should be "int", not "float"

My solution:

Set the value type of #EXT-X-TARGETDURATION to INT

Files affected
=====================
server_rn\appext\m3ugen\hlstshandler.cpp

Test perform
================
Using iphone to request a time shift live and found the value type of \
#EXT-X-TARGETDURATION is int

Integration Tests:
N/A.

Performance Tests: 
N/A

QA Hints
========
None.


Index: crtspbase.cpp
===================================================================
RCS file: /cvsroot/server/protocol/rtsp/crtspbase.cpp,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -d -r1.110 -r1.111
--- crtspbase.cpp	4 Sep 2012 06:52:32 -0000	1.110
+++ crtspbase.cpp	27 Feb 2013 07:39:13 -0000	1.111
@@ -1031,7 +1031,7 @@
     {
         HandleSessionHeaders(pRequestHeaders);
     }
-    HX_RELEASE(pRequestHeaders);
+    
 
     IHXMIMEHeader* pHdr = NULL;
     IHXBuffer* pVal = NULL;
@@ -1209,6 +1209,9 @@
 
                 pSession->AddSessionHeader(m_pRespMsg);
 
+                ClientSession* pClientSession = m_pClient->FindSession(sessionID);
+                RegisterPlayerOptions(pRequestHeaders, pClientSession);
+
                 // If the client requested a session, check for MidBox
 #if defined(HELIX_FEATURE_RTSP_MIDBOX_CHALLENGE)
                 if (m_clientType == MIDBOX_CLIENT)
@@ -1289,6 +1292,8 @@
 
     HX_RELEASE(pMsg);
 
+    HX_RELEASE(pRequestHeaders);
+
     return HXR_OK;
 }
 


_______________________________________________
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]