SLUDGE: remove unused libs

14 files changed, 0 insertions, 9364 deletions

diff --git a/engines/sludge/eglport/eglport.cpp b/engines/sludge/eglport/eglport.cpp
deleted file mode 100755
index 841438323f..0000000000
--- a/engines/sludge/eglport/eglport.cpp
+++ /dev/null
@@ -1,712 +0,0 @@
-/**
- *
- *  EGLPORT.C
- *  Copyright (C) 2011-2013 Scott R. Smith
- *
- *  Permission is hereby granted, free of charge, to any person obtaining a copy
- *  of this software and associated documentation files (the "Software"), to deal
- *  in the Software without restriction, including without limitation the rights
- *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *  copies of the Software, and to permit persons to whom the Software is
- *  furnished to do so, subject to the following conditions:
- *
- *  The above copyright notice and this permission notice shall be included in
- *  all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- *  THE SOFTWARE.
- *
- */
-
-#include "eglport.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-
-//#define USE_EGL_SDL 1
-//#define USE_GLES1	1
-
-#if defined(USE_EGL_SDL)
-#include "SDL.h"
-#include "SDL_syswm.h"
-SDL_SysWMinfo sysWmInfo;      /** Holds our X Display/Window information */
-#endif /* USE_EGL_SDL */
-
-#if defined(PANDORA) /* Pandora VSync Support */
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/ioctl.h>
-#include <linux/fb.h>
-
-#ifndef FBIO_WAITFORVSYNC
-#define FBIO_WAITFORVSYNC _IOW('F', 0x20, __u32)
-#endif
-int fbdev = -1;
-
-#elif defined(RPI)
-#include "bcm_host.h"
-#endif /* PANDORA */
-
-enum EGL_RENDER_T {
-    RENDER_RAW=0,           /** Sets render mode to raw or framebuffer mode. */
-    RENDER_SDL,             /** Sets render mode to X11/SDL mode. */
-    RENDER_TOTAL
-};
-
-enum EGL_SETTINGS_T {
-    CFG_MODE=0,             /** Render mode for EGL 0=RAW 1=SDL. */
-    CFG_VSYNC,              /** Controls system vsync if available. */
-    CFG_FSAA,               /** Number of samples for full screen AA. 0 is off, 2/4 samples. */
-    CFG_FPS,                /** Calculate and report frame per second. */
-    CFG_RED_SIZE,           /** Number of bits of Red in the color buffer. */
-    CFG_GREEN_SIZE,         /** Number of bits of Green in the color buffer. */
-    CFG_BLUE_SIZE,          /** Number of bits of Blue in the color buffer. */
-    CFG_ALPHA_SIZE,         /** Number of bits of Alpha in the color buffer. */
-    CFG_DEPTH_SIZE,         /** Number of bits of Z in the depth buffer. */
-    CFG_BUFFER_SIZE,        /** The total color component bits in the color buffer. */
-    CFG_STENCIL_SIZE,       /** Number of bits of Stencil in the stencil buffer. */
-    CFG_TOTAL               /** Total number of settings. */
-};
-
-NativeDisplayType   nativeDisplay = 0;      /** Reference to the systems native display */
-NativeWindowType    nativeWindow  = 0;      /** Reference to the systems native window */
-EGLint              eglSettings[CFG_TOTAL]; /** Stores setting values. */
-EGLDisplay          eglDisplay    = NULL;   /** Reference to the EGL display */
-EGLConfig           eglConfig     = NULL;   /** Reference to the EGL config */
-EGLContext          eglContext    = NULL;   /** Reference to the EGL context */
-EGLSurface          eglSurface    = NULL;   /** Reference to the EGL surface */
-
-#define     totalConfigsIn 5                /** Total number of configurations to request */
-EGLint      totalConfigsFound = 0;          /** Total number of configurations matching attributes */
-EGLConfig   eglConfigs[totalConfigsIn];     /** Structure containing references to matching configurations */
-
-uint32_t    fpsCount    = 0;                /** Total number of frames counted */
-uint32_t    fpsTime     = 0;                /** Start time of frame count measurment */
-
-int8_t	eglColorbits 	= 0;
-int8_t	eglDepthbits	= 0;
-int8_t	eglStencilbits	= 0;
-
-
-/** Private API */
-void        OpenCfg                 ( const char* file );
-int8_t      ConfigureEGL            ( EGLConfig config );
-int8_t      FindEGLConfigs          ( void );
-int8_t      CheckEGLErrors          ( const char* file, uint16_t line );
-
-int8_t      GetNativeDisplay        ( void );
-int8_t      GetNativeWindow         ( uint16_t width, uint16_t height );
-void        FreeNativeDisplay       ( void );
-void        FreeNativeWindow        ( void );
-
-void        Platform_Open           ( void );
-void        Platform_Close          ( void );
-void        Platform_VSync          ( void );
-uint32_t    Platform_GetTicks       ( void );
-
-void EGL_Init( void )
-{
-  //nothing...
-  return;
-}
-/** @brief Release all EGL and system resources
- */
-void EGL_Close( void )
-{
-    /* Release EGL resources */
-    if (eglDisplay != NULL)
-    {
-        peglMakeCurrent( eglDisplay, NULL, NULL, EGL_NO_CONTEXT );
-        if (eglContext != NULL) {
-            peglDestroyContext( eglDisplay, eglContext );
-        }
-        if (eglSurface != NULL) {
-            peglDestroySurface( eglDisplay, eglSurface );
-        }
-        peglTerminate( eglDisplay );
-    }
-
-    eglSurface = NULL;
-    eglContext = NULL;
-    eglDisplay = NULL;
-	
-	eglColorbits = 0;
-	eglDepthbits = 0;
-	eglStencilbits = 0;
-
-    /* Release platform resources */
-    FreeNativeWindow();
-    FreeNativeDisplay();
-    Platform_Close();
-
-    CheckEGLErrors( __FILE__, __LINE__ );
-
-    printf( "EGLport: Closed\n" );
-}
-
-/** @brief Swap the surface buffer onto the display
- */
-void EGL_SwapBuffers( void )
-{
-    if (eglSettings[CFG_VSYNC] != 0) {
-        Platform_VSync();
-    }
-
-    peglSwapBuffers( eglDisplay, eglSurface );
-
-    if (eglSettings[CFG_FPS] != 0) {
-        fpsCount++;
-
-        if (fpsTime - Platform_GetTicks() >= 1000)
-        {
-            printf( "EGLport: %d fps\n", fpsCount );
-            fpsTime = Platform_GetTicks();
-            fpsCount = 0;
-        }
-    }
-}
-
-/** @brief Obtain the system display and initialize EGL
- * @param width : desired pixel width of the window (not used by all platforms)
- * @param height : desired pixel height of the window (not used by all platforms)
- * @return : 0 if the function passed, else 1
- */
-int8_t EGL_Open( /*uint16_t width, uint16_t height*/ )
-{
-    EGLint eglMajorVer, eglMinorVer;
-    EGLBoolean result;
-    uint32_t configIndex = 0;
-    const char* output;
-
-    static const EGLint contextAttribs[] =
-    {
-#if defined(USE_GLES2)
-          EGL_CONTEXT_CLIENT_VERSION,     2,
-#endif
-          EGL_NONE
-    };
-
-#if defined(DEBUG)
-    printf( "EGLport Warning: DEBUG is enabled which may effect performance\n" );
-#endif
-
-    /* Check that system is not open */
-    if (eglDisplay != NULL || eglContext != NULL || eglSurface != NULL)
-    {
-        printf( "EGLport ERROR: EGL system is already open!\n" );
-        return 1;
-    }
-
-    /* Check for the cfg file to alternative settings */
-    OpenCfg( "eglport.cfg" );
-
-    /* Setup any platform specific bits */
-    Platform_Open();
-
-    printf( "EGLport: Opening EGL display\n" );
-    if (GetNativeDisplay() != 0)
-    {
-        printf( "EGLport ERROR: Unable to obtain native display!\n" );
-        return 1;
-    }
-
-    eglDisplay = peglGetDisplay( nativeDisplay );
-    if (eglDisplay == EGL_NO_DISPLAY)
-    {
-        CheckEGLErrors( __FILE__, __LINE__ );
-        printf( "EGLport ERROR: Unable to create EGL display.\n" );
-        return 1;
-    }
-
-    printf( "EGLport: Initializing\n" );
-    result = peglInitialize( eglDisplay, &eglMajorVer, &eglMinorVer );
-    if (result != EGL_TRUE )
-    {
-        CheckEGLErrors( __FILE__, __LINE__ );
-        printf( "EGLport ERROR: Unable to initialize EGL display.\n" );
-        return 1;
-    }
-
-    /* Get EGL Library Information */
-    printf( "EGL Implementation Version: Major %d Minor %d\n", eglMajorVer, eglMinorVer );
-    output = peglQueryString( eglDisplay, EGL_VENDOR );
-    printf( "EGL_VENDOR: %s\n", output );
-    output = peglQueryString( eglDisplay, EGL_VERSION );
-    printf( "EGL_VERSION: %s\n", output );
-    output = peglQueryString( eglDisplay, EGL_EXTENSIONS );
-    printf( "EGL_EXTENSIONS: %s\n", output );
-
-    if (FindEGLConfigs() != 0)
-    {
-        printf( "EGLport ERROR: Unable to configure EGL. See previous error.\n" );
-        return 1;
-    }
-
-    printf( "EGLport: Using Config %d\n", configIndex );
-#if defined(EGL_VERSION_1_2)
-    /* Bind GLES and create the context */
-    printf( "EGLport: Binding API\n" );
-    result = peglBindAPI( EGL_OPENGL_ES_API );
-    if ( result == EGL_FALSE )
-    {
-        CheckEGLErrors( __FILE__, __LINE__ );
-        printf( "EGLport ERROR: Could not bind EGL API.\n" );
-        return 1;
-    }
-#endif /* EGL_VERSION_1_2 */
-
-    printf( "EGLport: Creating Context\n" );
-    eglContext = peglCreateContext( eglDisplay, eglConfigs[configIndex], NULL, contextAttribs );
-    if (eglContext == EGL_NO_CONTEXT)
-    {
-        CheckEGLErrors( __FILE__, __LINE__ );
-        printf( "EGLport ERROR: Unable to create GLES context!\n");
-        return 1;
-    }
-
-    printf( "EGLport: Creating window surface\n" );
-    if (GetNativeWindow( 800, 480/*width, height*/ ) != 0)
-    {
-        printf( "EGLport ERROR: Unable to obtain native window!\n" );
-        return 1;
-    }
-
-    eglSurface = peglCreateWindowSurface( eglDisplay, eglConfigs[configIndex], nativeWindow, 0 );
-    if (eglSurface == EGL_NO_SURFACE)
-    {
-        CheckEGLErrors( __FILE__, __LINE__ );
-        printf( "EGLport ERROR: Unable to create EGL surface!\n" );
-        return 1;
-    }
-
-    printf( "EGLport: Making Current\n" );
-    result = peglMakeCurrent( eglDisplay,  eglSurface,  eglSurface, eglContext );
-    if (result != EGL_TRUE)
-    {
-        CheckEGLErrors( __FILE__, __LINE__ );
-        printf( "EGLport ERROR: Unable to make GLES context current\n" );
-        return 1;
-    }
-
-	{
-	  EGLint color, depth, stencil;
-	  eglGetConfigAttrib(eglDisplay, eglConfigs[configIndex], EGL_BUFFER_SIZE, &color);
-	  eglGetConfigAttrib(eglDisplay, eglConfigs[configIndex], EGL_DEPTH_SIZE, &depth);
-	  eglGetConfigAttrib(eglDisplay, eglConfigs[configIndex], EGL_STENCIL_SIZE, &stencil);
-	  eglColorbits = (color==16)?5:8; //quick hack
-	  eglDepthbits = depth;
-	  eglStencilbits = stencil;
-	}
-
-    printf( "EGLport: Setting swap interval\n" );
-    peglSwapInterval( eglDisplay, (eglSettings[CFG_VSYNC] > 0) ? 1 : 0 );
-
-    printf( "EGLport: Complete\n" );
-
-    CheckEGLErrors( __FILE__, __LINE__ );
-	
-    return 0;
-}
-
-/** @brief Read settings that configure how to use EGL
- * @param file : name of the config file
- */
-void OpenCfg ( const char* file )
-{
-    #define MAX_STRING 20
-    #define MAX_SIZE 100
-    uint8_t i;
-    FILE* fp = NULL;
-    char* location = NULL;
-    char eglStrings[CFG_TOTAL][MAX_STRING];
-    char buffer[MAX_SIZE];
-
-    strncpy( eglStrings[CFG_MODE], "egl_mode=", MAX_STRING );
-    strncpy( eglStrings[CFG_VSYNC], "use_vsync=", MAX_STRING );
-    strncpy( eglStrings[CFG_FSAA], "use_fsaa=", MAX_STRING );
-    strncpy( eglStrings[CFG_RED_SIZE], "size_red=", MAX_STRING );
-    strncpy( eglStrings[CFG_GREEN_SIZE], "size_green=", MAX_STRING );
-    strncpy( eglStrings[CFG_BLUE_SIZE], "size_blue=", MAX_STRING );
-    strncpy( eglStrings[CFG_ALPHA_SIZE], "size_alpha=", MAX_STRING );
-    strncpy( eglStrings[CFG_DEPTH_SIZE], "size_depth=", MAX_STRING );
-    strncpy( eglStrings[CFG_BUFFER_SIZE], "size_buffer=", MAX_STRING );
-    strncpy( eglStrings[CFG_STENCIL_SIZE], "size_stencil=", MAX_STRING );
-
-    /* Set defaults */
-#if defined(USE_EGL_SDL) && !defined(PANDORA)
-    eglSettings[CFG_MODE]           = RENDER_SDL;
-#else
-    eglSettings[CFG_MODE]           = RENDER_RAW;
-#endif
-    eglSettings[CFG_VSYNC]          = 0;
-    eglSettings[CFG_FSAA]           = 0;
-    eglSettings[CFG_FPS]            = 0;
-    eglSettings[CFG_RED_SIZE]       = 5;
-    eglSettings[CFG_GREEN_SIZE]     = 6;
-    eglSettings[CFG_BLUE_SIZE]      = 5;
-    eglSettings[CFG_ALPHA_SIZE]     = 0;
-    eglSettings[CFG_DEPTH_SIZE]     = 16;
-    eglSettings[CFG_BUFFER_SIZE]    = 16;
-    eglSettings[CFG_STENCIL_SIZE]   = 0;
-
-    /* Parse INI file */
-    fp = fopen( file, "r");
-    if (fp != NULL)
-    {
-        while (fgets( buffer, MAX_SIZE, fp ) != NULL)
-        {
-            for (i=0; i<CFG_TOTAL; i++)
-            {
-                location = strstr( buffer, eglStrings[i] );
-                if (location != NULL)
-                {
-                    eglSettings[i] = atol( location+strlen( eglStrings[i] ) );
-                    printf( "EGLport: %s set to %d.\n", eglStrings[i], eglSettings[i] );
-                    break;
-                }
-            }
-        }
-
-        fclose( fp );
-    }
-    else
-    {
-        printf( "EGL NOTICE: Unable to read ini settings from file '%s'. Using defaults\n", file );
-    }
-}
-
-/** @brief Find a EGL configuration tht matches the defined attributes
- * @return : 0 if the function passed, else 1
- */
-int8_t FindEGLConfigs( void )
-{
-    EGLBoolean result;
-    int attrib = 0;
-    EGLint ConfigAttribs[23];
-
-    ConfigAttribs[attrib++] = EGL_RED_SIZE;                         /* 1 */
-    ConfigAttribs[attrib++] = eglSettings[CFG_RED_SIZE];            /* 2 */
-    ConfigAttribs[attrib++] = EGL_GREEN_SIZE;                       /* 3 */
-    ConfigAttribs[attrib++] = eglSettings[CFG_GREEN_SIZE];          /* 4 */
-    ConfigAttribs[attrib++] = EGL_BLUE_SIZE;                        /* 5 */
-    ConfigAttribs[attrib++] = eglSettings[CFG_BLUE_SIZE];           /* 6 */
-    ConfigAttribs[attrib++] = EGL_ALPHA_SIZE;                       /* 7 */
-    ConfigAttribs[attrib++] = eglSettings[CFG_ALPHA_SIZE];          /* 8 */
-    ConfigAttribs[attrib++] = EGL_DEPTH_SIZE;                       /* 9 */
-    ConfigAttribs[attrib++] = eglSettings[CFG_DEPTH_SIZE];          /* 10 */
-    ConfigAttribs[attrib++] = EGL_BUFFER_SIZE;                      /* 11 */
-    ConfigAttribs[attrib++] = eglSettings[CFG_BUFFER_SIZE];         /* 12 */
-    ConfigAttribs[attrib++] = EGL_STENCIL_SIZE;                     /* 13 */
-    ConfigAttribs[attrib++] = eglSettings[CFG_STENCIL_SIZE];        /* 14 */
-    ConfigAttribs[attrib++] = EGL_SURFACE_TYPE;                     /* 15 */
-    ConfigAttribs[attrib++] = EGL_WINDOW_BIT;                       /* 16 */
-#if defined(EGL_VERSION_1_2)
-    ConfigAttribs[attrib++] = EGL_RENDERABLE_TYPE;                  /* 17 */
-#if defined(USE_GLES1)
-    ConfigAttribs[attrib++] = EGL_OPENGL_ES_BIT;
-#elif defined(USE_GLES2)
-    ConfigAttribs[attrib++] = EGL_OPENGL_ES2_BIT;                   /* 18 */
-#endif /* USE_GLES1 */
-#endif /* EGL_VERSION_1_2 */
-    ConfigAttribs[attrib++] = EGL_SAMPLE_BUFFERS;                   /* 19 */
-    ConfigAttribs[attrib++] = (eglSettings[CFG_FSAA] > 0) ? 1 : 0;  /* 20 */
-    ConfigAttribs[attrib++] = EGL_SAMPLES;                          /* 21 */
-    ConfigAttribs[attrib++] = eglSettings[CFG_FSAA];                /* 22 */
-    ConfigAttribs[attrib++] = EGL_NONE;                             /* 23 */
-
-    result = peglChooseConfig( eglDisplay, ConfigAttribs, eglConfigs, totalConfigsIn, &totalConfigsFound );
-    if (result != EGL_TRUE || totalConfigsFound == 0)
-    {
-        CheckEGLErrors( __FILE__, __LINE__ );
-        printf( "EGLport ERROR: Unable to query for available configs, found %d.\n", totalConfigsFound );
-        return 1;
-    }
-    printf( "EGLport: Found %d available configs\n", totalConfigsFound );
-
-    return 0;
-}
-
-/** @brief Error checking function
- * @param file : string reference that contains the source file that the check is occuring in
- * @param line : numeric reference that contains the line number that the check is occuring in
- * @return : 0 if the function passed, else 1
- */
-int8_t CheckEGLErrors( const char* file, uint16_t line )
-{
-    EGLenum error;
-    const char* errortext;
-    const char* description;
-
-    error = eglGetError();
-
-    if (error != EGL_SUCCESS && error != 0)
-    {
-        switch (error)
-        {
-            case EGL_NOT_INITIALIZED:
-                errortext   = "EGL_NOT_INITIALIZED.";
-                description = "EGL is not or could not be initialized, for the specified display.";
-                break;
-            case EGL_BAD_ACCESS:
-                errortext   = "EGL_BAD_ACCESS EGL";
-                description = "cannot access a requested resource (for example, a context is bound in another thread).";
-                break;
-            case EGL_BAD_ALLOC:
-                errortext   = "EGL_BAD_ALLOC EGL";
-                description = "failed to allocate resources for the requested operation.";
-                break;
-            case EGL_BAD_ATTRIBUTE:
-                errortext   = "EGL_BAD_ATTRIBUTE";
-                description = "An unrecognized attribute or attribute value was passed in anattribute list.";
-                break;
-            case EGL_BAD_CONFIG:
-                errortext   = "EGL_BAD_CONFIG";
-                description = "An EGLConfig argument does not name a valid EGLConfig.";
-                break;
-            case EGL_BAD_CONTEXT:
-                errortext   = "EGL_BAD_CONTEXT";
-                description = "An EGLContext argument does not name a valid EGLContext.";
-                break;
-            case EGL_BAD_CURRENT_SURFACE:
-                errortext   = "EGL_BAD_CURRENT_SURFACE";
-                description = "The current surface of the calling thread is a window, pbuffer,or pixmap that is no longer valid.";
-                break;
-            case EGL_BAD_DISPLAY:
-                errortext   = "EGL_BAD_DISPLAY";
-                description = "An EGLDisplay argument does not name a valid EGLDisplay.";
-                break;
-            case EGL_BAD_MATCH:
-                errortext   = "EGL_BAD_MATCH";
-                description = "Arguments are inconsistent; for example, an otherwise valid context requires buffers (e.g. depth or stencil) not allocated by an otherwise valid surface.";
-                break;
-            case EGL_BAD_NATIVE_PIXMAP:
-                errortext   = "EGL_BAD_NATIVE_PIXMAP";
-                description = "An EGLNativePixmapType argument does not refer to a validnative pixmap.";
-                break;
-            case EGL_BAD_NATIVE_WINDOW:
-                errortext   = "EGL_BAD_NATIVE_WINDOW";
-                description = "An EGLNativeWindowType argument does not refer to a validnative window.";
-                break;
-            case EGL_BAD_PARAMETER:
-                errortext   = "EGL_BAD_PARAMETER";
-                description = "One or more argument values are invalid.";
-                break;
-            case EGL_BAD_SURFACE:
-                errortext   = "EGL_BAD_SURFACE";
-                description = "An EGLSurface argument does not name a valid surface (window,pbuffer, or pixmap) configured for rendering";
-                break;
-            case EGL_CONTEXT_LOST:
-                errortext   = "EGL_CONTEXT_LOST";
-                description = "A power management event has occurred. The application mustdestroy all contexts and reinitialise client API state and objects to continue rendering.";
-                break;
-            default:
-                errortext   = "Unknown EGL Error";
-                description = "";
-                break;
-        }
-
-        printf( "EGLport ERROR: EGL Error detected in file %s at line %d: %s (0x%X)\n  Description: %s\n", file, line, errortext, error, description );
-        return 1;
-    }
-
-    return 0;
-}
-
-/** @brief Obtain a reference to the system's native display
- * @param window : pointer to save the display reference
- * @return : 0 if the function passed, else 1
- */
-int8_t GetNativeDisplay( void )
-{
-    if (eglSettings[CFG_MODE] == RENDER_RAW)        /* RAW FB mode */
-    {
-        printf( "EGLport: Using EGL_DEFAULT_DISPLAY\n" );
-        nativeDisplay = EGL_DEFAULT_DISPLAY;
-    }
-    else if (eglSettings[CFG_MODE] == RENDER_SDL)   /* SDL/X11 mode */
-    {
-#if defined(USE_EGL_SDL)
-        printf( "EGLport: Opening SDL/X11 display\n" );
-        SDL_VERSION(&sysWmInfo.version);
-        SDL_GetWMInfo(&sysWmInfo);
-        nativeDisplay = (EGLNativeDisplayType)sysWmInfo.info.x11.display;
-
-        if (nativeDisplay == 0)
-        {
-            printf( "EGLport ERROR: unable to get display!\n" );
-            return 1;
-        }
-#else
-        printf( "EGLport ERROR: SDL mode was not enabled in this compile!\n" );
-#endif
-    }
-
-    return 0;
-}
-
-/** @brief Obtain a reference to the system's native window
- * @param width : desired pixel width of the window (not used by all platforms)
- * @param height : desired pixel height of the window (not used by all platforms)
- * @return : 0 if the function passed, else 1
- */
-int8_t GetNativeWindow( uint16_t width, uint16_t height )
-{
-    nativeWindow = 0;
-
-#if defined(WIZ) || defined(CAANOO)
-
-    nativeWindow = (NativeWindowType)malloc(16*1024);
-
-    if(nativeWindow == NULL) {
-        printf( "EGLport ERROR: Memory for window Failed\n" );
-        return 1;
-    }
-
-#elif defined(RPI)
-
-    EGLBoolean result;
-    uint32_t screen_width, screen_height;
-    static EGL_DISPMANX_WINDOW_T nativewindow;
-    DISPMANX_ELEMENT_HANDLE_T dispman_element;
-    DISPMANX_DISPLAY_HANDLE_T dispman_display;
-    DISPMANX_UPDATE_HANDLE_T dispman_update;
-    VC_RECT_T dst_rect;
-    VC_RECT_T src_rect;
-
-    /* create an EGL window surface */
-    result = graphics_get_display_size(0 /* LCD */, &screen_width, &screen_height);
-    if(result < 0) {
-        printf( "EGLport ERROR: RPi graphicget_display_size failed\n" );
-        return 1;
-    }
-
-    dst_rect.x = 0;
-    dst_rect.y = 0;
-    dst_rect.width = screen_width;
-    dst_rect.height = screen_height;
-
-    src_rect.x = 0;
-    src_rect.y = 0;
-    src_rect.width = width << 16;
-    src_rect.height = height << 16;
-
-    dispman_display = vc_dispmanx_display_open( 0 /* LCD */);
-    dispman_update  = vc_dispmanx_update_start( 0 );
-    dispman_element = vc_dispmanx_element_add ( dispman_update, dispman_display,
-      0 /*layer*/, &dst_rect, 0 /*src*/,
-      &src_rect, DISPMANX_PROTECTION_NONE,  (VC_DISPMANX_ALPHA_T*)0 /*alpha*/,  (DISPMANX_CLAMP_T*)0 /*clamp*/,  (DISPMANX_TRANSFORM_T)0 /*transform*/);
-
-    nativewindow.element = dispman_element;
-    nativewindow.width = screen_width;
-    nativewindow.height = screen_height;
-    vc_dispmanx_update_submit_sync( dispman_update );
-
-    nativeWindow = (NativeWindowType)&nativewindow;
-
-#else /* default */
-
-    if (eglSettings[CFG_MODE] == RENDER_RAW)        /* RAW FB mode */
-    {
-        nativeWindow = 0;
-    }
-    else if(eglSettings[CFG_MODE] == RENDER_SDL)    /* SDL/X11 mode */
-    {
-#if defined(USE_EGL_SDL)
-        /* SDL_GetWMInfo is populated when display was opened */
-        nativeWindow = (NativeWindowType)sysWmInfo.info.x11.window;
-
-        if (nativeWindow == 0)
-        {
-            printf( "EGLport ERROR: unable to get window!\n" );
-            return 1;
-        }
-#else
-        printf( "EGLport ERROR: SDL mode was not enabled in this compile!\n" );
-#endif
-    }
-    else
-    {
-        printf( "EGLport ERROR: Unknown EGL render mode %d!\n", eglSettings[CFG_MODE] );
-        return 1;
-    }
-
-#endif /* WIZ / CAANOO */
-
-    return 0;
-}
-
-/** @brief Release the system's native display
- */
-void FreeNativeDisplay( void )
-{
-}
-
-/** @brief Release the system's native window
- */
-void FreeNativeWindow( void )
-{
-#if defined(WIZ) || defined(CAANOO)
-    if (nativeWindow != NULL) {
-        free( nativeWindow );
-    }
-    nativeWindow = NULL;
-#endif /* WIZ / CAANOO */
-}
-
-/** @brief Open any system specific resources
- */
-void Platform_Open( void )
-{
-#if defined(PANDORA)
-    /* Pandora VSync */
-    fbdev = open( "/dev/fb0", O_RDONLY /* O_RDWR */ );
-    if ( fbdev < 0 ) {
-        printf( "EGLport ERROR: Couldn't open /dev/fb0 for Pandora Vsync\n" );
-    }
-#elif defined(RPI)
-    bcm_host_init();
-#endif /* PANDORA */
-}
-
-/** @brief Release any system specific resources
- */
-void Platform_Close( void )
-{
-#if defined(PANDORA)
-    /* Pandora VSync */
-    close( fbdev );
-    fbdev = -1;
-#endif /* PANDORA */
-}
-
-/** @brief Check the systems vsync state
- */
-void Platform_VSync( void )
-{
-#if defined(PANDORA)
-    /* Pandora VSync */
-    if (fbdev >= 0) {
-        int arg = 0;
-        ioctl( fbdev, FBIO_WAITFORVSYNC, &arg );
-    }
-#endif /* PANDORA */
-}
-
-/** @brief Get the system tick time (ms)
- */
-uint32_t Platform_GetTicks( void )
-{
-    uint32_t ticks = 0;
-#if defined(USE_EGL_SDL)
-    ticks = SDL_GetTicks();
-#else
-    printf( "EGLport ERROR: SDL mode was not enabled in this compile!\n" );
-#endif
-    return ticks;
-}
-
diff --git a/engines/sludge/eglport/eglport.h b/engines/sludge/eglport/eglport.h
deleted file mode 100644
index 20fb979789..0000000000
--- a/engines/sludge/eglport/eglport.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/**
- *
- *  EGLPORT.H
- *  Copyright (C) 2011-2013 Scott R. Smith
- *
- *  Permission is hereby granted, free of charge, to any person obtaining a copy
- *  of this software and associated documentation files (the "Software"), to deal
- *  in the Software without restriction, including without limitation the rights
- *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *  copies of the Software, and to permit persons to whom the Software is
- *  furnished to do so, subject to the following conditions:
- *
- *  The above copyright notice and this permission notice shall be included in
- *  all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- *  THE SOFTWARE.
- *
- */
-
-#ifndef EGLPORT_H
-#define EGLPORT_H
-
-#include <stdint.h>
-#include "EGL/egl.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** Defines (in every case choose only one) */
-/**     Common: */
-/**         DEBUG : enable additional error monitoring per EGL function call */
-/**     Native display and window system for use with EGL */
-/**         USE_EGL_SDL : used for access to a SDL X11 window */
-/**     Platform: settings that are specific to that device */
-/**         PANDORA (USE_GLES1 or USE_GLES2) */
-/**         WIZ     (USE_GLES1) */
-/**         CAANOO  (USE_GLES1) */
-/**         RPI     (USE_GLES1 or USE_GLES2) */
-/**     GLES Version */
-/**         USE_GLES1 : EGL for use with OpenGL-ES 1.X contexts */
-/**         USE_GLES2 : EGL for use with OpenGL-ES 2.0 contexts */
-
-/** Public API */
-void    EGL_Init                    ( void );
-void    EGL_Close                   ( void );
-int8_t  EGL_Open                    ( /*uint16_t width, uint16_t height*/ );
-void    EGL_SwapBuffers             ( void );
-
-extern int8_t	eglColorbits;
-extern int8_t	eglDepthbits;
-extern int8_t	eglStencilbits;
-
-/** Simple Examples  */
-/**     Raw mode:
-            EGL_Open( window_width, window_height );
-            do while(!quit) {
-                ... run app
-                EGL_SwapBuffers();
-            }
-            EGL_Close();
-*/
-/**     X11/SDL mode:
-            SDL_Init( SDL_INIT_VIDEO );
-            SDL_Surface* screen = SDL_SetVideoMode(640, 480, 16, SDL_SWSURFACE|SDL_FULLSCREEN);
-            EGL_Open( window_width, window_height );
-            do while(!quit) {
-                ... run app
-                EGL_SwapBuffers();
-            }
-            EGL_Close();
-            SDL_Quit();
-*/
-
-#if defined(DEBUG)
-#define GET_EGLERROR(FUNCTION)               \
-    FUNCTION;                                \
-    {                                        \
-        CheckEGLErrors(__FILE__, __LINE__);  \
-    }
-#else
-#define GET_EGLERROR(FUNCTION) FUNCTION;
-#endif
-
-#define peglQueryString(A,B)                    GET_EGLERROR(eglQueryString(A,B))
-#define peglDestroyContext(A,B)                 GET_EGLERROR(eglDestroyContext(A,B))
-#define peglDestroySurface(A,B)                 GET_EGLERROR(eglDestroySurface(A,B))
-#define peglTerminate(A)                        GET_EGLERROR(eglTerminate(A))
-#define peglSwapBuffers(A,B)                    GET_EGLERROR(eglSwapBuffers(A,B))
-#define peglGetDisplay(A)                       GET_EGLERROR(eglGetDisplay(A))
-#define peglBindAPI(A)                          GET_EGLERROR(eglBindAPI(A))
-#define peglCreateContext(A,B,C,D)              GET_EGLERROR(eglCreateContext(A,B,C,D))
-#define peglCreateWindowSurface(A,B,C,D)        GET_EGLERROR(eglCreateWindowSurface(A,B,C,D))
-#define peglInitialize(A,B,C)                   GET_EGLERROR(eglInitialize(A,B,C))
-#define peglMakeCurrent(A,B,C,D)                GET_EGLERROR(eglMakeCurrent(A,B,C,D))
-#define peglChooseConfig(A,B,C,D,E)             GET_EGLERROR(eglChooseConfig(A,B,C,D,E))
-#define peglSwapInterval(A,B)                   GET_EGLERROR(eglSwapInterval(A,B))
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* EGLPORT_H */
diff --git a/engines/sludge/libvorbis/COPYING b/engines/sludge/libvorbis/COPYING
deleted file mode 100644
index 28de72a970..0000000000
--- a/engines/sludge/libvorbis/COPYING
+++ /dev/null
@@ -1,28 +0,0 @@
-Copyright (c) 2002-2008 Xiph.org Foundation
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-- Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-- Neither the name of the Xiph.org Foundation nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION
-OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/engines/sludge/libvorbis/vorbis_misc.h b/engines/sludge/libvorbis/vorbis_misc.h
deleted file mode 100644
index 85fe3074ac..0000000000
--- a/engines/sludge/libvorbis/vorbis_misc.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/********************************************************************
- *                                                                  *
- * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE.   *
- * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS     *
- * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
- * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
- *                                                                  *
- * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2009             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
- *                                                                  *
- ********************************************************************
-
- function: miscellaneous prototypes
- last mod: $Id: misc.h 16227 2009-07-08 06:58:46Z xiphmont $
-
- ********************************************************************/
-
-#ifndef _V_RANDOM_H_
-#define _V_RANDOM_H_
-#include "vorbis/codec.h"
-
-extern void *_vorbis_block_alloc(vorbis_block *vb,long bytes);
-extern void _vorbis_block_ripcord(vorbis_block *vb);
-
-#ifdef ANALYSIS
-extern int analysis_noisy;
-extern void _analysis_output(char *base,int i,float *v,int n,int bark,int dB,
-                             ogg_int64_t off);
-extern void _analysis_output_always(char *base,int i,float *v,int n,int bark,int dB,
-                             ogg_int64_t off);
-#endif
-
-#ifdef DEBUG_MALLOC
-
-#define _VDBG_GRAPHFILE "malloc.m"
-#undef _VDBG_GRAPHFILE
-extern void *_VDBG_malloc(void *ptr,long bytes,char *file,long line);
-extern void _VDBG_free(void *ptr,char *file,long line);
-
-#ifndef MISC_C
-#undef _ogg_malloc
-#undef _ogg_calloc
-#undef _ogg_realloc
-#undef _ogg_free
-
-#define _ogg_malloc(x) _VDBG_malloc(NULL,(x),__FILE__,__LINE__)
-#define _ogg_calloc(x,y) _VDBG_malloc(NULL,(x)*(y),__FILE__,__LINE__)
-#define _ogg_realloc(x,y) _VDBG_malloc((x),(y),__FILE__,__LINE__)
-#define _ogg_free(x) _VDBG_free((x),__FILE__,__LINE__)
-#endif
-#endif
-
-#endif
-
-
-
-
diff --git a/engines/sludge/libvorbis/vorbis_os.h b/engines/sludge/libvorbis/vorbis_os.h
deleted file mode 100644
index d12f082ebb..0000000000
--- a/engines/sludge/libvorbis/vorbis_os.h
+++ /dev/null
@@ -1,182 +0,0 @@
-#ifndef _OS_H
-#define _OS_H
-/********************************************************************
- *                                                                  *
- * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE.   *
- * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS     *
- * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
- * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
- *                                                                  *
- * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2009             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
- *                                                                  *
- ********************************************************************
-
- function: #ifdef jail to whip a few platforms into the UNIX ideal.
- last mod: $Id: os.h 16227 2009-07-08 06:58:46Z xiphmont $
-
- ********************************************************************/
-
-#include <math.h>
-#include <ogg/os_types.h>
-
-#include "vorbis_misc.h"
-
-#ifndef _V_IFDEFJAIL_H_
-#  define _V_IFDEFJAIL_H_
-
-#  ifdef __GNUC__
-#    define STIN static __inline__
-#  elif _WIN32
-#    define STIN static __inline
-#  else
-#    define STIN static
-#  endif
-
-#ifdef DJGPP
-#  define rint(x)   (floor((x)+0.5f))
-#endif
-
-#ifndef M_PI
-#  define M_PI (3.1415926536f)
-#endif
-
-#if defined(_WIN32) && !defined(__SYMBIAN32__)
-#  include <malloc.h>
-#  define rint(x)   (floor((x)+0.5f))
-#  define NO_FLOAT_MATH_LIB
-#  define FAST_HYPOT(a, b) sqrt((a)*(a) + (b)*(b))
-#endif
-
-#if defined(__SYMBIAN32__) && defined(__WINS__)
-void *_alloca(size_t size);
-#  define alloca _alloca
-#endif
-
-#ifndef FAST_HYPOT
-#  define FAST_HYPOT hypot
-#endif
-
-#endif
-
-#ifdef HAVE_ALLOCA_H
-#  include <alloca.h>
-#endif
-
-#ifdef USE_MEMORY_H
-#  include <memory.h>
-#endif
-
-#ifndef min
-#  define min(x,y)  ((x)>(y)?(y):(x))
-#endif
-
-#ifndef max
-#  define max(x,y)  ((x)<(y)?(y):(x))
-#endif
-
-
-/* Special i386 GCC implementation */
-#if defined(__i386__) && defined(__GNUC__) && !defined(__BEOS__)
-#  define VORBIS_FPU_CONTROL
-/* both GCC and MSVC are kinda stupid about rounding/casting to int.
-   Because of encapsulation constraints (GCC can't see inside the asm
-   block and so we end up doing stupid things like a store/load that
-   is collectively a noop), we do it this way */
-
-/* we must set up the fpu before this works!! */
-
-typedef ogg_int16_t vorbis_fpu_control;
-
-static inline void vorbis_fpu_setround(vorbis_fpu_control *fpu){
-  ogg_int16_t ret;
-  ogg_int16_t temp;
-  __asm__ __volatile__("fnstcw %0\n\t"
-          "movw %0,%%dx\n\t"
-          "andw $62463,%%dx\n\t"
-          "movw %%dx,%1\n\t"
-          "fldcw %1\n\t":"=m"(ret):"m"(temp): "dx");
-  *fpu=ret;
-}
-
-static inline void vorbis_fpu_restore(vorbis_fpu_control fpu){
-  __asm__ __volatile__("fldcw %0":: "m"(fpu));
-}
-
-/* assumes the FPU is in round mode! */
-static inline int vorbis_ftoi(double f){  /* yes, double!  Otherwise,
-                                             we get extra fst/fld to
-                                             truncate precision */
-  int i;
-  __asm__("fistl %0": "=m"(i) : "t"(f));
-  return(i);
-}
-#endif /* Special i386 GCC implementation */
-
-
-/* MSVC inline assembly. 32 bit only; inline ASM isn't implemented in the
- * 64 bit compiler */
-#if defined(_MSC_VER) && !defined(_WIN64) && !defined(_WIN32_WCE)
-#  define VORBIS_FPU_CONTROL
-
-typedef ogg_int16_t vorbis_fpu_control;
-
-static __inline int vorbis_ftoi(double f){
-        int i;
-        __asm{
-                fld f
-                fistp i
-        }
-        return i;
-}
-
-static __inline void vorbis_fpu_setround(vorbis_fpu_control *fpu){
-}
-
-static __inline void vorbis_fpu_restore(vorbis_fpu_control fpu){
-}
-
-#endif /* Special MSVC 32 bit implementation */
-
-
-/* Optimized code path for x86_64 builds. Uses SSE2 intrinsics. This can be
-   done safely because all x86_64 CPUs supports SSE2. */
-#if (defined(_MSC_VER) && defined(_WIN64)) || (defined(__GNUC__) && defined (__x86_64__))
-#  define VORBIS_FPU_CONTROL
-
-typedef ogg_int16_t vorbis_fpu_control;
-
-#include <emmintrin.h>
-static __inline int vorbis_ftoi(double f){
-        return _mm_cvtsd_si32(_mm_load_sd(&f));
-}
-
-static __inline void vorbis_fpu_setround(vorbis_fpu_control *fpu){
-}
-
-static __inline void vorbis_fpu_restore(vorbis_fpu_control fpu){
-}
-
-#endif /* Special MSVC x64 implementation */
-
-
-/* If no special implementation was found for the current compiler / platform,
-   use the default implementation here: */
-#ifndef VORBIS_FPU_CONTROL
-
-typedef int vorbis_fpu_control;
-
-static int vorbis_ftoi(double f){
-        /* Note: MSVC and GCC (at least on some systems) round towards zero, thus,
-           the floor() call is required to ensure correct roudning of
-           negative numbers */
-        return (int)floor(f+.5);
-}
-
-/* We don't have special code for this compiler/arch, so do it the slow way */
-#  define vorbis_fpu_setround(vorbis_fpu_control) {}
-#  define vorbis_fpu_restore(vorbis_fpu_control) {}
-
-#endif /* default implementation */
-
-#endif /* _OS_H */
diff --git a/engines/sludge/libwebm/AUTHORS.TXT b/engines/sludge/libwebm/AUTHORS.TXT
deleted file mode 100644
index f5f8c11948..0000000000
--- a/engines/sludge/libwebm/AUTHORS.TXT
+++ /dev/null
@@ -1,5 +0,0 @@
-# Names should be added to this file like so:

