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

equal deleted inserted replaced

-:85266cc22c7f
+:35baca0e7a2e
 * from initDisplayMode function.
 */
 // Global??? yes because we need to remove it from player listener, while finalizer will be called
 private VideoItem iVideoItem;
+ESWTinitializeListener iESWTinitializeListener;
 /**
 * Constructor of VideoControl
 * @param player
 */
 public VideoControl(Player player)
 {
 this.iPlayer=player;
+iESWTinitializeListener=(AnimationPlayer)iPlayer;
 }
 /**
 *
 */
 private Finalizer mFinalizer = new Finalizer()
 if (iStatus == NOT_INITIALIZED)
 {
 throw new IllegalStateException(
 "VideoControl.initDisplayMode() not called yet");
 }
-Image image=((AnimationPlayer)iPlayer).getCurrentFrame(aImageType);
+String supportedFormat=System.getProperty("video.snapshot.encodings");
-byte bytArry[]= null;//getByteArray(image);
+if (aImageType==null)
-// TODO Enable the permission check
+{
-// Commented out below line, because I was getting exception
+aImageType=supportedFormat.substring(0, supportedFormat.indexOf(' '));
-// Check the permission here, so 'the moment' is not lost?
+}
-//Security.ensurePermission(PERMISSION, PERMISSION, PERM_ARGS);
+else if (supportedFormat.indexOf(aImageType)==-1)
+{
+throw new MediaException("Unsupported image type: " + aImageType);
+}
+byte data[]=((AnimationPlayer)iPlayer).getCurrentFrame(aImageType);
+//TODO before returning the check permissions here
+// we are making late check here, so that moment should not be lost.
 //        ApplicationUtils appUtils = ApplicationUtils.getInstance();
 //        PlayerPermission per = new PlayerPermission("audio/video recording","snapshot");
 //        appUtils.checkPermission(per);
-return bytArry;
+return data;
 }
 /**
 * Return the height of the source video. The height must be a positive number.
 * @return the height of the source video.
 if (aArg!=null && aArg.equals(Control.class.getName()))
 {
 // Following line will return the same Display object
 // Which is created in Midlet
 iDisplay =Display.getDefault();
+iESWTinitializeListener.notifyDisplayAvailable(iDisplay);
 }
 else
 {
 // Get the Display object of ESWT
 iDisplay = com.nokia.mj.impl.nokialcdui.LCDUIInvoker.getEswtDisplay();
+iESWTinitializeListener.notifyDisplayAvailable(iDisplay);
 }
 if (aMode == USE_GUI_PRIMITIVE)
 {
 Object guiObject = null;
 if (aArg == null)
 {
 guiObject = initDynamicDisplayMode(aArg);
 // Since it is eswtControl itself so no need of LCDUIInvoker here
 // assign it in iControl and return immediately from here
 iControl=(Control)guiObject;
+iESWTinitializeListener.notifyControlAvailable(iControl);
 // Now we will change the status, when MIDlet developer will call the setParent
 iStatus = USE_GUI_PRIMITIVE;
 return iControl;
 }
 }
 throw new java.lang.IllegalArgumentException(
 "For USE_DIRECT_VIDEO mode argument should not be null");
 }
 iControl = com.nokia.mj.impl.nokialcdui.LCDUIInvoker
 .getEswtControl(aArg);
+//in this case Control will be provided immediately
+iESWTinitializeListener.notifyControlAvailable(iControl);
 //If USE_DIRECT_VIDEO is set, the video by default is not
 //shown when the canvas is displayed until setVisible(true) is called
 //iIsControlVisible variable of AnimationPlayer class decides, whether
 //animation should be visible or not, and by default it is true;
 //So making it false here.
 * Creates the VideoItem object of size of image(gif)
 * @return VideoItem(a CustomItem ) object
 */
 private Object initLCDUI()
 {
-final String DEBUG_STR="VideoControl::initLCDUI()";
-Logger.LOG(Logger.EJavaMMAPI, Logger.EInfo,DEBUG_STR+"+");
 iVideoItem = new VideoItem(((AnimationPlayer)iPlayer).getImageDimension());
 iPlayer.addPlayerListener(iVideoItem);
 iStatus = USE_GUI_PRIMITIVE;
-Logger.LOG(Logger.EJavaMMAPI, Logger.EInfo,DEBUG_STR+"-");
 return iVideoItem;
 }
 /**
 * Initializes USE_GUI_PRIMITIVE mode when null parameter is given to
 {
 throw new IllegalStateException(
 "VideoControl.initDisplayMode() not called yet");
 }
 //if this is in case of form, return silently
+// No need to display the CustomItem in full screen mode
 //This is as per earlier NOKIA implementation,
 if (iVideoItem!=null)
 {
 return;
 }
 /* (non-Javadoc)
 * @see javax.microedition.media.control.VideoControl#setDisplayLocation(int, int)
 */
 public void setDisplayLocation(int aX, int aY)
 {
+if (iStatus == USE_GUI_PRIMITIVE)
+{
+// In USE_GUI_PRIMITIVE mode, this call will be ignored.
+return;
+}
+if (iStatus != USE_DIRECT_VIDEO)
+{
+// This method only works when the USE_DIRECT_VIDEO mode is set.
+throw new IllegalStateException();
+}
 // Need to ignore this call in case of USE_GUI_PRIMITIVE
 // in case of customItem, we are getting canvasExtension as control
 // and in this case we need to ignore the setDisplayLocation call.
 // it is also possible that iControl may be null( it will be null until and unless
 // notifyControlAvailable function is not get called)
-System.out.println("VideoControl::setDisplayLocation() curretn status is "+iStatus);
+if (iControl==null)// || (iControl instanceof org.eclipse.swt.internal.extension.CanvasExtension))
-if (iControl==null || (iControl instanceof org.eclipse.swt.internal.extension.CanvasExtension))
 return ;
 ((AnimationPlayer)iPlayer).setDisplayLocation(aX, aY);
 }
 /**
 }
 /*******************************FOLLOWING FUNCTIONS ARE USED FOR INTERNAL PURPOSE***********************/
 /**
 *
 * @return Display object retrieved from ESWT
-*/
+//     */
-Display getiDisplay()
+//    Display getiDisplay()
-{
+//    {
-return iDisplay;
+//        return iDisplay;
-}
+//    }
 /**
 *
 * @return
 */
-Control getControl()
+//    Control getControl()
-{
+//    {
-return iControl;
+//        return iControl;
-}
+//    }
 /**
 * Function of ItemStateChangeListener
 * Notified by LCDUI implementation
 * @param ctrl
 * @param item
 */
 public void notifyControlAvailable(Control ctrl,Item item)
 {
 final String DEBUG_STR= "VideoControl::notifyControlAvailable(Control ctrl,Item item)";
 iControl=ctrl;
+iESWTinitializeListener.notifyControlAvailable(iControl);
 Logger.LOG(Logger.EJavaMMAPI, Logger.EInfo, DEBUG_STR+"Control is "+ctrl.hashCode()+ " Item is "+item);
-//TODO is it proper here to put the below line in try/catch?, remove if we can.
-// Otherwise it may deteriorate the performance, as in case of CustomItem on each
-// repaint, eSWT control is getting destroyed, and reconstructed
-((AnimationPlayer)iPlayer).addPaintListener(iControl);
 }
 /**
 * Function of ItemStateChangeListener
 * We don't need to do anything in this function
 *

changeset 49	35baca0e7a2e
parent 35	85266cc22c7f
child 50	023eef975703