Changeset 9878 for trunk/Jav_CO/com/scenari/s/co/transform/swf/HTransformerSwfHeader.java

Timestamp:

10/26/07 17:54:04 (4 years ago)

Author:

sys

Message:

swf2props : parsing des formats FLV et SWF

File:

• trunk/Jav_CO/com/scenari/s/co/transform/swf/HTransformerSwfHeader.java (modified) (4 diffs)

trunk/Jav_CO/com/scenari/s/co/transform/swf/HTransformerSwfHeader.java

@@ -49 +49 @@
 import java.io.Writer;
 
-import com.scenari.ext.swf.FSHeader;
+import com.scenari.ext.swf.FlashHeader;
+import com.scenari.ext.swf.FlvHeader;
+import com.scenari.ext.swf.SwfHeader;
 import com.scenari.s.co.transform.HTransformParams;
 import com.scenari.s.co.transform.HTransformer;
@@ -80 +82 @@
          */
         public void hTransform(Object pSrc, Object pRes, HTransformParams pParams) throws Exception {
-                byte[] vData;
-                FSHeader vHeader;
+                FlashHeader vHeader;
                 InputStream vIn = null;
                 
@@ -89 +90 @@
 
                 try {
+                        byte[] vData;
+                        InputStream vStream;
                         if (pSrc instanceof InputStream) {
                                 vData = new byte[4096];
-                                ((InputStream) pSrc).read(vData);
-                                vHeader = new FSHeader(vData, (InputStream)pSrc );
+                                vStream = (InputStream) pSrc;
                         } else {
                                 vData = new byte[Math.min((int)((File) pSrc).length(), 4096)];
+                                //vIn sera clos dans la clause finally
                                 vIn = new FileInputStream((File) pSrc);
-                                vIn.read(vData);
-                                vHeader = new FSHeader(vData, vIn);
-                        }
+                                vStream = vIn;
+                        }
+                        int vRead = vStream.read(vData);
+                        while(vRead != -1 && vRead < vData.length) {
+                                //On s'assure que la tableau a été entièrement renseigné, ou qu'on est à la fin du stream
+                                int vRead2 = vStream.read(vData, vRead, vData.length - vRead);
+                                if(vRead2==-1) break;
+                                vRead += vRead2;
+                        }
+                        vHeader = FlashHeader.buildHeader(vData, vStream);
         
                         //Encoding
@@ -112 +122 @@
                         vXmlWriter = new HXmlWriterIO(vResult);
                         vXmlWriter.hWriteHeaderXml("utf-8");
-                        vXmlWriter.hWriteStartTag("swfHeader");
-                        vXmlWriter.hWriteAttribut("signature", vHeader.getSignature());
-                        vXmlWriter.hWriteAttribut("version", HCharSeqUtil.hGetIntToString(vHeader.getVersion()));
-                        vXmlWriter.hWriteAttribut("frameRate", String.valueOf(vHeader.getFrameRate()));
-                        vXmlWriter.hWriteAttribut("numberOfFrames", String.valueOf(vHeader.getNumberOfFrames()));
-                        vXmlWriter.hWriteAttribut("x1", HCharSeqUtil.hGetIntToString(vHeader.getMinX()));
-                        vXmlWriter.hWriteAttribut("y1", HCharSeqUtil.hGetIntToString(vHeader.getMinY()));
-                        vXmlWriter.hWriteAttribut("x2", HCharSeqUtil.hGetIntToString(vHeader.getMaxX()));
-                        vXmlWriter.hWriteAttribut("y2", HCharSeqUtil.hGetIntToString(vHeader.getMaxY()));
-                        vXmlWriter.hWriteEndEmptyTag();
+                        if(vHeader instanceof SwfHeader) {
+                                SwfHeader vSwfHeader = (SwfHeader)vHeader;
+                                vXmlWriter.hWriteStartTag("swfHeader");
+                                vXmlWriter.hWriteAttribut("signature", vSwfHeader.getSignature());
+                                vXmlWriter.hWriteAttribut("version", HCharSeqUtil.hGetIntToString(vSwfHeader.getVersion()));
+                                vXmlWriter.hWriteAttribut("frameRate", String.valueOf(vSwfHeader.getFrameRate()));
+                                vXmlWriter.hWriteAttribut("numberOfFrames", String.valueOf(vSwfHeader.getNumberOfFrames()));
+                                vXmlWriter.hWriteAttribut("x1", HCharSeqUtil.hGetIntToString(vSwfHeader.getMinX()));
+                                vXmlWriter.hWriteAttribut("y1", HCharSeqUtil.hGetIntToString(vSwfHeader.getMinY()));
+                                vXmlWriter.hWriteAttribut("x2", HCharSeqUtil.hGetIntToString(vSwfHeader.getMaxX()));
+                                vXmlWriter.hWriteAttribut("y2", HCharSeqUtil.hGetIntToString(vSwfHeader.getMaxY()));
+                                vXmlWriter.hWriteEndEmptyTag();
+                        } else if(vHeader instanceof FlvHeader) {
+                                FlvHeader vFlvHeader = (FlvHeader)vHeader;
+                                vXmlWriter.hWriteStartTag("flvHeader");
+                                vXmlWriter.hWriteAttribut("version", HCharSeqUtil.hGetIntToString(vFlvHeader.getVersion()));
+                                vXmlWriter.hWriteAttribut("hasAudio", String.valueOf(vFlvHeader.getHasAudio()));
+                                vXmlWriter.hWriteAttribut("hasVideo", String.valueOf(vFlvHeader.getHasVideo()));
+                                vXmlWriter.hWriteAttribut("duration", String.valueOf(vFlvHeader.getDuration()));
+                                vXmlWriter.hWriteAttribut("audioCodec", vFlvHeader.getAudioCodec());
+                                vXmlWriter.hWriteAttribut("audioSampleRate", String.valueOf(vFlvHeader.getAudioCodec()));
+                                vXmlWriter.hWriteAttribut("audioSampleSize", String.valueOf(vFlvHeader.getAudioSampleSize()));
+                                vXmlWriter.hWriteAttribut("audioType", vFlvHeader.getAudioType());
+                                vXmlWriter.hWriteAttribut("videoCodec", vFlvHeader.getVideoCodec());
+                                vXmlWriter.hWriteAttribut("frameType", vFlvHeader.getFrameType());
+                                vXmlWriter.hWriteAttribut("width", HCharSeqUtil.hGetIntToString(vFlvHeader.getWidth()));
+                                vXmlWriter.hWriteAttribut("height", HCharSeqUtil.hGetIntToString(vFlvHeader.getHeight()));
+                                vXmlWriter.hWriteEndEmptyTag();
+                        } else {
+                                vXmlWriter.hWriteEmptyTag("formatUnknown");
+                        }
                 } catch (Exception e) {
                         throw (Exception) HLogMgr.hAddMessage(e, "Echec à l'extraction des propriétés d'une image.");