[Sageplugins-commit] MediaStreaming/src/sagex/streaming/httpls/playlist SegmentPlaylist.java, 1.2, 1.3

[jreichen <jre...@us...>]

Update of /cvsroot/sageplugins/MediaStreaming/src/sagex/streaming/httpls/playlist
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv7015/src/sagex/streaming/httpls/playlist

Modified Files:
	SegmentPlaylist.java 
Log Message:
Don't Log the whole segment playlist

Index: SegmentPlaylist.java
===================================================================
RCS file: /cvsroot/sageplugins/MediaStreaming/src/sagex/streaming/httpls/playlist/SegmentPlaylist.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SegmentPlaylist.java	16 Jan 2011 05:04:16 -0000	1.2
--- SegmentPlaylist.java	18 Jan 2011 01:40:10 -0000	1.3
***************
*** 73,78 ****
              long mediaFileSegmentDurationInMillis = MediaFileAPI.GetDurationForSegment(mediaFile, i);
              long mediaFileSegmentDurationInSeconds = mediaFileSegmentDurationInMillis / 1000; // milliseconds to seconds
!             Log.debug("mediaFileSegmentDurationInMillis: " + mediaFileSegmentDurationInMillis);
!             Log.debug("mediaFileSegmentDurationInSeconds: " + mediaFileSegmentDurationInSeconds);
              
              int sequence = 0;
--- 73,78 ----
              long mediaFileSegmentDurationInMillis = MediaFileAPI.GetDurationForSegment(mediaFile, i);
              long mediaFileSegmentDurationInSeconds = mediaFileSegmentDurationInMillis / 1000; // milliseconds to seconds
!             Log.debug("mediaFileSegmentDurationInMillis (" + i + "): " + mediaFileSegmentDurationInMillis);
!             Log.debug("mediaFileSegmentDurationInSeconds (" + i + "): " + mediaFileSegmentDurationInSeconds);
              
              int sequence = 0;
***************
*** 80,84 ****
              {
                  long currentDuration = Math.min(SegmentPlaylist.TARGET_DURATION, mediaFileSegmentDurationInSeconds - j);
-                 Log.debug("currentDuration: " + currentDuration);
                  
                  Segment newSegment = new Segment(currentDuration, sequence, i, showName);
--- 80,83 ----
***************
*** 120,127 ****
          for (int i = 0; i < segmentCount; i++)
          {
!             String str = segmentList.get(i).toString();
              sb.append(str);
  
!             if ((i == 0) || (i >= segmentCount - 1))
              {
                  Log.debug(str);
--- 119,135 ----
          for (int i = 0; i < segmentCount; i++)
          {
!             Segment currentSegment = segmentList.get(i);
!             Segment previousSegment = (i == 0) ? null : segmentList.get(i - 1);
!             Segment nextSegment = (i == segmentCount - 1) ? null : segmentList.get(i + 1);
!             String str = currentSegment.toString();
              sb.append(str);
  
!             // first or last playlist segment for each media file segment
!             // printing the whole playlist makes the log harder to read
!             if ((previousSegment == null) ||
!                 (nextSegment == null) ||
!                 (previousSegment.mediaFileSegment != currentSegment.mediaFileSegment) ||
!                 (currentSegment.mediaFileSegment != nextSegment.mediaFileSegment)
!                )                    
              {
                  Log.debug(str);
***************
*** 160,165 ****
          {
              StringBuilder sb = new StringBuilder();
              sb.append("#EXTINF:" + segmentDuration + "," + showName + "\r\n");
-             Log.debug("#EXTINF:" + segmentDuration + "," + showName);
  
              String url = "/stream/HTTPLiveStreamingSegment?" +
--- 168,173 ----
          {
              StringBuilder sb = new StringBuilder();
+             
              sb.append("#EXTINF:" + segmentDuration + "," + showName + "\r\n");
  
              String url = "/stream/HTTPLiveStreamingSegment?" +
***************
*** 170,174 ****
                           "&MediaFileSegment=" + mediaFileSegment;
              sb.append(url + "\r\n");
-             Log.debug(url);
  
              return sb.toString();
--- 178,181 ----