Menu
▾
▴
[Sageplugins-commit] MediaStreaming/src/sagex/streaming/servlet SageServlet.java, 1.3, 1.4 MediaFileThumbnailServlet.java, 1.2, 1.3 HTTPLiveStreamingPlaylistServlet.java, 1.5, 1.6 MediaFileServlet.java, 1.2, 1.3 HTTPLiveStreamingSegmentServlet.java, 1.5, 1.6
|
From: Fonceur <fo...@us...> - 2011-11-13 18:59:58
|
Update of /cvsroot/sageplugins/MediaStreaming/src/sagex/streaming/servlet
In directory vz-cvs-3.sog:/tmp/cvs-serv32645/src/sagex/streaming/servlet
Modified Files:
SageServlet.java MediaFileThumbnailServlet.java
HTTPLiveStreamingPlaylistServlet.java MediaFileServlet.java
HTTPLiveStreamingSegmentServlet.java
Log Message:
Removed left over sage.jar usage. Modified some resolutions/bit rate/key frame.
Index: MediaFileServlet.java
===================================================================
RCS file: /cvsroot/sageplugins/MediaStreaming/src/sagex/streaming/servlet/MediaFileServlet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MediaFileServlet.java 5 Nov 2010 02:58:36 -0000 1.2
--- MediaFileServlet.java 13 Nov 2011 18:59:56 -0000 1.3
***************
*** 13,17 ****
import org.mortbay.log.Log;
- import sage.SageTV;
import sagex.api.AiringAPI;
import sagex.api.MediaFileAPI;
--- 13,16 ----
***************
*** 38,42 ****
Log.debug("----------- MediaFileServlet begin request Headers ---------------");
! Enumeration headers = req.getHeaderNames();
while (headers.hasMoreElements())
{
--- 37,41 ----
Log.debug("----------- MediaFileServlet begin request Headers ---------------");
! Enumeration<?> headers = req.getHeaderNames();
while (headers.hasMoreElements())
{
***************
*** 53,57 ****
throw new IllegalArgumentException("no MediaFileID passed");
}
! File files[] = (File[]) SageTV.api("GetSegmentFiles", new Object[] {mediaFile});
int filenum = 0;
if (files.length > 1)
--- 52,56 ----
throw new IllegalArgumentException("no MediaFileID passed");
}
! File files[] = (File[]) MediaFileAPI.GetSegmentFiles(mediaFile);
int filenum = 0;
if (files.length > 1)
Index: HTTPLiveStreamingSegmentServlet.java
===================================================================
RCS file: /cvsroot/sageplugins/MediaStreaming/src/sagex/streaming/servlet/HTTPLiveStreamingSegmentServlet.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** HTTPLiveStreamingSegmentServlet.java 9 Apr 2011 00:06:25 -0000 1.5
--- HTTPLiveStreamingSegmentServlet.java 13 Nov 2011 18:59:56 -0000 1.6
***************
*** 36,40 ****
Log.debug("----------- HTTPLiveStreamingSegmentServlet begin request Headers ---------------");
! Enumeration headers = req.getHeaderNames();
while (headers.hasMoreElements())
{
--- 36,40 ----
Log.debug("----------- HTTPLiveStreamingSegmentServlet begin request Headers ---------------");
! Enumeration<?> headers = req.getHeaderNames();
while (headers.hasMoreElements())
{
Index: MediaFileThumbnailServlet.java
===================================================================
RCS file: /cvsroot/sageplugins/MediaStreaming/src/sagex/streaming/servlet/MediaFileThumbnailServlet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MediaFileThumbnailServlet.java 5 Nov 2010 02:58:36 -0000 1.2
--- MediaFileThumbnailServlet.java 13 Nov 2011 18:59:56 -0000 1.3
***************
*** 11,15 ****
import org.mortbay.log.Log;
! import sage.SageTV;
/**
--- 11,19 ----
import org.mortbay.log.Log;
! import sagex.api.AlbumAPI;
! import sagex.api.Database;
! import sagex.api.MediaFileAPI;
! import sagex.api.Utility;
!
/**
***************
*** 32,36 ****
if (mediaFile != null)
{
! thumb = SageTV.api("GetThumbnail", new Object[] {mediaFile});
if (thumb == null)
{
--- 36,40 ----
if (mediaFile != null)
{
! thumb = MediaFileAPI.GetThumbnail(mediaFile);
if (thumb == null)
{
***************
*** 48,64 ****
String genre = req.getParameter("genre");
if (genre == null) genre = "";
! Object albums = SageTV.api("GetAlbums", null);
! albums = SageTV.api("FilterByMethod",new Object[] {albums,"GetAlbumName",albumName,Boolean.TRUE});
! albums = SageTV.api("FilterByMethod",new Object[] {albums,"GetAlbumArtist",artist,Boolean.TRUE});
! albums = SageTV.api("FilterByMethod",new Object[] {albums,"GetAlbumYear",year,Boolean.TRUE});
! albums = SageTV.api("FilterByMethod",new Object[] {albums,"GetAlbumGenre",genre,Boolean.TRUE});
! Object album = SageTV.api("GetElement", new Object[] {albums,0});
if (album == null)
{
throw new Exception("Cound not find album for: " + albumName + "/" + artist + "/" + year + "/" + genre);
}
! if ((Boolean) SageTV.api("HasAlbumArt", new Object[] {album}))
{
! thumb = SageTV.api("GetAlbumArt", new Object[] {album});
}
if (thumb == null)
--- 52,68 ----
String genre = req.getParameter("genre");
if (genre == null) genre = "";
! Object albums = AlbumAPI.GetAlbums();
! albums = Database.FilterByMethod(albums,"GetAlbumName",albumName,Boolean.TRUE);
! albums = Database.FilterByMethod(albums,"GetAlbumArtist",artist,Boolean.TRUE);
! albums = Database.FilterByMethod(albums,"GetAlbumYear",year,Boolean.TRUE);
! albums = Database.FilterByMethod(albums,"GetAlbumGenre",genre,Boolean.TRUE);
! Object album = Utility.GetElement(albums,0);
if (album == null)
{
throw new Exception("Cound not find album for: " + albumName + "/" + artist + "/" + year + "/" + genre);
}
! if ((Boolean) AlbumAPI.HasAlbumArt(album))
{
! thumb = AlbumAPI.GetAlbumArt(album);
}
if (thumb == null)
***************
*** 67,71 ****
}
}
! BufferedImage image = (BufferedImage) SageTV.api("GetImageAsBufferedImage", new Object[] {thumb});
if (image == null)
{
--- 71,75 ----
}
}
! BufferedImage image = (BufferedImage) Utility.GetImageAsBufferedImage(thumb);
if (image == null)
{
Index: HTTPLiveStreamingPlaylistServlet.java
===================================================================
RCS file: /cvsroot/sageplugins/MediaStreaming/src/sagex/streaming/servlet/HTTPLiveStreamingPlaylistServlet.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** HTTPLiveStreamingPlaylistServlet.java 9 Apr 2011 00:04:40 -0000 1.5
--- HTTPLiveStreamingPlaylistServlet.java 13 Nov 2011 18:59:56 -0000 1.6
***************
*** 52,56 ****
Log.debug("----------- HTTPLiveStreamingPlaylistServlet begin request Headers ---------------");
! Enumeration headers = req.getHeaderNames();
while (headers.hasMoreElements())
{
--- 52,56 ----
Log.debug("----------- HTTPLiveStreamingPlaylistServlet begin request Headers ---------------");
! Enumeration<?> headers = req.getHeaderNames();
while (headers.hasMoreElements())
{
Index: SageServlet.java
===================================================================
RCS file: /cvsroot/sageplugins/MediaStreaming/src/sagex/streaming/servlet/SageServlet.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SageServlet.java 8 Apr 2011 23:51:03 -0000 1.3
--- SageServlet.java 13 Nov 2011 18:59:56 -0000 1.4
***************
*** 4,8 ****
import java.io.IOException;
- import java.lang.reflect.InvocationTargetException;
import javax.servlet.ServletException;
--- 4,7 ----
***************
*** 13,17 ****
import org.mortbay.log.Log;
! import sage.SageTV;
/**
--- 12,18 ----
import org.mortbay.log.Log;
! import sagex.api.AiringAPI;
! import sagex.api.Configuration;
! import sagex.api.MediaFileAPI;
/**
***************
*** 41,47 ****
try
{
! charset = (String) SageTV.api("GetProperty", new Object[] {"nielm/webserver/charset", "UTF-8"});
}
! catch (InvocationTargetException e)
{
Log.debug("Error getting charset:" + e.toString());
--- 42,48 ----
try
{
! charset = Configuration.GetProperty("nielm/webserver/charset", "UTF-8");
}
! catch (Exception e)
{
Log.debug("Error getting charset:" + e.toString());
***************
*** 96,100 ****
{
Integer id = Integer.parseInt(idStr);
! mediaFile = SageTV.api("GetMediaFileForID", new Object[] {id});
}
else
--- 97,101 ----
{
Integer id = Integer.parseInt(idStr);
! mediaFile = MediaFileAPI.GetMediaFileForID(id);
}
else
***************
*** 104,111 ****
{
Integer id = Integer.parseInt(idStr);
! Object airing = SageTV.api("GetAiringForID", new Object[] {id});
if (airing != null)
{
! mediaFile = SageTV.api("GetMediaFileForAiring", new Object[] {airing});
}
}
--- 105,112 ----
{
Integer id = Integer.parseInt(idStr);
! Object airing = AiringAPI.GetAiringForID(id);
if (airing != null)
{
! mediaFile = MediaFileAPI.GetMediaFileAiring(airing);
}
}
|
