EDL (and ComSkip) integration - Printable Version

Code:

Index: mplayer.cpp



===================================================================



--- mplayer.cpp    (revision 9840)



+++ mplayer.cpp    (working copy)



@@ -122,6 +122,7 @@



   m_bLimitedHWAC3 = false;

   m_bDeinterlace = false;

   m_subcp = "";

+  m_strEdl = "";

   m_synccomp = 0.0f;

 }

 void CMPlayer::Options::SetFPS(float fFPS)

@@ -279,6 +280,11 @@



   m_iAutoSync = iAutoSync;

 }

 

+void CMPlayer::Options::SetEdl(const string& strEdl)

+{

+  m_strEdl = strEdl;

+}

+

 void CMPlayer::Options::GetOptions(int& argc, char* argv[])

 {

   CStdString strTmp;

@@ -332,6 +338,12 @@



     }

   }

 

+  if (m_strEdl.length() > 0)

+  {

+    m_vecOptions.push_back("-edl");

+    m_vecOptions.push_back( m_strEdl.c_str());

+  }

+

   //MOVED TO mplayer.conf

   //Enable mplayer's internal highly accurate sleeping.

   //m_vecOptions.push_back("-softsleep");

@@ -858,6 +870,16 @@



     m_iPTS = 0;

     m_bPaused = false;

 

+    CStdString strEdlFileName;

+    if (!bFileOnInternet && bIsVideo && !bIsDVD )

+    {

+      CUtil::ReplaceExtension(strFile, ".edl", strEdlFileName);

+      if ( CFile::Exists(strEdlFileName) )

+      {

+        options.SetEdl(strEdlFileName);

+      }

+    }

+    

     // first init mplayer. This is needed 2 find out all information

     // like audio channels, fps etc

     load();

@@ -2051,4 +2073,4 @@



     m_evProcessDone.WaitMSec(1000);

     m_evProcessDone.WaitMSec(1000);

   }

-}



\ No newline at end of file



+}

Index: MPlayer.h



===================================================================



--- MPlayer.h    (revision 9840)



+++ MPlayer.h    (working copy)



@@ -61,6 +61,8 @@



 

     void SetAutoSync(int iAutoSync);

 

+    void SetEdl(const string& strEdl);

+

     void SetAudioOutput(const string& output) { m_videooutput = output; }

     void SetVideoOutput(const string& output) { m_audiooutput = output; }

     void SetAudioCodec(const string& codec) { m_videocodec = codec; }

@@ -94,6 +96,7 @@



     string m_demuxer;

     bool m_bDisableAO;

     string m_subcp;

+    string m_strEdl;

     string m_strChannelMapping;

     string m_strDvdDevice;

     string m_strFlipBiDiCharset;

Code:

Edit Decision List



XBMC supports Edit Decision Lists.



An Edit Decision List or EDL allows you to automatically skip or mute sections of videos during playback, based on a movie specific EDL configuration file. The EDL can for example be used to to skip commecials or intros.



The current EDL file format is:

[begin second] [end second] [action]



Where the seconds are floating-point numbers and the action is either 0 for skip or 1 for mute. Example:



5.3   7.1    0

15    16.7   1

420   422    0



This will skip from second 5.3 to second 7.1 of the video, then mute at 15 seconds, unmute at 16.7 seconds and skip from second 420 to second 422 of the video. These actions will be performed when the playback timer reaches the times given in the file. 



To use an edl file with a video file, put it in the same folder as the video file. 

The edl and video files must have the same name, for example:



Video File: The Matrix.avi

EDL: The Matrix.edl