comparison main/IMAFencoder.c @ 636:767789a78984 imaf_enc

Fix from Jesus Corral Garcia (for crashes etc)

 int samplecontainer(MovieBox *moov, int, int, const char *name);
 int sampledescription(MovieBox *moov, int);
 int presetcontainer(MovieBox *moov, int, int *vol_values, int type, int fade_in);
 int rulescontainer(MovieBox *moov, int SelRuleType, int SelRule_PAR1, int SelRule_PAR2,
                    int MixRuleType, int MixRule_PAR1, int MixRule_PAR2, int MixRule_PAR3, int MixRule_PAR4);
-void writemoovbox(MovieBox moov, int numtrack,int totaltracks, FILE *imf, FILE *text);
+void writemoovbox(MovieBox moov, int numtrack,int totaltracks, FILE *imf, FILE *text, bool HasTextFile);
 int readTrack(MovieBox *moov, int,const char *name);
 
 // Timed Text Functions
 int trackstructure_text (MovieBox *moov, int numtrack, int clock, int durationTrack, int sizemdat,const char *textfile,FILE *text,int totaltracks);
 int samplecontainer_text(MovieBox *moov, int numtrack, int sizemdat, const char *textfiles,int totaltracks);

     file_created->show();
 }
 
 int mainIMAFencoder (int totaltracks, QString files_path[maxtracks],QString outimaf,
                      QString picturefile, QString textfile, int vol_values[maxtracks], bool HasImageFile,
-                     int SelRuleType, int SelRule_PAR1, int SelRule_PAR2,
+                     bool HasTextFile, int SelRuleType, int SelRule_PAR1, int SelRule_PAR2,
                      int MixRuleType, int MixRule_PAR1, int MixRule_PAR2, int MixRule_PAR3, int MixRule_PAR4,
                      int group_tracks[maxtracks], int group_volume, QString group_name, QString group_description,
                      int pres_type, int fade_in)
 {
     //Variables

         } else { //if there is no image, the size is 0
         imagesize = 0;
     }
 
     //INPUT: Timed-Text
-    c_str2= textfile.toStdString().c_str(); //convert Qstring to const char
-    text = fopen(c_str2, "rb");
-    sizetext= getTextSize (text); //calculate the size of the text
-    if((text)==NULL) {
-            // do something
-        }
-
+    if (HasTextFile){
+        c_str2= textfile.toStdString().c_str(); //convert Qstring to const char
+        text = fopen(c_str2, "rb");
+        sizetext= getTextSize (text); //calculate the size of the text
+    }
+    else{
+        sizetext = 0;
+    }
     //Create OUTPUT file (.ima)
     imf = fopen (outimaf.toStdString().c_str(),"wb");
 
     //Define the File Type Box
     filetypebx(&ftyp);

     //Rules
     sizeRUCO = rulescontainer(&moov, SelRuleType, SelRule_PAR1, SelRule_PAR2,
                               MixRuleType, MixRule_PAR1, MixRule_PAR2, MixRule_PAR3, MixRule_PAR4); // Creates the rules, returns the size of the box.
 
     //Text track
-    c_str2= textfile.toStdString().c_str(); //convert Qstring to const char
-    sizeTRAK = trackstructure_text (&moov, numtrack, clock, durationTrack, sizemdat, c_str2, text, totaltracks) + sizeTRAK;
-
+    if (HasTextFile){
+        c_str2= textfile.toStdString().c_str(); //convert Qstring to const char
+        sizeTRAK = trackstructure_text (&moov, numtrack, clock, durationTrack, sizemdat, c_str2, text, totaltracks) + sizeTRAK;
+    }
     //Movie Header - Overall declarations
     moovheaderbox(&moov, clock, sizeTRAK, sizePRCO, totaltracks, durationTrack, sizeRUCO, sizeGRCO); // -> enter sizeGRCO instead of 0
 
     //Writes the movie box into the file
-    writemoovbox(moov, numtrack, totaltracks, imf, text);
+    writemoovbox(moov, numtrack, totaltracks, imf, text, HasTextFile);
 
     //Writes the meta box into the IMAF file
     if (HasImageFile){
         writemetabox(meta,imf);
     }

         fread(&mdat->data, sizeof(char), 1, song);
         fwrite(&mdat->data, sizeof(char), 1, imf);
     }
 
     // copy the text in the 3gp to the ima and add the text modifiers
-
+  if (sizetext !=0){
     cnt=0;// the total number of bytes of the whole text including modifiers
     fseek(text,0,SEEK_CUR);
     sizestring=0;//number of bytes of a phrase (without modifiers)
     initposition[0]=0;// this array saves the initial position of a word
     if(numtr==totaltracks-1){  // writes the text after the samples of all the audio tracks

         swap = bytereverse(sizeMDAT);
         fseek(imf,-(sizeMDAT-imagesize),SEEK_CUR); //overwrittes sizeMDAT with the total size (Image is yet to be written in the file at this point)
         fwrite(&swap, sizeof(u32), 1, imf);
         fseek(imf,(sizeMDAT-imagesize)-4,SEEK_CUR);	// (Image is yet to be written in the file at this point)
     } // close if (numtr==totaltracks-1)
-
+}//close if sizetext
     fclose(song);
 
     return size;
 }
 

     swap = bytereverse ('moov');
     moov->type = swap;
 }
 
 
-void writemoovbox(MovieBox moov, int numtrack,int totaltracks, FILE *imf, FILE *text)
+void writemoovbox(MovieBox moov, int numtrack,int totaltracks, FILE *imf, FILE *text, bool HasTextFile)
 {
     int i, j, k, m, t, swap, pos, temp, type;
     int cnt = 0, cnt2 = 0, d = 0, dat = 0, dat1 = 0, dat2 = 0, dat3 = 0, size = 0;
     u16 numgroups, numel;
 

         fwrite(&moov.RulesContainer.MixingRules.mix_description[i],
                sizeof(char), 1, imf);
     }
 
     //TIMED TEXT
+
+    if (HasTextFile){
     fwrite(&moov.TrackBox[numtrack].size, sizeof(u32), 1, imf);
     fwrite(&moov.TrackBox[numtrack].type, sizeof(u32), 1, imf);
     //Track header//
     fwrite(&moov.TrackBox[numtrack].TrackHeaderBox,
             sizeof(moov.TrackBox[numtrack].TrackHeaderBox), 1, imf);

             ChunkOffsetBox.entry_count);i++){
 
         fwrite(&moov.TrackBox[numtrack].MediaBox.MediaInformationBox.SampleTableBox.
                 ChunkOffsetBox.chunk_offset[i], sizeof(u32), 1, imf);
     }
-
+    } // end if HasTextFile
     //Song Image//
     /* Go to function "writemeta" */
 
 }