-# Name or Organization <email address>

-

-Google Inc.

-Rikard Peterson <info@trumgottist.com>

diff --git a/engines/sludge/libwebm/LICENSE.TXT b/engines/sludge/libwebm/LICENSE.TXT
deleted file mode 100644
index 7a6f99547d..0000000000
--- a/engines/sludge/libwebm/LICENSE.TXT
+++ /dev/null
@@ -1,30 +0,0 @@
-Copyright (c) 2010, Google Inc. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-  * Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-  * Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in
-    the documentation and/or other materials provided with the
-    distribution.
-
-  * Neither the name of Google nor the names of its contributors may
-    be used to endorse or promote products derived from this software
-    without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
diff --git a/engines/sludge/libwebm/PATENTS.TXT b/engines/sludge/libwebm/PATENTS.TXT
deleted file mode 100644
index 4414d83850..0000000000
--- a/engines/sludge/libwebm/PATENTS.TXT
+++ /dev/null
@@ -1,22 +0,0 @@
-Additional IP Rights Grant (Patents)
-
-"This implementation" means the copyrightable works distributed by
-Google as part of the WebM Project.
-
-Google hereby grants to you a perpetual, worldwide, non-exclusive,
-no-charge, royalty-free, irrevocable (except as stated in this section)
-patent license to make, have made, use, offer to sell, sell, import,
-transfer, and otherwise run, modify and propagate the contents of this
-implementation of VP8, where such license applies only to those patent
-claims, both currently owned by Google and acquired in the future,
-licensable by Google that are necessarily infringed by this
-implementation of VP8. This grant does not include claims that would be
-infringed only as a consequence of further modification of this
-implementation. If you or your agent or exclusive licensee institute or
-order or agree to the institution of patent litigation against any
-entity (including a cross-claim or counterclaim in a lawsuit) alleging
-that this implementation of VP8 or any code incorporated within this
-implementation of VP8 constitutes direct or contributory patent
-infringement, or inducement of patent infringement, then any patent
-rights granted to you under this License for this implementation of VP8
-shall terminate as of the date such litigation is filed.
diff --git a/engines/sludge/libwebm/mkvparser.cpp b/engines/sludge/libwebm/mkvparser.cpp
deleted file mode 100644
index 8a25af70d0..0000000000
--- a/engines/sludge/libwebm/mkvparser.cpp
+++ /dev/null
@@ -1,7327 +0,0 @@
-// Copyright (c) 2010 The WebM project authors. All Rights Reserved.

-//

-// Use of this source code is governed by a BSD-style license

-// that can be found in the LICENSE file in the root of the source

-// tree. An additional intellectual property rights grant can be found

-// in the file PATENTS.  All contributing project authors may

-// be found in the AUTHORS file in the root of the source tree.

-

-#include "mkvparser.hpp"

-#include <cassert>

-#include <cstring>

-#include <new>

-#include <climits>

-

-mkvparser::IMkvReader::~IMkvReader()

-{

-}

-

-void mkvparser::GetVersion(int& major, int& minor, int& build, int& revision)

-{

-    major = 1;

-    minor = 0;

-    build = 0;

-    revision = 17;

-}

-

-long long mkvparser::ReadUInt(IMkvReader* pReader, long long pos, long& len)

-{

-    assert(pReader);

-    assert(pos >= 0);

-

-    int status;

-

-//#ifdef _DEBUG

-//    long long total, available;

-//    status = pReader->Length(&total, &available);

-//    assert(status >= 0);

-//    assert((total < 0) || (available <= total));

-//    assert(pos < available);

-//    assert((available - pos) >= 1);  //assume here max u-int len is 8

-//#endif

-

-    len = 1;

-

-    unsigned char b;

-

-    status = pReader->Read(pos, 1, &b);

-

-    if (status < 0)  //error or underflow

-        return status;

-

-    if (status > 0)  //interpreted as "underflow"

-        return E_BUFFER_NOT_FULL;

-

-    if (b == 0)  //we can't handle u-int values larger than 8 bytes

-        return E_FILE_FORMAT_INVALID;

-

-    unsigned char m = 0x80;

-

-    while (!(b & m))

-    {

-        m >>= 1;

-        ++len;

-    }

-

-//#ifdef _DEBUG

-//    assert((available - pos) >= len);

-//#endif

-

-    long long result = b & (~m);

-    ++pos;

-

-    for (int i = 1; i < len; ++i)

-    {

-        status = pReader->Read(pos, 1, &b);

-

-        if (status < 0)

-        {

-            len = 1;

-            return status;

-        }

-

-        if (status > 0)

-        {

-            len = 1;

-            return E_BUFFER_NOT_FULL;

-        }

-

-        result <<= 8;

-        result |= b;

-

-        ++pos;

-    }

-

-    return result;

-}

-

-long long mkvparser::GetUIntLength(

-    IMkvReader* pReader,

-    long long pos,

-    long& len)

-{

-    assert(pReader);

-    assert(pos >= 0);

-

-    long long total, available;

-

-    int status = pReader->Length(&total, &available);

-    assert(status >= 0);

-    assert((total < 0) || (available <= total));

-

-    len = 1;

-

-    if (pos >= available)

-        return pos;  //too few bytes available

-

-    unsigned char b;

-

-    status = pReader->Read(pos, 1, &b);

-

-    if (status < 0)

-        return status;

-

-    assert(status == 0);

-

-    if (b == 0)  //we can't handle u-int values larger than 8 bytes

-        return E_FILE_FORMAT_INVALID;

-

-    unsigned char m = 0x80;

-

-    while (!(b & m))

-    {

-        m >>= 1;

-        ++len;

-    }

-

-    return 0;  //success

-}

-

-long long mkvparser::SyncReadUInt(

-    IMkvReader* pReader,

-    long long pos,

-    long long stop,

-    long& len)

-{

-    assert(pReader);

-

-    if (pos >= stop)

-        return E_FILE_FORMAT_INVALID;

-

-    unsigned char b;

-

-    long hr = pReader->Read(pos, 1, &b);

-

-    if (hr < 0)

-        return hr;

-

-    if (hr != 0L)

-        return E_BUFFER_NOT_FULL;

-

-    if (b == 0)  //we can't handle u-int values larger than 8 bytes

-        return E_FILE_FORMAT_INVALID;

-

-    unsigned char m = 0x80;

-    len = 1;

-

-    while (!(b & m))

-    {

-        m >>= 1;

-        ++len;

-    }

-

-    if ((pos + len) > stop)

-        return E_FILE_FORMAT_INVALID;

-

-    long long result = b & (~m);

-    ++pos;

-

-    for (int i = 1; i < len; ++i)

-    {

-        hr = pReader->Read(pos, 1, &b);

-

-        if (hr < 0)

-            return hr;

-

-        if (hr != 0L)

-            return E_BUFFER_NOT_FULL;

-

-        result <<= 8;

-        result |= b;

-

-        ++pos;

-    }

-

-    return result;

-}

-

-

-long long mkvparser::UnserializeUInt(

-    IMkvReader* pReader,

-    long long pos,

-    long long size)

-{

-    assert(pReader);

-    assert(pos >= 0);

-    assert(size > 0);

-    assert(size <= 8);

-

-    long long result = 0;

-

-    for (long long i = 0; i < size; ++i)

-    {

-        unsigned char b;

-

-        const long status = pReader->Read(pos, 1, &b);

-

-        if (status < 0)

-            return status;

-

-        result <<= 8;

-        result |= b;

-

-        ++pos;

-    }

-

-    return result;

-}

-

-

-float mkvparser::Unserialize4Float(

-    IMkvReader* pReader,

-    long long pos)

-{

-    assert(pReader);

-    assert(pos >= 0);

-

-#ifdef _DEBUG

-    {

-        long long total, available;

-

-        const long status = pReader->Length(&total, &available);

-        assert(status >= 0);

-        assert((total < 0) || (available <= total));

-        assert((pos + 4) <= available);

-    }

-#endif

-

-#if 0

-    float result;

-

-    unsigned char* const p = (unsigned char*)&result;

-    unsigned char* q = p + 4;

-

-    for (;;)

-    {

-        hr = pReader->Read(pos, 1, --q);

-        assert(hr == 0L);

-

-        if (q == p)

-            break;

-

-        ++pos;

-    }

-#else

-    union

-    {

-        float result;

-        unsigned long buf;

-    };

-

-    buf = 0;

-

-    for (int i = 0;;)

-    {

-        unsigned char b;

-

-        const int status = pReader->Read(pos++, 1, &b);

-

-        if (status < 0)  //error

-            return static_cast<float>(status);

-

-        buf |= b;

-

-        if (++i >= 4)

-            break;

-

-        buf <<= 8;

-    }

-#endif

-

-    return result;

-}

-

-

-double mkvparser::Unserialize8Double(

-    IMkvReader* pReader,

-    long long pos)

-{

-    assert(pReader);

-    assert(pos >= 0);

-

-#if 0

-    double result;

-

-    unsigned char* const p = (unsigned char*)&result;

-    unsigned char* q = p + 8;

-

-    for (;;)

-    {

-        const long hr = pReader->Read(pos, 1, --q);

-        assert(hr == 0L);

-

-        if (q == p)

-            break;

-

-        ++pos;

-    }

-#else

-    union

-    {

-        double result;

-        long long buf;

-    };

-

-    buf = 0;

-

-    for (int i = 0;;)

-    {

-        unsigned char b;

-

-        const int status = pReader->Read(pos++, 1, &b);

-

-        if (status < 0)  //error

-            return static_cast<double>(status);

-

-        buf |= b;

-

-        if (++i >= 8)

-            break;

-

-        buf <<= 8;

-    }

-#endif

-

-    return result;

-}

-

-signed char mkvparser::Unserialize1SInt(

-    IMkvReader* pReader,

-    long long pos)

-{

-    assert(pReader);

-    assert(pos >= 0);

-

-#ifdef _DEBUG

-    {

-        long long total, available;

-

-        const long status = pReader->Length(&total, &available);

-        assert(status == 0);

-        assert((total < 0) || (available <= total));

-        assert(pos < available);

-    }

-#endif

-

-    signed char result;

-    unsigned char& b = reinterpret_cast<unsigned char&>(result);

-

-    const int status = pReader->Read(pos, 1, &b);

-    assert(status == 0);  //TODO: must be handled somehow

-

-    return result;

-}

-

-short mkvparser::Unserialize2SInt(

-    IMkvReader* pReader,

-    long long pos)

-{

-    assert(pReader);

-    assert(pos >= 0);

-

-#ifdef _DEBUG

-    {

-        long long total, available;

-

-        const long status = pReader->Length(&total, &available);

-        assert(status >= 0);

-        assert((total < 0) || (available <= total));

-        assert((pos + 2) <= available);

-    }

-#endif

-

-#if 0

-    short result;

-

-    unsigned char* const p = (unsigned char*)&result;

-    unsigned char* q = p + 2;

-

-    for (;;)

-    {

-        hr = pReader->Read(pos, 1, --q);

-        assert(hr == 0L);

-

-        if (q == p)

-            break;

-

-        ++pos;

-    }

-#else

-    short result = 0;

-

-    for (int i = 0;;)

-    {

-        unsigned char b;

-

-        const int status = pReader->Read(pos++, 1, &b);

-        assert(status == 0);  //TODO: must be handled somehow

-

-        result |= b;

-

-        if (++i >= 2)

-            break;

-

-        result <<= 8;

-    }

-#endif

-

-    return result;

-}

-

-

-bool mkvparser::Match(

-    IMkvReader* pReader,

-    long long& pos,

-    unsigned long id_,

-    long long& val)

-{

-    assert(pReader);

-    assert(pos >= 0);

-

-    long long total, available;

-

-    const long status = pReader->Length(&total, &available);

-    assert(status >= 0);

-    assert((total < 0) || (available <= total));

-

-    long len;

-

-    const long long id = ReadUInt(pReader, pos, len);

-    assert(id >= 0);

-    assert(len > 0);

-    assert(len <= 8);

-    assert((pos + len) <= available);

-

-    if ((unsigned long)id != id_)

-        return false;

-

-    pos += len;  //consume id

-

-    const long long size = ReadUInt(pReader, pos, len);

-    assert(size >= 0);

-    assert(size <= 8);

-    assert(len > 0);

-    assert(len <= 8);

-    assert((pos + len) <= available);

-

-    pos += len;  //consume length of size of payload

-

-    val = UnserializeUInt(pReader, pos, size);

-    assert(val >= 0);

-

-    pos += size;  //consume size of payload

-

-    return true;

-}

-

-bool mkvparser::Match(

-    IMkvReader* pReader,

-    long long& pos,

-    unsigned long id_,

-    char*& val)

-{

-    assert(pReader);

-    assert(pos >= 0);

-

-    long long total, available;

-

-    long status = pReader->Length(&total, &available);

-    assert(status >= 0);

-    assert((total < 0) || (available <= total));

-

-    long len;

-

-    const long long id = ReadUInt(pReader, pos, len);

-    assert(id >= 0);

-    assert(len > 0);

-    assert(len <= 8);

-    assert((pos + len) <= available);

-

-    if ((unsigned long)id != id_)

-        return false;

-

-    pos += len;  //consume id

-

-    const long long size_ = ReadUInt(pReader, pos, len);

-    assert(size_ >= 0);

-    assert(len > 0);

-    assert(len <= 8);

-    assert((pos + len) <= available);

-

-    pos += len;  //consume length of size of payload

-    assert((pos + size_) <= available);

-

-    const size_t size = static_cast<size_t>(size_);

-    val = new char[size+1];

-

-    for (size_t i = 0; i < size; ++i)

-    {

-        char c;

-

-        status = pReader->Read(pos + i, 1, (unsigned char*)&c);

-        assert(status == 0);  //TODO

-

-        val[i] = c;

-

-        if (c == '\0')

-            break;

-    }

-

-    val[size] = '\0';

-    pos += size_;  //consume size of payload

-

-    return true;

-}

-

-bool mkvparser::Match(

-    IMkvReader* pReader,

-    long long& pos,

-    unsigned long id_,

-    unsigned char*& buf,

-    size_t& buflen)

-{

-    assert(pReader);

-    assert(pos >= 0);

-

-    long long total, available;

-

-    long status = pReader->Length(&total, &available);

-    assert(status >= 0);

-    assert((total < 0) || (available <= total));

-

-    long len;

-    const long long id = ReadUInt(pReader, pos, len);

-    assert(id >= 0);

-    assert(len > 0);

-    assert(len <= 8);

-    assert((pos + len) <= available);

-

-    if ((unsigned long)id != id_)

-        return false;

-

-    pos += len;  //consume id

-

-    const long long size_ = ReadUInt(pReader, pos, len);

-    assert(size_ >= 0);

-    assert(len > 0);

-    assert(len <= 8);

-    assert((pos + len) <= available);

-

-    pos += len;  //consume length of size of payload

-    assert((pos + size_) <= available);

-

-    const long buflen_ = static_cast<long>(size_);

-

-    buf = new (std::nothrow) unsigned char[buflen_];

-    assert(buf);  //TODO

-

-    status = pReader->Read(pos, buflen_, buf);

-    assert(status == 0);  //TODO

-

-    buflen = buflen_;

-

-    pos += size_;  //consume size of payload

-    return true;

-}

-

-

-bool mkvparser::Match(

-    IMkvReader* pReader,

-    long long& pos,

-    unsigned long id_,

-    double& val)

-{

-    assert(pReader);

-    assert(pos >= 0);

-

-    long long total, available;

-

-    const long status = pReader->Length(&total, &available);

-    assert(status >= 0);

-    assert((total < 0) || (available <= total));

-

-    long idlen;

-

-    const long long id = ReadUInt(pReader, pos, idlen);

-    assert(id >= 0);  //TODO

-

-    if ((unsigned long)id != id_)

-        return false;

-

-    long sizelen;

-    const long long size = ReadUInt(pReader, pos + idlen, sizelen);

-

-    switch (size)

-    {

-        case 4:

-        case 8:

-            break;

-        default:

-            return false;

-    }

-

-    pos += idlen + sizelen;  //consume id and size fields

-    assert((pos + size) <= available);

-

-    if (size == 4)

-        val = Unserialize4Float(pReader, pos);

-    else

-    {

-        assert(size == 8);

-        val = Unserialize8Double(pReader, pos);

-    }

-

-    pos += size;  //consume size of payload

-

-    return true;

-}

-

-

-bool mkvparser::Match(

-    IMkvReader* pReader,

-    long long& pos,

-    unsigned long id_,

-    short& val)

-{

-    assert(pReader);

-    assert(pos >= 0);

-

-    long long total, available;

-

-    const long status = pReader->Length(&total, &available);

-    assert(status >= 0);

-    assert((total < 0) || (available <= total));

-

-    long len;

-    const long long id = ReadUInt(pReader, pos, len);

-    assert(id >= 0);

-    assert((pos + len) <= available);

-

-    if ((unsigned long)id != id_)

-        return false;

-

-    pos += len;  //consume id

-

-    const long long size = ReadUInt(pReader, pos, len);

-    assert(size <= 2);

-    assert((pos + len) <= available);

-

-    pos += len;  //consume length of size of payload

-    assert((pos + size) <= available);

-

-    //TODO:

-    // Generalize this to work for any size signed int

-    if (size == 1)

-        val = Unserialize1SInt(pReader, pos);

-    else

-        val = Unserialize2SInt(pReader, pos);

-

-    pos += size;  //consume size of payload

-

-    return true;

-}

-

-

-namespace mkvparser

