Changeset 5bc8ca51c941b558cfa42eccb71cb9f37e0f161f

Timestamp:

09/02/05 11:09:41 (4 years ago)

Author:

Gildas Bazin <gbazin@videolan.org>

git-committer:

Gildas Bazin <gbazin@videolan.org> 1107943781 +0000

git-parent:

[5281148de4fb4ac815798a43aa67542a07315166]

git-author:

Gildas Bazin <gbazin@videolan.org> 1107943781 +0000

Message:

* modules/demux/mkv.cpp: Patch by Steve Lhomme (steve dot lhomme at free dot fr) to allow the Matroska demuxer to find all files in the same "family" in the same directory as the source file.
This will be useful to find segments corresponding to the different titles/domains (as in DVDs).

Files:

• configure.ac (modified) (2 diffs)
• modules/demux/mkv.cpp (modified) (18 diffs)

configure.ac

@@ -304 +304 @@
-
-dnl Check for usual libc functions
- lseek
+
-AC_CHECK_FUNCS(strcasecmp,,[AC_CHECK_FUNCS(stricmp)])
-AC_CHECK_FUNCS(strncasecmp,,[AC_CHECK_FUNCS(strnicmp)])
@@ -1757 +1757 @@
-  AC_LANG_PUSH(C++)
-  AC_CHECK_HEADERS(ebml/EbmlVersion.h, [
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        ])
-
+
+
+
-    ])
-  ])

modules/demux/mkv.cpp

