[Madsserv-commit] madsserv/src/server/transition Transition.java,1.9,1.10

[<mar...@us...>]

Update of /cvsroot/madsserv/madsserv/src/server/transition
In directory sc8-pr-cvs1:/tmp/cvs-serv14048/src/server/transition

Modified Files:
	Transition.java 
Log Message:
Amelioration des transitions

Index: Transition.java
===================================================================
RCS file: /cvsroot/madsserv/madsserv/src/server/transition/Transition.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Transition.java	24 Mar 2003 02:54:25 -0000	1.9
--- Transition.java	26 Mar 2003 01:03:42 -0000	1.10
***************
*** 33,36 ****
--- 33,38 ----
    protected Streaming streamingRef;
    private String temp;
+   protected Format[][] supportedFormats = null;
+ 
  
    /**
***************
*** 164,172 ****
  
    {
-     Random random = new Random();
      double mediaLength = 0;
      double auxTime = 0;
      float jpegQuality=0;
!     Time startTime;
      Time auxMediaTime;
      Format[] reencodingFormats=null;
--- 166,173 ----
  
    {
      double mediaLength = 0;
      double auxTime = 0;
      float jpegQuality=0;
!     Time startTime = null;
      Time auxMediaTime;
      Format[] reencodingFormats=null;
***************
*** 175,191 ****
  
      //variables qui stockes le format original Video et Audio
-     Format[][] supportedFormats;
      qualityLevel = _qualityLevel;
  
      addLog("nouvelle qualite " + String.valueOf(qualityLevel));
!     //On obtient ici les formats Video et Audio Supportes.
!     try {
!       supportedFormats = reencodeRef.getSupportedFormats();
!       reencodingFormats= gestionAdaptaRef.getStreamingFormat(supportedFormats,qualityLevel);
      }
      catch (Exception e) {
        throw e;
      }
!     //On obtient ici les formats Video et Audio de reencodage.
      if (reencodeRef.multiMedia) {
        reencodingVideoFor = (VideoFormat) reencodingFormats[1];
--- 176,202 ----
  
      //variables qui stockes le format original Video et Audio
      qualityLevel = _qualityLevel;
  
      addLog("nouvelle qualite " + String.valueOf(qualityLevel));
! 
!     if(_newFile) { // Nouveau fichier
!       try { //On obtient ici les formats Video et Audio Supportes.
!         supportedFormats = reencodeRef.getSupportedFormats();
!       }
!       catch (Exception e) {
!         throw e;
!       }
!       totalTime = 0;
!       startTime = new Time(0);
!     }
! 
!     try { // On recupere les formats de reencodage
!       reencodingFormats = gestionAdaptaRef.getStreamingFormat(supportedFormats,
!           qualityLevel);
      }
      catch (Exception e) {
        throw e;
      }
! 
      if (reencodeRef.multiMedia) {
        reencodingVideoFor = (VideoFormat) reencodingFormats[1];
***************
*** 197,201 ****
      }
  
!     if (!_newFile) {
        mediaTimeReceived = false;
        mediaLength = reencodeRef.getMediaLength();
--- 208,212 ----
      }
  
!     if (!_newFile) { // Fichier deja commence
        mediaTimeReceived = false;
        mediaLength = reencodeRef.getMediaLength();
***************
*** 208,217 ****
        startTime = new Time(totalTime);
      }
-     else {
-       totalTime = 0;
-       startTime = new Time(0);
-     }
-     //on Transmet ici les formats Audio et Video de reencodage
  
      if (reencodeRef.multiMedia) {
        reencodeRef.setReencodingVideoFormat(reencodingVideoFor);
--- 219,224 ----
        startTime = new Time(totalTime);
      }
  
+     // On transmet ici les formats Audio et Video de reencodage
      if (reencodeRef.multiMedia) {
        reencodeRef.setReencodingVideoFormat(reencodingVideoFor);