-{

-

-EBMLHeader::EBMLHeader() :

-    m_docType(NULL)

-{

-    Init();

-}

-

-EBMLHeader::~EBMLHeader()

-{

-    delete[] m_docType;

-}

-

-void EBMLHeader::Init()

-{

-    m_version = 1;

-    m_readVersion = 1;

-    m_maxIdLength = 4;

-    m_maxSizeLength = 8;

-

-    if (m_docType)

-    {

-        delete[] m_docType;

-        m_docType = NULL;

-    }

-

-    m_docTypeVersion = 1;

-    m_docTypeReadVersion = 1;

-}

-

-long long EBMLHeader::Parse(

-    IMkvReader* pReader,

-    long long& pos)

-{

-    assert(pReader);

-

-    long long total, available;

-

-    long status = pReader->Length(&total, &available);

-

-    if (status < 0)  //error

-        return status;

-

-    pos = 0;

-    long long end = (available >= 1024) ? 1024 : available;

-

-    for (;;)

-    {

-        unsigned char b = 0;

-

-        while (pos < end)

-        {

-            status = pReader->Read(pos, 1, &b);

-

-            if (status < 0)  //error

-                return status;

-

-            if (b == 0x1A)

-                break;

-

-            ++pos;

-        }

-

-        if (b != 0x1A)

-        {

-            if (pos >= 1024)

-                return E_FILE_FORMAT_INVALID;  //don't bother looking anymore

-

-            if ((total >= 0) && ((total - available) < 5))

-                return E_FILE_FORMAT_INVALID;

-

-            return available + 5;  //5 = 4-byte ID + 1st byte of size

-        }

-

-        if ((total >= 0) && ((total - pos) < 5))

-            return E_FILE_FORMAT_INVALID;

-

-        if ((available - pos) < 5)

-            return pos + 5;  //try again later

-

-        long len;

-

-        const long long result = ReadUInt(pReader, pos, len);

-

-        if (result < 0)  //error

-            return result;

-

-        if (result == 0x0A45DFA3)  //EBML Header ID

-        {

-            pos += len;  //consume ID

-            break;

-        }

-

-        ++pos;  //throw away just the 0x1A byte, and try again

-    }

-

-    //pos designates start of size field

-

-    //get length of size field

-

-    long len;

-    long long result = GetUIntLength(pReader, pos, len);

-

-    if (result < 0)  //error

-        return result;

-

-    if (result > 0)  //need more data

-        return result;

-

-    assert(len > 0);

-    assert(len <= 8);

-

-    if ((total >= 0) && ((total -  pos) < len))

-        return E_FILE_FORMAT_INVALID;

-

-    if ((available - pos) < len)

-        return pos + len;  //try again later

-

-    //get the EBML header size

-

-    result = ReadUInt(pReader, pos, len);

-

-    if (result < 0)  //error

-        return result;

-

-    pos += len;  //consume size field

-

-    //pos now designates start of payload

-

-    if ((total >= 0) && ((total - pos) < result))

-        return E_FILE_FORMAT_INVALID;

-

-    if ((available - pos) < result)

-        return pos + result;

-

-    end = pos + result;

-

-    Init();

-

-    while (pos < end)

-    {

-        if (Match(pReader, pos, 0x0286, m_version))

-            ;

-        else if (Match(pReader, pos, 0x02F7, m_readVersion))

-            ;

-        else if (Match(pReader, pos, 0x02F2, m_maxIdLength))

-            ;

-        else if (Match(pReader, pos, 0x02F3, m_maxSizeLength))

-            ;

-        else if (Match(pReader, pos, 0x0282, m_docType))

-            ;

-        else if (Match(pReader, pos, 0x0287, m_docTypeVersion))

-            ;

-        else if (Match(pReader, pos, 0x0285, m_docTypeReadVersion))

-            ;

-        else

-        {

-            result = ReadUInt(pReader, pos, len);

-            assert(result > 0);

-            assert(len > 0);

-            assert(len <= 8);

-

-            pos += len;

-            assert(pos < end);

-

-            result = ReadUInt(pReader, pos, len);

-            assert(result >= 0);

-            assert(len > 0);

-            assert(len <= 8);

-

-            pos += len + result;

-            assert(pos <= end);

-        }

-    }

-

-    assert(pos == end);

-    return 0;

-}

-

-

-Segment::Segment(

-    IMkvReader* pReader,

-    long long start,

-    long long size) :

-    m_pReader(pReader),

-    m_start(start),

-    m_size(size),

-    m_pos(start),

-    m_pSeekHead(NULL),

-    m_pInfo(NULL),

-    m_pTracks(NULL),

-    m_pCues(NULL),

-    m_clusters(NULL),

-    m_clusterCount(0),

-    m_clusterPreloadCount(0),

-    m_clusterSize(0)

-{

-}

-

-

-Segment::~Segment()

-{

-    const long count = m_clusterCount + m_clusterPreloadCount;

-

-    Cluster** i = m_clusters;

-    Cluster** j = m_clusters + count;

-

-    while (i != j)

-    {

-        Cluster* const p = *i++;

-        assert(p);

-

-        delete p;

-    }

-

-    delete[] m_clusters;

-

-    delete m_pTracks;

-    delete m_pInfo;

-    delete m_pCues;

-    delete m_pSeekHead;

-}

-

-

-long long Segment::CreateInstance(

-    IMkvReader* pReader,

-    long long pos,

-    Segment*& pSegment)

-{

-    assert(pReader);

-    assert(pos >= 0);

-

-    pSegment = NULL;

-

-    long long total, available;

-

-    const long status = pReader->Length(&total, &available);

-	

-//	fprintf(stderr, "status: %d total: %d available: %d\n", status, total, available);

-

-    if (status < 0) //error

-        return status;

-

-    if (available < 0)

-        return -1;

-

-    if ((total >= 0) && (available > total))

-        return -1;

-

-    const long long end = (total >= 0) ? total : available;

-    //TODO: this might need to be liberalized

-

-    //I would assume that in practice this loop would execute

-    //exactly once, but we allow for other elements (e.g. Void)

-    //to immediately follow the EBML header.  This is fine for

-    //the source filter case (since the entire file is available),

-    //but in the splitter case over a network we should probably

-    //just give up early.  We could for example decide only to

-    //execute this loop a maximum of, say, 10 times.

-    //TODO:

-    //There is an implied "give up early" by only parsing up

-    //to the available limit.  We do do that, but only if the

-    //total file size is unknown.  We could decide to always

-    //use what's available as our limit (irrespective of whether

-    //we happen to know the total file length).  This would have

-    //as its sense "parse this much of the file before giving up",

-    //which a slightly different sense from "try to parse up to

-    //10 EMBL elements before giving up".

-

-    while (pos < end)

-    {

-        //Read ID

-

-        long len;

-        long long result = GetUIntLength(pReader, pos, len);

-

-        if (result)  //error, or too few available bytes

-            return result;

-

-        if ((pos + len) > end)

-            return E_FILE_FORMAT_INVALID;

-

-        if ((pos + len) > available)

-            return pos + len;

-

-        const long long id = ReadUInt(pReader, pos, len);

-

-        if (id < 0)  //error

-            return id;

-

-        pos += len;  //consume ID

-

-        //Read Size

-

-        result = GetUIntLength(pReader, pos, len);

-

-        if (result)  //error, or too few available bytes

-            return result;

-

-        if ((pos + len) > end)

-            return E_FILE_FORMAT_INVALID;

-

-        if ((pos + len) > available)

-            return pos + len;

-

-        long long size = ReadUInt(pReader, pos, len);

-

-        if (size < 0)  //error

-            return size;

-

-        pos += len;  //consume length of size of element

-

-        //Pos now points to start of payload

-

-        //Handle "unknown size" for live streaming of webm files.

-        const long long unknown_size = (1LL << (7 * len)) - 1;

-

-        if (id == 0x08538067)  //Segment ID

-        {

-            if (size == unknown_size)

-                size = -1;

-

-            else if (total < 0)

-                size = -1;

-

-            else if ((pos + size) > end)

-                return E_FILE_FORMAT_INVALID;

-

-            pSegment = new (std::nothrow) Segment(pReader, pos, size);

-

-            if (pSegment == 0)

-                return -1;  //generic error

-

-            return 0;    //success

-        }

-

-        if (size == unknown_size)

-            return E_FILE_FORMAT_INVALID;

-

-        if ((pos + size) > end)

-            return E_FILE_FORMAT_INVALID;

-

-        pos += size;  //consume payload

-    }

-

-    return E_FILE_FORMAT_INVALID;  //there is no segment

-    //TODO: this might need to be liberalized.  See comments above.

-}

-

-

-long long Segment::ParseHeaders()

-{

-    //Outermost (level 0) segment object has been constructed,

-    //and pos designates start of payload.  We need to find the

-    //inner (level 1) elements.

-    long long total, available;

-

-    const int status = m_pReader->Length(&total, &available);

-    assert(status == 0);

-    assert((total < 0) || (available <= total));

-

-    const long long segment_stop = (m_size < 0) ? -1 : m_start + m_size;

-    assert((segment_stop < 0) || (total < 0) || (segment_stop <= total));

-    assert((segment_stop < 0) || (m_pos <= segment_stop));

-

-    for (;;)

-    {

-        if ((total >= 0) && (m_pos >= total))

-            break;

-

-        if ((segment_stop >= 0) && (m_pos >= segment_stop))

-            break;

-

-        long long pos = m_pos;

-        const long long element_start = pos;

-

-        if ((pos + 1) > available)

-            return (pos + 1);

-

-        long len;

-        long long result = GetUIntLength(m_pReader, pos, len);

-

-        if (result < 0)  //error

-            return result;

-

-        if (result > 0)  //underflow (weird)

-            return (pos + 1);

-

-        if ((segment_stop >= 0) && ((pos + len) > segment_stop))

-            return E_FILE_FORMAT_INVALID;

-

-        if ((pos + len) > available)

-            return pos + len;

-

-        const long long idpos = pos;

-        const long long id = ReadUInt(m_pReader, idpos, len);

-

-        if (id < 0)  //error

-            return id;

-

-        if (id == 0x0F43B675)  //Cluster ID

-            break;

-

-        pos += len;  //consume ID

-

-        if ((pos + 1) > available)

-            return (pos + 1);

-

-        //Read Size

-        result = GetUIntLength(m_pReader, pos, len);

-

-        if (result < 0)  //error

-            return result;

-

-        if (result > 0)  //underflow (weird)

-            return (pos + 1);

-

-        if ((segment_stop >= 0) && ((pos + len) > segment_stop))

-            return E_FILE_FORMAT_INVALID;

-

-        if ((pos + len) > available)

-            return pos + len;

-

-        const long long size = ReadUInt(m_pReader, pos, len);

-

-        if (size < 0)  //error

-            return size;

-

-        pos += len;  //consume length of size of element

-

-        const long long element_size = size + pos - element_start;

-

-        //Pos now points to start of payload

-

-        if ((segment_stop >= 0) && ((pos + size) > segment_stop))

-            return E_FILE_FORMAT_INVALID;

-

-        //We read EBML elements either in total or nothing at all.

-

-        if ((pos + size) > available)

-            return pos + size;

-

-        if (id == 0x0549A966)  //Segment Info ID

-        {

-            assert(m_pInfo == NULL);

-

-            m_pInfo = new SegmentInfo(this,

-                                      pos,

-                                      size,

-                                      element_start,

-                                      element_size);

-            assert(m_pInfo);  //TODO

-        }

-        else if (id == 0x0654AE6B)  //Tracks ID

-        {

-            assert(m_pTracks == NULL);

-

-            m_pTracks = new Tracks(this,

-                                   pos,

-                                   size,

-                                   element_start,

-                                   element_size);

-            assert(m_pTracks);  //TODO

-        }

-        else if (id == 0x0C53BB6B)  //Cues ID

-        {

-            if (m_pCues == NULL)

-            {

-                m_pCues = new Cues(this,

-                                   pos,

-                                   size,

-                                   element_start,

-                                   element_size);

-                assert(m_pCues);  //TODO

-            }

-        }

-        else if (id == 0x014D9B74)  //SeekHead ID

-        {

-#if 0

-            if (available >= total)

-                ParseSeekHead(pos, size);

-#else

-            if (m_pSeekHead == NULL)

-            {

-                m_pSeekHead = new SeekHead(this,

-                                           pos,

-                                           size,

-                                           element_start,

-                                           element_size);

-

-                assert(m_pSeekHead);  //TODO

-            }

-#endif

-        }

-

-        m_pos = pos + size;  //consume payload

-    }

-

-    assert((segment_stop < 0) || (m_pos <= segment_stop));

-

-    if (m_pInfo == NULL)  //TODO: liberalize this behavior

-        return E_FILE_FORMAT_INVALID;

-

-    if (m_pTracks == NULL)

-        return E_FILE_FORMAT_INVALID;

-

-    return 0;  //success

-}

-

-

-#if 0

-long Segment::FindNextCluster(long long& pos, size& len) const

-{

-    //Outermost (level 0) segment object has been constructed,

-    //and pos designates start of payload.  We need to find the

-    //inner (level 1) elements.

-    long long total, available;

-

-    const int status = m_pReader->Length(&total, &available);

-    assert(status == 0);

-    assert(total >= 0);

-    assert(available <= total);

-

-    const long long stop = m_start + m_size;

-    assert(stop <= total);

-    assert(m_pos <= stop);

-

-    pos = m_pos;

-

-    while (pos < stop)

-    {

-        long long result = GetUIntLength(m_pReader, pos, len);

-

-        if (result < 0)

-            return static_cast<long>(result);

-

-        if (result > 0)

-            return E_BUFFER_NOT_FULL;

-

-        if ((pos + len) > stop)

-            return E_FILE_FORMAT_INVALID;

-

-        if ((pos + len) > available)

-            return E_BUFFER_NOT_FULL;

-

-        const long long idpos = pos;

-        const long long id = ReadUInt(m_pReader, idpos, len);

-

-        if (id < 0)  //error

-            return static_cast<long>(id);

-

-        pos += len;  //consume ID

-

-        //Read Size

-        result = GetUIntLength(m_pReader, pos, len);

-

-        if (result < 0)  //error

-            return static_cast<long>(result);

-

-        if (result > 0)

-            return E_BUFFER_NOT_FULL;

-

-        if ((pos + len) > stop)

-            return E_FILE_FORMAT_INVALID;

-

-        if ((pos + len) > available)

-            return E_BUFFER_NOT_FULL;

-

-        const long long size = ReadUInt(m_pReader, pos, len);

-

-        if (size < 0)  //error

-            return static_cast<long>(size);

-

-        pos += len;  //consume length of size of element

-

-        //Pos now points to start of payload

-

-        if ((pos + size) > stop)

-            return E_FILE_FORMAT_INVALID;

-

-        if ((pos + size) > available)

-            return E_BUFFER_NOT_FULL;

-

-        if (id == 0x0F43B675)  //Cluster ID

-        {

-            len = static_cast<long>(size);

-            return 0;  //success

-        }

-

-        pos += size;  //consume payload

-    }

-

-    return E_FILE_FORMAT_INVALID;

-}

-#endif

-

-

-#if 0

-long Segment::ParseCluster(long long& off, long long& new_pos) const

-{

-    off = -1;

-    new_pos = -1;

-

-    const long long stop = m_start + m_size;

-    assert(m_pos <= stop);

-

-    long long pos = m_pos;

-

-    while (pos < stop)

-    {

-        long len;

-        const long long idpos = pos;

-

-        const long long id = SyncReadUInt(m_pReader, pos, stop, len);

-

-        if (id < 0)  //error

-            return static_cast<long>(id);

-

-        if (id == 0)

-            return E_FILE_FORMAT_INVALID;

-

-        pos += len;  //consume id

-        assert(pos < stop);

-

-        const long long size = SyncReadUInt(m_pReader, pos, stop, len);

-

-        if (size < 0)  //error

-            return static_cast<long>(size);

-

-        pos += len;  //consume size

-        assert(pos <= stop);

-

-        if (size == 0)  //weird

-            continue;

-

-        //pos now points to start of payload

-

-        pos += size;  //consume payload

-        assert(pos <= stop);

-

-        if (id == 0x0F43B675)  //Cluster ID

-        {

-            const long long off_ = idpos - m_start;

-

-            if (Cluster::HasBlockEntries(this, off_))

-            {

-                off = off_;   // >= 0 means we found a cluster

-                break;

-            }

-        }

-    }

-

-    assert(pos <= stop);

-

-    //Indicate to caller how much of file has been consumed. This is

-    //used later in AddCluster to adjust the current parse position

-    //(the value cached in the segment object itself) to the

-    //file position value just past the cluster we parsed.

-

-    if (off < 0)  //we did not found any more clusters

-    {

-        new_pos = stop;  //pos >= 0 here means EOF (cluster is NULL)

-        return 0;        //TODO: confirm this return value

-    }

-

-    //We found a cluster.  Now read something, to ensure that it is

-    //fully loaded in the network cache.

-

-    if (pos >= stop)  //we parsed the entire segment

-    {

-        //We did find a cluster, but it was very last element in the segment.

-        //Our preference is that the loop above runs 1 1/2 times:

-        //the first pass finds the cluster, and the second pass

-        //finds the element the follows the cluster.  In this case, however,

-        //we reached the end of the file without finding another element,

-        //so we didn't actually read anything yet associated with "end of the

-        //cluster".  And we must perform an actual read, in order

-        //to guarantee that all of the data that belongs to this

-        //cluster has been loaded into the network cache.  So instead

-        //of reading the next element that follows the cluster, we

-        //read the last byte of the cluster (which is also the last

-        //byte in the file).

-

-        //Read the last byte of the file. (Reading 0 bytes at pos

-        //might work too -- it would depend on how the reader is

-        //implemented.  Here we take the more conservative approach,

-        //since this makes fewer assumptions about the network

-        //reader abstraction.)

-

-        unsigned char b;

-

-        const int result = m_pReader->Read(pos - 1, 1, &b);

-        assert(result == 0);

-

-        new_pos = stop;

-    }

-    else

-    {

-        long len;

-        const long long idpos = pos;

-

-        const long long id = SyncReadUInt(m_pReader, pos, stop, len);

-

-        if (id < 0)  //error

-            return static_cast<long>(id);

-

-        if (id == 0)

-            return E_BUFFER_NOT_FULL;

-

-        pos += len;  //consume id

-        assert(pos < stop);

-

-        const long long size = SyncReadUInt(m_pReader, pos, stop, len);

-

-        if (size < 0)  //error

-            return static_cast<long>(size);

-

-        new_pos = idpos;

-    }

-

-    return 0;

-}

-

-

-bool Segment::AddCluster(long long off, long long pos)

-{

-    assert(pos >= m_start);

-

-    const long long stop = m_start + m_size;

-    assert(pos <= stop);

-

-    if (off >= 0)

-    {

-        Cluster* const pCluster = Cluster::Parse(this,

-                                                 m_clusterCount,

-                                                 off,

-                                                 0,

-                                                 0);

-        assert(pCluster);

-

-        AppendCluster(pCluster);

-        assert(m_clusters);

-        assert(m_clusterSize > pCluster->m_index);

-        assert(m_clusters[pCluster->m_index] == pCluster);

-    }

-

-    m_pos = pos;  //m_pos >= stop is now we know we have all clusters

-    return (pos >= stop);

-}

-#endif

-

-

-long Segment::LoadCluster(

-    long long& pos,

-    long& len)

-{

-    long long total, avail;

-

-    long status = m_pReader->Length(&total, &avail);

-

-    if (status < 0)  //error

-        return status;

-

-    assert((total < 0) || (avail <= total));

-

-    const long long segment_stop = (m_size < 0) ? -1 : m_start + m_size;

-

-    for (;;)

-    {

-        if ((total >= 0) && (m_pos >= total))

-            return 1;  //no more clusters

-

-        if ((segment_stop >= 0) && (m_pos >= segment_stop))

-            return 1;  //no more clusters

-

-        pos = m_pos;

-

-        //Read ID

-

-        if ((pos + 1) > avail)

-        {

-            len = 1;

-            return E_BUFFER_NOT_FULL;

-        }

-

-        long long result = GetUIntLength(m_pReader, pos, len);

-

-        if (result < 0)  //error

-            return static_cast<long>(result);

-

-        if (result > 0)  //weird

-            return E_BUFFER_NOT_FULL;

-

-        if ((segment_stop >= 0) && ((pos + len) > segment_stop))

-            return E_FILE_FORMAT_INVALID;

-

-        if ((pos + len) > avail)

-            return E_BUFFER_NOT_FULL;

-

-        const long long idpos = pos;

-        const long long id = ReadUInt(m_pReader, idpos, len);

-

-        if (id < 0)  //error (or underflow)

-            return static_cast<long>(id);

-

-        pos += len;  //consume ID

-

-        //Read Size

-

-        if ((pos + 1) > avail)

-        {

-            len = 1;

-            return E_BUFFER_NOT_FULL;

-        }

-

-        result = GetUIntLength(m_pReader, pos, len);

-

-        if (result < 0)  //error

-            return static_cast<long>(result);

-

-        if (result > 0)  //weird

-            return E_BUFFER_NOT_FULL;

-

-        if ((segment_stop >= 0) && ((pos + len) > segment_stop))

-            return E_FILE_FORMAT_INVALID;

-

-        if ((pos + len) > avail)

-            return E_BUFFER_NOT_FULL;

-

-        const long long size = ReadUInt(m_pReader, pos, len);

-

-        if (size < 0)  //error

-            return static_cast<long>(size);

-

-        const long long unknown_size = (1LL << (7 * len)) - 1;

-

-        if (size == unknown_size)

-            return E_FILE_FORMAT_INVALID;  //TODO: allow this

-

-        pos += len;  //consume length of size of element

-

-        const long long element_size = size + pos - idpos;

-

-        if (size == 0)  //weird

-        {

-            m_pos = pos;

-            continue;

-        }

-

-        //Pos now points to start of payload

-

-        if ((segment_stop >= 0) && ((pos + size) > segment_stop))

-            return E_FILE_FORMAT_INVALID;

-

-#if 0

-        len = static_cast<long>(size);

-

-        if ((pos + size) > avail)

-            return E_BUFFER_NOT_FULL;

-#endif

-

-        if (id == 0x0C53BB6B)  //Cues ID

-        {

-            if (m_pCues == NULL)

-            {

-                m_pCues = new Cues(this,

-                                   pos,

-                                   size,

-                                   idpos,

-                                   element_size);

-                assert(m_pCues);  //TODO

-            }

-

-            m_pos = pos + size;  //consume payload

-            continue;

-        }

-

-        if (id != 0x0F43B675)  //Cluster ID

-        {

-            m_pos = pos + size;  //consume payload

-            continue;

-        }

-

-        const long idx = m_clusterCount;

-        const long long idoff = idpos - m_start;

-

-        long long pos_;

-        long len_;

-

-        status = Cluster::HasBlockEntries(this, idoff, pos_, len_);

-

-        if (status < 0) //error, or underflow

-        {

-            pos = pos_;

-            len = len_;

-

-            return status;

-        }

-

-        if (m_clusterPreloadCount > 0)

-        {

-            assert(idx < m_clusterSize);

-

-            Cluster* const pCluster = m_clusters[idx];

-            assert(pCluster);

-            assert(pCluster->m_index < 0);

-

-            //const long long off_ = pCluster->m_pos;

-            //assert(off_);

-            //const long long off = off_ * ((off_ >= 0) ? 1 : -1);

-            //assert(idoff <= off);

-

-            const long long off = pCluster->GetPosition();

-            assert(off >= 0);

-

-            if (idoff == off)  //preloaded already

-            {

-                if (status == 0)  //no block entries

-                    return E_FILE_FORMAT_INVALID;

-

-                pCluster->m_index = idx;  //move from preloaded to loaded

-                ++m_clusterCount;

-                --m_clusterPreloadCount;

-

-                m_pos = pos + size;  //consume payload

-                assert((segment_stop < 0) || (m_pos <= segment_stop));

-#if 0

-                status = pCluster->Load(pos, len);  //set size and timecode

-                assert(status == 0);  //TODO

-#endif

-                return 0;  //success

-            }

-        }

-

-        m_pos = pos + size;  //consume payload

-        assert((segment_stop < 0) || (m_pos <= segment_stop));

-

-        if (status == 0)  //no block entries

-            continue;

-

-        Cluster* const pCluster = Cluster::Create(this,

-                                                  idx,

-                                                  idoff,

-                                                  element_size);

-        assert(pCluster);

-

-        AppendCluster(pCluster);

-        assert(m_clusters);

-        assert(idx < m_clusterSize);

-        assert(m_clusters[idx] == pCluster);

-#if 0

-        status = pCluster->Load(pos, len);

-        assert(status == 0);  //TODO

-#endif

-        return 0;

-    }

-}

-

-

-void Segment::AppendCluster(Cluster* pCluster)

-{

-    assert(pCluster);

-    assert(pCluster->m_index >= 0);

-

-    const long count = m_clusterCount + m_clusterPreloadCount;

-

-    long& size = m_clusterSize;

-    assert(size >= count);

-

-    const long idx = pCluster->m_index;

-    assert(idx == m_clusterCount);

-

-    if (count >= size)

-    {

-        long n;

-

-        if (size > 0)

-            n = 2 * size;

-        else if (m_pInfo == 0)

-            n = 2048;

-        else

-        {

-            const long long ns = m_pInfo->GetDuration();

-

-            if (ns <= 0)

-                n = 2048;

-            else

-            {

-                const long long sec = (ns + 999999999LL) / 1000000000LL;

-                n = static_cast<long>(sec);

-            }

-        }

-

-        Cluster** const qq = new Cluster*[n];

-        Cluster** q = qq;

-

-        Cluster** p = m_clusters;

-        Cluster** const pp = p + count;

-

-        while (p != pp)

-            *q++ = *p++;

-

-        delete[] m_clusters;

-

-        m_clusters = qq;

-        size = n;

-    }

-

-    if (m_clusterPreloadCount > 0)

-    {

-        assert(m_clusters);

-

-        Cluster** const p = m_clusters + m_clusterCount;

-        assert(*p);

-        assert((*p)->m_index < 0);

-

-        Cluster** q = p + m_clusterPreloadCount;

-        assert(q < (m_clusters + size));

-

-        for (;;)

-        {

-            Cluster** const qq = q - 1;

-            assert((*qq)->m_index < 0);

-

-            *q = *qq;

-            q = qq;

-

-            if (q == p)

-                break;

-        }

-    }

-

-    m_clusters[idx] = pCluster;

-    ++m_clusterCount;

-}

-

-

-void Segment::PreloadCluster(Cluster* pCluster, ptrdiff_t idx)

-{

-    assert(pCluster);

-    assert(pCluster->m_index < 0);

-    assert(idx >= m_clusterCount);

-

-    const long count = m_clusterCount + m_clusterPreloadCount;

-

-    long& size = m_clusterSize;

-    assert(size >= count);

-

-    if (count >= size)

-    {

-        long n;

-

-        if (size > 0)

-            n = 2 * size;

-        else if (m_pInfo == 0)

-            n = 2048;

-        else

-        {

-            const long long ns = m_pInfo->GetDuration();

-

-            if (ns <= 0)

-                n = 2048;

-            else

-            {

-                const long long sec = (ns + 999999999LL) / 1000000000LL;

-                n = static_cast<long>(sec);

-            }

-        }

-

-        Cluster** const qq = new Cluster*[n];

-        Cluster** q = qq;

-

-        Cluster** p = m_clusters;

-        Cluster** const pp = p + count;

-

-        while (p != pp)

-            *q++ = *p++;

-

-        delete[] m_clusters;

-

-        m_clusters = qq;

-        size = n;

-    }

-

-    assert(m_clusters);

-

-    Cluster** const p = m_clusters + idx;

-

-    Cluster** q = m_clusters + count;

-    assert(q >= p);

-    assert(q < (m_clusters + size));

-

-    while (q > p)

-    {

-        Cluster** const qq = q - 1;

-        assert((*qq)->m_index < 0);

-

-        *q = *qq;

-        q = qq;

-    }

-

-    m_clusters[idx] = pCluster;

-    ++m_clusterPreloadCount;

-}

-

-

-long Segment::Load()

-{

-    assert(m_clusters == NULL);

-    assert(m_clusterSize == 0);

-    assert(m_clusterCount == 0);

-    //assert(m_size >= 0);

-

-    //Outermost (level 0) segment object has been constructed,

-    //and pos designates start of payload.  We need to find the

-    //inner (level 1) elements.

-

-    long long total, avail;

-

-    long status = m_pReader->Length(&total, &avail);

-

-    if (status < 0)  //error

-        return status;

-

-    assert((total < 0) || (avail <= total));

-

-    const long long segment_stop = (m_size < 0) ? -1 : m_start + m_size;

-

-    for (;;)

-    {

-        long long pos = m_pos;

-

-        if ((total >= 0) && (pos >= total))

-            break;

-

-        if ((segment_stop >= 0) && (pos >= segment_stop))

-            break;

-

-        const long long element_start = pos;

-

-        long len;

-

-        long long result = GetUIntLength(m_pReader, pos, len);

-

-        if (result < 0)  //error

-            return static_cast<long>(result);

-

-        if ((segment_stop >= 0) && ((pos + len) > segment_stop))

-            return E_FILE_FORMAT_INVALID;

-

-        const long long idpos = pos;

-        const long long id = ReadUInt(m_pReader, idpos, len);

-

-        if (id < 0)  //error

-            return static_cast<long>(id);

-

-        pos += len;  //consume ID

-

-        //Read Size

-        result = GetUIntLength(m_pReader, pos, len);

-

-        if (result < 0)  //error

-            return static_cast<long>(result);

-

-        if ((segment_stop >= 0) && ((pos + len) > segment_stop))

-            return E_FILE_FORMAT_INVALID;

-

-        const long long size = ReadUInt(m_pReader, pos, len);

-

-        if (size < 0)  //error

-            return static_cast<long>(size);

-

-        const long long unknown_size = (1LL << (7 * len)) - 1;

-

-        if (size == unknown_size)

-            return E_FILE_FORMAT_INVALID;

-

-        pos += len;  //consume length of size of element

-

-        //Pos now points to start of payload

-

-        const long long element_size = (pos - element_start) + size;

-

-        if ((segment_stop >= 0) && ((pos + size) > segment_stop))

-            return E_FILE_FORMAT_INVALID;

-

-        if (id == 0x0F43B675)  //Cluster ID

-        {

-            const long idx = m_clusterCount;

-            const long long off = idpos - m_start;

-

-            long long pos_;

-            long len_;

-

-            status = Cluster::HasBlockEntries(this, off, pos_, len_);

-

-            if (status < 0)  //weird: error or underflow

-                return status;

-

-            if (status > 0)  //have block entries

-            {

-                Cluster* const pCluster = Cluster::Create(this,

-                                                         idx,

-                                                         off,

-                                                         element_size);

-                assert(pCluster);

-

-                AppendCluster(pCluster);

-                assert(m_clusters);

-                assert(m_clusterSize > idx);

-                assert(m_clusters[idx] == pCluster);

-            }

-        }

-        else if (id == 0x0C53BB6B)  //Cues ID

-        {

-            assert(m_pCues == NULL);

-

-            m_pCues = new Cues(this, pos, size, element_start, element_size);

-            assert(m_pCues);  //TODO

-        }

-        else if (id == 0x0549A966)  //SegmentInfo ID

-        {

-            assert(m_pInfo == NULL);

-

-            m_pInfo = new SegmentInfo(this,

-                                      pos,

-                                      size,

-                                      element_start,

-                                      element_size);

-            assert(m_pInfo);

-        }

-        else if (id == 0x0654AE6B)  //Tracks ID

-        {

-            assert(m_pTracks == NULL);

-

-            m_pTracks = new Tracks(this,

-                                   pos,

-                                   size,

-                                   element_start,

-                                   element_size);

-            assert(m_pTracks);  //TODO

-        }

-

-        m_pos = pos + size;  //consume payload

-    }

-

-    if (m_pInfo == NULL)

-        return E_FILE_FORMAT_INVALID;  //TODO: ignore this case?

-

-    if (m_pTracks == NULL)

-        return E_FILE_FORMAT_INVALID;

-

-    if (m_clusters == NULL)  //TODO: ignore this case?

-        return E_FILE_FORMAT_INVALID;

-

-    return 0;

-}

-

-

-#if 0

-void Segment::ParseSeekHead(long long start, long long size_)

-{

-    long long pos = start;

-    const long long stop = start + size_;

-

-    while (pos < stop)

-    {

-        long len;

-

-        const long long id = ReadUInt(m_pReader, pos, len);

-        assert(id >= 0);  //TODO

-        assert((pos + len) <= stop);

-

-        pos += len;  //consume ID

-

-        const long long size = ReadUInt(m_pReader, pos, len);

-        assert(size >= 0);

-        assert((pos + len) <= stop);

-

-        pos += len;  //consume Size field

-        assert((pos + size) <= stop);

-

-        if (id == 0x0DBB)  //SeekEntry ID

-            ParseSeekEntry(pos, size);

-

-        pos += size;  //consume payload

-        assert(pos <= stop);

-    }

-

-    assert(pos == stop);

-}

-#else

-SeekHead::SeekHead(

-    Segment* pSegment,

-    long long start,

-    long long size_,

-    long long element_start,

-    long long element_size) :

-    m_pSegment(pSegment),

-    m_start(start),

-    m_size(size_),

-    m_element_start(element_start),

-    m_element_size(element_size),

-    m_entries(0),

-    m_count(0)

-{

-    long long pos = start;

-    const long long stop = start + size_;

-

-    IMkvReader* const pReader = m_pSegment->m_pReader;

-

-    //first count the seek head entries

-

-    int count = 0;

-

-    while (pos < stop)

-    {

-        long len;

-

-        const long long id = ReadUInt(pReader, pos, len);

-        assert(id >= 0);  //TODO

-        assert((pos + len) <= stop);

-

-        pos += len;  //consume ID

-

-        const long long size = ReadUInt(pReader, pos, len);

-        assert(size >= 0);

-        assert((pos + len) <= stop);

-

-        pos += len;  //consume Size field

-        assert((pos + size) <= stop);

-

-        if (id == 0x0DBB)  //SeekEntry ID

-            ++count;

-

-        pos += size;  //consume payload

-        assert(pos <= stop);

-    }

-

-    assert(pos == stop);

-

-    if (count <= 0)

-        return;  //nothing else for us to do

-

-    m_entries = new (std::nothrow) Entry[count];

-    assert(m_entries);  //TODO

-

-    //now parse the entries

-

-    Entry* pEntry = m_entries;

-    pos = start;

-

-    while (pos < stop)

-    {

-        long len;

-

-        const long long id = ReadUInt(pReader, pos, len);

-        assert(id >= 0);  //TODO

-        assert((pos + len) <= stop);

-

-        pos += len;  //consume ID

-

-        const long long size = ReadUInt(pReader, pos, len);

-        assert(size >= 0);

-        assert((pos + len) <= stop);

-

-        pos += len;  //consume Size field

-        assert((pos + size) <= stop);

-

-        if (id == 0x0DBB)  //SeekEntry ID

-            ParseEntry(pReader, pos, size, pEntry);

-

-        pos += size;  //consume payload

-        assert(pos <= stop);

-    }

-

-    assert(pos == stop);

-

-    const ptrdiff_t count_ = ptrdiff_t(pEntry - m_entries);

-    assert(count_ >= 0);

-    assert(count_ <= count);

-

-    m_count = static_cast<int>(count_);

-}

-

-SeekHead::~SeekHead()

-{

-    delete[] m_entries;

-}

-

-int SeekHead::GetCount() const

-{

-    return m_count;

-}

-

-const SeekHead::Entry* SeekHead::GetEntry(int idx) const

-{

-    if (idx < 0)

-        return 0;

-

-    if (idx >= m_count)

-        return 0;

-

-    return m_entries + idx;

-}

-#endif

-

-

-#if 0

-void Segment::ParseCues(long long off)

-{

-    if (m_pCues)

-        return;

-

-    //odbgstream os;

-    //os << "Segment::ParseCues (begin)" << endl;

-

-    long long pos = m_start + off;

-    const long long element_start = pos;

-    const long long stop = m_start + m_size;

-

-    long len;

-

-    long long result = GetUIntLength(m_pReader, pos, len);

-    assert(result == 0);

-    assert((pos + len) <= stop);

-

-    const long long idpos = pos;

-

-    const long long id = ReadUInt(m_pReader, idpos, len);

-    assert(id == 0x0C53BB6B);  //Cues ID

-

-    pos += len;  //consume ID

-    assert(pos < stop);

-

-    //Read Size

-

-    result = GetUIntLength(m_pReader, pos, len);

-    assert(result == 0);

-    assert((pos + len) <= stop);

-

-    const long long size = ReadUInt(m_pReader, pos, len);

-    assert(size >= 0);

-

-    pos += len;  //consume length of size of element

-    assert((pos + size) <= stop);

-

-    const long long element_size = size + pos - element_start;

-

-    //Pos now points to start of payload

-

-    m_pCues = new Cues(this, pos, size, element_start, element_size);

-    assert(m_pCues);  //TODO

-

-    //os << "Segment::ParseCues (end)" << endl;

-}

-#else

-long Segment::ParseCues(

-    long long off,

-    long long& pos,

-    long& len)

-{

-    if (m_pCues)

-        return 0;  //success

-

-    if (off < 0)

-        return -1;

-

-    long long total, avail;

-

-    const int status = m_pReader->Length(&total, &avail);

-

-    if (status < 0)  //error

-        return status;

-

-    assert((total < 0) || (avail <= total));

-

-    pos = m_start + off;

-

-    const long long element_start = pos;

-    const long long segment_stop = (m_size < 0) ? -1 : m_start + m_size;

-

-    if ((pos + 1) > avail)

-    {

-        len = 1;

-        return E_BUFFER_NOT_FULL;

-    }

-

-    long long result = GetUIntLength(m_pReader, pos, len);

-

-    if (result < 0)  //error

-        return static_cast<long>(result);

-

-    if (result > 0) //underflow (weird)

-    {

-        len = 1;

-        return E_BUFFER_NOT_FULL;

-    }

-

-    if ((segment_stop >= 0) && ((pos + len) > segment_stop))

-        return E_FILE_FORMAT_INVALID;

-

-    if ((pos + len) > avail)

-        return E_BUFFER_NOT_FULL;

-

-    const long long idpos = pos;

-

-    const long long id = ReadUInt(m_pReader, idpos, len);

-

-    if (id != 0x0C53BB6B)  //Cues ID

-        return E_FILE_FORMAT_INVALID;

-

-    pos += len;  //consume ID

-    assert((segment_stop < 0) || (pos <= segment_stop));

-

-    //Read Size

-

-    if ((pos + 1) > avail)

-    {

-        len = 1;

-        return E_BUFFER_NOT_FULL;

-    }

-

-    result = GetUIntLength(m_pReader, pos, len);

-

-    if (result < 0)  //error

-        return static_cast<long>(result);

-

-    if (result > 0) //underflow (weird)

-    {

-        len = 1;

-        return E_BUFFER_NOT_FULL;

-    }

-

-    if ((segment_stop >= 0) && ((pos + len) > segment_stop))

-        return E_FILE_FORMAT_INVALID;

-

-    if ((pos + len) > avail)

-        return E_BUFFER_NOT_FULL;

-

-    const long long size = ReadUInt(m_pReader, pos, len);

-

-    if (size < 0)  //error

-        return static_cast<long>(size);

-

-    if (size == 0)  //weird, although technically not illegal

-        return 1;   //done

-

-    pos += len;  //consume length of size of element

-    assert((segment_stop < 0) || (pos <= segment_stop));

-

-    //Pos now points to start of payload

-

-    const long long element_stop = pos + size;

-

-    if ((segment_stop >= 0) && (element_stop > segment_stop))

-        return E_FILE_FORMAT_INVALID;

-

-    len = static_cast<long>(size);

-

-    if (element_stop > avail)

-        return E_BUFFER_NOT_FULL;

-

-    const long long element_size = element_stop - element_start;

-

-    m_pCues = new (std::nothrow) Cues(

-                                    this,

-                                    pos,

-                                    size,

-                                    element_start,

-                                    element_size);

-    assert(m_pCues);  //TODO

-

-    return 0;  //success

-}

-#endif

-

-

-#if 0

-void Segment::ParseSeekEntry(

-    long long start,

-    long long size_)

-{

-    long long pos = start;

-

-    const long long stop = start + size_;

-

-    long len;

-

-    const long long seekIdId = ReadUInt(m_pReader, pos, len);

-    //seekIdId;

-    assert(seekIdId == 0x13AB);  //SeekID ID

-    assert((pos + len) <= stop);

-

-    pos += len;  //consume id

-

-    const long long seekIdSize = ReadUInt(m_pReader, pos, len);

-    assert(seekIdSize >= 0);

-    assert((pos + len) <= stop);

-

-    pos += len;  //consume size

-

-    const long long seekId = ReadUInt(m_pReader, pos, len);  //payload

-    assert(seekId >= 0);

-    assert(len == seekIdSize);

-    assert((pos + len) <= stop);

-

-    pos += seekIdSize;  //consume payload

-

-    const long long seekPosId = ReadUInt(m_pReader, pos, len);

-    //seekPosId;

-    assert(seekPosId == 0x13AC);  //SeekPos ID

-    assert((pos + len) <= stop);

-

-    pos += len;  //consume id

-

-    const long long seekPosSize = ReadUInt(m_pReader, pos, len);

-    assert(seekPosSize >= 0);

-    assert((pos + len) <= stop);

-

-    pos += len;  //consume size

-    assert((pos + seekPosSize) <= stop);

-

-    const long long seekOff = UnserializeUInt(m_pReader, pos, seekPosSize);

-    assert(seekOff >= 0);

-    assert(seekOff < m_size);

-

-    pos += seekPosSize;  //consume payload

-    assert(pos == stop);

-

-    const long long seekPos = m_start + seekOff;

-    assert(seekPos < (m_start + m_size));

-

-    if (seekId == 0x0C53BB6B)  //Cues ID

-        ParseCues(seekOff);

-}

-#else

-void SeekHead::ParseEntry(

-    IMkvReader* pReader,

-    long long start,

-    long long size_,

-    Entry*& pEntry)

-{

-    long long pos = start;

-    const long long stop = start + size_;

-

-    long len;

-

-    //parse the container for the level-1 element ID

-

-    const long long seekIdId = ReadUInt(pReader, pos, len);

-    //seekIdId;

-

-    if (seekIdId != 0x13AB)  //SeekID ID

-        return;

-

-    if ((pos + len) > stop)

-        return;

-

-    pos += len;  //consume SeekID id

-

-    const long long seekIdSize = ReadUInt(pReader, pos, len);

-

-    if (seekIdSize <= 0)

-        return;

-

-    if ((pos + len) > stop)

-        return;

-

-    pos += len;  //consume size of field

-

-    if ((pos + seekIdSize) > stop)

-        return;

-

-    //TODO: it's not clear whether this is correct

-    //It seems as if the payload here is "binary" which

-    //means the value of the ID should be unserialized,

-    //not parsed as an uint.

-    //

-    pEntry->id = ReadUInt(pReader, pos, len);  //payload

-

-    if (pEntry->id <= 0)

-        return;

-

-    if (len != seekIdSize)

-        return;

-

-    pos += seekIdSize;  //consume SeekID payload

-

-    const long long seekPosId = ReadUInt(pReader, pos, len);

-

-    if (seekPosId != 0x13AC)  //SeekPos ID

-        return;

-

-    if ((pos + len) > stop)

-        return;

-

-    pos += len;  //consume id

-

-    const long long seekPosSize = ReadUInt(pReader, pos, len);

-

-    if (seekPosSize <= 0)

-        return;

-

-    if ((pos + len) > stop)

-        return;

-

-    pos += len;  //consume size

-

-    if ((pos + seekPosSize) > stop)

-        return;

-

-    pEntry->pos = UnserializeUInt(pReader, pos, seekPosSize);

-

-    if (pEntry->pos < 0)

-        return;

-

-    pos += seekPosSize;  //consume payload

-

-    if (pos != stop)

-        return;

-

-    ++pEntry;  //success

-}

-#endif

-

-

-Cues::Cues(

-    Segment* pSegment,

-    long long start_,

-    long long size_,

-    long long element_start,

-    long long element_size) :

-    m_pSegment(pSegment),

-    m_start(start_),

-    m_size(size_),

-    m_cue_points(NULL),

-    m_count(0),

-    m_preload_count(0),

-    m_pos(start_),

-    m_element_start(element_start),

-    m_element_size(element_size)

-{

-}

-

-

-Cues::~Cues()

-{

-    const size_t n = m_count + m_preload_count;

-

-    CuePoint** p = m_cue_points;

-    CuePoint** const q = p + n;

-

-    while (p != q)

-    {

-        CuePoint* const pCP = *p++;

-        assert(pCP);

-

-        delete pCP;

-    }

-

-    delete[] m_cue_points;

-}

-

-

-long Cues::GetCount() const

-{

-    if (m_cue_points == NULL)

-        return -1;

-

-    return m_count;  //TODO: really ignore preload count?

-}

-

-

-bool Cues::DoneParsing() const

-{

-    const long long stop = m_start + m_size;

-    return (m_pos >= stop);

-}

-

-

-void Cues::Init() const

-{

-    if (m_cue_points)

-        return;

-

-    assert(m_count == 0);

-    assert(m_preload_count == 0);

-

-    IMkvReader* const pReader = m_pSegment->m_pReader;

-

-    const long long stop = m_start + m_size;

-    long long pos = m_start;

-

-    size_t cue_points_size = 0;

-

-    while (pos < stop)

-    {

-        const long long idpos = pos;

-

-        long len;

-

-        const long long id = ReadUInt(pReader, pos, len);

-        assert(id >= 0);  //TODO

-        assert((pos + len) <= stop);

-

-        pos += len;  //consume ID

-

-        const long long size = ReadUInt(pReader, pos, len);

-        assert(size >= 0);

-        assert((pos + len) <= stop);

-

-        pos += len;  //consume Size field

-        assert((pos + size) <= stop);

-

-        if (id == 0x3B)  //CuePoint ID

-            PreloadCuePoint(cue_points_size, idpos);

-

-        pos += size;  //consume payload

-        assert(pos <= stop);

-    }

-}

-

-

-void Cues::PreloadCuePoint(

-    size_t& cue_points_size,

-    long long pos) const

-{

-    assert(m_count == 0);

-

-    if (m_preload_count >= cue_points_size)

-    {

-        size_t n;

-

-        if (cue_points_size > 0)

-            n = static_cast<size_t>(2 * cue_points_size);

-        else

-        {

-            const SegmentInfo* const pInfo = m_pSegment->GetInfo();

-

-            if (pInfo == NULL)

-                n = 2048;

-            else

-            {

-                const long long ns = pInfo->GetDuration();

-

-                if (ns <= 0)

-                    n = 2048;

-                else

-                {

-                    const long long sec = (ns + 999999999LL) / 1000000000LL;

-                    n = static_cast<size_t>(sec);

-                }

-            }

-        }

-

-        CuePoint** const qq = new CuePoint*[n];

-        CuePoint** q = qq;  //beginning of target

-

-        CuePoint** p = m_cue_points;                //beginning of source

-        CuePoint** const pp = p + m_preload_count;  //end of source

-

-        while (p != pp)

-            *q++ = *p++;

-

-        delete[] m_cue_points;

-

-        m_cue_points = qq;

-        cue_points_size = n;

-    }

-

-    CuePoint* const pCP = new CuePoint(m_preload_count, pos);

-    m_cue_points[m_preload_count++] = pCP;

-}

-

-

-bool Cues::LoadCuePoint() const

-{

-    //odbgstream os;

-    //os << "Cues::LoadCuePoint" << endl;

-

-    const long long stop = m_start + m_size;

-

-    if (m_pos >= stop)

-        return false;  //nothing else to do

-

-    Init();

-

-    IMkvReader* const pReader = m_pSegment->m_pReader;

-

-    while (m_pos < stop)

-    {

-        const long long idpos = m_pos;

-

-        long len;

-

-        const long long id = ReadUInt(pReader, m_pos, len);

-        assert(id >= 0);  //TODO

-        assert((m_pos + len) <= stop);

-

-        m_pos += len;  //consume ID

-

-        const long long size = ReadUInt(pReader, m_pos, len);

-        assert(size >= 0);

-        assert((m_pos + len) <= stop);

-

-        m_pos += len;  //consume Size field

-        assert((m_pos + size) <= stop);

-

-        if (id != 0x3B)  //CuePoint ID

-        {

-            m_pos += size;  //consume payload

-            assert(m_pos <= stop);

-

-            continue;

-        }

-

-        assert(m_preload_count > 0);

-

-        CuePoint* const pCP = m_cue_points[m_count];

-        assert(pCP);

-        assert((pCP->GetTimeCode() >= 0) || (-pCP->GetTimeCode() == idpos));

-

-        pCP->Load(pReader);

-        ++m_count;

-        --m_preload_count;

-

-        m_pos += size;  //consume payload

-        assert(m_pos <= stop);

-

-        break;

-    }

-

-    return (m_pos < stop);

-}

-

-

-bool Cues::Find(

-    long long time_ns,

-    const Track* pTrack,

-    const CuePoint*& pCP,

-    const CuePoint::TrackPosition*& pTP) const

-{

-    assert(time_ns >= 0);

-    assert(pTrack);

-

-#if 0

-    LoadCuePoint();  //establish invariant

-

-    assert(m_cue_points);

-    assert(m_count > 0);

-

-    CuePoint** const ii = m_cue_points;

-    CuePoint** i = ii;

-

-    CuePoint** const jj = ii + m_count + m_preload_count;

-    CuePoint** j = jj;

-

-    pCP = *i;

-    assert(pCP);

-

-    if (time_ns <= pCP->GetTime(m_pSegment))

-    {

-        pTP = pCP->Find(pTrack);

-        return (pTP != NULL);

-    }

-

-    IMkvReader* const pReader = m_pSegment->m_pReader;

-

-    while (i < j)

-    {

-        //INVARIANT:

-        //[ii, i) <= time_ns

-        //[i, j)  ?

-        //[j, jj) > time_ns

-

-        CuePoint** const k = i + (j - i) / 2;

-        assert(k < jj);

-

-        CuePoint* const pCP = *k;

-        assert(pCP);

-

-        pCP->Load(pReader);

-

-        const long long t = pCP->GetTime(m_pSegment);

-

-        if (t <= time_ns)

-            i = k + 1;

-        else

-            j = k;

-

-        assert(i <= j);

-    }

-

-    assert(i == j);

-    assert(i <= jj);

-    assert(i > ii);

-

-    pCP = *--i;

-    assert(pCP);

-    assert(pCP->GetTime(m_pSegment) <= time_ns);

-#else

-    if (m_cue_points == NULL)

-        return false;

-

-    if (m_count == 0)

-        return false;

-

-    CuePoint** const ii = m_cue_points;

-    CuePoint** i = ii;

-

-    CuePoint** const jj = ii + m_count;

-    CuePoint** j = jj;

-

-    pCP = *i;

-    assert(pCP);

-

-    if (time_ns <= pCP->GetTime(m_pSegment))

-    {

-        pTP = pCP->Find(pTrack);

-        return (pTP != NULL);

-    }

-

-    while (i < j)

-    {

-        //INVARIANT:

-        //[ii, i) <= time_ns

-        //[i, j)  ?

-        //[j, jj) > time_ns

-

-        CuePoint** const k = i + (j - i) / 2;

-        assert(k < jj);

-

-        CuePoint* const pCP = *k;

-        assert(pCP);

-

-        const long long t = pCP->GetTime(m_pSegment);

-

-        if (t <= time_ns)

-            i = k + 1;

-        else

-            j = k;

-

-        assert(i <= j);

-    }

-

-    assert(i == j);

-    assert(i <= jj);

-    assert(i > ii);

-

-    pCP = *--i;

-    assert(pCP);

-    assert(pCP->GetTime(m_pSegment) <= time_ns);

-#endif

-

-    //TODO: here and elsewhere, it's probably not correct to search

-    //for the cue point with this time, and then search for a matching

-    //track.  In principle, the matching track could be on some earlier

-    //cue point, and with our current algorithm, we'd miss it.  To make

-    //this bullet-proof, we'd need to create a secondary structure,

-    //with a list of cue points that apply to a track, and then search

-    //that track-based structure for a matching cue point.

-

-    pTP = pCP->Find(pTrack);

-    return (pTP != NULL);

-}

-

-

-#if 0

-bool Cues::FindNext(

-    long long time_ns,

-    const Track* pTrack,

-    const CuePoint*& pCP,

-    const CuePoint::TrackPosition*& pTP) const

-{

-    pCP = 0;

-    pTP = 0;

-

-    if (m_count == 0)

-        return false;

-

-    assert(m_cue_points);

-

-    const CuePoint* const* const ii = m_cue_points;

-    const CuePoint* const* i = ii;

-

-    const CuePoint* const* const jj = ii + m_count;

-    const CuePoint* const* j = jj;

-

-    while (i < j)

-    {

-        //INVARIANT:

-        //[ii, i) <= time_ns

-        //[i, j)  ?

-        //[j, jj) > time_ns

-

-        const CuePoint* const* const k = i + (j - i) / 2;

-        assert(k < jj);

-

-        pCP = *k;

-        assert(pCP);

-

-        const long long t = pCP->GetTime(m_pSegment);

-

-        if (t <= time_ns)

-            i = k + 1;

-        else

-            j = k;

-

-        assert(i <= j);

-    }

-

-    assert(i == j);

-    assert(i <= jj);

-

-    if (i >= jj)  //time_ns is greater than max cue point

-        return false;

-

-    pCP = *i;

-    assert(pCP);

-    assert(pCP->GetTime(m_pSegment) > time_ns);

-

-    pTP = pCP->Find(pTrack);

-    return (pTP != NULL);

-}

-#endif

-

-

-const CuePoint* Cues::GetFirst() const

-{

-    if (m_cue_points == NULL)

-        return NULL;

-

-    if (m_count == 0)

-        return NULL;

-

-#if 0

-    LoadCuePoint();  //init cues

-

-    const size_t count = m_count + m_preload_count;

-

-    if (count == 0)  //weird

-        return NULL;

-#endif

-

-    CuePoint* const* const pp = m_cue_points;

-    assert(pp);

-

-    CuePoint* const pCP = pp[0];

-    assert(pCP);

-    assert(pCP->GetTimeCode() >= 0);

-

-    return pCP;

-}

-

-

-const CuePoint* Cues::GetLast() const

-{

-    if (m_cue_points == NULL)

-        return NULL;

-

-    if (m_count == 0)

-        return NULL;

-

-#if 0

-    LoadCuePoint();  //init cues

-

-    const size_t count = m_count + m_preload_count;

-

-    if (count == 0)  //weird

-        return NULL;

-

-    const size_t index = count - 1;

-

-    CuePoint* const* const pp = m_cue_points;

-    assert(pp);

-

-    CuePoint* const pCP = pp[index];

-    assert(pCP);

-

-    pCP->Load(m_pSegment->m_pReader);

-    assert(pCP->GetTimeCode() >= 0);

-#else

-    const size_t index = m_count - 1;

-

-    CuePoint* const* const pp = m_cue_points;

-    assert(pp);

-

-    CuePoint* const pCP = pp[index];

-    assert(pCP);

-    assert(pCP->GetTimeCode() >= 0);

-#endif

-

-    return pCP;

-}

-

-

-const CuePoint* Cues::GetNext(const CuePoint* pCurr) const

-{

-    if (pCurr == NULL)

-        return NULL;

-

-    assert(pCurr->GetTimeCode() >= 0);

-    assert(m_cue_points);

-    assert(m_count >= 1);

-

-#if 0

-    const size_t count = m_count + m_preload_count;

-

-    size_t index = pCurr->m_index;

-    assert(index < count);

-

-    CuePoint* const* const pp = m_cue_points;

-    assert(pp);

-    assert(pp[index] == pCurr);

-

-    ++index;

-

-    if (index >= count)

-        return NULL;

-

-    CuePoint* const pNext = pp[index];

-    assert(pNext);

-

-    pNext->Load(m_pSegment->m_pReader);

-#else

-    size_t index = pCurr->m_index;

-    assert(index < m_count);

-

-    CuePoint* const* const pp = m_cue_points;

-    assert(pp);

-    assert(pp[index] == pCurr);

-

-    ++index;

-

-    if (index >= m_count)

-        return NULL;

-

-    CuePoint* const pNext = pp[index];

-    assert(pNext);

-    assert(pNext->GetTimeCode() >= 0);

-#endif

-

-    return pNext;

-}

-

-

-const BlockEntry* Cues::GetBlock(

-    const CuePoint* pCP,

-    const CuePoint::TrackPosition* pTP) const

-{

-    if (pCP == NULL)

-        return NULL;

-

-    if (pTP == NULL)

-        return NULL;

-

-    return m_pSegment->GetBlock(*pCP, *pTP);

-}

-

-

-const BlockEntry* Segment::GetBlock(

-    const CuePoint& cp,

-    const CuePoint::TrackPosition& tp)

-{

-    Cluster** const ii = m_clusters;

-    Cluster** i = ii;

-

-    const long count = m_clusterCount + m_clusterPreloadCount;

-

-    Cluster** const jj = ii + count;

-    Cluster** j = jj;

-

-    while (i < j)

-    {

-        //INVARIANT:

-        //[ii, i) < pTP->m_pos

-        //[i, j) ?

-        //[j, jj)  > pTP->m_pos

-

-        Cluster** const k = i + (j - i) / 2;

-        assert(k < jj);

-

-        Cluster* const pCluster = *k;

-        assert(pCluster);

-

-        //const long long pos_ = pCluster->m_pos;

-        //assert(pos_);

-        //const long long pos = pos_ * ((pos_ < 0) ? -1 : 1);

-

-        const long long pos = pCluster->GetPosition();

-        assert(pos >= 0);

-

-        if (pos < tp.m_pos)

-            i = k + 1;

-        else if (pos > tp.m_pos)

-            j = k;

-        else

-            return pCluster->GetEntry(cp, tp);

-    }

-

-    assert(i == j);

-    //assert(Cluster::HasBlockEntries(this, tp.m_pos));

-

-    Cluster* const pCluster = Cluster::Create(this, -1, tp.m_pos, -1);

-    assert(pCluster);

-

-    const ptrdiff_t idx = i - m_clusters;

-

-    PreloadCluster(pCluster, idx);

-    assert(m_clusters);

-    assert(m_clusterPreloadCount > 0);

-    assert(m_clusters[idx] == pCluster);

-

-    return pCluster->GetEntry(cp, tp);

-}

-

-

-const Cluster* Segment::FindOrPreloadCluster(long long requested_pos)

-{

-    if (requested_pos < 0)

-        return 0;

-

-    Cluster** const ii = m_clusters;

-    Cluster** i = ii;

-

-    const long count = m_clusterCount + m_clusterPreloadCount;

-

-    Cluster** const jj = ii + count;

-    Cluster** j = jj;

-

-    while (i < j)

-    {

-        //INVARIANT:

-        //[ii, i) < pTP->m_pos

-        //[i, j) ?

-        //[j, jj)  > pTP->m_pos

-

-        Cluster** const k = i + (j - i) / 2;

-        assert(k < jj);

-

-        Cluster* const pCluster = *k;

-        assert(pCluster);

-

-        //const long long pos_ = pCluster->m_pos;

-        //assert(pos_);

-        //const long long pos = pos_ * ((pos_ < 0) ? -1 : 1);

-

-        const long long pos = pCluster->GetPosition();

-        assert(pos >= 0);

-

-        if (pos < requested_pos)

-            i = k + 1;

-        else if (pos > requested_pos)

-            j = k;

-        else

-            return pCluster;

-    }

-

-    assert(i == j);

-    //assert(Cluster::HasBlockEntries(this, tp.m_pos));

-

-    Cluster* const pCluster = Cluster::Create(

-                                this,

-                                -1,

-                                requested_pos,

-                                -1);

-    assert(pCluster);

-

-    const ptrdiff_t idx = i - m_clusters;

-

-    PreloadCluster(pCluster, idx);

-    assert(m_clusters);

-    assert(m_clusterPreloadCount > 0);

-    assert(m_clusters[idx] == pCluster);

-

-    return pCluster;

-}

-

-

-CuePoint::CuePoint(size_t idx, long long pos) :

-    m_element_start(0),

-    m_element_size(0),

-    m_index(idx),

-    m_timecode(-1 * pos),

-    m_track_positions(NULL),

-    m_track_positions_count(0)

-{

-    assert(pos > 0);

-}

-

-

-CuePoint::~CuePoint()

-{

-    delete[] m_track_positions;

-}

-

-

-void CuePoint::Load(IMkvReader* pReader)

-{

-    //odbgstream os;

-    //os << "CuePoint::Load(begin): timecode=" << m_timecode << endl;

-

-    if (m_timecode >= 0)  //already loaded

-        return;

-

-    assert(m_track_positions == NULL);

-    assert(m_track_positions_count == 0);

-

-    long long pos_ = -m_timecode;

-    const long long element_start = pos_;

-

-    long long stop;

-

-    {

-        long len;

-

-        const long long id = ReadUInt(pReader, pos_, len);

-        assert(id == 0x3B);  //CuePoint ID

-        //assert((pos + len) <= stop);

-

-        pos_ += len;  //consume ID

-

-        const long long size = ReadUInt(pReader, pos_, len);

-        assert(size >= 0);

-        //assert((pos + len) <= stop);

-

-        pos_ += len;  //consume Size field

-        //assert((pos + size) <= stop);

-

-        //pos_ now points to start of payload

-

-        stop = pos_ + size;

-    }

-

-    const long long element_size = stop - element_start;

-

-    long long pos = pos_;

-

-    //First count number of track positions

-

-    while (pos < stop)

-    {

-        long len;

-

-        const long long id = ReadUInt(pReader, pos, len);

-        assert(id >= 0);  //TODO

-        assert((pos + len) <= stop);

-

-        pos += len;  //consume ID

-

-        const long long size = ReadUInt(pReader, pos, len);

-        assert(size >= 0);

-        assert((pos + len) <= stop);

-

-        pos += len;  //consume Size field

-        assert((pos + size) <= stop);

-

-        if (id == 0x33)  //CueTime ID

-            m_timecode = UnserializeUInt(pReader, pos, size);

-

-        else if (id == 0x37) //CueTrackPosition(s) ID

-            ++m_track_positions_count;

-

-        pos += size;  //consume payload

-        assert(pos <= stop);

-    }

-

-    assert(m_timecode >= 0);

-    assert(m_track_positions_count > 0);

-

-    //os << "CuePoint::Load(cont'd): idpos=" << idpos

-    //   << " timecode=" << m_timecode

-    //   << endl;

-

-    m_track_positions = new TrackPosition[m_track_positions_count];

-

-    //Now parse track positions

-

-    TrackPosition* p = m_track_positions;

-    pos = pos_;

-

-    while (pos < stop)

-    {

-        long len;

-

-        const long long id = ReadUInt(pReader, pos, len);

-        assert(id >= 0);  //TODO

-        assert((pos + len) <= stop);

-

-        pos += len;  //consume ID

-

-        const long long size = ReadUInt(pReader, pos, len);

-        assert(size >= 0);

-        assert((pos + len) <= stop);

-

-        pos += len;  //consume Size field

-        assert((pos + size) <= stop);

-

-        if (id == 0x37) //CueTrackPosition(s) ID

-        {

-            TrackPosition& tp = *p++;

-            tp.Parse(pReader, pos, size);

-        }

-

-        pos += size;  //consume payload

-        assert(pos <= stop);

-    }

-

-    assert(size_t(p - m_track_positions) == m_track_positions_count);

-

-    m_element_start = element_start;

-    m_element_size = element_size;

-}

-

-

-

-void CuePoint::TrackPosition::Parse(

-    IMkvReader* pReader,

-    long long start_,

-    long long size_)

-{

-    const long long stop = start_ + size_;

-    long long pos = start_;

-

-    m_track = -1;

-    m_pos = -1;

-    m_block = 1;  //default

-

-    while (pos < stop)

-    {

-        long len;

-

-        const long long id = ReadUInt(pReader, pos, len);

-        assert(id >= 0);  //TODO

-        assert((pos + len) <= stop);

-

-        pos += len;  //consume ID

-

-        const long long size = ReadUInt(pReader, pos, len);

-        assert(size >= 0);

-        assert((pos + len) <= stop);

-

-        pos += len;  //consume Size field

-        assert((pos + size) <= stop);

-

-        if (id == 0x77)  //CueTrack ID

-            m_track = UnserializeUInt(pReader, pos, size);

-

-        else if (id == 0x71)  //CueClusterPos ID

-            m_pos = UnserializeUInt(pReader, pos, size);

-

-        else if (id == 0x1378)  //CueBlockNumber

-            m_block = UnserializeUInt(pReader, pos, size);

-

-        pos += size;  //consume payload

-        assert(pos <= stop);

-    }

-

-    assert(m_pos >= 0);

-    assert(m_track > 0);

-    //assert(m_block > 0);

-}

-

-

-const CuePoint::TrackPosition* CuePoint::Find(const Track* pTrack) const

-{

-    assert(pTrack);

-

-    const long long n = pTrack->GetNumber();

-

-    const TrackPosition* i = m_track_positions;

-    const TrackPosition* const j = i + m_track_positions_count;

-

-    while (i != j)

-    {

-        const TrackPosition& p = *i++;

-

-        if (p.m_track == n)

-            return &p;

-    }

-

-    return NULL;  //no matching track number found

-}

-

-

-long long CuePoint::GetTimeCode() const

-{

-    return m_timecode;

-}

-

-long long CuePoint::GetTime(const Segment* pSegment) const

-{

-    assert(pSegment);

-    assert(m_timecode >= 0);

-

-    const SegmentInfo* const pInfo = pSegment->GetInfo();

-    assert(pInfo);

-

-    const long long scale = pInfo->GetTimeCodeScale();

-    assert(scale >= 1);

-

-    const long long time = scale * m_timecode;

-

-    return time;

-}

-

-

-long long Segment::Unparsed() const

-{

-    if (m_size < 0)

-        return LLONG_MAX;

-

-    const long long stop = m_start + m_size;

-

-    const long long result = stop - m_pos;

-    assert(result >= 0);

-

-    return result;

-}

-

-

-const Cluster* Segment::GetFirst() const

-{

-    if ((m_clusters == NULL) || (m_clusterCount <= 0))

-       return &m_eos;

-

-    Cluster* const pCluster = m_clusters[0];

-    assert(pCluster);

-

-    return pCluster;

-}

-

-

-const Cluster* Segment::GetLast() const

-{

-    if ((m_clusters == NULL) || (m_clusterCount <= 0))

-        return &m_eos;

-

-    const long idx = m_clusterCount - 1;

-

-    Cluster* const pCluster = m_clusters[idx];

-    assert(pCluster);

-

-    return pCluster;

-}

-

-

-unsigned long Segment::GetCount() const

-{

-    return m_clusterCount;

-}

-

-

-const Cluster* Segment::GetNext(const Cluster* pCurr)

-{

-    assert(pCurr);

-    assert(pCurr != &m_eos);

-    assert(m_clusters);

-

-    long idx =  pCurr->m_index;

-

-    if (idx >= 0)

-    {

-        assert(m_clusterCount > 0);

-        assert(idx < m_clusterCount);

-        assert(pCurr == m_clusters[idx]);

-

-        ++idx;

-

-        if (idx >= m_clusterCount)

-            return &m_eos;  //caller will LoadCluster as desired

-

-        Cluster* const pNext = m_clusters[idx];

-        assert(pNext);

-        assert(pNext->m_index >= 0);

-        assert(pNext->m_index == idx);

-

-        return pNext;

-    }

-

-    assert(m_clusterPreloadCount > 0);

-

-    //const long long off_ = pCurr->m_pos;

-    //const long long off = off_ * ((off_ < 0) ? -1 : 1);

-    //long long pos = m_start + off;

-

-    long long pos = pCurr->m_element_start;

-

-    assert(m_size >= 0);  //TODO

-    const long long stop = m_start + m_size;  //end of segment

-

-    {

-        long len;

-

-        long long result = GetUIntLength(m_pReader, pos, len);

-        assert(result == 0);  //TODO

-        assert((pos + len) <= stop);  //TODO

-

-        const long long id = ReadUInt(m_pReader, pos, len);

-        assert(id == 0x0F43B675);  //Cluster ID   //TODO

-

-        pos += len;  //consume ID

-

-        //Read Size

-        result = GetUIntLength(m_pReader, pos, len);

-        assert(result == 0);  //TODO

-        assert((pos + len) <= stop);  //TODO

-

-        const long long size = ReadUInt(m_pReader, pos, len);

-        assert(size > 0);  //TODO

-        assert((pCurr->m_size <= 0) || (pCurr->m_size == size));

-

-        pos += len;  //consume length of size of element

-        assert((pos + size) <= stop);  //TODO

-

-        //Pos now points to start of payload

-

-        pos += size;  //consume payload

-    }

-

-    long long off_next = 0;

-    //long long element_start_next = 0;

-    long long element_size_next = 0;

-

-    while (pos < stop)

-    {

-        long len;

-

-        long long result = GetUIntLength(m_pReader, pos, len);

-        assert(result == 0);  //TODO

-        assert((pos + len) <= stop);  //TODO

-

-        const long long idpos = pos;  //pos of next (potential) cluster

-

-        const long long id = ReadUInt(m_pReader, idpos, len);

-        assert(id > 0);  //TODO

-

-        pos += len;  //consume ID

-

-        //Read Size

-        result = GetUIntLength(m_pReader, pos, len);

-        assert(result == 0);  //TODO

-        assert((pos + len) <= stop);  //TODO

-

-        const long long size = ReadUInt(m_pReader, pos, len);

-        assert(size >= 0);  //TODO

-

-        pos += len;  //consume length of size of element

-        assert((pos + size) <= stop);  //TODO

-

-        const long long element_size = size + pos - idpos;

-

-        //Pos now points to start of payload

-

-        if (size == 0)  //weird

-            continue;

-

-        if (id == 0x0F43B675)  //Cluster ID

-        {

-            const long long off_next_ = idpos - m_start;

-

-            long long pos_;

-            long len_;

-

-            const long status = Cluster::HasBlockEntries(

-                                    this,

-                                    off_next_,

-                                    pos_,

-                                    len_);

-

-            assert(status >= 0);

-

-            if (status > 0)

-            {

-                off_next = off_next_;

-                //element_start_next = idpos;

-                element_size_next = element_size;

-                break;

-            }

-        }

-

-        pos += size;  //consume payload

-    }

-

-    if (off_next <= 0)

-        return 0;

-

-    Cluster** const ii = m_clusters + m_clusterCount;

-    Cluster** i = ii;

-

-    Cluster** const jj = ii + m_clusterPreloadCount;

-    Cluster** j = jj;

-

-    while (i < j)

-    {

-        //INVARIANT:

-        //[0, i) < pos_next

-        //[i, j) ?

-        //[j, jj)  > pos_next

-

-        Cluster** const k = i + (j - i) / 2;

-        assert(k < jj);

-

-        Cluster* const pNext = *k;

-        assert(pNext);

-        assert(pNext->m_index < 0);

-

-        //const long long pos_ = pNext->m_pos;

-        //assert(pos_);

-        //pos = pos_ * ((pos_ < 0) ? -1 : 1);

-

-        pos = pNext->GetPosition();

-

-        if (pos < off_next)

-            i = k + 1;

-        else if (pos > off_next)

-            j = k;

-        else

-            return pNext;

-    }

-

-    assert(i == j);

-

-    Cluster* const pNext = Cluster::Create(this,

-                                          -1,

-                                          off_next,

-                                          element_size_next);

-    assert(pNext);

-

-    const ptrdiff_t idx_next = i - m_clusters;  //insertion position

-

-    PreloadCluster(pNext, idx_next);

-    assert(m_clusters);

-    assert(idx_next < m_clusterSize);

-    assert(m_clusters[idx_next] == pNext);

-

-    return pNext;

-}

-

-

-long Segment::ParseNext(

-    const Cluster* pCurr,

-    const Cluster*& pResult,

-    long long& pos,

-    long& len)

-{

-    assert(pCurr);

-    assert(!pCurr->EOS());

-    assert(m_clusters);

-

-    pResult = 0;

-

-    if (pCurr->m_index >= 0)  //loaded (not merely preloaded)

-    {

-        assert(m_clusters[pCurr->m_index] == pCurr);

-

-        const long next_idx = pCurr->m_index + 1;

-

-        if (next_idx < m_clusterCount)

-        {

-            pResult = m_clusters[next_idx];

-            return 0;  //success

-        }

-

-        //curr cluster is last among loaded

-

-        const long result = LoadCluster(pos, len);

-

-        if (result < 0)  //error or underflow

-            return result;

-

-        if (result > 0)  //no more clusters

-        {

-            //pResult = &m_eos;

-            return 1;

-        }

-

-        pResult = GetLast();

-        return 0;  //success

-    }

-

-    long long total, avail;

-

-    long status = m_pReader->Length(&total, &avail);

-

-    if (status < 0)  //error

-        return status;

-

-    assert((total < 0) || (avail <= total));

-

-    //const long long off_curr_ = pCurr->m_pos;

-    //const long long off_curr = off_curr_ * ((off_curr_ < 0) ? -1 : 1);

-

-    //pos = m_start + off_curr;

-

-    const long long segment_stop = (m_size < 0) ? -1 : m_start + m_size;

-

-    //interrogate curr cluster

-

-    pos = pCurr->m_element_start;

-

-    if (pCurr->m_size >= 0)  //loaded (either partially or fully)

-    {

-        assert(pCurr->m_element_size > pCurr->m_size);

-        pos += pCurr->m_element_size;

-    }

-    else  //weird: preloaded only

-    {

-        if ((pos + 1) > avail)

-        {

-            len = 1;

-            return E_BUFFER_NOT_FULL;

-        }

-

-        long long result = GetUIntLength(m_pReader, pos, len);

-

-        if (result < 0)  //error

-            return static_cast<long>(result);

-

-        if (result > 0)  //weird

-            return E_BUFFER_NOT_FULL;

-

-        if ((segment_stop >= 0) && ((pos + len) > segment_stop))

-            return E_FILE_FORMAT_INVALID;

-

-        if ((pos + len) > avail)

-            return E_BUFFER_NOT_FULL;

-

-        const long long id = ReadUInt(m_pReader, pos, len);

-

-        if (id != 0x0F43B675)  //weird: not Cluster ID

-            return -1;

-

-        pos += len;  //consume ID

-

-        //Read Size

-

-        if ((pos + 1) > avail)

-        {

-            len = 1;

-            return E_BUFFER_NOT_FULL;

-        }

-

-        result = GetUIntLength(m_pReader, pos, len);

-

-        if (result < 0)  //error

-            return static_cast<long>(result);

-

-        if (result > 0)  //weird

-            return E_BUFFER_NOT_FULL;

-

-        if ((segment_stop >= 0) && ((pos + len) > segment_stop))

-            return E_FILE_FORMAT_INVALID;

-

-        if ((pos + len) > avail)

-            return E_BUFFER_NOT_FULL;

-

-        const long long size = ReadUInt(m_pReader, pos, len);

-

-        if (size < 0) //error

-            return static_cast<long>(size);

-

-        const long long unknown_size = (1LL << (7 * len)) - 1;

-

-        if (size == unknown_size)

-            return E_FILE_FORMAT_INVALID;

-

-        if (size == 0)

-            return E_FILE_FORMAT_INVALID;

-

-        assert((pCurr->m_size <= 0) || (pCurr->m_size == size));

-

-        pos += len;  //consume length of size of element

-

-        if ((segment_stop >= 0) && ((pos + size) > segment_stop))

-            return E_FILE_FORMAT_INVALID;

-

-        //Pos now points to start of payload

-

-        pos += size;  //consume payload (that is, the current cluster)

-        assert((segment_stop < 0) || (pos <= segment_stop));

-

-        //By consuming the payload, we are assuming that the curr

-        //cluster isn't interesting.  That is, we don't bother checking

-        //whether the payload of the curr cluster is less than what

-        //happens to be available (obtained via IMkvReader::Length).

-        //Presumably the caller has already dispensed with the current

-        //cluster, and really does want the next cluster.

-    }

-

-    //pos now points to just beyond the last fully-loaded cluster

-

-    //Parse next cluster.  This is strictly a parsing activity.

-    //Creation of a new cluster object happens later, after the

-    //parsing is done.

-

-    long long off_next = 0;

-    long long element_start = -1;

-    long long element_size = -1;

-

-    for (;;)

-    {

-        if ((total >= 0) && (pos >= total))

-            break;

-

-        if ((segment_stop >= 0) && (pos >= segment_stop))

-            break;

-

-        if ((pos + 1) > avail)

-        {

-            len = 1;

-            return E_BUFFER_NOT_FULL;

-        }

-

-        long long result = GetUIntLength(m_pReader, pos, len);

-

-        if (result < 0)  //error

-            return static_cast<long>(result);

-

-        if (result > 0)  //weird

-            return E_BUFFER_NOT_FULL;

-

-        if ((segment_stop >= 0) && ((pos + len) > segment_stop))

-            return E_FILE_FORMAT_INVALID;

-

-        if ((pos + len) > avail)

-            return E_BUFFER_NOT_FULL;

-

-        const long long idpos = pos;             //absolute

-        const long long idoff = pos - m_start;   //relative

-

-        const long long id = ReadUInt(m_pReader, idpos, len);  //absolute

-

-        if (id < 0)  //error

-            return static_cast<long>(id);

-

-        if (id == 0)  //weird

-            return -1;  //generic error

-

-        pos += len;  //consume ID

-

-        //Read Size

-

-        if ((pos + 1) > avail)

-        {

-            len = 1;

-            return E_BUFFER_NOT_FULL;

-        }

-

-        result = GetUIntLength(m_pReader, pos, len);

-

-        if (result < 0)  //error

-            return static_cast<long>(result);

-

-        if (result > 0)  //weird

-            return E_BUFFER_NOT_FULL;

-

-        if ((segment_stop >= 0) && ((pos + len) > segment_stop))

-            return E_FILE_FORMAT_INVALID;

-

-        if ((pos + len) > avail)

-            return E_BUFFER_NOT_FULL;

-

-        const long long size = ReadUInt(m_pReader, pos, len);

-

-        if (size < 0)  //error

-            return static_cast<long>(size);

-

-        const long long unknown_size = (1LL << (7 * len)) - 1;

-

-        if (size == unknown_size)

-            return E_FILE_FORMAT_INVALID;

-

-        pos += len;  //consume length of size of element

-

-        //Pos now points to start of payload

-

-        if (size == 0)  //weird

-            continue;

-

-        element_start = idpos;

-        const long long element_stop = pos + size;

-

-        if ((segment_stop >= 0) && (element_stop > segment_stop))

-            return E_FILE_FORMAT_INVALID;

-

-        element_size = element_stop - element_start;

-

-        if (id == 0x0C53BB6B)  //Cues ID

-        {

-            if (m_pCues == NULL)

-            {

-                m_pCues = new Cues(this,

-                                    pos,

-                                    size,

-                                    element_start,

-                                    element_size);

-                assert(m_pCues);  //TODO

-            }

-

-            pos += size;  //consume payload

-            assert((segment_stop < 0) || (pos <= segment_stop));

-

-            continue;

-        }

-

-        if (id != 0x0F43B675)  //Cluster ID

-        {

-            pos += size;  //consume payload

-            assert((segment_stop < 0) || (pos <= segment_stop));

-

-            continue;

-        }

-

-#if 0

-        len = static_cast<long>(size);

-

-        if (element_stop > avail)

-            return E_BUFFER_NOT_FULL;

-#endif

-

-        long long pos_;

-        long len_;

-

-        status = Cluster::HasBlockEntries(this, idoff, pos_, len_);

-

-        if (status < 0)  //error or underflow

-        {

-            pos = pos_;

-            len = len_;

-

-            return status;

-        }

-

-        if (status > 0)  //have block entries

-        {

-            off_next = idoff;

-            break;

-        }

-

-        pos += size;  //consume payload

-        assert((segment_stop < 0) || (pos <= segment_stop));

-    }

-

-    if (off_next <= 0)  //no next cluster found

-    {

-        //pResult = &m_eos;

-        return 1;

-    }

-

-    //We have parsed the next cluster.

-    //We have not created a cluster object yet.  What we need

-    //to do now is determine whether it has already be preloaded

-    //(in which case, an object for this cluster has already been

-    //created), and if not, create a new cluster object.

-

-    Cluster** const ii = m_clusters + m_clusterCount;

-    Cluster** i = ii;

-

-    Cluster** const jj = ii + m_clusterPreloadCount;

-    Cluster** j = jj;

-

-    while (i < j)

-    {

-        //INVARIANT:

-        //[0, i) < pos_next

-        //[i, j) ?

-        //[j, jj)  > pos_next

-

-        Cluster** const k = i + (j - i) / 2;

-        assert(k < jj);

-

-        const Cluster* const pNext = *k;

-        assert(pNext);

-        assert(pNext->m_index < 0);

-

-        //const long long pos_ = pNext->m_pos;

-        //assert(pos_);

-        //pos = pos_ * ((pos_ < 0) ? -1 : 1);

-

-        pos = pNext->GetPosition();

-        assert(pos >= 0);

-

-        if (pos < off_next)

-            i = k + 1;

-        else if (pos > off_next)

-            j = k;

-        else

-        {

-#if 0

-            status = pNext->Load(pos, len);

-            assert(status == 0);

-

-            if (status < 0)  //should never happen

-                return status;

-#endif

-            pResult = pNext;

-            return 0;  //success

-        }

-    }

-

-    assert(i == j);

-

-    Cluster* const pNext = Cluster::Create(this,

-                                            -1,   //preloaded

-                                            off_next,

-                                            element_size);

-    assert(pNext);

-

-    const ptrdiff_t idx_next = i - m_clusters;  //insertion position

-

-    PreloadCluster(pNext, idx_next);

-    assert(m_clusters);

-    assert(idx_next < m_clusterSize);

-    assert(m_clusters[idx_next] == pNext);

-

-#if 0

-    status = pNext->Load(pos, len);

-    assert(status == 0);

-

-    if (status < 0)

-        return status;

-#endif

-

-    pResult = pNext;

-    return 0;  //success

-}

-

-

-const Cluster* Segment::FindCluster(long long time_ns) const

-{

-    if ((m_clusters == NULL) || (m_clusterCount <= 0))

-        return &m_eos;

-

-    {

-        Cluster* const pCluster = m_clusters[0];

-        assert(pCluster);

-        assert(pCluster->m_index == 0);

-

-        if (time_ns <= pCluster->GetTime())

-            return pCluster;

-    }

-

-    //Binary search of cluster array

-

-    long i = 0;

-    long j = m_clusterCount;

-

-    while (i < j)

-    {

-        //INVARIANT:

-        //[0, i) <= time_ns

-        //[i, j) ?

-        //[j, m_clusterCount)  > time_ns

-

-        const long k = i + (j - i) / 2;

-        assert(k < m_clusterCount);

-

-        Cluster* const pCluster = m_clusters[k];

-        assert(pCluster);

-        assert(pCluster->m_index == k);

-

-        const long long t = pCluster->GetTime();

-

-        if (t <= time_ns)

-            i = k + 1;

-        else

-            j = k;

-

-        assert(i <= j);

-    }

-

-    assert(i == j);

-    assert(i > 0);

-    assert(i <= m_clusterCount);

-

-    const long k = i - 1;

-

-    Cluster* const pCluster = m_clusters[k];

-    assert(pCluster);

-    assert(pCluster->m_index == k);

-    assert(pCluster->GetTime() <= time_ns);

-

-    return pCluster;

-}

-

-

-#if 0

-const BlockEntry* Segment::Seek(

-    long long time_ns,

-    const Track* pTrack) const

-{

-    assert(pTrack);

-

-    if ((m_clusters == NULL) || (m_clusterCount <= 0))

-        return pTrack->GetEOS();

-

-    Cluster** const i = m_clusters;

-    assert(i);

-

-    {

-        Cluster* const pCluster = *i;

-        assert(pCluster);

-        assert(pCluster->m_index == 0);  //m_clusterCount > 0

-        assert(pCluster->m_pSegment == this);

-

-        if (time_ns <= pCluster->GetTime())

-            return pCluster->GetEntry(pTrack);

-    }

-

-    Cluster** const j = i + m_clusterCount;

-

-    if (pTrack->GetType() == 2)  //audio

-    {

-        //TODO: we could decide to use cues for this, as we do for video.

-        //But we only use it for video because looking around for a keyframe

-        //can get expensive.  Audio doesn't require anything special so a

-        //straight cluster search is good enough (we assume).

-

-        Cluster** lo = i;

-        Cluster** hi = j;

-

-        while (lo < hi)

-        {

-            //INVARIANT:

-            //[i, lo) <= time_ns

-            //[lo, hi) ?

-            //[hi, j)  > time_ns

-

-            Cluster** const mid = lo + (hi - lo) / 2;

-            assert(mid < hi);

-

-            Cluster* const pCluster = *mid;

-            assert(pCluster);

-            assert(pCluster->m_index == long(mid - m_clusters));

-            assert(pCluster->m_pSegment == this);

-

-            const long long t = pCluster->GetTime();

-

-            if (t <= time_ns)

-                lo = mid + 1;

-            else

-                hi = mid;

-

-            assert(lo <= hi);

-        }

-

-        assert(lo == hi);

-        assert(lo > i);

-        assert(lo <= j);

-

-        while (lo > i)

-        {

-            Cluster* const pCluster = *--lo;

-            assert(pCluster);

-            assert(pCluster->GetTime() <= time_ns);

-

-            const BlockEntry* const pBE = pCluster->GetEntry(pTrack);

-

-            if ((pBE != 0) && !pBE->EOS())

-                return pBE;

-

-            //landed on empty cluster (no entries)

-        }

-

-        return pTrack->GetEOS();  //weird

-    }

-

-    assert(pTrack->GetType() == 1);  //video

-

-    Cluster** lo = i;

-    Cluster** hi = j;

-

-    while (lo < hi)

-    {

-        //INVARIANT:

-        //[i, lo) <= time_ns

-        //[lo, hi) ?

-        //[hi, j)  > time_ns

-

-        Cluster** const mid = lo + (hi - lo) / 2;

-        assert(mid < hi);

-

-        Cluster* const pCluster = *mid;

-        assert(pCluster);

-

-        const long long t = pCluster->GetTime();

-

-        if (t <= time_ns)

-            lo = mid + 1;

-        else

-            hi = mid;

-

-        assert(lo <= hi);

-    }

-

-    assert(lo == hi);

-    assert(lo > i);

-    assert(lo <= j);

-

-    Cluster* pCluster = *--lo;

-    assert(pCluster);

-    assert(pCluster->GetTime() <= time_ns);

-

-    {

-        const BlockEntry* const pBE = pCluster->GetEntry(pTrack, time_ns);

-

-        if ((pBE != 0) && !pBE->EOS())  //found a keyframe

-            return pBE;

-    }

-

-    const VideoTrack* const pVideo = static_cast<const VideoTrack*>(pTrack);

-

-    while (lo != i)

-    {

-        pCluster = *--lo;

-        assert(pCluster);

-        assert(pCluster->GetTime() <= time_ns);

-

-        const BlockEntry* const pBlockEntry = pCluster->GetMaxKey(pVideo);

-

-        if ((pBlockEntry != 0) && !pBlockEntry->EOS())

-            return pBlockEntry;

-    }

-

-    //weird: we're on the first cluster, but no keyframe found

-    //should never happen but we must return something anyway

-

-    return pTrack->GetEOS();

-}

-#endif

-

-

-#if 0

-bool Segment::SearchCues(

-    long long time_ns,

-    Track* pTrack,

-    Cluster*& pCluster,

-    const BlockEntry*& pBlockEntry,

-    const CuePoint*& pCP,

-    const CuePoint::TrackPosition*& pTP)

-{

-    if (pTrack->GetType() != 1)  //not video

-        return false;  //TODO: for now, just handle video stream

-

-    if (m_pCues == NULL)

-        return false;

-

-    if (!m_pCues->Find(time_ns, pTrack, pCP, pTP))

-        return false;  //weird

-

-    assert(pCP);

-    assert(pTP);

-    assert(pTP->m_track == pTrack->GetNumber());

-

-    //We have the cue point and track position we want,

-    //so we now need to search for the cluster having

-    //the indicated position.

-

-    return GetCluster(pCP, pTP, pCluster, pBlockEntry);

-}

-#endif

-

-

-const Tracks* Segment::GetTracks() const

-{

-    return m_pTracks;

-}

-

-

-const SegmentInfo* Segment::GetInfo() const

-{

-    return m_pInfo;

-}

-

-

-const Cues* Segment::GetCues() const

-{

-    return m_pCues;

-}

-

-

-const SeekHead* Segment::GetSeekHead() const

-{

-    return m_pSeekHead;

-}

-

-

-long long Segment::GetDuration() const

-{

-    assert(m_pInfo);

-    return m_pInfo->GetDuration();

-}

-

-

-SegmentInfo::SegmentInfo(

-    Segment* pSegment,

-    long long start,

-    long long size_,

-    long long element_start,

-    long long element_size) :

-    m_pSegment(pSegment),

-    m_start(start),

-    m_size(size_),

-    m_pMuxingAppAsUTF8(NULL),

-    m_pWritingAppAsUTF8(NULL),

-    m_pTitleAsUTF8(NULL),

-    m_element_start(element_start),

-    m_element_size(element_size)

-{

-    IMkvReader* const pReader = m_pSegment->m_pReader;

-

-    long long pos = start;

-    const long long stop = start + size_;

-

-    m_timecodeScale = 1000000;

-    m_duration = -1;

-

-    while (pos < stop)

-    {

-        if (Match(pReader, pos, 0x0AD7B1, m_timecodeScale))

-            assert(m_timecodeScale > 0);

-

-        else if (Match(pReader, pos, 0x0489, m_duration))

-            assert(m_duration >= 0);

-

-        else if (Match(pReader, pos, 0x0D80, m_pMuxingAppAsUTF8))   //[4D][80]

-            assert(m_pMuxingAppAsUTF8);

-

-        else if (Match(pReader, pos, 0x1741, m_pWritingAppAsUTF8))  //[57][41]

-            assert(m_pWritingAppAsUTF8);

-

-        else if (Match(pReader, pos, 0x3BA9, m_pTitleAsUTF8))       //[7B][A9]

-            assert(m_pTitleAsUTF8);

-

-        else

-        {

-            long len;

-

-            const long long id = ReadUInt(pReader, pos, len);

-            //id;

-            assert(id >= 0);

-            assert((pos + len) <= stop);

-

-            pos += len;  //consume id

-            assert((stop - pos) > 0);

-

-            const long long size = ReadUInt(pReader, pos, len);

-            assert(size >= 0);

-            assert((pos + len) <= stop);

-

-            pos += len + size;  //consume size and payload

-            assert(pos <= stop);

-        }

-    }

-

-    assert(pos == stop);

-}

-

-SegmentInfo::~SegmentInfo()

-{

-    if (m_pMuxingAppAsUTF8)

-    {

-        delete[] m_pMuxingAppAsUTF8;

-        m_pMuxingAppAsUTF8 = NULL;

-    }

-

-    if (m_pWritingAppAsUTF8)

-    {

-        delete[] m_pWritingAppAsUTF8;

-        m_pWritingAppAsUTF8 = NULL;

-    }

-

-    if (m_pTitleAsUTF8)

-    {

-        delete[] m_pTitleAsUTF8;

-        m_pTitleAsUTF8 = NULL;

-    }

-}

-

-long long SegmentInfo::GetTimeCodeScale() const

-{

-    return m_timecodeScale;

-}

-

-

-long long SegmentInfo::GetDuration() const

-{

-    if (m_duration < 0)

-        return -1;

-

-    assert(m_timecodeScale >= 1);

-

-    const double dd = double(m_duration) * double(m_timecodeScale);

-    const long long d = static_cast<long long>(dd);

-

-    return d;

-}

-

-const char* SegmentInfo::GetMuxingAppAsUTF8() const

-{

-    return m_pMuxingAppAsUTF8;

-}

-

-

-const char* SegmentInfo::GetWritingAppAsUTF8() const

-{

-    return m_pWritingAppAsUTF8;

-}

-

-const char* SegmentInfo::GetTitleAsUTF8() const

-{

-    return m_pTitleAsUTF8;

-}

-

-Track::Track(

-    Segment* pSegment,

-    const Info& i,

-    long long element_start,

-    long long element_size) :

-    m_pSegment(pSegment),

-    m_info(i),

-    m_element_start(element_start),

-    m_element_size(element_size)

-{

-}

-

-Track::~Track()

-{

-    Info& info = const_cast<Info&>(m_info);

-    info.Clear();

-}

-

-Track::Info::Info():

-    type(-1),

-    number(-1),

-    uid(ULLONG_MAX),

-    nameAsUTF8(NULL),

-    codecId(NULL),

-    codecPrivate(NULL),

-    codecPrivateSize(0),

-    codecNameAsUTF8(NULL)

-{

-}

-

-void Track::Info::Clear()

-{

-    delete[] nameAsUTF8;

-    nameAsUTF8 = NULL;

-

-    delete[] codecId;

-    codecId = NULL;

-

-    delete[] codecPrivate;

-    codecPrivate = NULL;

-

-    codecPrivateSize = 0;

-

-    delete[] codecNameAsUTF8;

-    codecNameAsUTF8 = NULL;

-}

-

-const BlockEntry* Track::GetEOS() const

-{

-    return &m_eos;

-}

-

-long long Track::GetType() const

-{

-    return m_info.type;

-}

-

-long long Track::GetNumber() const

-{

-    return m_info.number;

-}

-

-unsigned long long Track::GetUid() const

-{

-    return m_info.uid;

-}

-

-const char* Track::GetNameAsUTF8() const

-{

-    return m_info.nameAsUTF8;

-}

-

-const char* Track::GetCodecNameAsUTF8() const

-{

-    return m_info.codecNameAsUTF8;

-}

-

-

-const char* Track::GetCodecId() const

-{

-    return m_info.codecId;

-}

-

-const unsigned char* Track::GetCodecPrivate(size_t& size) const

-{

-    size = m_info.codecPrivateSize;

-    return m_info.codecPrivate;

-}

-

-

-bool Track::GetLacing() const

-{

-    return m_info.lacing;

-}

-

-

-long Track::GetFirst(const BlockEntry*& pBlockEntry) const

-{

-    const Cluster* pCluster = m_pSegment->GetFirst();

-

-    for (int i = 0; ; )

-    {

-        if (pCluster == NULL)

-        {

-            pBlockEntry = GetEOS();

-            return 1;

-        }

-

-        if (pCluster->EOS())

-        {

-            if (m_pSegment->Unparsed() <= 0)  //all clusters have been loaded

-            {

-                pBlockEntry = GetEOS();

-                return 1;

-            }

-

-            pBlockEntry = 0;

-            return E_BUFFER_NOT_FULL;

-        }

-

-        pBlockEntry = pCluster->GetFirst();

-

-        if (pBlockEntry == 0)  //empty cluster

-        {

-            pCluster = m_pSegment->GetNext(pCluster);

-            continue;

-        }

-

-        for (;;)

-        {

-            const Block* const pBlock = pBlockEntry->GetBlock();

-            assert(pBlock);

-

-            const long long tn = pBlock->GetTrackNumber();

-

-            if ((tn == m_info.number) && VetEntry(pBlockEntry))

-                return 0;

-

-            pBlockEntry = pCluster->GetNext(pBlockEntry);

-

-            if (pBlockEntry == 0)

-                break;

-        }

-

-        ++i;

-

-        if (i >= 100)

-            break;

-

-        pCluster = m_pSegment->GetNext(pCluster);

-    }

-

-    //NOTE: if we get here, it means that we didn't find a block with

-    //a matching track number.  We interpret that as an error (which

-    //might be too conservative).

-

-    pBlockEntry = GetEOS();  //so we can return a non-NULL value

-    return 1;

-}

-

-

-long Track::GetNext(

-    const BlockEntry* pCurrEntry,

-    const BlockEntry*& pNextEntry) const

-{

-    assert(pCurrEntry);

-    assert(!pCurrEntry->EOS());  //?

-

-    const Block* const pCurrBlock = pCurrEntry->GetBlock();

-    assert(pCurrBlock->GetTrackNumber() == m_info.number);

-

-    const Cluster* pCluster = pCurrEntry->GetCluster();

-    assert(pCluster);

-    assert(!pCluster->EOS());

-

-    pNextEntry = pCluster->GetNext(pCurrEntry);

-

-    for (int i = 0; ; )

-    {

-        while (pNextEntry)

-        {

-            const Block* const pNextBlock = pNextEntry->GetBlock();

-            assert(pNextBlock);

-

-            if (pNextBlock->GetTrackNumber() == m_info.number)

-                return 0;

-

-            pNextEntry = pCluster->GetNext(pNextEntry);

-        }

-

-        pCluster = m_pSegment->GetNext(pCluster);

-

-        if (pCluster == NULL)

-        {

-            pNextEntry = GetEOS();

-            return 1;

-        }

-

-        if (pCluster->EOS())

-        {

-            if (m_pSegment->Unparsed() <= 0)   //all clusters have been loaded

-            {

-                pNextEntry = GetEOS();

-                return 1;

-            }

-

-            //TODO: there is a potential O(n^2) problem here: we tell the

-            //caller to (pre)load another cluster, which he does, but then he

-            //calls GetNext again, which repeats the same search.  This is

-            //a pathological case, since the only way it can happen is if

-            //there exists a long sequence of clusters none of which contain a

-            // block from this track.  One way around this problem is for the

-            //caller to be smarter when he loads another cluster: don't call

-            //us back until you have a cluster that contains a block from this

-            //track. (Of course, that's not cheap either, since our caller

-            //would have to scan the each cluster as it's loaded, so that

-            //would just push back the problem.)

-

-            pNextEntry = NULL;

-            return E_BUFFER_NOT_FULL;

-        }

-

-        pNextEntry = pCluster->GetFirst();

-

-        if (pNextEntry == NULL)  //empty cluster

-            continue;

-

-        ++i;

-

-        if (i >= 100)

-            break;

-    }

-

-    //NOTE: if we get here, it means that we didn't find a block with

-    //a matching track number after lots of searching, so we give

-    //up trying.

-

-    pNextEntry = GetEOS();  //so we can return a non-NULL value

-    return 1;

-}

-

-

-Track::EOSBlock::EOSBlock()

-{

-}

-

-

-bool Track::EOSBlock::EOS() const

-{

-    return true;

-}

-

-

-const Cluster* Track::EOSBlock::GetCluster() const

-{

-    return NULL;

-}

-

-

-size_t Track::EOSBlock::GetIndex() const

-{

-    return 0;

-}

-

-

-const Block* Track::EOSBlock::GetBlock() const

-{

-    return NULL;

-}

-

-

-bool Track::EOSBlock::IsBFrame() const

-{

-    return false;

-}

-

-

-VideoTrack::VideoTrack(

-    Segment* pSegment,

-    const Info& i,

-    long long element_start,

-    long long element_size) :

-    Track(pSegment, i, element_start, element_size),

-    m_width(-1),

-    m_height(-1),

-    m_rate(-1)

-{

-    assert(i.type == 1);

-    assert(i.number > 0);

-

-    IMkvReader* const pReader = pSegment->m_pReader;

-

-    const Settings& s = i.settings;

-    assert(s.start >= 0);

-    assert(s.size >= 0);

-

-    long long pos = s.start;

-    assert(pos >= 0);

-

-    const long long stop = pos + s.size;

-

-    while (pos < stop)

-    {

-#ifdef _DEBUG

-        long len;

-        const long long id = ReadUInt(pReader, pos, len);

-        assert(id >= 0);  //TODO: handle error case

-        assert((pos + len) <= stop);

-#endif

-        if (Match(pReader, pos, 0x30, m_width))

-            ;

-        else if (Match(pReader, pos, 0x3A, m_height))

-            ;

-        else if (Match(pReader, pos, 0x0383E3, m_rate))

-            ;

-        else

-        {

-            long len;

-            const long long id = ReadUInt(pReader, pos, len);

-            assert(id >= 0);  //TODO: handle error case

-            assert((pos + len) <= stop);

-

-            pos += len;  //consume id

-

-            const long long size = ReadUInt(pReader, pos, len);

-            assert(size >= 0);  //TODO: handle error case

-            assert((pos + len) <= stop);

-

-            pos += len;  //consume length of size

-            assert((pos + size) <= stop);

-

-            //pos now designates start of payload

-

-            pos += size;  //consume payload

-            assert(pos <= stop);

-        }

-    }

-

-    return;

-}

-

-

-bool VideoTrack::VetEntry(const BlockEntry* pBlockEntry) const

-{

-    assert(pBlockEntry);

-

-    const Block* const pBlock = pBlockEntry->GetBlock();

-    assert(pBlock);

-    assert(pBlock->GetTrackNumber() == m_info.number);

-

-    return pBlock->IsKey();

-}

-

-

-long VideoTrack::Seek(

-    long long time_ns,

-    const BlockEntry*& pResult) const

-{

-    const long status = GetFirst(pResult);

-

-    if (status < 0)  //buffer underflow, etc

-        return status;

-

-    assert(pResult);

-

-    if (pResult->EOS())

-        return 0;

-

-    const Cluster* pCluster = pResult->GetCluster();

-    assert(pCluster);

-    assert(pCluster->GetIndex() >= 0);

-

-    if (time_ns <= pResult->GetBlock()->GetTime(pCluster))

-        return 0;

-

-    Cluster** const clusters = m_pSegment->m_clusters;

-    assert(clusters);

-

-    const long count = m_pSegment->GetCount();  //loaded only, not pre-loaded

-    assert(count > 0);

-

-    Cluster** const i = clusters + pCluster->GetIndex();

-    assert(i);

-    assert(*i == pCluster);

-    assert(pCluster->GetTime() <= time_ns);

-

-    Cluster** const j = clusters + count;

-

-    Cluster** lo = i;

-    Cluster** hi = j;

-

-    while (lo < hi)

-    {

-        //INVARIANT:

-        //[i, lo) <= time_ns

-        //[lo, hi) ?

-        //[hi, j)  > time_ns

-

-        Cluster** const mid = lo + (hi - lo) / 2;

-        assert(mid < hi);

-

-        pCluster = *mid;

-        assert(pCluster);

-        assert(pCluster->GetIndex() >= 0);

-        assert(pCluster->GetIndex() == long(mid - m_pSegment->m_clusters));

-

-        const long long t = pCluster->GetTime();

-

-        if (t <= time_ns)

-            lo = mid + 1;

-        else

-            hi = mid;

-

-        assert(lo <= hi);

-    }

-

-    assert(lo == hi);

-    assert(lo > i);

-    assert(lo <= j);

-

-    pCluster = *--lo;

-    assert(pCluster);

-    assert(pCluster->GetTime() <= time_ns);

-

-    pResult = pCluster->GetEntry(this, time_ns);

-

-    if ((pResult != 0) && !pResult->EOS())  //found a keyframe

-        return 0;

-

-    while (lo != i)

-    {

-        pCluster = *--lo;

-        assert(pCluster);

-        assert(pCluster->GetTime() <= time_ns);

-

-        //TODO:

-        //We need to handle the case when a cluster

-        //contains multiple keyframes.  Simply returning

-        //the largest keyframe on the cluster isn't

-        //good enough.

-        pResult = pCluster->GetMaxKey(this);

-

-        if ((pResult != 0) && !pResult->EOS())

-            return 0;

-    }

-

-    //weird: we're on the first cluster, but no keyframe found

-    //should never happen but we must return something anyway

-

-    pResult = GetEOS();

-    return 0;

-}

-

-

-long long VideoTrack::GetWidth() const

-{

-    return m_width;

-}

-

-

-long long VideoTrack::GetHeight() const

-{

-    return m_height;

-}

-

-

-double VideoTrack::GetFrameRate() const

-{

-    return m_rate;

-}

-

-

-AudioTrack::AudioTrack(

-    Segment* pSegment,

-    const Info& i,

-    long long element_start,

-    long long element_size) :

-    Track(pSegment, i, element_start, element_size),

-    m_rate(0.0),

-    m_channels(0),

-    m_bitDepth(-1)

-{

-    assert(i.type == 2);

-    assert(i.number > 0);

-

-    IMkvReader* const pReader = pSegment->m_pReader;

-

-    const Settings& s = i.settings;

-    assert(s.start >= 0);

-    assert(s.size >= 0);

-

-    long long pos = s.start;

-    assert(pos >= 0);

-

-    const long long stop = pos + s.size;

-

-    while (pos < stop)

-    {

-#ifdef _DEBUG

-        long len;

-        const long long id = ReadUInt(pReader, pos, len);

-        assert(id >= 0);  //TODO: handle error case

-        assert((pos + len) <= stop);

-#endif

-        if (Match(pReader, pos, 0x35, m_rate))

-            ;

-        else if (Match(pReader, pos, 0x1F, m_channels))

-            ;

-        else if (Match(pReader, pos, 0x2264, m_bitDepth))

-            ;

-        else

-        {

-            long len;

-            const long long id = ReadUInt(pReader, pos, len);

-            assert(id >= 0);  //TODO: handle error case

-            assert((pos + len) <= stop);

-

-            pos += len;  //consume id

-

-            const long long size = ReadUInt(pReader, pos, len);

-            assert(size >= 0);  //TODO: handle error case

-            assert((pos + len) <= stop);

-

-            pos += len;  //consume length of size

-            assert((pos + size) <= stop);

-

-            //pos now designates start of payload

-

-            pos += size;  //consume payload

-            assert(pos <= stop);

-        }

-    }

-

-    if (m_channels <= 0)

-        m_channels = 1;  //Matroska spec says this is the default

-

-    return;

-}

-

-

-bool AudioTrack::VetEntry(const BlockEntry* pBlockEntry) const

-{

-    assert(pBlockEntry);

-

-    const Block* const pBlock = pBlockEntry->GetBlock();

-    assert(pBlock);

-    assert(pBlock->GetTrackNumber() == m_info.number);

-

-    return true;

-}

-

-

-long AudioTrack::Seek(

-    long long time_ns,

-    const BlockEntry*& pResult) const

-{

-    const long status = GetFirst(pResult);

-

-    if (status < 0)  //buffer underflow, etc

-        return status;

-

-    assert(pResult);

-

-    if (pResult->EOS())

-        return 0;

-

-    const Cluster* pCluster = pResult->GetCluster();

-    assert(pCluster);

-    assert(pCluster->GetIndex() >= 0);

-

-    if (time_ns <= pResult->GetBlock()->GetTime(pCluster))

-        return 0;

-

-    Cluster** const clusters = m_pSegment->m_clusters;

-    assert(clusters);

-

-    const long count = m_pSegment->GetCount();  //loaded only, not preloaded

-    assert(count > 0);

-

-    Cluster** const i = clusters + pCluster->GetIndex();

-    assert(i);

-    assert(*i == pCluster);

-    assert(pCluster->GetTime() <= time_ns);

-

-    Cluster** const j = clusters + count;

-

-    Cluster** lo = i;

-    Cluster** hi = j;

-

-    while (lo < hi)

-    {

-        //INVARIANT:

-        //[i, lo) <= time_ns

-        //[lo, hi) ?

-        //[hi, j)  > time_ns

-

-        Cluster** const mid = lo + (hi - lo) / 2;

-        assert(mid < hi);

-

-        pCluster = *mid;

-        assert(pCluster);

-        assert(pCluster->GetIndex() >= 0);

-        assert(pCluster->GetIndex() == long(mid - m_pSegment->m_clusters));

-

-        const long long t = pCluster->GetTime();

-

-        if (t <= time_ns)

-            lo = mid + 1;

-        else

-            hi = mid;

-

-        assert(lo <= hi);

-    }

-

-    assert(lo == hi);

-    assert(lo > i);

-    assert(lo <= j);

-

-    while (lo > i)

-    {

-        pCluster = *--lo;

-        assert(pCluster);

-        assert(pCluster->GetTime() <= time_ns);

-

-        pResult = pCluster->GetEntry(this);

-

-        if ((pResult != 0) && !pResult->EOS())

-            return 0;

-

-        //landed on empty cluster (no entries)

-    }

-

-    pResult = GetEOS();  //weird

-    return 0;

-}

-

-

-double AudioTrack::GetSamplingRate() const

-{

-    return m_rate;

-}

-

-

-long long AudioTrack::GetChannels() const

-{

-    return m_channels;

-}

-

-long long AudioTrack::GetBitDepth() const

-{

-    return m_bitDepth;

-}

-

-Tracks::Tracks(

-    Segment* pSegment,

-    long long start,

-    long long size_,

-    long long element_start,

-    long long element_size) :

-    m_pSegment(pSegment),

-    m_start(start),

-    m_size(size_),

-    m_trackEntries(NULL),

-    m_trackEntriesEnd(NULL),

-    m_element_start(element_start),

-    m_element_size(element_size)

-{

-    long long stop = m_start + m_size;

-    IMkvReader* const pReader = m_pSegment->m_pReader;

-

-    long long pos1 = m_start;

-    int count = 0;

-

-    while (pos1 < stop)

-    {

-        long len;

-        const long long id = ReadUInt(pReader, pos1, len);

-        assert(id >= 0);

-        assert((pos1 + len) <= stop);

-

-        pos1 += len;  //consume id

-

-        const long long size = ReadUInt(pReader, pos1, len);

-        assert(size >= 0);

-        assert((pos1 + len) <= stop);

-

-        pos1 += len;  //consume length of size

-

-        //pos now desinates start of element

-        if (id == 0x2E)  //TrackEntry ID

-            ++count;

-

-        pos1 += size;  //consume payload

-        assert(pos1 <= stop);

-    }

-

-    if (count <= 0)

-        return;

-

-    m_trackEntries = new Track*[count];

-    m_trackEntriesEnd = m_trackEntries;

-

-    long long pos = m_start;

-

-    while (pos < stop)

-    {

-        long len;

-        const long long id = ReadUInt(pReader, pos, len);

-        assert(id >= 0);

-        assert((pos + len) <= stop);

-

-        const long long element_start = pos;

-

-        pos += len;  //consume id

-

-        const long long size1 = ReadUInt(pReader, pos, len);

-        assert(size1 >= 0);

-        assert((pos + len) <= stop);

-

-        pos += len;  //consume length of size

-

-        //pos now desinates start of element

-

-        const long long element_size = size1 + pos - element_start;

-

-        if (id == 0x2E)  //TrackEntry ID

-        {

-            Track*& pTrack = *m_trackEntriesEnd;

-            ParseTrackEntry(pos, size1, pTrack, element_start, element_size);

-

-            if (pTrack)

-                ++m_trackEntriesEnd;

-        }

-

-        pos += size1;  //consume payload

-        assert(pos <= stop);

-    }

-}

-

-

-unsigned long Tracks::GetTracksCount() const

-{

-    const ptrdiff_t result = m_trackEntriesEnd - m_trackEntries;

-    assert(result >= 0);

-

-    return static_cast<unsigned long>(result);

-}

-

-

-void Tracks::ParseTrackEntry(

-    long long start,

-    long long size,

-    Track*& pTrack,

-    long long element_start,

-    long long element_size)

-{

-    IMkvReader* const pReader = m_pSegment->m_pReader;

-

-    long long pos = start;

-    const long long stop = start + size;

-

-    Track::Info i;

-

-    Track::Settings videoSettings;

-    videoSettings.start = -1;

-

-    Track::Settings audioSettings;

-    audioSettings.start = -1;

-

-    long long lacing = 1;  //default is true

-

-    while (pos < stop)

-    {

-#ifdef _DEBUG

-        long len;

-        const long long id = ReadUInt(pReader, pos, len);

-        len;

-        id;

-#endif

-        if (Match(pReader, pos, 0x57, i.number))

-            assert(i.number > 0);

-        //else if (Match(pReader, pos, 0x33C5, i.uid))

-        //    ;

-        else if (Match(pReader, pos, 0x03, i.type))

-            ;

-        else if (Match(pReader, pos, 0x136E, i.nameAsUTF8))

-            assert(i.nameAsUTF8);

-        else if (Match(pReader, pos, 0x06, i.codecId))

-            ;

-        else if (Match(pReader, pos, 0x1C, lacing))

-            assert(lacing <= 1);

-        else if (Match(pReader,

-                       pos,

-                       0x23A2,

-                       i.codecPrivate,

-                       i.codecPrivateSize))

-            ;

-        else if (Match(pReader, pos, 0x058688, i.codecNameAsUTF8))

-            assert(i.codecNameAsUTF8);

-        else

-        {

-            long len;

-

-            const long long idpos = pos;

-            idpos;

-

-            const long long id = ReadUInt(pReader, pos, len);

-            assert(id >= 0);  //TODO: handle error case

-            assert((pos + len) <= stop);

-

-            pos += len;  //consume id

-

-            const long long size = ReadUInt(pReader, pos, len);

-            assert(size >= 0);  //TODO: handle error case

-            assert((pos + len) <= stop);

-

-            pos += len;  //consume length of size

-            const long long start = pos;

-

-            pos += size;  //consume payload

-            assert(pos <= stop);

-

-            if (id == 0x60)

-            {

-                videoSettings.start = start;

-                videoSettings.size = size;

-            }

-            else if (id == 0x61)

-            {

-                audioSettings.start = start;

-                audioSettings.size = size;

-            }

-            else if (id == 0x33C5)  //Track UID

-            {

-                assert(size <= 8);

-

-                i.uid = 0;

-                long long pos_ = start;

-                const long long pos_end = start + size;

-

-                while (pos_ != pos_end)

-                {

-                    unsigned char b;

-

-                    const long status = pReader->Read(pos_, 1, &b);

-                    assert(status == 0);

-

-                    i.uid <<= 8;

-                    i.uid |= b;

-

-                    ++pos_;

-                }

-            }

-        }

-    }

-

-    assert(pos == stop);

-    //TODO: propertly vet info.number, to ensure both its existence,

-    //and that it is unique among all tracks.

-    assert(i.number > 0);

-

-    i.lacing = (lacing > 0) ? true : false;

-

-    //TODO: vet settings, to ensure that video settings (0x60)

-    //were specified when type = 1, and that audio settings (0x61)

-    //were specified when type = 2.

-    if (i.type == 1)  //video

-    {

-        assert(audioSettings.start < 0);

-        assert(videoSettings.start >= 0);

-

-        i.settings = videoSettings;

-

-        VideoTrack* const t = new VideoTrack(

-            m_pSegment,

-            i,

-            element_start,

-            element_size);

-        assert(t);  //TODO

-        pTrack = t;

-    }

-    else if (i.type == 2)  //audio

-    {

-        assert(videoSettings.start < 0);

-        assert(audioSettings.start >= 0);

-

-        i.settings = audioSettings;

-

-        AudioTrack* const t = new  AudioTrack(

-            m_pSegment,

-            i,

-            element_start,

-            element_size);

-        assert(t);  //TODO

-        pTrack = t;

-    }

-    else

-    {

-        // for now we do not support other track types yet.

-        // TODO: support other track types

-        i.Clear();

-

-        pTrack = NULL;

-    }

-

-    return;

-}

-

-

-Tracks::~Tracks()

-{

-    Track** i = m_trackEntries;

-    Track** const j = m_trackEntriesEnd;

-

-    while (i != j)

-    {

-        Track* const pTrack = *i++;

-        delete pTrack;

-    }

-

-    delete[] m_trackEntries;

-}

-

-const Track* Tracks::GetTrackByNumber(unsigned long tn_) const

-{

-    const long long tn = tn_;

-

-    Track** i = m_trackEntries;

-    Track** const j = m_trackEntriesEnd;

-

-    while (i != j)

-    {

-        Track* const pTrack = *i++;

-

-        if (pTrack == NULL)

-            continue;

-

-        if (tn == pTrack->GetNumber())

-            return pTrack;

-    }

-

-    return NULL;  //not found

-}

-

-

-const Track* Tracks::GetTrackByIndex(unsigned long idx) const

-{

-    const ptrdiff_t count = m_trackEntriesEnd - m_trackEntries;

-

-    if (idx >= static_cast<unsigned long>(count))

-         return NULL;

-

-    return m_trackEntries[idx];

-}

-

-

-long long Cluster::Unparsed() const

-{

-    if (m_size < 0)  //not even partially loaded

-        return LLONG_MAX;

-

-    assert(m_pos >= m_element_start);

-    assert(m_element_size > m_size);

-

-    const long long element_stop = m_element_start + m_element_size;

-    assert(m_pos <= element_stop);

-

-    const long long result = element_stop - m_pos;

-    assert(result >= 0);

-

-    return result;

-}

-

-

-void Cluster::Load() const

-{

-    assert(m_pSegment);

-    assert(m_pos >= m_element_start);

-    assert(m_size);

-

-    if (m_size > 0)  //loaded

-    {

-        assert(m_timecode >= 0);

-        return;

-    }

-

-    assert(m_pos == m_element_start);

-    assert(m_size < 0);

-    assert(m_timecode < 0);

-

-    IMkvReader* const pReader = m_pSegment->m_pReader;

-

-    //m_pos *= -1;                                  //relative to segment

-    //long long pos = m_pSegment->m_start + m_pos;  //absolute

-

-    long len;

-

-    const long long id_ = ReadUInt(pReader, m_pos, len);

-    assert(id_ >= 0);

-    assert(id_ == 0x0F43B675);  //Cluster ID

-

-    m_pos += len;  //consume id

-

-    m_size = ReadUInt(pReader, m_pos, len);

-    assert(m_size >= 0);

-

-    m_pos += len;  //consume size field

-

-    const long long stop = m_pos + m_size;

-

-    const long long element_size = stop - m_element_start;

-    assert((m_element_size <= 0) || (m_element_size == element_size));

-

-    if (m_element_size <= 0)

-        m_element_size = element_size;

-

-    long long timecode = -1;

-

-    while (m_pos < stop)

-    {

-        if (Match(pReader, m_pos, 0x67, timecode))

-            break;

-        else

-        {

-            const long long id = ReadUInt(pReader, m_pos, len);

-            assert(id >= 0);  //TODO

-            assert((m_pos + len) <= stop);

-

-            m_pos += len;  //consume id

-

-            const long long size = ReadUInt(pReader, m_pos, len);

-            assert(size >= 0);  //TODO

-            assert((m_pos + len) <= stop);

-

-            m_pos += len;  //consume size

-

-            if (id == 0x20)  //BlockGroup ID

-                break;

-

-            if (id == 0x23)  //SimpleBlock ID

-                break;

-

-            m_pos += size;  //consume payload

-            assert(m_pos <= stop);

-        }

-    }

-

-    assert(m_pos <= stop);

-    assert(timecode >= 0);

-

-    m_timecode = timecode;

-}

-

-

-long Cluster::Load(long long& pos, long& len) const

-{

-    assert(m_pSegment);

-    assert(m_pos >= m_element_start);

-    assert(m_size);

-

-    if (m_size > 0)  //loaded (partially or fully)

-    {

-        assert(m_timecode >= 0);

-        assert(m_element_size > m_size);

-        assert(m_pos <= (m_element_start + m_element_size));

-

-        return 0;

-    }

-

-    assert(m_pos == m_element_start);

-    assert(m_size < 0);

-    assert(m_timecode < 0);

-

-    IMkvReader* const pReader = m_pSegment->m_pReader;

-

-    long long total, avail;

-

-    const int status = pReader->Length(&total, &avail);

-

-    if (status < 0)  //error

-        return status;

-

-    assert((total < 0) || (avail <= total));

-

-    pos = m_pos;

-

-    long long cluster_size, cluster_stop;

-

-    {

-        if ((pos + 1) > avail)

-        {

-            len = 1;

-            return E_BUFFER_NOT_FULL;

-        }

-

-        long long result = GetUIntLength(pReader, pos, len);

-

-        if (result < 0)  //error or underflow

-            return static_cast<long>(result);

-

-        if (result > 0)  //underflow (weird)

-            return E_BUFFER_NOT_FULL;

-

-        //if ((pos + len) > segment_stop)

-        //    return E_FILE_FORMAT_INVALID;

-

-        if ((pos + len) > avail)

-            return E_BUFFER_NOT_FULL;

-

-        const long long id_ = ReadUInt(pReader, pos, len);

-

-        if (id_ < 0)  //error

-            return static_cast<long>(id_);

-

-        if (id_ != 0x0F43B675)  //Cluster ID

-            return E_FILE_FORMAT_INVALID;

-

-        pos += len;  //consume id

-

-        //read cluster size

-

-        if ((pos + 1) > avail)

-        {

-            len = 1;

-            return E_BUFFER_NOT_FULL;

-        }

-

-        result = GetUIntLength(pReader, pos, len);

-

-        if (result < 0)  //error

-            return static_cast<long>(result);

-

-        if (result > 0)  //weird

-            return E_BUFFER_NOT_FULL;

-

-        //if ((pos + len) > segment_stop)

-        //    return E_FILE_FORMAT_INVALID;

-

-        if ((pos + len) > avail)

-            return E_BUFFER_NOT_FULL;

-

-        cluster_size = ReadUInt(pReader, pos, len);

-

-        if (cluster_size < 0)  //error

-            return static_cast<long>(cluster_size);

-

-        const long long unknown_size = (1LL << (7 * len)) - 1;

-

-        if (cluster_size == unknown_size)

-            return E_FILE_FORMAT_INVALID;

-

-        if (cluster_size == 0)

-            return E_FILE_FORMAT_INVALID;

-

-        pos += len;  //consume length of size of element

-

-        cluster_stop = pos + cluster_size;

-    }

-

-    //pos points to start of payload

-

-#if 0

-    len = static_cast<long>(size_);

-

-    if (cluster_stop > avail)

-        return E_BUFFER_NOT_FULL;

-#endif

-

-    long long timecode = -1;

-    long long new_pos = -1;

-    bool bBlock = false;

-

-    while (pos < cluster_stop)

-    {

-        //Parse ID

-

-        if ((pos + 1) > avail)

-        {

-            len = 1;

-            return E_BUFFER_NOT_FULL;

-        }

-

-        long long result = GetUIntLength(pReader, pos, len);

-

-        if (result < 0)  //error

-            return static_cast<long>(result);

-

-        if (result > 0)  //weird

-            return E_BUFFER_NOT_FULL;

-

-        if ((pos + len) > cluster_stop)

-            return E_FILE_FORMAT_INVALID;

-

-        if ((pos + len) > avail)

-            return E_BUFFER_NOT_FULL;

-

-        const long long id = ReadUInt(pReader, pos, len);

-

-        if (id < 0) //error

-            return static_cast<long>(id);

-

-        if (id == 0)

-            return E_FILE_FORMAT_INVALID;

-

-        pos += len;  //consume ID field

-

-        //Parse Size

-

-        if ((pos + 1) > avail)

-        {

-            len = 1;

-            return E_BUFFER_NOT_FULL;

-        }

-

-        result = GetUIntLength(pReader, pos, len);

-

-        if (result < 0)  //error

-            return static_cast<long>(result);

-

-        if (result > 0)  //weird

-            return E_BUFFER_NOT_FULL;

-

-        if ((pos + len) > cluster_stop)

-            return E_FILE_FORMAT_INVALID;

-

-        if ((pos + len) > avail)

-            return E_BUFFER_NOT_FULL;

-

-        const long long size = ReadUInt(pReader, pos, len);

-

-        if (size < 0)  //error

-            return static_cast<long>(size);

-

-        const long long unknown_size = (1LL << (7 * len)) - 1;

-

-        if (size == unknown_size)

-            return E_FILE_FORMAT_INVALID;

-

-        pos += len;  //consume size field

-

-        if (pos > cluster_stop)

-            return E_FILE_FORMAT_INVALID;

-

-        //pos now points to start of payload

-

-        if (size == 0)  //weird

-            continue;

-

-        if ((pos + size) > cluster_stop)

-            return E_FILE_FORMAT_INVALID;

-

-        if (id == 0x67)  //TimeCode ID

-        {

-            len = static_cast<long>(size);

-

-            if ((pos + size) > avail)

-                return E_BUFFER_NOT_FULL;

-

-            timecode = UnserializeUInt(pReader, pos, size);

-

-            if (timecode < 0)  //error (or underflow)

-                return static_cast<long>(timecode);

-

-            new_pos = pos + size;

-

-            if (bBlock)

-                break;

-        }

-        else if (id == 0x20)  //BlockGroup ID

-        {

-            bBlock = true;

-            break;

-        }

-        else if (id == 0x23)  //SimpleBlock ID

-        {

-            bBlock = true;

-            break;

-        }

-

-        pos += size;  //consume payload

-        assert(pos <= cluster_stop);

-    }

-

-    assert(pos <= cluster_stop);

-

-    if (timecode < 0)  //no timecode found

-        return E_FILE_FORMAT_INVALID;

-

-    if (!bBlock)

-        return E_FILE_FORMAT_INVALID;

-

-    m_pos = new_pos;  //designates position just beyond timecode payload

-    m_size = cluster_size;  // m_size > 0 means we're partially loaded

-    m_element_size = cluster_stop - m_element_start;

-

-    m_timecode = timecode;  // m_timecode >= 0 means we're partially loaded

-

-    //LoadBlockEntries();

-

-    return 0;

-}

-

-

-long Cluster::Parse(long long& pos, long& len) const

-{

-    long status = Load(pos, len);

-

-    if (status < 0)

-        return status;

-

-    assert(m_pos >= m_element_start);

-    assert(m_size > 0);

-    assert(m_element_size > m_size);

-    assert(m_timecode >= 0);

-

-    const long long cluster_stop = m_element_start + m_element_size;

-

-    if (m_pos >= cluster_stop)

-        return 1;  //nothing else to do

-

-    IMkvReader* const pReader = m_pSegment->m_pReader;

-

-    long long total, avail;

-

-    status = pReader->Length(&total, &avail);

-

-    if (status < 0)  //error

-        return status;

-

-    assert((total < 0) || (avail <= total));

-

-    pos = m_pos;

-

-    while (pos < cluster_stop)

-    {

-        //Parse ID

-

-        if ((pos + 1) > avail)

-        {

-            len = 1;

-            return E_BUFFER_NOT_FULL;

-        }

-

-        long long result = GetUIntLength(pReader, pos, len);

-

-        if (result < 0)  //error

-            return static_cast<long>(result);

-

-        if (result > 0)  //weird

-            return E_BUFFER_NOT_FULL;

-

-        if ((pos + len) > cluster_stop)

-            return E_FILE_FORMAT_INVALID;

-

-        if ((pos + len) > avail)

-            return E_BUFFER_NOT_FULL;

-

-        const long long id = ReadUInt(pReader, pos, len);

-

-        if (id < 0) //error

-            return static_cast<long>(id);

-

-        if (id == 0)

-            return E_FILE_FORMAT_INVALID;

-

-        pos += len;  //consume ID field

-

-        //Parse Size

-

-        if ((pos + 1) > avail)

-        {

-            len = 1;

-            return E_BUFFER_NOT_FULL;

-        }

-

-        result = GetUIntLength(pReader, pos, len);

-

-        if (result < 0)  //error

-            return static_cast<long>(result);

-

-        if (result > 0)  //weird

-            return E_BUFFER_NOT_FULL;

-

-        if ((pos + len) > cluster_stop)

-            return E_FILE_FORMAT_INVALID;

-

-        if ((pos + len) > avail)

-            return E_BUFFER_NOT_FULL;

-

-        const long long size = ReadUInt(pReader, pos, len);

-

-        if (size < 0)  //error

-            return static_cast<long>(size);

-

-        const long long unknown_size = (1LL << (7 * len)) - 1;

-

-        if (size == unknown_size)

-            return E_FILE_FORMAT_INVALID;

-

-        pos += len;  //consume size field

-

-        if (pos > cluster_stop)

-            return E_FILE_FORMAT_INVALID;

-

-        //pos now points to start of payload

-

-        if (size == 0)  //weird

-            continue;

-

-        const long long block_start = pos;

-        const long long block_stop = pos + size;

-

-        if (block_stop > cluster_stop)

-            return E_FILE_FORMAT_INVALID;

-

-        if ((id != 0x20) && (id != 0x23))  //BlockGroup or SimpleBlock

-        {

-            pos += size;  //consume payload

-            assert(pos <= cluster_stop);

-

-            continue;

-        }

-

-        //Parse track number

-

-        if ((pos + 1) > avail)

-        {

-            len = 1;

-            return E_BUFFER_NOT_FULL;

-        }

-

-        result = GetUIntLength(pReader, pos, len);

-

-        if (result < 0)  //error

-            return static_cast<long>(result);

-

-        if (result > 0)  //weird

-            return E_BUFFER_NOT_FULL;

-

-        if ((pos + len) > block_stop)

-            return E_FILE_FORMAT_INVALID;

-

-        if ((pos + len) > avail)

-            return E_BUFFER_NOT_FULL;

-

-        const long long track = ReadUInt(pReader, pos, len);

-

-        if (track < 0) //error

-            return static_cast<long>(track);

-

-        if (track == 0)

-            return E_FILE_FORMAT_INVALID;

-

-        pos += len;  //consume track number

-

-        if (pos >= block_stop)

-            return E_FILE_FORMAT_INVALID;

-

-        pos += 2;  //consume timecode

-

-        if (pos >= block_stop)

-            return E_FILE_FORMAT_INVALID;

-

-        if (pos >= avail)

-        {

-            len = 1;

-            return E_BUFFER_NOT_FULL;

-        }

-

-        unsigned char flags;

-

-        status = pReader->Read(pos, 1, &flags);

-

-        if (status < 0)  //error or underflow

-        {

-            len = 1;

-            return status;

-        }

-

-        ++pos;  //consume flags byte

-

-        if (pos >= block_stop)

-            return E_FILE_FORMAT_INVALID;

-

-        const int lacing = int(flags & 0x06) >> 1;

-

-        if ((lacing != 0) && (block_stop > avail))

-        {

-            len = static_cast<long>(block_stop - pos);

-            return E_BUFFER_NOT_FULL;

-        }

-

-        ParseBlock(id, block_start, size);

-

-        m_pos = block_stop;

-        assert(m_pos <= cluster_stop);

-

-        return 0;  //success

-    }

-

-    m_pos = pos;

-    assert(m_pos <= cluster_stop);

-

-    return 1;  //no more entries

-}

-

-

-long Cluster::GetEntry(long index, const mkvparser::BlockEntry*& pEntry) const

-{

-    assert(m_pos >= m_element_start);

-

-    pEntry = 0;

-

-    if (index < 0)

-        return -1;  //generic error

-

-    if (m_entries_count < 0)

-        return E_BUFFER_NOT_FULL;

-

-    assert(m_entries);

-    assert(m_entries_size > 0);

-    assert(m_entries_count <= m_entries_size);

-    assert(m_size > 0);

-    assert(m_element_size > m_size);

-

-    if (index < m_entries_count)

-    {

-        pEntry = m_entries[index];

-        assert(pEntry);

-

-        return 1;  //found entry

-    }

-

-    const long long element_stop = m_element_start + m_element_size;

-

-    if (m_pos >= element_stop)

-        return 0;  //nothing left to parse

-

-    return E_BUFFER_NOT_FULL;  //underflow, since more remains to be parsed

-}

-

-

-Cluster* Cluster::Create(

-    Segment* pSegment,

-    long idx,

-    long long off,

-    long long element_size)

-{

-    assert(pSegment);

-    assert(off >= 0);

-

-    const long long element_start = pSegment->m_start + off;

-

-    Cluster* const pCluster = new Cluster(pSegment,

-                                          idx,

-                                          //-off,  //means preloaded only

-                                          element_start,

-                                          element_size);

-    assert(pCluster);

-

-    return pCluster;

-}

-

-

-Cluster::Cluster() :

-    m_pSegment(NULL),

-    m_index(0),

-    m_pos(0),

-    m_size(0),

-    m_element_start(0),

-    m_element_size(0),

-    m_timecode(0),

-    m_entries(NULL),

-    m_entries_size(0),

-    m_entries_count(0)  //means "no entries"

-{

-}

-

-

-Cluster::Cluster(

-    Segment* pSegment,

-    long idx,

-    long long element_start,

-    long long element_size) :

-    m_pSegment(pSegment),

-    m_index(idx),

-    m_pos(element_start),

-    m_element_start(element_start),

-    m_element_size(element_size),

-    m_size(-1),

-    m_timecode(-1),

-    m_entries(NULL),

-    m_entries_size(0),

-    m_entries_count(-1)  //means "has not been parsed yet"

-{

-}

-

-

-Cluster::~Cluster()

-{

-    if (m_entries_count <= 0)

-        return;

-

-    BlockEntry** i = m_entries;

-    BlockEntry** const j = m_entries + m_entries_count;

-

-    while (i != j)

-    {

-         BlockEntry* p = *i++;

-         assert(p);

-

-         delete p;

-    }

-

-    delete[] m_entries;

-}

-

-

-bool Cluster::EOS() const

-{

-    return (m_pSegment == NULL);

-}

-

-

-long Cluster::GetIndex() const

-{

-    return m_index;

-}

-

-

-long long Cluster::GetPosition() const

-{

-    const long long pos = m_element_start - m_pSegment->m_start;

-    assert(pos >= 0);

-

-    return pos;

-}

-

-

-long long Cluster::GetElementSize() const

-{

-    return m_element_size;

-}

-

-

-#if 0

-bool Cluster::HasBlockEntries(

-    const Segment* pSegment,

-    long long off)  //relative to start of segment payload

-{

-    assert(pSegment);

-    assert(off >= 0);  //relative to segment

-

-    IMkvReader* const pReader = pSegment->m_pReader;

-

-    long long pos = pSegment->m_start + off;  //absolute

-    long long size;

-

-    {

-        long len;

-

-        const long long id = ReadUInt(pReader, pos, len);

-        id;

-        assert(id >= 0);

-        assert(id == 0x0F43B675);  //Cluster ID

-

-        pos += len;  //consume id

-

-        size = ReadUInt(pReader, pos, len);

-        assert(size > 0);

-

-        pos += len;  //consume size

-

-        //pos now points to start of payload

-    }

-

-    const long long stop = pos + size;

-

-    while (pos < stop)

-    {

-        long len;

-

-        const long long id = ReadUInt(pReader, pos, len);

-        assert(id >= 0);  //TODO

-        assert((pos + len) <= stop);

-

-        pos += len;  //consume id

-

-        const long long size = ReadUInt(pReader, pos, len);

-        assert(size >= 0);  //TODO

-        assert((pos + len) <= stop);

-

-        pos += len;  //consume size

-

-        if (id == 0x20)  //BlockGroup ID

-            return true;

-

-        if (id == 0x23)  //SimpleBlock ID

-            return true;

-

-        pos += size;  //consume payload

-        assert(pos <= stop);

-    }

-

-    return false;

-}

-#endif

-

-

-long Cluster::HasBlockEntries(

-    const Segment* pSegment,

-    long long off,  //relative to start of segment payload

-    long long& pos,

-    long& len)

-{

-    assert(pSegment);

-    assert(off >= 0);  //relative to segment

-

-    IMkvReader* const pReader = pSegment->m_pReader;

-

-    long long total, avail;

-

-    long status = pReader->Length(&total, &avail);

-

-    if (status < 0)  //error

-        return status;

-

-    assert((total < 0) || (avail <= total));

-

-    pos = pSegment->m_start + off;  //absolute

-

-    const long long segment_stop =

-        (pSegment->m_size < 0) ? -1 : pSegment->m_start + pSegment->m_size;

-

-    long long cluster_stop;

-

-    {

-        if ((pos + 1) > avail)

-        {

-            len = 1;

-            return E_BUFFER_NOT_FULL;

-        }

-

-        long long result = GetUIntLength(pReader, pos, len);

-

-        if (result < 0)  //error

-            return static_cast<long>(result);

-

-        if (result > 0)  //need more data

-            return E_BUFFER_NOT_FULL;

-

-        if ((segment_stop >= 0) && ((pos + len) > segment_stop))

-            return E_FILE_FORMAT_INVALID;

-

-        if ((pos + len) > avail)

-            return E_BUFFER_NOT_FULL;

-

-        const long long id = ReadUInt(pReader, pos, len);

-

-        if (id < 0)  //error

-            return static_cast<long>(id);

-

-        if (id != 0x0F43B675)  //weird: not cluster ID

-            return -1;         //generic error

-

-        pos += len;  //consume Cluster ID field

-

-        //read size field

-

-        if ((pos + 1) > avail)

-        {

-            len = 1;

-            return E_BUFFER_NOT_FULL;

-        }

-

-        result = GetUIntLength(pReader, pos, len);

-

-        if (result < 0)  //error

-            return static_cast<long>(result);

-

-        if (result > 0)  //weird

-            return E_BUFFER_NOT_FULL;

-

-        if ((segment_stop >= 0) && ((pos + len) > segment_stop))

-            return E_FILE_FORMAT_INVALID;

-

-        if ((pos + len) > avail)

-            return E_BUFFER_NOT_FULL;

-

-        const long long size = ReadUInt(pReader, pos, len);

-

-        if (size < 0)  //error

-            return static_cast<long>(size);

-

-        const long long unknown_size = (1LL << (7 * len)) - 1;

-

-        if (size == unknown_size)

-            return E_FILE_FORMAT_INVALID;

-

-        if (size == 0)

-            return 0;  //cluster does not have entries

-

-        pos += len;  //consume size field

-

-        cluster_stop = pos + size;

-

-        if ((segment_stop >= 0) && (cluster_stop > segment_stop))

-            return E_FILE_FORMAT_INVALID;

-

-        if ((total >= 0) && (cluster_stop > total))

-            return E_FILE_FORMAT_INVALID;

-    }

-

-    //pos points to start of payload

-

-    while (pos < cluster_stop)

-    {

-        if ((pos + 1) > avail)

-        {

-            len = 1;

-            return E_BUFFER_NOT_FULL;

-        }

-

-        long long result = GetUIntLength(pReader, pos, len);

-

-        if (result < 0)  //error

-            return static_cast<long>(result);

-

-        if (result > 0)  //need more data

-            return E_BUFFER_NOT_FULL;

-

-        if ((pos + len) > cluster_stop)

-            return E_FILE_FORMAT_INVALID;

-

-        if ((pos + len) > avail)

-            return E_BUFFER_NOT_FULL;

-

-        const long long id = ReadUInt(pReader, pos, len);

-

-        if (id < 0)  //error

-            return static_cast<long>(id);

-

-        pos += len;  //consume id field

-

-        if (pos >= cluster_stop)

-            return E_FILE_FORMAT_INVALID;

-

-        //read size field

-

-        if ((pos + 1) > avail)

-        {

-            len = 1;

-            return E_BUFFER_NOT_FULL;

-        }

-

-        result = GetUIntLength(pReader, pos, len);

-

-        if (result < 0)  //error

-            return static_cast<long>(result);

-

-        if (result > 0)  //underflow

-            return E_BUFFER_NOT_FULL;

-

-        if ((pos + len) > cluster_stop)

-            return E_FILE_FORMAT_INVALID;

-

-        if ((pos + len) > avail)

-            return E_BUFFER_NOT_FULL;

-

-        const long long size = ReadUInt(pReader, pos, len);

-

-        if (size < 0)  //error

-            return static_cast<long>(size);

-

-        const long long unknown_size = (1LL << (7 * len)) - 1;

-

-        if (size == unknown_size)

-            return E_FILE_FORMAT_INVALID;

-

-        pos += len;  //consume size field

-

-        if (pos > cluster_stop)

-            return E_FILE_FORMAT_INVALID;

-

-        if (size == 0)  //weird

-            continue;

-

-        if ((pos + size) > cluster_stop)

-            return E_FILE_FORMAT_INVALID;

-

-        if (id == 0x20)  //BlockGroup ID

-            return 1;    //have at least one entry

-

-        if (id == 0x23)  //SimpleBlock ID

-            return 1;    //have at least one entry

-

-        pos += size;  //consume payload

-        assert(pos <= cluster_stop);

-    }

-

-    return 0;  //no entries detected

-}

-

-

-void Cluster::LoadBlockEntries() const

-{

-    //LoadBlockEntries loads all of the entries on the cluster.

-

-    //if (m_entries)

-    //    return;

-

-    //if (m_entries_count == 0)  //already parsed, and no entries found

-    //    return;

-

-    if (m_pSegment == 0)  //EOS cluster

-        return;

-

-    assert(m_pos >= m_element_start);

-    assert(m_size);  //preloaded only, or (partially) loaded

-    //assert(m_entries_count < 0);

-

-    IMkvReader* const pReader = m_pSegment->m_pReader;

-

-    //if (m_pos < 0)

-    //    m_pos *= -1;  //relative to segment

-    //long long pos = m_pSegment->m_start + m_pos;  //absolute

-

-    if (m_size < 0)

-    {

-        assert(m_pos == m_element_start);

-

-        long len;

-

-        const long long id = ReadUInt(pReader, m_pos, len);

-   //     id;

-        assert(id >= 0);

-        assert(id == 0x0F43B675);  //Cluster ID

-

-        m_pos += len;  //consume id

-

-        m_size = ReadUInt(pReader, m_pos, len);

-        assert(m_size > 0);

-

-        const long long unknown_size = (1LL << (7 * len)) - 1;

-        unknown_size;

-        assert(m_size != unknown_size);

-

-        m_pos += len;  //consume size field

-

-        //m_pos now points to start of cluster payload

-

-        const long long cluster_stop = m_pos + m_size;

-        const long long element_size = cluster_stop - m_element_start;

-        assert((m_element_size <= 0) || (m_element_size == element_size));

-

-        if (element_size <= 0)

-            m_element_size = element_size;

-    }

-

-    assert(m_size > 0);

-    assert(m_element_size > m_size);

-

-    const long long cluster_stop = m_element_start + m_element_size;

-

-    if (m_pos >= cluster_stop)

-        return;

-

-    long long timecode = -1;  //of cluster itself

-

-    //First count the number of entries (that remain)

-

-    long long pos = m_pos;

-    int entries_count = 0;  //that remain

-

-    while (pos < cluster_stop)

-    {

-        if (Match(pReader, pos, 0x67, timecode))

-        {

-            if (m_timecode >= 0)

-                assert(timecode == m_timecode);

-            else

-                m_timecode = timecode;

-        }

-        else

-        {

-            long len;

-

-            const long long id = ReadUInt(pReader, pos, len);

-            assert(id >= 0);  //TODO

-            assert((pos + len) <= cluster_stop);

-

-            pos += len;  //consume id

-

-            const long long size = ReadUInt(pReader, pos, len);

-            assert(size >= 0);  //TODO

-            assert((pos + len) <= cluster_stop);

-

-            pos += len;  //consume size

-

-            if (id == 0x20)  //BlockGroup ID

-                ++entries_count;

-            else if (id == 0x23)  //SimpleBlock ID

-                ++entries_count;

-

-            pos += size;  //consume payload

-            assert(pos <= cluster_stop);

-        }

-    }

-

-    assert(pos == cluster_stop);

-    assert(m_timecode >= 0);

-

-    if (entries_count == 0)  //nothing remains to be done

-    {

-        m_pos = pos;

-

-        if (m_entries_count < 0)

-            m_entries_count = 0;

-

-        return;

-    }

-

-    BlockEntry** ppEntry;

-

-    if (m_entries_count < 0)  //haven't parsed anything yet

-    {

-        assert(m_entries == NULL);

-        assert(m_entries_size == 0);

-

-        m_entries_size = entries_count;

-        m_entries = new BlockEntry*[m_entries_size];

-

-        ppEntry = m_entries;

-        m_entries_count = entries_count;

-    }

-    else

-    {

-        assert(m_entries);

-        assert(m_entries_size > 0);

-        assert(m_entries_count > 0);

-        assert(m_entries_count <= m_entries_size);

-

-        const long entries_size = m_entries_count + entries_count;

-

-        if (m_entries_size < entries_size)

-        {

-            BlockEntry** const entries = new BlockEntry*[entries_size];

-            assert(entries);

-

-            BlockEntry** src = m_entries;

-            BlockEntry** const src_end = src + m_entries_count;

-

-            BlockEntry** dst = entries;

-

-            while (src != src_end)

-                *dst++ = *src++;

-

-            delete[] m_entries;

-

-            m_entries = entries;

-            m_entries_size = entries_size;

-        }

-

-        ppEntry = m_entries + m_entries_count;

-        m_entries_count = entries_size;

-    }

-

-    while (m_pos < cluster_stop)

-    {

-        long len;

-        const long long id = ReadUInt(pReader, m_pos, len);

-        assert(id >= 0);  //TODO

-        assert((m_pos + len) <= cluster_stop);

-

-        m_pos += len;  //consume id

-

-        const long long size = ReadUInt(pReader, m_pos, len);

-        assert(size >= 0);  //TODO

-        assert((m_pos + len) <= cluster_stop);

-

-        m_pos += len;  //consume size

-

-        if (id == 0x20)  //BlockGroup ID

-            ParseBlockGroup(m_pos, size, ppEntry);

-        else if (id == 0x23)  //SimpleBlock ID

-            ParseSimpleBlock(m_pos, size, ppEntry);

-

-        m_pos += size;  //consume payload

-        assert(m_pos <= cluster_stop);

-    }

-

-    assert(m_pos == cluster_stop);

-    assert((ppEntry - m_entries) == m_entries_count);

-}

-

-

-

-long long Cluster::GetTimeCode() const

-{

-    Load();

-    return m_timecode;

-}

-

-

-long long Cluster::GetTime() const

-{

-    const long long tc = GetTimeCode();

-    assert(tc >= 0);

-

-    const SegmentInfo* const pInfo = m_pSegment->GetInfo();

-    assert(pInfo);

-

-    const long long scale = pInfo->GetTimeCodeScale();

-    assert(scale >= 1);

-

-    const long long t = m_timecode * scale;

-

-    return t;

-}

-

-

-long long Cluster::GetFirstTime() const

-{

-    const BlockEntry* const pEntry = GetFirst();

-

-    if (pEntry == NULL)  //empty cluster

-        return GetTime();

-

-    const Block* const pBlock = pEntry->GetBlock();

-    assert(pBlock);

-

-    return pBlock->GetTime(this);

-}

-

-

-long long Cluster::GetLastTime() const

-{

-    const BlockEntry* const pEntry = GetLast();

-

-    if (pEntry == NULL)  //empty cluster

-        return GetTime();

-

-    const Block* const pBlock = pEntry->GetBlock();

-    assert(pBlock);

-

-    return pBlock->GetTime(this);

-}

-

-

-void Cluster::ParseBlock(

-    long long id,

-    long long pos,   //absolute pos of payload

-    long long size) const

-{

-    BlockEntry** ppEntry;

-

-    if (m_entries_count < 0)  //haven't parsed anything yet

-    {

-        assert(m_entries == NULL);

-        assert(m_entries_size == 0);

-

-        m_entries_size = 1024;

-        m_entries = new BlockEntry*[m_entries_size];

-

-        ppEntry = m_entries;

-        m_entries_count = 1;

-    }

-    else

-    {

-        assert(m_entries);

-        assert(m_entries_size > 0);

-        assert(m_entries_count > 0);

-        assert(m_entries_count <= m_entries_size);

-

-        if (m_entries_count >= m_entries_size)

-        {

-            const long entries_size = 2 * m_entries_size;

-

-            BlockEntry** const entries = new BlockEntry*[entries_size];

-            assert(entries);

-

-            BlockEntry** src = m_entries;

-            BlockEntry** const src_end = src + m_entries_count;

-

-            BlockEntry** dst = entries;

-

-            while (src != src_end)

-                *dst++ = *src++;

-

-            delete[] m_entries;

-

-            m_entries = entries;

-            m_entries_size = entries_size;

-        }

-

-        ppEntry = m_entries + m_entries_count;

-        ++m_entries_count;

-    }

-

-    if (id == 0x20)  //BlockGroup ID

-        ParseBlockGroup(pos, size, ppEntry);

-    else

-    {

-        assert(id == 0x23);  //SimpleBlock ID

-        ParseSimpleBlock(pos, size, ppEntry);

-    }

-}

-

-

-void Cluster::ParseBlockGroup(

-    long long st,

-    long long sz,

-    BlockEntry**& ppEntry) const

-{

-    assert(m_entries);

-    assert(m_entries_size > 0);

-    assert(ppEntry);

-    assert(ppEntry >= m_entries);

-

-    const ptrdiff_t idx = ppEntry - m_entries;

-    assert(idx >= 0);

-    assert(idx < m_entries_size);

-

-    Cluster* const this_ = const_cast<Cluster*>(this);

-    *ppEntry++ = new BlockGroup(this_, idx, st, sz);

-}

-

-

-

-void Cluster::ParseSimpleBlock(

-    long long st,

-    long long sz,

-    BlockEntry**& ppEntry) const

-{

-    assert(m_entries);

-    assert(m_entries_size > 0);

-    assert(ppEntry);

-    assert(ppEntry >= m_entries);

-

-    const ptrdiff_t idx = ppEntry - m_entries;

-    assert(idx >= 0);

-    assert(idx < m_entries_size);

-

-    Cluster* const this_ = const_cast<Cluster*>(this);

-    *ppEntry++ = new SimpleBlock(this_, idx, st, sz);

-}

-

-

-const BlockEntry* Cluster::GetFirst() const

-{

-    LoadBlockEntries();

-

-    if ((m_entries == NULL) || (m_entries_count <= 0))

-        return NULL;

-

-    const BlockEntry* const pFirst = m_entries[0];

-    assert(pFirst);

-

-    return pFirst;

-}

-

-

-const BlockEntry* Cluster::GetLast() const

-{

-    LoadBlockEntries();

-

-    if ((m_entries == NULL) || (m_entries_count <= 0))

-        return NULL;

-

-    const long idx = m_entries_count - 1;

-

-    const BlockEntry* const pLast = m_entries[idx];

-    assert(pLast);

-

-    return pLast;

-}

-

-

-const BlockEntry* Cluster::GetNext(const BlockEntry* pEntry) const

-{

-    assert(pEntry);

-    assert(m_entries != NULL);

-    assert(m_entries_count > 0);

-

-    size_t idx = pEntry->GetIndex();

-    assert(idx < size_t(m_entries_count));

-    assert(m_entries[idx] == pEntry);

-

-    ++idx;

-

-    if (idx >= size_t(m_entries_count))

-      return NULL;

-

-    return m_entries[idx];

-}

-

-

-long Cluster::GetEntryCount() const

-{

-    return m_entries_count;

-}

-

-

-const BlockEntry* Cluster::GetEntry(

-    const Track* pTrack,

-    long long time_ns) const

-{

-    assert(pTrack);

-

-    if (m_pSegment == NULL)  //this is the special EOS cluster

-        return pTrack->GetEOS();

-

-    LoadBlockEntries();

-

-    if ((m_entries == NULL) || (m_entries_count <= 0))

-        return NULL;  //return EOS here?

-

-    const BlockEntry* pResult = pTrack->GetEOS();

-

-    BlockEntry** i = m_entries;

-    assert(i);

-

-    BlockEntry** const j = i + m_entries_count;

-

-    while (i != j)

-    {

-        const BlockEntry* const pEntry = *i++;

-        assert(pEntry);

-        assert(!pEntry->EOS());

-

-        const Block* const pBlock = pEntry->GetBlock();

-        assert(pBlock);

-

-        if (pBlock->GetTrackNumber() != pTrack->GetNumber())

-            continue;

-

-        if (pTrack->VetEntry(pEntry))

-        {

-            if (time_ns < 0)  //just want first candidate block

-                return pEntry;

-

-            const long long ns = pBlock->GetTime(this);

-

-            if (ns > time_ns)

-                break;

-

-            pResult = pEntry;

-        }

-        else if (time_ns >= 0)

-        {

-            const long long ns = pBlock->GetTime(this);

-

-            if (ns > time_ns)

-                break;

-        }

-    }

-

-    return pResult;

-}

-

-

-const BlockEntry*

-Cluster::GetEntry(

-    const CuePoint& cp,

-    const CuePoint::TrackPosition& tp) const

-{

-    assert(m_pSegment);

-

-    LoadBlockEntries();

-

-    if (m_entries == NULL)

-        return NULL;

-

-    const long long count = m_entries_count;

-

-    if (count <= 0)

-        return NULL;

-

-    const long long tc = cp.GetTimeCode();

-

-    if ((tp.m_block > 0) && (tp.m_block <= count))

-    {

-        const size_t block = static_cast<size_t>(tp.m_block);

-        const size_t index = block - 1;

-

-        const BlockEntry* const pEntry = m_entries[index];

-        assert(pEntry);

-        assert(!pEntry->EOS());

-

-        const Block* const pBlock = pEntry->GetBlock();

-        assert(pBlock);

-

-        if ((pBlock->GetTrackNumber() == tp.m_track) &&

-            (pBlock->GetTimeCode(this) == tc))

-        {

-            return pEntry;

-        }

-    }

-

-    const BlockEntry* const* i = m_entries;

-    const BlockEntry* const* const j = i + count;

-

-    while (i != j)

-    {

-#ifdef _DEBUG

-        const ptrdiff_t idx = i - m_entries;

-        idx;

-#endif

-

-        const BlockEntry* const pEntry = *i++;

-        assert(pEntry);

-        assert(!pEntry->EOS());

-

-        const Block* const pBlock = pEntry->GetBlock();

-        assert(pBlock);

-

-        if (pBlock->GetTrackNumber() != tp.m_track)

-            continue;

-

-        const long long tc_ = pBlock->GetTimeCode(this);

-        assert(tc_ >= 0);

-

-        if (tc_ < tc)

-            continue;

-

-        if (tc_ > tc)

-            return NULL;

-

-        const Tracks* const pTracks = m_pSegment->GetTracks();

-        assert(pTracks);

-

-        const long tn = static_cast<long>(tp.m_track);

-        const Track* const pTrack = pTracks->GetTrackByNumber(tn);

-

-        if (pTrack == NULL)

-            return NULL;

-

-        const long long type = pTrack->GetType();

-

-        if (type == 2)  //audio

-            return pEntry;

-

-        if (type != 1)  //not video

-            return NULL;

-

-        if (!pBlock->IsKey())

-            return NULL;

-

-        return pEntry;

-    }

-

-    return NULL;

-}

-

-

-const BlockEntry* Cluster::GetMaxKey(const VideoTrack* pTrack) const

-{

-    assert(pTrack);

-

-    if (m_pSegment == NULL)  //EOS

-        return pTrack->GetEOS();

-

-    LoadBlockEntries();

-

-    if ((m_entries == NULL) || (m_entries_count <= 0))

-        return pTrack->GetEOS();

-

-    BlockEntry** i = m_entries + m_entries_count;

-    BlockEntry** const j = m_entries;

-

-    while (i != j)

-    {

-        const BlockEntry* const pEntry = *--i;

-        assert(pEntry);

-        assert(!pEntry->EOS());

-

-        const Block* const pBlock = pEntry->GetBlock();

-        assert(pBlock);

-

-        if (pBlock->GetTrackNumber() != pTrack->GetNumber())

-            continue;

-

-        if (pBlock->IsKey())

-            return pEntry;

-    }

-

-    return pTrack->GetEOS();  //no satisfactory block found

-}

-

-

-

-BlockEntry::BlockEntry()

-{

-}

-

-

-BlockEntry::~BlockEntry()

-{

-}

-

-

-SimpleBlock::SimpleBlock(

-    Cluster* pCluster,

-    size_t idx,

-    long long start,

-    long long size) :

-    m_pCluster(pCluster),

-    m_index(idx),

-    m_block(start, size, pCluster->m_pSegment->m_pReader)

-{

-}

-

-

-bool SimpleBlock::EOS() const

-{

-    return false;

-}

-

-

-const Cluster* SimpleBlock::GetCluster() const

-{

-    return m_pCluster;

-}

-

-

-size_t SimpleBlock::GetIndex() const

-{

-    return m_index;

-}

-

-

-const Block* SimpleBlock::GetBlock() const

-{

-    return &m_block;

-}

-

-

-//bool SimpleBlock::IsBFrame() const

-//{

-//    return false;

-//}

-

-

-BlockGroup::BlockGroup(

-    Cluster* pCluster,

-    size_t idx,

-    long long start,

-    long long size_) :

-    m_pCluster(pCluster),

-    m_index(idx),

-    m_prevTimeCode(0),

-    m_nextTimeCode(0),

-    m_pBlock(NULL)  //TODO: accept multiple blocks within a block group

-{

-    IMkvReader* const pReader = m_pCluster->m_pSegment->m_pReader;

-

-    long long pos = start;

-    const long long stop = start + size_;

-

-    bool bSimpleBlock = false;

-    bool bReferenceBlock = false;

-

-    while (pos < stop)

-    {

-        short t;

-

-        if (Match(pReader, pos, 0x7B, t))

-        {

-            if (t < 0)

-                m_prevTimeCode = t;

-            else if (t > 0)

-                m_nextTimeCode = t;

-            else

-                assert(false);

-

-            bReferenceBlock = true;

-        }

-        else

-        {

-            long len;

-            const long long id = ReadUInt(pReader, pos, len);

-            assert(id >= 0);  //TODO

-            assert((pos + len) <= stop);

-

-            pos += len;  //consume ID

-

-            const long long size = ReadUInt(pReader, pos, len);

-            assert(size >= 0);  //TODO

-            assert((pos + len) <= stop);

-

-            pos += len;  //consume size

-

-            switch (id)

-            {

-                case 0x23:  //SimpleBlock ID

-                    bSimpleBlock = true;

-                    //YES, FALL THROUGH TO NEXT CASE

-

-                case 0x21:  //Block ID

-                    ParseBlock(pos, size);

-                    break;

-

-                default:

-                    break;

-            }

-

-            pos += size;  //consume payload

-            assert(pos <= stop);

-        }

-    }

-

-    assert(pos == stop);

-    assert(m_pBlock);

-

-    if (!bSimpleBlock)

-        m_pBlock->SetKey(!bReferenceBlock);

-}

-

-

-BlockGroup::~BlockGroup()

-{

-    delete m_pBlock;

-}

-

-

-void BlockGroup::ParseBlock(long long start, long long size)

-{

-    IMkvReader* const pReader = m_pCluster->m_pSegment->m_pReader;

-

-    Block* const pBlock = new Block(start, size, pReader);

-    assert(pBlock);  //TODO

-

-    //TODO: the Matroska spec says you have multiple blocks within the

-    //same block group, with blocks ranked by priority (the flag bits).

-

-    assert(m_pBlock == NULL);

-    m_pBlock = pBlock;

-}

-

-

-bool BlockGroup::EOS() const

-{

-    return false;

-}

-

-

-const Cluster* BlockGroup::GetCluster() const

-{

-    return m_pCluster;

-}

-

-

-size_t BlockGroup::GetIndex() const

-{

-    return m_index;

-}

-

-

-const Block* BlockGroup::GetBlock() const

-{

-    return m_pBlock;

-}

-

-

-short BlockGroup::GetPrevTimeCode() const

-{

-    return m_prevTimeCode;

-}

-

-

-short BlockGroup::GetNextTimeCode() const

-{

-    return m_nextTimeCode;

-}

-

-

-//bool BlockGroup::IsBFrame() const

-//{

-//    return (m_nextTimeCode > 0);

-//}

-

-

-Block::Block(long long start, long long size_, IMkvReader* pReader) :

-    m_start(start),

-    m_size(size_)

-{

-    long long pos = start;

-    const long long stop = start + size_;

-

-    long len;

-

-    m_track = ReadUInt(pReader, pos, len);

-    assert(m_track > 0);

-    assert((pos + len) <= stop);

-

-    pos += len;  //consume track number

-    assert((stop - pos) >= 2);

-

-    m_timecode = Unserialize2SInt(pReader, pos);

-

-    pos += 2;

-    assert((stop - pos) >= 1);

-

-    long status = pReader->Read(pos, 1, &m_flags);

-    assert(status == 0);

-

-#if 0

-    const int invisible = int(m_flags & 0x08) >> 3;

-    invisible;

-    assert(!invisible);  //TODO

-#endif

-

-    const int lacing = int(m_flags & 0x06) >> 1;

-

-    ++pos;  //consume flags byte

-    assert(pos <= stop);

-

-    if (lacing == 0)  //no lacing

-    {

-        m_frame_count = 1;

-        m_frames = new Frame[m_frame_count];

-

-        Frame& f = m_frames[0];

-        f.pos = pos;

-

-        const long long frame_size = stop - pos;

-        assert(frame_size <= LONG_MAX);

-

-        f.len = static_cast<long>(frame_size);

-

-        return;

-    }

-

-    assert(pos < stop);

-

-    unsigned char count;

-

-    status = pReader->Read(pos, 1, &count);

-    assert(status == 0);

-

-    ++pos;  //consume frame count

-    assert(pos <= stop);

-

-    m_frame_count = ++count;

-    m_frames = new Frame[m_frame_count];

-

-    if (lacing == 1)  //Xiph

-    {

-        Frame* pf = m_frames;

-        Frame* const pf_end = pf + m_frame_count;

-

-        long size = 0;

-

-        while (count > 1)

-        {

-            long frame_size = 0;

-

-            for (;;)

-            {

-                unsigned char val;

-

-                status = pReader->Read(pos, 1, &val);

-                assert(status == 0);

-

-                ++pos;  //consume xiph size byte

-

-                frame_size += val;

-

-                if (val < 255)

-                    break;

-            }

-

-            Frame& f = *pf++;

-            assert(pf < pf_end);

-

-            f.len = frame_size;

-            size += frame_size;  //contribution of this frame

-

-            --count;

-        }

-

-        assert(pf < pf_end);

-        assert(pos < stop);

-

-        {

-            Frame& f = *pf++;

-            assert(pf == pf_end);

-

-            const long long total_size = stop - pos;

-            assert(total_size > size);

-

-            const long long frame_size = total_size - size;

-            assert(frame_size <= LONG_MAX);

-

-            f.len = static_cast<long>(frame_size);

-        }

-

-        pf = m_frames;

-        while (pf != pf_end)

-        {

-            Frame& f = *pf++;

-            assert((pos + f.len) <= stop);

-

-            f.pos = pos;

-            pos += f.len;

-        }

-

-        assert(pos == stop);

-    }

-    else if (lacing == 2)  //fixed-size lacing

-    {

-        const long long total_size = stop - pos;

-        assert((total_size % m_frame_count) == 0);

-

-        const long long frame_size = total_size / m_frame_count;

-        assert(frame_size <= LONG_MAX);

-

-        Frame* pf = m_frames;

-        Frame* const pf_end = pf + m_frame_count;

-

-        while (pf != pf_end)

-        {

-            assert((pos + frame_size) <= stop);

-

-            Frame& f = *pf++;

-

-            f.pos = pos;

-            f.len = static_cast<long>(frame_size);

-

-            pos += frame_size;

-        }

-

-        assert(pos == stop);

-    }

-    else

-    {

-        assert(lacing == 3);  //EBML lacing

-        assert(pos < stop);

-

-        long size = 0;

-

-        long long frame_size = ReadUInt(pReader, pos, len);

-        assert(frame_size > 0);

-        assert(frame_size <= LONG_MAX);

-        assert((pos + len) <= stop);

-

-        pos += len; //consume length of size of first frame

-        assert((pos + frame_size) <= stop);

-

-        Frame* pf = m_frames;

-        Frame* const pf_end = pf + m_frame_count;

-

-        {

-            Frame& curr = *pf;

-

-            curr.len = static_cast<long>(frame_size);

-            size += curr.len;  //contribution of this frame

-        }

-

-        --count;

-

-        while (count > 1)

-        {

-            assert(pos < stop);

-            assert(pf < pf_end);

-

-            const Frame& prev = *pf++;

-            assert(pf < pf_end);

-            assert(prev.len == frame_size);

-

-            Frame& curr = *pf;

-

-            const long long delta_size_ = ReadUInt(pReader, pos, len);

-            assert(delta_size_ >= 0);

-            assert((pos + len) <= stop);

-

-            pos += len;  //consume length of (delta) size

-            assert(pos <= stop);

-

-            const int exp = 7*len - 1;

-            const long long bias = (1LL << exp) - 1LL;

-            const long long delta_size = delta_size_ - bias;

-

-            frame_size += delta_size;

-            assert(frame_size > 0);

-            assert(frame_size <= LONG_MAX);

-

-            curr.len = static_cast<long>(frame_size);

-            size += curr.len;  //contribution of this frame

-

-            --count;

-        }

-

-        {

-            assert(pos < stop);

-            assert(pf < pf_end);

-

-            const Frame& prev = *pf++;

-            assert(pf < pf_end);

-            assert(prev.len == frame_size);

-

-            Frame& curr = *pf++;

-            assert(pf == pf_end);

-

-            const long long total_size = stop - pos;

-            assert(total_size > 0);

-            assert(total_size > size);

-

-            frame_size = total_size - size;

-            assert(frame_size > 0);

-            assert(frame_size <= LONG_MAX);

-

-            curr.len = static_cast<long>(frame_size);

-        }

-

-        pf = m_frames;

-        while (pf != pf_end)

-        {

-            Frame& f = *pf++;

-            assert((pos + f.len) <= stop);

-

-            f.pos = pos;

-            pos += f.len;

-        }

-

-        assert(pos == stop);

-    }

-}

-

-

-Block::~Block()

-{

-    delete[] m_frames;

-}

-

-

-long long Block::GetTimeCode(const Cluster* pCluster) const

-{

-    assert(pCluster);

-

-    const long long tc0 = pCluster->GetTimeCode();

-    assert(tc0 >= 0);

-

-    const long long tc = tc0 + static_cast<long long>(m_timecode);

-    assert(tc >= 0);

-

-    return tc;  //unscaled timecode units

-}

-

-

-long long Block::GetTime(const Cluster* pCluster) const

-{

-    assert(pCluster);

-

-    const long long tc = GetTimeCode(pCluster);

-

-    const Segment* const pSegment = pCluster->m_pSegment;

-    const SegmentInfo* const pInfo = pSegment->GetInfo();

-    assert(pInfo);

-

-    const long long scale = pInfo->GetTimeCodeScale();

-    assert(scale >= 1);

-

-    const long long ns = tc * scale;

-

-    return ns;

-}

-

-

-long long Block::GetTrackNumber() const

-{

-    return m_track;

-}

-

-

-bool Block::IsKey() const

-{

-    return ((m_flags & static_cast<unsigned char>(1 << 7)) != 0);

-}

-

-

-void Block::SetKey(bool bKey)

-{

-    if (bKey)

-        m_flags |= static_cast<unsigned char>(1 << 7);

-    else

-        m_flags &= 0x7F;

-}

-

-

-bool Block::IsInvisible() const

-{

-    return bool(int(m_flags & 0x08) != 0);

-}

-

-

-int Block::GetFrameCount() const

-{

-    return m_frame_count;

-}

-

-

-const Block::Frame& Block::GetFrame(int idx) const

-{

-    assert(idx >= 0);

-    assert(idx < m_frame_count);

-

-    const Frame& f = m_frames[idx];

-    assert(f.pos > 0);

-    assert(f.len > 0);

-

-    return f;

-}

-

-

-long Block::Frame::Read(IMkvReader* pReader, unsigned char* buf) const

-{

-    assert(pReader);

-    assert(buf);

-

-    const long status = pReader->Read(pos, len, buf);

-    return status;

-}

-

-

-}  //end namespace mkvparser