@@ -6 +6 @@
- *
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
+ *          Steve Lhomme <steve.lhomme@free.fr>
- *
- * This program is free software; you can redistribute it and/or modify
@@ -42 +43 @@
-#include <cassert>
-#include <typeinfo>
+#include <string>
+#include <vector>
+
+#ifdef HAVE_DIRENT_H
+#   include <dirent.h>
+#elif defined( UNDER_CE )
+#   include <windows.h>                               /* GetFileAttributes() */
+#else
+#   include "../../src/extras/dirent.h"
+#endif
-
-/* libebml and matroska */
@@ -50 +61 @@
-#include "ebml/EbmlVersion.h"
-#include "ebml/EbmlVoid.h"
-
-
+
+
-#include "matroska/KaxAttachments.h"
-#include "matroska/KaxBlock.h"
@@ -86 +97 @@
-#define MATROSKA_COMPRESSION_ZLIB 1
-
+/**
+ * What's between a directory and a filename?
+ */
+#if defined( WIN32 )
+    #define DIRECTORY_SEPARATOR '\\'
+#else
+    #define DIRECTORY_SEPARATOR '/'
+#endif
+
-using namespace LIBMATROSKA_NAMESPACE;
-using namespace std;
@@ -299 +319 @@
-} mkv_index_t;
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    vlc_stream_io_callback  *in;
-    EbmlStream              *es;
@@ -323 +371 @@
-    KaxSegment              *segment;
-    KaxCluster              *cluster;
+    KaxSegmentUID           segment_uid;
-
-    mtime_t                 i_pts;
@@ -341 +390 @@
-
-    input_title_t           *title;
+
+    std::vector<KaxSegmentFamily> families;
+    std::vector<KaxSegment*> family_members;
-};
-
@@ -365 +417 @@
-    demux_sys_t *p_sys;
-    uint8_t     *p_peek;
+    std::string  s_path, s_filename;
+    int          i_upper_lvl;
+    size_t       i, j;
-
-    int          i_track;
@@ -390 +445 @@
-    p_demux->pf_demux   = Demux;
-    p_demux->pf_control = Control;
-
-
-
+
+
-    p_sys->in = new vlc_stream_io_callback( p_demux->s );
-    p_sys->es = new EbmlStream( *p_sys->in );
@@ -422 +476 @@
-        msg_Err( p_demux, "failed to create EbmlStream" );
-        delete p_sys->in;
-free( p_sys )
+delete p_sys
-        return VLC_EGENERIC;
-    }
@@ -496 +550 @@
-        }
-    }
+
+    /* get the files from the same dir from the same family (based on p_demux->psz_path) */
+    /* _todo_ handle multi-segment files */
+    if (p_demux->psz_path[0] != '\0' && (!strcmp(p_demux->psz_access, "") || !strcmp(p_demux->psz_access, "")))
+    {
+        // assume it's a regular file
+        // get the directory path
+        s_path = p_demux->psz_path;
+        if (s_path.at(s_path.length() - 1) == DIRECTORY_SEPARATOR)
+        {
+            s_path = s_path.substr(0,s_path.length()-1);
+        }
+        else
+        {
+            if (s_path.find_last_of(DIRECTORY_SEPARATOR) > 0) 
+            {
+                s_path = s_path.substr(0,s_path.find_last_of(DIRECTORY_SEPARATOR));
+            }
+        }
+
+        struct dirent *p_file_item;
+        DIR *p_src_dir = opendir(s_path.c_str());
+
+        if (p_src_dir != NULL)
+        {
+            while (p_file_item = readdir(p_src_dir))
+            {
+                if (p_file_item->d_namlen > 4)
+                {
+                    s_filename = s_path + DIRECTORY_SEPARATOR + p_file_item->d_name;
+
+                    if (!s_filename.compare(p_demux->psz_path))
+                        continue;
+
+                    if (!s_filename.compare(s_filename.length() - 3, 3, "mkv") || 
+                        !s_filename.compare(s_filename.length() - 3, 3, "mka"))
+                    {
+                        // test wether this file belongs to the our family
+                        bool b_keep_file_opened = false;
+                        StdIOCallback *p_file_io = new StdIOCallback(s_filename.c_str(), MODE_READ);
+                        EbmlStream *p_stream = new EbmlStream(*p_file_io);
+                        EbmlElement *p_l0, *p_l1, *p_l2;
+
+                        // verify the EBML Header
+                        p_l0 = p_stream->FindNextID(EbmlHead::ClassInfos, 0xFFFFFFFFL);
+                        if (p_l0 == NULL)
+                        {
+                            delete p_stream;
+                            delete p_file_io;
+                            continue;
+                        }
+
+                        p_l0->SkipData(*p_stream, EbmlHead_Context);
+                        delete p_l0;
+
+                        // find all segments in this file
+                        p_l0 = p_stream->FindNextID(KaxSegment::ClassInfos, 0xFFFFFFFFL);
+                        if (p_l0 == NULL)
+                        {
+                            delete p_stream;
+                            delete p_file_io;
+                            continue;
+                        }
+
+                        i_upper_lvl = 0;
+
+                        while (p_l0 != 0)
+                        {
+                            if (EbmlId(*p_l0) == KaxSegment::ClassInfos.GlobalId)
+                            {
+                                EbmlParser  *ep;
+                                KaxSegmentUID *p_uid = NULL;
+
+                                ep = new EbmlParser(p_stream, p_l0);
+                                bool b_this_segment_matches = false;
+                                while (p_l1 = ep->Get())
+                                {
+                                    if (MKV_IS_ID(p_l1, KaxInfo))
+                                    {
+                                        // find the families of this segment
+                                        KaxInfo *p_info = static_cast<KaxInfo*>(p_l1);
+
+                                        p_info->Read(*p_stream, KaxInfo::ClassInfos.Context, i_upper_lvl, p_l2, true);
+                                        for( i = 0; i < p_info->ListSize() && !b_this_segment_matches; i++ )
+                                        {
+                                            EbmlElement *l = (*p_info)[i];
+
+                                            if( MKV_IS_ID( l, KaxSegmentUID ) )
+                                            {
+                                                p_uid = static_cast<KaxSegmentUID*>(l);
+                                                if (p_sys->segment_uid == *p_uid)
+                                                    break;
+                                            }
+                                            else if( MKV_IS_ID( l, KaxSegmentFamily ) )
+                                            {
+                                                KaxSegmentFamily *p_fam = static_cast<KaxSegmentFamily*>(l);
+                                                for (j=0; j<p_sys->families.size(); j++)
+                                                {
+                                                    if (p_sys->families.at(j) == *p_fam)
+                                                    {
+                                                        b_this_segment_matches = true;
+                                                        break;
+                                                    }
+                                                }
+                                            }
+                                        }
+                                        break;
+                                    }
+                                }
+
+                                if (b_this_segment_matches)
+                                {
+                                    b_keep_file_opened = true;
+                                }
+                            }
+
+                            p_l0->SkipData(*p_stream, EbmlHead_Context);
+                            delete p_l0;
+                            p_l0 = p_stream->FindNextID(KaxSegment::ClassInfos, 0xFFFFFFFFL);
+                        }
+
+                        if (!b_keep_file_opened)
+                        {
+                            delete p_stream;
+                            delete p_file_io;
+                        }
+                    }
+                }
+            }
+            closedir( p_src_dir );
+        }
+    }
+
-
-    if( p_sys->cluster == NULL )
@@ -740 +927 @@
-            tk.fmt.audio.i_blockalign = ( tk.fmt.audio.i_bitspersample + 7 ) / 8 * tk.fmt.audio.i_channels;
-        }
+        else if( !strcmp( tk.psz_codec, "A_TTA1" ) )
+        {
+            /* FIXME: support this codec */
+            msg_Err( p_demux, "TTA not supported yet[%d, n=%d]", i_track, tk.i_number );
+            tk.fmt.i_codec = VLC_FOURCC( 'u', 'n', 'd', 'f' );
+        }
+        else if( !strcmp( tk.psz_codec, "A_WAVPACK4" ) )
+        {
+            /* FIXME: support this codec */
+            msg_Err( p_demux, "Wavpack not supported yet[%d, n=%d]", i_track, tk.i_number );
+            tk.fmt.i_codec = VLC_FOURCC( 'u', 'n', 'd', 'f' );
+        }
-        else if( !strcmp( tk.psz_codec, "S_TEXT/UTF8" ) )
-        {
@@ -776 +975 @@
-            }
-        }
+        else if( !strcmp( tk.psz_codec, "B_VOBBTN" ) )
+        {
+            /* FIXME: support this codec */
+            msg_Err( p_demux, "Vob Buttons not supported yet[%d, n=%d]", i_track, tk.i_number );
+            tk.fmt.i_codec = VLC_FOURCC( 'u', 'n', 'd', 'f' );
+        }
-        else
-        {
@@ -798 +1003 @@
-    delete p_sys->es;
-    delete p_sys->in;
-free( p_sys )
+delete p_sys
-    return VLC_EGENERIC;
-}
@@ -844 +1049 @@
-    delete p_sys->es;
-    delete p_sys->in;
-
-
+
-}
-
@@ -1101 +1305 @@
-    if( tk.p_es == NULL )
-    {
+        msg_Err( p_demux, "unknown track number=%d", block->TrackNum() );
-        return;
-    }
@@ -2312 +2517 @@
-        if( MKV_IS_ID( l, KaxSegmentUID ) )
-        {
-KaxSegmentUID &uid = *(KaxSegmentUID*)l
-
-uint32(uid
+p_sys->segment_uid = *(new KaxSegmentUID(*static_cast<KaxSegmentUID*>(l)))
+
+*(uint32*)p_sys->segment_uid.GetBuffer(
-        }
-        else if( MKV_IS_ID( l, KaxTimecodeScale ) )
@@ -2368 +2573 @@
-
-            msg_Dbg( p_demux, "|   |   + Title=%s", p_sys->psz_title );
+        }
+        if( MKV_IS_ID( l, KaxSegmentFamily ) )
+        {
+            KaxSegmentFamily *uid = static_cast<KaxSegmentFamily*>(l);
+
+            p_sys->families.push_back(*uid);
+
+            msg_Dbg( p_demux, "|   |   + family=%d", *(uint32*)uid->GetBuffer() );
-        }
-#if defined( HAVE_GMTIME_R ) && !defined( SYS_DARWIN )