FCL/sf/app/jrt: comparison javauis/mmapi_qt/baseline/javasrc/com/nokia/microedition/media/animation/AnimationPlayer.java

equal deleted inserted replaced

-:e0d6e9bd3ca7
+:bf7ee68962da
 * Description: AnimationPlayer
 *
 */
 package com.nokia.microedition.media.animation;
-import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.OutputStream;
 import java.util.Enumeration;
 import java.util.Hashtable;
-import java.util.Timer;
-import java.util.TimerTask;
 import javax.microedition.media.Control;
 import javax.microedition.media.MediaException;
-import javax.microedition.media.Player;
 import javax.microedition.media.PlayerListener;
 import javax.microedition.media.protocol.DataSource;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.SWTException;
 import com.nokia.microedition.media.BufferDataSource;
 import com.nokia.microedition.media.InputStreamDataSource;
 import com.nokia.microedition.media.InputStreamSourceStream;
 import com.nokia.microedition.media.PlayerBase;
 import com.nokia.microedition.media.PlayerListenerImpl;
-import com.nokia.mj.impl.nokialcdui.LCDUIInvoker;
-import com.nokia.mj.impl.utils.Logger;
 public class AnimationPlayer extends PlayerBase implements ESWTinitializeListener
 {
 // GIF image information, array length will be equal to the number of frames in image
 protected ImageData [] iImageData;
 // Actual dimension of the image, this should be initialized while creating the player
 // as user can change the size of the image later, in that case too, getSourceheight and getSourceWidth
 // of VideoControl should return the actual width and height of the image
 private Point iSourceDimension;
 // Current dimension of the image, MIDlet developer may change the size of VideoControl
-//    private Point iCurrentVideoDimension;
+private Point iCurrentVideoDimension;
 // Total time taken so far to player the animation, it keeps updating as player moves
 private long iMediaTime;
 // Time at which, player should be stopped
 // This will set through StopTimeControl.setTime();
 // otherwise default time is Long.MAX_VALUE
 // Total duration of the player
 private long iDuration=TIME_UNKNOWN;
 /**
 *
 * @param ds DataSource which contains the data to be displayed
-*/
+* @throws MediaException
-public AnimationPlayer(DataSource ds)
+*/
+public AnimationPlayer(DataSource ds) throws MediaException
 {
 iPlayerListenerImpl= new PlayerListenerImpl(this);
 //TODO check if we can do it in better way
 // this is temporary solution
 // for this I have written two functions getDataSource and getInputStream function
 InputStreamSourceStream isss=(InputStreamSourceStream)isds.getStreams()[0];
 InputStream is = isss.getInputStream();
 if (is!=null)
 {
 ImageLoader imageLoader= new ImageLoader();
+// If it is any other format other than the image(jpeg, png and gif),
+// following line will throw the SWT exception
 iImageData=imageLoader.load(is);
+// If the image is loaded properly, we need to check whether it is GIF image or not.
+// It can be PNG and JPEG as well
+if (iImageData[0].type!=SWT.IMAGE_GIF)
+throw new MediaException("Could not create player");
 try
 {
 is.close();
 }
 catch (IOException e)
 {
 e.printStackTrace();
 }
 iSourceDimension= new Point(imageLoader.logicalScreenWidth, imageLoader.logicalScreenHeight);
+iCurrentVideoDimension= new Point(imageLoader.logicalScreenWidth, imageLoader.logicalScreenHeight);
 iBackgroundPixel= imageLoader.backgroundPixel;
 }
 populateControl();
 }
 /**
 *
 * @param locator
 * @throws SWTException
 */
-public AnimationPlayer(String locator) throws SWTException
+public AnimationPlayer(String locator) throws SWTException, MediaException
 {
+ImageLoader imageLoader= new ImageLoader();
+// If it is any other format other than the image(jpeg, png and gif),
+// following line will throw the SWT exception
+iImageData=imageLoader.load(locator);
+// If the image is loaded properly, we need to check whether it is GIF image or not.
+// It can be PNG and JPEG as well
+if (iImageData[0].type!=SWT.IMAGE_GIF)
+throw new MediaException("Could not create player");
 iPlayerListenerImpl= new PlayerListenerImpl(this);
-ImageLoader imageLoader= new ImageLoader();
-// Following line may throw SWTException
-iImageData=imageLoader.load(locator);
 iSourceDimension= new Point(imageLoader.logicalScreenWidth, imageLoader.logicalScreenHeight);
+iCurrentVideoDimension= new Point(imageLoader.logicalScreenWidth, imageLoader.logicalScreenHeight);
 iBackgroundPixel= imageLoader.backgroundPixel;
 populateControl();
 }
 /**
 */
 protected void doStop() throws MediaException
 {
 // since after stopping the player the player state will move to pre-fetched state
 changePlayerState(PREFETCHED);
-iPlayerListenerImpl.postEvent(PlayerListener.STOPPED, new Long(iMediaTime * 10000));
+//iPlayerListenerImpl.postEvent(PlayerListener.STOPPED, new Long(iMediaTime * 10000));
+iPlayerListenerImpl.postEvent(PlayerListener.STOPPED, new Long(iMediaTime));
 }
 /**
 * Function of InternalPlayer interface
 */
 * This returns the total time taken, till now, to play the video.
 */
 public long getMediaTime()
 {
 closeCheck();
-// Since we have to return it in microsecond multiply it with 10000;
+return iMediaTime;
-return iMediaTime*10000;
 }
 public int getState()
 {
 return iState;
 }
 /**
 *
 */
+GC gc = null;
 public void start() throws MediaException
 {
 final String DEBUG_STR = "AnimationPlayer::start()";
-final long inTime = System.currentTimeMillis();
+//        final long inTime = System.currentTimeMillis();
 prefetch();
 // Only prefetched player may be started. If player is already started
 // this method returns silently.
 if (getState() == PREFETCHED)
 {
 //initialize();
 changePlayerState(STARTED);
 Thread thread = new Thread("Animation")
 {
 int loopCount = iCurrentLoopCount;
-GC gc = null;
 public void run()
 {
 //changePlayerState(STARTED);
 final int noOfFrames = iImageData.length;
 while (iState == STARTED)
 {
-final int delayTimeForNextFrame = iImageData[iFrameIndex].delayTime;
+final int delayTimeForNextFrame = iImageData[iFrameIndex].delayTime*10000 ;
 // Since we are going to display first frame, notify all
 // PlayerListener that Player has started
 if (iFrameIndex == 0)
 {
+iMediaTime=0;
 iPlayerListenerImpl.postEvent(
-PlayerListener.STARTED, new Long(
+PlayerListener.STARTED, new Long(0));
-iMediaTime * 10000));
 }
 if (iDisplay != null)
 {
 iDisplay.syncExec(new Runnable()
 {
 public void run()
 {
-if (gc == null)
+// For out of memory issue in case of full screen, we are scaling the image
-gc = new GC(iImage);
+// while displaying it.
-Image tempImage = new Image(iDisplay,iImageData[iFrameIndex]);
+ImageData tempImageData =iImageData[iFrameIndex] ;
+if (iSourceDimension.x!=iCurrentVideoDimension.x || iSourceDimension.x!=iCurrentVideoDimension.x)
+{
+tempImageData = iImageData[iFrameIndex].scaledTo(iCurrentVideoDimension.x , iCurrentVideoDimension.y);
+}
+Image tempImage = new Image(iDisplay,tempImageData);
+//Image tempImage = new Image(iDisplay,iImageData[iFrameIndex]);
 gc.drawImage(tempImage, 0, 0);
 tempImage.dispose();
 iFrameIndex = (iFrameIndex + 1) % noOfFrames;
 if (iControl != null)
 {
 }
 iMediaTime += delayTimeForNextFrame;
 }
 });
 }
-else// if the initDisplayMode is not called yer
+else// if the initDisplayMode is not called yet
 {
 iFrameIndex = (iFrameIndex + 1) % noOfFrames;
 iMediaTime += delayTimeForNextFrame;
 }
 try
 {
-Thread.sleep(delayTimeForNextFrame * 10);
+Thread.sleep(delayTimeForNextFrame / 1000);
 }
 catch (InterruptedException e)
 {
-// TODO Auto-generated catch block
 e.printStackTrace();
 }
 // post EOM event
 if (iFrameIndex == 0)
 {
 }
 // send the END_OF_MEDIA event to all
 // listener
 iPlayerListenerImpl.postEvent(
 PlayerListener.END_OF_MEDIA,
-new Long(iMediaTime * 10000));
+new Long(iMediaTime));
-iMediaTime = 0;
 }
 if (iAnimationObserver!=null)
 {
-iAnimationObserver.animationAdvanced(iMediaTime*10000);
+iAnimationObserver.animationAdvanced(iMediaTime);
 }
 }// end of while loop
 iCurrentLoopCount = loopCount;
-// Logger.LOG(Logger.EJavaMMAPI, Logger.EInfo, DEBUG_STR
 }
 };
 thread.start();
 }