diff --git a/engines/sludge/libwebm/mkvparser.hpp b/engines/sludge/libwebm/mkvparser.hpp
deleted file mode 100644
index 1ebfbaf361..0000000000
--- a/engines/sludge/libwebm/mkvparser.hpp
+++ /dev/null
@@ -1,729 +0,0 @@
-// Copyright (c) 2010 The WebM project authors. All Rights Reserved.

-//

-// Use of this source code is governed by a BSD-style license

-// that can be found in the LICENSE file in the root of the source

-// tree. An additional intellectual property rights grant can be found

-// in the file PATENTS.  All contributing project authors may

-// be found in the AUTHORS file in the root of the source tree.

-

-#ifndef MKVPARSER_HPP

-#define MKVPARSER_HPP

-

-#include <cstdlib>

-#include <cstdio>

-#include <cstddef>

-

-namespace mkvparser

-{

-

-const int E_FILE_FORMAT_INVALID = -2;

-const int E_BUFFER_NOT_FULL = -3;

-

-class IMkvReader

-{

-public:

-    virtual int Read(long long pos, long len, unsigned char* buf) = 0;

-    virtual int Length(long long* total, long long* available) = 0;

-protected:

-    virtual ~IMkvReader();

-};

-

-long long GetUIntLength(IMkvReader*, long long, long&);

-long long ReadUInt(IMkvReader*, long long, long&);

-long long SyncReadUInt(IMkvReader*, long long pos, long long stop, long&);

-long long UnserializeUInt(IMkvReader*, long long pos, long long size);

-float Unserialize4Float(IMkvReader*, long long);

-double Unserialize8Double(IMkvReader*, long long);

-short Unserialize2SInt(IMkvReader*, long long);

-signed char Unserialize1SInt(IMkvReader*, long long);

-bool Match(IMkvReader*, long long&, unsigned long, long long&);

-bool Match(IMkvReader*, long long&, unsigned long, char*&);

-bool Match(IMkvReader*, long long&, unsigned long, unsigned char*&, size_t&);

-bool Match(IMkvReader*, long long&, unsigned long, double&);

-bool Match(IMkvReader*, long long&, unsigned long, short&);

-

-void GetVersion(int& major, int& minor, int& build, int& revision);

-

-struct EBMLHeader

-{

-    EBMLHeader();

-    ~EBMLHeader();

-    long long m_version;

-    long long m_readVersion;

-    long long m_maxIdLength;

-    long long m_maxSizeLength;

-    char* m_docType;

-    long long m_docTypeVersion;

-    long long m_docTypeReadVersion;

-

-    long long Parse(IMkvReader*, long long&);

-    void Init();

-};

-

-

-class Segment;

-class Track;

-class Cluster;

-

-class Block

-{

-    Block(const Block&);

-    Block& operator=(const Block&);

-

-public:

-    const long long m_start;

-    const long long m_size;

-

-    Block(long long start, long long size, IMkvReader*);

-    ~Block();

-

-    long long GetTrackNumber() const;

-    long long GetTimeCode(const Cluster*) const;  //absolute, but not scaled

-    long long GetTime(const Cluster*) const;      //absolute, and scaled (ns)

-    bool IsKey() const;

-    void SetKey(bool);

-    bool IsInvisible() const;

-

-    int GetFrameCount() const;  //to index frames: [0, count)

-

-    struct Frame

-    {

-        long long pos;  //absolute offset

-        long len;

-

-        long Read(IMkvReader*, unsigned char*) const;

-    };

-

-    const Frame& GetFrame(int frame_index) const;

-

-private:

-    long long m_track;   //Track::Number()

-    short m_timecode;  //relative to cluster

-    unsigned char m_flags;

-

-    Frame* m_frames;

-    int m_frame_count;

-

-};

-

-

-class BlockEntry

-{

-    BlockEntry(const BlockEntry&);

-    BlockEntry& operator=(const BlockEntry&);

-

-public:

-    virtual ~BlockEntry();

-    virtual bool EOS() const = 0;

-    virtual const Cluster* GetCluster() const = 0;

-    virtual size_t GetIndex() const = 0;

-    virtual const Block* GetBlock() const = 0;

-    //virtual bool IsBFrame() const = 0;

-

-protected:

-    BlockEntry();

-

-};

-

-

-class SimpleBlock : public BlockEntry

-{

-    SimpleBlock(const SimpleBlock&);

-    SimpleBlock& operator=(const SimpleBlock&);

-

-public:

-    SimpleBlock(Cluster*, size_t, long long start, long long size);

-

-    bool EOS() const;

-    const Cluster* GetCluster() const;

-    size_t GetIndex() const;

-    const Block* GetBlock() const;

-    //bool IsBFrame() const;

-

-protected:

-    Cluster* const m_pCluster;

-    const size_t m_index;

-    Block m_block;

-

-};

-

-

-class BlockGroup : public BlockEntry

-{

-    BlockGroup(const BlockGroup&);

-    BlockGroup& operator=(const BlockGroup&);

-

-public:

-    BlockGroup(Cluster*, size_t, long long, long long);

-    ~BlockGroup();

-

-    bool EOS() const;

-    const Cluster* GetCluster() const;

-    size_t GetIndex() const;

-    const Block* GetBlock() const;

-    //bool IsBFrame() const;

-

-    short GetPrevTimeCode() const;  //relative to block's time

-    short GetNextTimeCode() const;  //as above

-

-protected:

-    Cluster* const m_pCluster;

-    const size_t m_index;

-

-private:

-    BlockGroup(Cluster*, size_t, unsigned long);

-    void ParseBlock(long long start, long long size);

-

-    short m_prevTimeCode;

-    short m_nextTimeCode;

-

-    //TODO: the Matroska spec says you can have multiple blocks within the

-    //same block group, with blocks ranked by priority (the flag bits).

-    //For now we just cache a single block.

-#if 0

-    typedef std::deque<Block*> blocks_t;

-    blocks_t m_blocks;  //In practice should contain only a single element.

-#else

-    Block* m_pBlock;

-#endif

-

-};

-

-

-class Track

-{

-    Track(const Track&);

-    Track& operator=(const Track&);

-

-public:

-    Segment* const m_pSegment;

-    const long long m_element_start;

-    const long long m_element_size;

-    virtual ~Track();

-

-    long long GetType() const;

-    long long GetNumber() const;

-    unsigned long long GetUid() const;

-    const char* GetNameAsUTF8() const;

-    const char* GetCodecNameAsUTF8() const;

-    const char* GetCodecId() const;

-    const unsigned char* GetCodecPrivate(size_t&) const;

-    bool GetLacing() const;

-

-    const BlockEntry* GetEOS() const;

-

-    struct Settings

-    {

-        long long start;

-        long long size;

-    };

-

-    struct Info

-    {

-        long long type;

-        long long number;

-        unsigned long long uid;

-        char* nameAsUTF8;

-        char* codecId;

-        unsigned char* codecPrivate;

-        size_t codecPrivateSize;

-        char* codecNameAsUTF8;

-        bool lacing;

-        Settings settings;

-

-        Info();

-        void Clear();

-    };

-

-    long GetFirst(const BlockEntry*&) const;

-    long GetNext(const BlockEntry* pCurr, const BlockEntry*& pNext) const;

-    virtual bool VetEntry(const BlockEntry*) const = 0;

-    virtual long Seek(long long time_ns, const BlockEntry*&) const = 0;

-

-protected:

-    Track(

-        Segment*,

-        const Info&,

-        long long element_start,

-        long long element_size);

-    const Info m_info;

-

-    class EOSBlock : public BlockEntry

-    {

-    public:

-        EOSBlock();

-

-        bool EOS() const;

-        const Cluster* GetCluster() const;

-        size_t GetIndex() const;

-        const Block* GetBlock() const;

-        bool IsBFrame() const;

-    };

-

-    EOSBlock m_eos;

-

-};

-

-

-class VideoTrack : public Track

-{

-    VideoTrack(const VideoTrack&);

-    VideoTrack& operator=(const VideoTrack&);

-

-public:

-    VideoTrack(

-        Segment*,

-        const Info&,

-        long long element_start,

-        long long element_size);

-    long long GetWidth() const;

-    long long GetHeight() const;

-    double GetFrameRate() const;

-

-    bool VetEntry(const BlockEntry*) const;

-    long Seek(long long time_ns, const BlockEntry*&) const;

-

-private:

-    long long m_width;

-    long long m_height;

-    double m_rate;

-

-};

-

-

-class AudioTrack : public Track

-{

-    AudioTrack(const AudioTrack&);

-    AudioTrack& operator=(const AudioTrack&);

-

-public:

-    AudioTrack(

-        Segment*,

-        const Info&,

-        long long element_start,

-        long long element_size);

-    double GetSamplingRate() const;

-    long long GetChannels() const;

-    long long GetBitDepth() const;

-    bool VetEntry(const BlockEntry*) const;

-    long Seek(long long time_ns, const BlockEntry*&) const;

-

-private:

-    double m_rate;

-    long long m_channels;

-    long long m_bitDepth;

-};

-

-

-class Tracks

-{

-    Tracks(const Tracks&);

-    Tracks& operator=(const Tracks&);

-

-public:

-    Segment* const m_pSegment;

-    const long long m_start;

-    const long long m_size;

-    const long long m_element_start;

-    const long long m_element_size;

-

-    Tracks(

-        Segment*,

-        long long start,

-        long long size,

-        long long element_start,

-        long long element_size);

-    virtual ~Tracks();

-

-    const Track* GetTrackByNumber(unsigned long tn) const;

-    const Track* GetTrackByIndex(unsigned long idx) const;

-

-private:

-    Track** m_trackEntries;

-    Track** m_trackEntriesEnd;

-

-    void ParseTrackEntry(

-        long long,

-        long long,

-        Track*&,

-        long long element_start,

-        long long element_size);

-

-public:

-    unsigned long GetTracksCount() const;

-};

-

-

-class SegmentInfo

-{

-    SegmentInfo(const SegmentInfo&);

-    SegmentInfo& operator=(const SegmentInfo&);

-

-public:

-    Segment* const m_pSegment;

-    const long long m_start;

-    const long long m_size;

-    const long long m_element_start;

-    const long long m_element_size;

-

-    SegmentInfo(

-        Segment*,

-        long long start,

-        long long size,

-        long long element_start,

-        long long element_size);

-

-    ~SegmentInfo();

-

-    long long GetTimeCodeScale() const;

-    long long GetDuration() const;  //scaled

-    const char* GetMuxingAppAsUTF8() const;

-    const char* GetWritingAppAsUTF8() const;

-    const char* GetTitleAsUTF8() const;

-

-private:

-    long long m_timecodeScale;

-    double m_duration;

-    char* m_pMuxingAppAsUTF8;

-    char* m_pWritingAppAsUTF8;

-    char* m_pTitleAsUTF8;

-};

-

-

-class SeekHead

-{

-    SeekHead(const SeekHead&);

-    SeekHead& operator=(const SeekHead&);

-

-public:

-    Segment* const m_pSegment;

-    const long long m_start;

-    const long long m_size;

-    const long long m_element_start;

-    const long long m_element_size;

-

-    SeekHead(

-        Segment*,

-        long long start,

-        long long size,

-        long long element_start,

-        long long element_size);

-

-    ~SeekHead();

-

-    struct Entry

-    {

-        long long id;

-        long long pos;

-    };

-

-    int GetCount() const;

-    const Entry* GetEntry(int idx) const;

-

-private:

-    Entry* m_entries;

-    int m_count;

-

-    static void ParseEntry(

-        IMkvReader*,

-        long long pos,

-        long long size,

-        Entry*&);

-

-};

-

-class Cues;

-class CuePoint

-{

-    friend class Cues;

-

-    CuePoint(size_t, long long);

-    ~CuePoint();

-

-    CuePoint(const CuePoint&);

-    CuePoint& operator=(const CuePoint&);

-

-public:

-    long long m_element_start;

-    long long m_element_size;

-

-    void Load(IMkvReader*);

-

-    long long GetTimeCode() const;      //absolute but unscaled

-    long long GetTime(const Segment*) const;  //absolute and scaled (ns units)

-

-    struct TrackPosition

-    {

-        long long m_track;

-        long long m_pos;  //of cluster

-        long long m_block;

-        //codec_state  //defaults to 0

-        //reference = clusters containing req'd referenced blocks

-        //  reftime = timecode of the referenced block

-

-        void Parse(IMkvReader*, long long, long long);

-    };

-

-    const TrackPosition* Find(const Track*) const;

-

-private:

-    const size_t m_index;

-    long long m_timecode;

-    TrackPosition* m_track_positions;

-    size_t m_track_positions_count;

-

-};

-

-

-class Cues

-{

-    friend class Segment;

-

-    Cues(

-        Segment*,

-        long long start,

-        long long size,

-        long long element_start,

-        long long element_size);

-    ~Cues();

-

-    Cues(const Cues&);

-    Cues& operator=(const Cues&);

-

-public:

-    Segment* const m_pSegment;

-    const long long m_start;

-    const long long m_size;

-    const long long m_element_start;

-    const long long m_element_size;

-

-    bool Find(  //lower bound of time_ns

-        long long time_ns,

-        const Track*,

-        const CuePoint*&,

-        const CuePoint::TrackPosition*&) const;

-

-#if 0

-    bool FindNext(  //upper_bound of time_ns

-        long long time_ns,

-        const Track*,

-        const CuePoint*&,

-        const CuePoint::TrackPosition*&) const;

-#endif

-

-    const CuePoint* GetFirst() const;

-    const CuePoint* GetLast() const;

-    const CuePoint* GetNext(const CuePoint*) const;

-

-    const BlockEntry* GetBlock(

-                        const CuePoint*,

-                        const CuePoint::TrackPosition*) const;

-

-    bool LoadCuePoint() const;

-    long GetCount() const;  //loaded only

-    //long GetTotal() const;  //loaded + preloaded

-    bool DoneParsing() const;

-

-private:

-    void Init() const;

-    void PreloadCuePoint(size_t&, long long) const;

-

-    mutable CuePoint** m_cue_points;

-    mutable size_t m_count;

-    mutable size_t m_preload_count;

-    mutable long long m_pos;

-

-};

-

-

-class Cluster

-{

-    friend class Segment;

-

-    Cluster(const Cluster&);

-    Cluster& operator=(const Cluster&);

-

-public:

-    Segment* const m_pSegment;

-

-public:

-    static Cluster* Create(

-        Segment*,

-        long index,     //index in segment

-        long long off,  //offset relative to segment

-        long long element_size);

-

-    Cluster();  //EndOfStream

-    ~Cluster();

-

-    bool EOS() const;

-

-    long long GetTimeCode() const;   //absolute, but not scaled

-    long long GetTime() const;       //absolute, and scaled (nanosecond units)

-    long long GetFirstTime() const;  //time (ns) of first (earliest) block

-    long long GetLastTime() const;   //time (ns) of last (latest) block

-

-    const BlockEntry* GetFirst() const;

-    const BlockEntry* GetLast() const;

-    const BlockEntry* GetNext(const BlockEntry*) const;

-    const BlockEntry* GetEntry(const Track*, long long ns = -1) const;

-    const BlockEntry* GetEntry(

-        const CuePoint&,

-        const CuePoint::TrackPosition&) const;

-    const BlockEntry* GetMaxKey(const VideoTrack*) const;

-

-//    static bool HasBlockEntries(const Segment*, long long);

-

-    static long HasBlockEntries(

-            const Segment*,

-            long long idoff,

-            long long& pos,

-            long& size);

-

-    long GetEntryCount() const;

-

-    void Load() const;

-    long Load(long long& pos, long& size) const;

-

-    void LoadBlockEntries() const;

-

-    long Parse(long long& pos, long& size) const;

-    long GetEntry(long index, const mkvparser::BlockEntry*&) const;

-

-protected:

-    Cluster(

-        Segment*,

-        long index,

-        //long long off,

-        long long element_start,

-        long long element_size);

-

-public:

-    const long long m_element_start;

-    long long GetPosition() const;  //offset relative to segment

-

-    long GetIndex() const;

-    long long GetElementSize() const;

-    //long long GetPayloadSize() const;

-

-    long long Unparsed() const;

-

-private:

-    long m_index;

-    mutable long long m_pos;

-    mutable long long m_size;

-    mutable long long m_element_size;

-    mutable long long m_timecode;

-    mutable BlockEntry** m_entries;

-    mutable long m_entries_size;

-    mutable long m_entries_count;

-

-    void ParseBlock(long long id, long long pos, long long size) const;

-    void ParseBlockGroup(long long, long long, BlockEntry**&) const;

-    void ParseSimpleBlock(long long, long long, BlockEntry**&) const;

-

-};

-

-

-class Segment

-{

-    friend class Cues;

-    friend class VideoTrack;

-    friend class AudioTrack;

-

-    Segment(const Segment&);

-    Segment& operator=(const Segment&);

-

-private:

-    Segment(IMkvReader*, long long pos, long long size);

-

-public:

-    IMkvReader* const m_pReader;

-    const long long m_start;  //posn of segment payload

-    const long long m_size;   //size of segment payload

-    Cluster m_eos;  //TODO: make private?

-

-    static long long CreateInstance(IMkvReader*, long long, Segment*&);

-    ~Segment();

-

-    long Load();  //loads headers and all clusters

-

-    //for incremental loading

-    long long Unparsed() const;

-    long long ParseHeaders();  //stops when first cluster is found

-    //long FindNextCluster(long long& pos, long& size) const;

-    long LoadCluster(long long& pos, long& size);  //load one cluster

-    long LoadCluster();

-

-    long ParseNext(

-            const Cluster* pCurr,

-            const Cluster*& pNext,

-            long long& pos,

-            long& size);

-

-#if 0

-    //This pair parses one cluster, but only changes the state of the

-    //segment object when the cluster is actually added to the index.

-    long ParseCluster(long long& cluster_pos, long long& new_pos) const;

-    bool AddCluster(long long cluster_pos, long long new_pos);

-#endif

-

-    const SeekHead* GetSeekHead() const;

-    const Tracks* GetTracks() const;

-    const SegmentInfo* GetInfo() const;

-    const Cues* GetCues() const;

-

-    long long GetDuration() const;

-

-    unsigned long GetCount() const;

-    const Cluster* GetFirst() const;

-    const Cluster* GetLast() const;

-    const Cluster* GetNext(const Cluster*);

-

-    const Cluster* FindCluster(long long time_nanoseconds) const;

-    //const BlockEntry* Seek(long long time_nanoseconds, const Track*) const;

-

-    const Cluster* FindOrPreloadCluster(long long pos);

-

-    long ParseCues(

-        long long cues_off,  //offset relative to start of segment

-        long long& parse_pos,

-        long& parse_len);

-

-private:

-

-    long long m_pos;  //absolute file posn; what has been consumed so far

-

-    SeekHead* m_pSeekHead;

-    SegmentInfo* m_pInfo;

-    Tracks* m_pTracks;

-    Cues* m_pCues;

-    Cluster** m_clusters;

-    long m_clusterCount;         //number of entries for which m_index >= 0

-    long m_clusterPreloadCount;  //number of entries for which m_index < 0

-    long m_clusterSize;          //array size

-

-    void AppendCluster(Cluster*);

-    void PreloadCluster(Cluster*, ptrdiff_t);

-

-    //void ParseSeekHead(long long pos, long long size);

-    //void ParseSeekEntry(long long pos, long long size);

-    //void ParseCues(long long);

-

-    const BlockEntry* GetBlock(

-        const CuePoint&,

-        const CuePoint::TrackPosition&);

-

-};

-

-}  //end namespace mkvparser

