AC_CHECK_FUNCS(gettimeofday select strerror strtod strtol strtof strtoll strtoull isatty vasprintf asprintf swab sigrelse getpwuid memalign posix_memalign gethostbyname2 if_nametoindex atoll getenv putenv setenv gmtime_r ctime_r localtime_r lrintf daemon)
dnl Check for usual libc functions
-AC_CHECK_FUNCS(strdup strndup atof lseek)
+AC_CHECK_FUNCS(strdup strndup atof)
AC_CHECK_FUNCS(strcasecmp,,[AC_CHECK_FUNCS(stricmp)])
AC_CHECK_FUNCS(strncasecmp,,[AC_CHECK_FUNCS(strnicmp)])
AC_CHECK_FUNCS(strcasestr,,[AC_CHECK_FUNCS(stristr)])
if test "${enable_mkv}" != "no" -a "${CXX}" != ""; then
AC_LANG_PUSH(C++)
AC_CHECK_HEADERS(ebml/EbmlVersion.h, [
- AC_CHECK_HEADERS(matroska/KaxVersion.h, [
- AC_CHECK_HEADERS(matroska/KaxAttachments.h)
- VLC_ADD_CXXFLAGS([mkv],[])
- AC_CHECK_LIB(ebml_pic, main, [
- # We have ebml_pic, that's good, we can build an mkv.so plugin !
- VLC_ADD_PLUGINS([mkv])
- VLC_ADD_LDFLAGS([mkv],[-lmatroska_pic -lebml_pic])
- ], [
- AC_CHECK_LIB(ebml, main, [
- # We only have libebml, make mkv.a a builtin
- VLC_ADD_BUILTINS([mkv])
- VLC_ADD_LDFLAGS([mkv],[-lmatroska -lebml])
+ AC_MSG_CHECKING(for libebml version >= 0.7.3)
+ AC_EGREP_CPP(yes,
+ [#include <ebml/EbmlVersion.h>
+ #ifdef LIBEBML_VERSION
+ #if LIBEBML_VERSION >= 0x000703
+ yes
+ #endif
+ #endif],
+ [AC_MSG_RESULT([yes])
+ AC_CHECK_HEADERS(matroska/KaxVersion.h, [
+ AC_MSG_CHECKING(for libmatroska version >= 0.7.5)
+ AC_EGREP_CPP(yes,
+ [#include <matroska/KaxVersion.h>
+ #ifdef LIBMATROSKA_VERSION
+ #if LIBMATROSKA_VERSION >= 0x000705
+ yes
+ #endif
+ #endif],
+ [AC_MSG_RESULT([yes])
+ AC_CHECK_HEADERS(matroska/KaxAttachments.h)
+ VLC_ADD_CXXFLAGS([mkv],[])
+ AC_CHECK_LIB(ebml_pic, main, [
+ # We have ebml_pic, that's good, we can build an mkv.so plugin !
+ VLC_ADD_PLUGINS([mkv])
+ VLC_ADD_LDFLAGS([mkv],[-lmatroska_pic -lebml_pic])
+ ], [
+ AC_CHECK_LIB(ebml, main, [
+ # We only have libebml, make mkv.a a builtin
+ VLC_ADD_BUILTINS([mkv])
+ VLC_ADD_LDFLAGS([mkv],[-lmatroska -lebml])
+ ])
+ ])
+ ],
+ [AC_MSG_RESULT([no])
+ AC_MSG_ERROR([Your libmatroska is too old: you may get a more recent one from http://dl.matroska.org/downloads/libmatroska/. Alternatively you can use --disable-mkv to disable the matroska plugin.])
+ ])
])
- ])
+ ],
+ [AC_MSG_RESULT([no])
+ AC_MSG_ERROR([Your libebml is too old: you may get a more recent one from http://dl.matroska.org/downloads/libebml/. Alternatively you can use --disable-mkv to disable the matroska plugin.])
])
])
AC_LANG_POP(C++)
* $Id$
*
* 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
* it under the terms of the GNU General Public License as published by
#include <iostream>
#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 */
#include "ebml/EbmlHead.h"
#include "ebml/EbmlContexts.h"
#include "ebml/EbmlVersion.h"
#include "ebml/EbmlVoid.h"
+#include "ebml/StdIOCallback.h"
-#include "matroska/FileKax.h"
#include "matroska/KaxAttachments.h"
#include "matroska/KaxBlock.h"
#include "matroska/KaxBlockData.h"
#define MATROSKA_COMPRESSION_NONE 0
#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;
vlc_bool_t b_key;
} mkv_index_t;
-struct demux_sys_t
+class demux_sys_t
{
+public:
+ demux_sys_t()
+ :in(NULL)
+ ,es(NULL)
+ ,ep(NULL)
+ ,i_timescale(0)
+ ,f_duration(0.0)
+ ,i_track(0)
+ ,track(NULL)
+ ,i_cues_position(0)
+ ,i_chapters_position(0)
+ ,i_tags_position(0)
+ ,segment(NULL)
+ ,cluster(NULL)
+ ,i_pts(0)
+ ,b_cues(false)
+ ,i_index(0)
+ ,i_index_max(0)
+ ,index(NULL)
+ ,psz_muxing_application(NULL)
+ ,psz_writing_application(NULL)
+ ,psz_segment_filename(NULL)
+ ,psz_title(NULL)
+ ,psz_date_utc(NULL)
+ ,meta(NULL)
+ ,title(NULL)
+ {}
+
vlc_stream_io_callback *in;
EbmlStream *es;
EbmlParser *ep;
/* current data */
KaxSegment *segment;
KaxCluster *cluster;
+ KaxSegmentUID segment_uid;
mtime_t i_pts;
vlc_meta_t *meta;
input_title_t *title;
+
+ std::vector<KaxSegmentFamily> families;
+ std::vector<KaxSegment*> family_members;
};
#define MKVD_TIMECODESCALE 1000000
demux_t *p_demux = (demux_t*)p_this;
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;
/* Set the demux function */
p_demux->pf_demux = Demux;
p_demux->pf_control = Control;
- p_demux->p_sys = p_sys = (demux_sys_t*)malloc(sizeof( demux_sys_t ));
+ p_demux->p_sys = p_sys = new demux_sys_t;
- memset( p_sys, 0, sizeof( demux_sys_t ) );
p_sys->in = new vlc_stream_io_callback( p_demux->s );
p_sys->es = new EbmlStream( *p_sys->in );
p_sys->f_duration = -1;
{
msg_Err( p_demux, "failed to create EbmlStream" );
delete p_sys->in;
- free( p_sys );
+ delete p_sys;
return VLC_EGENERIC;
}
/* Find the EbmlHead element */
}
}
+ /* 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 )
{
msg_Err( p_demux, "cannot find any cluster, damaged file ?" );
}
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" ) )
{
tk.fmt.i_codec = VLC_FOURCC( 's', 'u', 'b', 't' );
free( p_buf );
}
}
+ 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
{
msg_Err( p_demux, "unknow codec id=`%s'", tk.psz_codec );
error:
delete p_sys->es;
delete p_sys->in;
- free( p_sys );
+ delete p_sys;
return VLC_EGENERIC;
}
delete p_sys->ep;
delete p_sys->es;
delete p_sys->in;
-
- free( p_sys );
+ delete p_sys;
}
/*****************************************************************************
}
if( tk.p_es == NULL )
{
+ msg_Err( p_demux, "unknown track number=%d", block->TrackNum() );
return;
}
if( MKV_IS_ID( l, KaxSegmentUID ) )
{
- KaxSegmentUID &uid = *(KaxSegmentUID*)l;
+ p_sys->segment_uid = *(new KaxSegmentUID(*static_cast<KaxSegmentUID*>(l)));
- msg_Dbg( p_demux, "| | + UID=%d", uint32(uid) );
+ msg_Dbg( p_demux, "| | + UID=%d", *(uint32*)p_sys->segment_uid.GetBuffer() );
}
else if( MKV_IS_ID( l, KaxTimecodeScale ) )
{
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 )
else if( MKV_IS_ID( l, KaxDateUTC ) )
{
projects / vlc / commitdiff