-// Logger.LOG(Logger.EJavaMMAPI, Logger.EInfo,DEBUG_STR + "-");
 }
 /**
 * State of the player should be changed from this function only.
 * @param aState
 *  It is getting created, when initDisplayMode of VideoControl class is called.
 */
 public void notifyDisplayAvailable(Display aDisplay)
 {
 iDisplay= aDisplay;
-iImage=new Image(iDisplay, iImageData[0]);
+//iImage=new Image(iDisplay, iImageData[0]);
+iImage=new Image(iDisplay, iImageData[iFrameIndex]);
+iDisplay.syncExec(new Runnable()
+{
+public void run()
+{
+gc = new GC(iImage);
+}
+});
 }
 /**
 * Notified when the control is available
 * @param aControl(this is eSWTControl )
 */
 * This function will be called from setDisplaySize(int width, int height) of animation/VideoControl class
 * When MIDlet developer will try to alter the size of the image
 * @param width : to be set of the video(Animated GIF)
 * @param height : height to be set of video(Animated GIF)
 */
-void updateImageData(int width, int height)
+void updateImageData(int aWidth, int aHeight)
 {
-int noOfFrames= iImageData.length;
+//        int noOfFrames= iImageData.length;
-for (int i=0; i<noOfFrames; i++)
+//        for (int i=0; i<noOfFrames; i++)
-{
+//        {
-iImageData[i]=iImageData[i].scaledTo(width, height);
+//            iImageData[i]=iImageData[i].scaledTo(aWidth, aHeight);
-}
+//        }
-iImage=new Image(iDisplay, iImageData[iFrameIndex]);
+//        iImage=new Image(iDisplay, iImageData[iFrameIndex]);
+iCurrentVideoDimension.x=aWidth;
+iCurrentVideoDimension.y= aHeight;
+iImage=new Image(iDisplay, iImageData[iFrameIndex].scaledTo(aWidth, aHeight));
 }
 /**
 * Overloaded function for calling the above function
 */
 /**
 * Returns Point object, which contains the width and height of the image
 * Called from VideoControl to get the image width and height,
 * so that Item will be created exactly of same dimension
 */
-Point getImageDimension()
+Point getCurrentVideoDimension()
 {
-//      return iCurrentVideoDimension;
+return iCurrentVideoDimension;
-return new org.eclipse.swt.graphics.Point(iImageData[0].width, iImageData[0].height);
+// return new org.eclipse.swt.graphics.Point(iImageData[0].width, iImageData[0].height);
 }
 int getTotalNumberFrames()
 {
 void setDisplayLocation(int aX, int aY)
 {
 iDisplayLocation.x=aX;
 iDisplayLocation.y=aY;
 }
 /**
 * @return the position of the image to be displayed
 */
 Point getiDisplayLocation()
 {
 void setiIsControlVisible(boolean iIsControlVisible)
 {
 this.iIsControlVisible = iIsControlVisible;
 }
 /**
-* Called from
+* Called from StopTimeControl.animationAdvanced(long), once the stopped time is greater than or equal media time.
 */
 void postEvent(long aMediaTime)
 {
 changePlayerState(PREFETCHED);
 iPlayerListenerImpl.postEvent(PlayerListener.STOPPED_AT_TIME, new Long(

changeset 61	bf7ee68962da
parent 48	e0d6e9bd3ca7
child 79	2f468c1958d0