-

-inline long mkvparser::Segment::LoadCluster()

-{

-    long long pos;

-    long size;

-

-    return LoadCluster(pos, size);

-}

-

-#endif  //MKVPARSER_HPP

diff --git a/engines/sludge/libwebm/mkvreader.cpp b/engines/sludge/libwebm/mkvreader.cpp
deleted file mode 100644
index 4cae468d0d..0000000000
--- a/engines/sludge/libwebm/mkvreader.cpp
+++ /dev/null
@@ -1,120 +0,0 @@
-// Copyright (c) 2010 The WebM project authors. All Rights Reserved.

-//

-// Use of this source code is governed by a BSD-style license

-// that can be found in the LICENSE file in the root of the source

-// tree. An additional intellectual property rights grant can be found

-// in the file PATENTS.  All contributing project authors may

-// be found in the AUTHORS file in the root of the source tree.

-

-// Modified by Rikard Peterson 2011 to fit in the SLUDGE engine.

-

-#include "mkvreader.hpp"

-#include "../newfatal.h"

-#include "../fileset.h"

-

-#include <cassert>

-#include <stdio.h>

-

-#if 0

-MkvReader::MkvReader() :

-    m_file(0)

-{

-}

-

-MkvReader::~MkvReader()

-{

-    Close();

-}

