check validity of media folder. Handle unknow MP4 creation times.

4 files changed, 27 insertions, 6 deletions

diff --git a/mp4.c b/mp4.c
index eaab233..d8c5c4b 100644
--- a/mp4.c
+++ b/mp4.c
@@ -203,12 +203,17 @@ bool cMp4Metadata::parseMovieHeader (FILE* ifd, uint64_t s) {
   if (m_box.mFlags == 1) {
     uint32_t ts;
     uint64_t dur;
+    uint64_t ct;
+
     read_size += 28;
     res = fread (p, 1, 28, ifd);
     if (res < 28) 
       return false;
 
-    mCreationTime = parseUInt64(p) - 2082844800;
+    ct = parseUInt64(p);
+    if (ct != 0) {
+      mCreationTime = ct - 2082844800;
+    }
     ts = parseUInt32 (&(p[16]));
     dur = parseUInt64 (&(p[20]));
 
@@ -219,16 +224,17 @@ bool cMp4Metadata::parseMovieHeader (FILE* ifd, uint64_t s) {
   else {
     uint32_t ts;
     uint32_t dur;
-    uint32_t c;
+    uint32_t ct;
 
     read_size += 16;
     res = fread (p, 1, 16, ifd);
     if (res < 16) 
       return false;
 
-    c = parseUInt32(p) - 2082844800;
-    mCreationTime = c;
-
+    ct = parseUInt32(p) ;
+    if (ct != 0) {
+      mCreationTime = ct- 2082844800;
+    }
     ts= parseUInt32(&(p[8]));
     dur= parseUInt32(&(p[12]));
 
diff --git a/responsememblk.c b/responsememblk.c
index 22c3b40..92e1bc2 100755
--- a/responsememblk.c
+++ b/responsememblk.c
@@ -1818,7 +1818,9 @@ int cResponseMemBlk::parseFiles(vector<sFileEntry> *entries, string prefix, stri
 			   << endl;
 	    cMp4Metadata meta(pathbuf, statbuf->st_size);
 	    meta.parseMetadata();
-	    entries->push_back(sFileEntry(prefix+de->d_name, pathbuf, meta.mCreationTime, mime, 
+	    entries->push_back(sFileEntry(prefix+de->d_name, pathbuf, 
+					  ((meta.mCreationTime != 0) ? meta.mCreationTime : statbuf->st_mtime), 
+					  mime, 
 					  (meta.mHaveTitle) ? meta.mTitle : prefix+de->d_name, 
 					  meta.mShortDesc, meta.mLongDesc, meta.mDuration));
 	}
@@ -1927,6 +1929,9 @@ void cResponseMemBlk::sendServerNameXml () {
   snprintf(f, sizeof(f), "<cmds>%s</cmds>\n", ((mRequest->mFactory->getConfig()->getCmds()) ? "true" : "false"));
   *mResponseMessage += f;
 
+  snprintf(f, sizeof(f), "<mf>%s</mf>\n", ((mRequest->mFactory->getConfig()->haveMediaFolder()) ? "true" : "false"));
+  *mResponseMessage += f;
+
   *mResponseMessage += "</servername>\n";
   sendHeaders(200, "OK", NULL, "application/xml", mResponseMessage->size(), -1);
 }
diff --git a/stvw_cfg.c b/stvw_cfg.c
index 4ca2559..7af88b7 100755
--- a/stvw_cfg.c
+++ b/stvw_cfg.c
@@ -50,6 +50,14 @@ cSmartTvConfig::cSmartTvConfig(string d): mConfigDir(d), mLog(NULL), mCfgFile(NU
   mLiveChannels = 30;
 
   readConfig();
+
+  struct stat statbuf;
+  mHaveMediaFolder = false;
+  if (stat(mMediaFolder.c_str(), &statbuf) != -1) {
+    if (S_ISDIR(statbuf.st_mode)) {
+      mHaveMediaFolder = true;
+    }
+  } 
 }
 
 cSmartTvConfig::~cSmartTvConfig() {
diff --git a/stvw_cfg.h b/stvw_cfg.h
index 3c134d0..a2c0233 100755
--- a/stvw_cfg.h
+++ b/stvw_cfg.h
@@ -47,6 +47,7 @@ class cSmartTvConfig {
 
   string mLogFile;
   string mMediaFolder;
+  bool mHaveMediaFolder;
   unsigned int mSegmentDuration;
   int mHasMinBufferTime;
   float mHasBitrateCorrection;
@@ -71,6 +72,7 @@ class cSmartTvConfig {
 
   string getLogFile() { return mLogFile; };
   string getMediaFolder() { return mMediaFolder; };
+  bool haveMediaFolder() { return mHaveMediaFolder; };
   unsigned int getSegmentDuration() {return mSegmentDuration; };
   int getHasMinBufferTime() { return mHasMinBufferTime; };
   float getHasBitrateCorrection() { return mHasBitrateCorrection; };