-

-int MkvReader::Open(int fileNumber)

-{

-    if (! fileNumber)

-        return -1;

-

-    if (m_file)

-        return -1;

-

-	m_file = fileNumber;

-

-	setResourceForFatal (fileNumber);

-	m_length = openFileFromNum (fileNumber);

-	if (m_length == 0) {

-		finishAccess();

-		setResourceForFatal (-1);

-		return -1;

-	}

-	/*

-#ifdef WIN32

-	m_start = _ftelli64(bigDataFile);

-#else*/

-    m_start = ftell(bigDataFile);

-/*#endif

-*/

-	finishAccess();

-    return 0;

-}

-

-void MkvReader::Close()

-{

-    if (m_file)

-    {

-		finishAccess();

-		setResourceForFatal (-1);

-        m_file = 0;

-    }

-}

-

-int MkvReader::Length(long long* total, long long* available)

-{

-    if (! m_file)

-        return -1;

-

-    if (total)

-        *total = m_length;

-

-    if (available)

-        *available = m_length;

-

-    return 0;

-}

-

-int MkvReader::Read(long long offset, long len, unsigned char* buffer)

-{

-    if (! m_file)

-        return -1;

-

-    if (offset < 0)

-        return -1;

-

-    if (len < 0)

-        return -1;

-

-    if (len == 0)

-        return 0;

-

-

-    if (offset >= m_length)

-        return -1;

-

-	if (startAccess())

-		fprintf(stderr, "Warning: Datafile already in use when playing movie!\n");

-/*

-#ifdef WIN32

-    const int status = _fseeki64(bigDataFile, m_start+offset, SEEK_SET);

-

-    if (status)

-        return -1;  //error

-#else*/

-    fseek(bigDataFile, m_start+offset, SEEK_SET);

-//#endif

-

-    const size_t size = fread(buffer, 1, len, bigDataFile);

-

-	finishAccess();

-

-    if (size < size_t(len))

-        return -1;  //error

-

-    return 0;  //success

-}

-#endif

diff --git a/engines/sludge/libwebm/mkvreader.hpp b/engines/sludge/libwebm/mkvreader.hpp
deleted file mode 100644
index b46ef7821a..0000000000
--- a/engines/sludge/libwebm/mkvreader.hpp
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (c) 2010 The WebM project authors. All Rights Reserved.

-//

-// Use of this source code is governed by a BSD-style license

-// that can be found in the LICENSE file in the root of the source

-// tree. An additional intellectual property rights grant can be found

-// in the file PATENTS.  All contributing project authors may

-// be found in the AUTHORS file in the root of the source tree.

-

-// Modified by Rikard Peterson 2011 to fit in the SLUDGE engine.

-

-#ifndef MKVREADER_HPP

-#define MKVREADER_HPP

-

-#include "mkvparser.hpp"

-#include <cstdio>

-

-class MkvReader : public mkvparser::IMkvReader

-{

-#if 0

-    MkvReader(const MkvReader&);

-    MkvReader& operator=(const MkvReader&);

-public:

-    MkvReader();

-    virtual ~MkvReader();

-

-    int Open(int fileNumber);

-    void Close();

-    bool IsOpen() const;

-

-    virtual int Read(long long position, long length, unsigned char* buffer);

-    virtual int Length(long long* total, long long* available);

-private:

-    long long m_length;

-	unsigned int m_start;

-    int m_file;

-#endif

-};

-

-#endif //MKVREADER_HPP

diff --git a/engines/sludge/module.mk b/engines/sludge/module.mk
index 2e321ea415..fa1f3136bb 100644
--- a/engines/sludge/module.mk
+++ b/engines/sludge/module.mk
@@ -42,8 +42,6 @@ MODULE_OBJS := \
 	utf8.o \
 	variable.o \
 	zbuffer.o \
-#	libwebm/mkvparser.o \
-#	libwebm/mkvreader.o \
  
 MODULE_DIRS += \
 	engines/sludge
diff --git a/engines/sludge/movie.cpp b/engines/sludge/movie.cpp
index df9031bab7..51f45e5120 100644
--- a/engines/sludge/movie.cpp
+++ b/engines/sludge/movie.cpp
@@ -36,8 +36,6 @@
 #endif
 
 #include "sludge/CommonCode/specialsettings.h"
-#include "sludge/libwebm/mkvreader.hpp"
-#include "sludge/libwebm/mkvparser.hpp"
 
 #include "sludge/newfatal.h"
 #include "sludge/timing.h"