Changeset 40322

Timestamp:

04/17/17 22:27:46 (6 years ago)

Author:

obi

Message:

update libeplayer3 new version only buffer

Location:

titan

Files:

• libeplayer3/Makefile.am.sh4 (modified) (3 diffs)
• libeplayer3/container/container_ffmpeg.c (modified) (112 diffs)
• libeplayer3/container/flv2mpeg4_ffmpeg.c (added)
• libeplayer3/container/tools_ffmpeg.c (added)
• libeplayer3/container/wrapped_ffmpeg.c (added)
• libeplayer3/external (added)
• libeplayer3/external/ffmpeg (added)
• libeplayer3/external/ffmpeg/get_bits.h (added)
• libeplayer3/external/ffmpeg/latmenc.h (added)
• libeplayer3/external/ffmpeg/mathops.h (added)
• libeplayer3/external/ffmpeg/mpeg4audio.h (added)
• libeplayer3/external/ffmpeg/put_bits.h (added)
• libeplayer3/external/ffmpeg/src (added)
• libeplayer3/external/ffmpeg/src/bitstream.c (added)
• libeplayer3/external/ffmpeg/src/latmenc.c (added)
• libeplayer3/external/ffmpeg/src/mpeg4audio.c (added)
• libeplayer3/external/flv2mpeg4 (added)
• libeplayer3/external/flv2mpeg4/doc (added)
• libeplayer3/external/flv2mpeg4/doc/COPYING (added)
• libeplayer3/external/flv2mpeg4/doc/CREDITS (added)
• libeplayer3/external/flv2mpeg4/doc/FFMPEG_CREDITS (added)
• libeplayer3/external/flv2mpeg4/doc/FFMPEG_IMPORTS (added)
• libeplayer3/external/flv2mpeg4/doc/INSTALL (added)
• libeplayer3/external/flv2mpeg4/doc/README (added)
• libeplayer3/external/flv2mpeg4/flv2mpeg4.h (added)
• libeplayer3/external/flv2mpeg4/src (added)
• libeplayer3/external/flv2mpeg4/src/bitreader.h (added)
• libeplayer3/external/flv2mpeg4/src/bitwriter.h (added)
• libeplayer3/external/flv2mpeg4/src/dcprediction.c (added)
• libeplayer3/external/flv2mpeg4/src/dcprediction.h (added)
• libeplayer3/external/flv2mpeg4/src/flv.h (added)
• libeplayer3/external/flv2mpeg4/src/flv2mpeg4.c (added)
• libeplayer3/external/flv2mpeg4/src/flvdecoder.c (added)
• libeplayer3/external/flv2mpeg4/src/m4v.h (added)
• libeplayer3/external/flv2mpeg4/src/m4vencode.c (added)
• libeplayer3/external/flv2mpeg4/src/m4vencode.h (added)
• libeplayer3/external/flv2mpeg4/src/m4vencode_tables.h (added)
• libeplayer3/external/flv2mpeg4/src/type.h (added)
• libeplayer3/include/container.h (modified) (2 diffs)
• libeplayer3/include/manager.h (modified) (2 diffs)
• libeplayer3/include/misc.h (modified) (6 diffs)
• libeplayer3/include/output.h (modified) (5 diffs)
• libeplayer3/include/playback.h (modified) (2 diffs)
• libeplayer3/include/writer.h (modified) (5 diffs)
• libeplayer3/main/exteplayer.c (modified) (9 diffs)
• libeplayer3/manager/manager.c (modified) (2 diffs)
• libeplayer3/manager/subtitle.c (modified) (2 diffs)
• libeplayer3/manager/video.c (modified) (1 diff)
• libeplayer3/output/linuxdvb_mipsel.c (modified) (5 diffs)
• libeplayer3/output/linuxdvb_sh4.c (modified) (2 diffs)
• libeplayer3/output/output.c (modified) (14 diffs)
• libeplayer3/output/output_subtitle.c (modified) (16 diffs)
• libeplayer3/output/writer/mipsel/writer.c (modified) (4 diffs)
• libeplayer3/output/writer/sh4/writer.c (modified) (2 diffs)
• libeplayer3/playback/playback.c (modified) (12 diffs)
• titan/player.h (modified) (5 diffs)

titan/libeplayer3/Makefile.am.sh4

@@ -5 +5 @@
 
 AM_CPPFLAGS = \
-        -Iinclude
+        -Iinclude \
+        -Iexternal
 
 lib_LTLIBRARIES = libeplayer3.la
@@ -11 +12 @@
 container/container.c \
 container/container_ffmpeg.c \
-container/container_ass.c \
-container/text_srt.c \
-container/text_ssa.c \
 manager/manager.c \
 manager/audio.c \
 manager/video.c \
 manager/subtitle.c \
-manager/dvbsubtitle.c \
-manager/teletext.c \
 output/linuxdvb_sh4.c \
 output/output_subtitle.c \
 output/output.c \
-output/output_pipe.c \
 output/writer/common/pes.c \
 output/writer/common/misc.c \
 output/writer/sh4/writer.c \
-output/writer/sh4/framebuffer.c \
 output/writer/sh4/aac.c \
 output/writer/sh4/ac3.c \
@@ -40 +34 @@
 output/writer/sh4/wma.c \
 output/writer/sh4/wmv.c \
-playback/playback.c
+playback/playback.c \
+external/ffmpeg/src/bitstream.c \
+external/ffmpeg/src/latmenc.c \
+external/ffmpeg/src/mpeg4audio.c
+
 
 #SOURCE_FILES+=" output/writer/sh4/divx.c

titan/libeplayer3/container/container_ffmpeg.c

@@ -49 +49 @@
 #include <libavutil/opt.h>
 
+#include <ffmpeg/mpeg4audio.h>
+
 #include "common.h"
 #include "misc.h"
@@ -55 +57 @@
 #include "pcm.h"
 #include "ffmpeg_metadata.h"
-#include "subtitle.h"
-
 /* ***************************** */
 /* Makros/Constants              */
 /* ***************************** */
+#if (LIBAVFORMAT_VERSION_MAJOR > 57) 
+#define TS_BYTES_SEEKING 0
+#else
+#define TS_BYTES_SEEKING 1
+#endif
+
 /* Some STB with old kernels have problem with default 
  * read/write functions in ffmpeg which use open/read
@@ -67 +73 @@
 #define SAM_CUSTOM_IO
 
-//SULGE DEBUG ENABLED
 #define SAM_WITH_DEBUG
 #ifdef SAM_WITH_DEBUG
@@ -74 +79 @@
 #define FFMPEG_SILENT
 #endif
-
-//#define FFMPEG_DEBUG
 
 #ifdef FFMPEG_DEBUG
@@ -144 +147 @@
 static int32_t container_ffmpeg_seek_bytes(off_t pos);
 static int32_t container_ffmpeg_seek(Context_t *context, int64_t sec, uint8_t absolute);
-//static int32_t container_ffmpeg_seek_rel(Context_t *context, off_t pos, int64_t pts, int64_t sec);
+static int32_t container_ffmpeg_seek_rel(Context_t *context, off_t pos, int64_t pts, int64_t sec);
 static int32_t container_ffmpeg_get_length(Context_t *context, int64_t *length);
 static int64_t calcPts(uint32_t avContextIdx, AVStream *stream, int64_t pts);
@@ -152 +155 @@
  * we start playback before download was finished 
  */
-static int32_t progressive_download = 0;
-void progressive_download_set(int32_t val)
-{
-    progressive_download = val;
-}
-
-/* This is very bad to include source file 
- * and must be corrected in the future
- */
-//#include "buff_ffmpeg.c"
-
+static int32_t progressive_playback = 0;
+void progressive_playback_set(int32_t val)
+{
+    progressive_playback = val;
+}
+
+#include "buff_ffmpeg.c"
+#include "wrapped_ffmpeg.c"
+#include "tools_ffmpeg.c"
 #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(56, 34, 100)
 #include "mpeg4p2_ffmpeg.c"
+#endif
+
+#ifdef HAVE_FLV2MPEG4_CONVERTER
+#include "flv2mpeg4_ffmpeg.c"
 #endif
 
@@ -173 +178 @@
 static int32_t wma_software_decode = 0;
 static int32_t aac_software_decode = 0;
+#ifdef __sh__
+static int32_t aac_latm_software_decode = 1;
+#else
+static int32_t aac_latm_software_decode = 0;
+#endif
+
 static int32_t ac3_software_decode = 0;
 static int32_t eac3_software_decode = 0;
@@ -182 +193 @@
 static int32_t rtmp_proto_impl = 0; // 0 - auto, 1 - native, 2 - librtmp
 
-//for buffered io
-#define FILLBUFSIZE 0
-#define FILLBUFDIFF 1048576
-#define FILLBUFPAKET 5120
-#define FILLBUFSEEKTIME 3 //sec
-#define TIMEOUT_MAX_ITERS 10
-
-static int ffmpeg_buf_size = FILLBUFSIZE + FILLBUFDIFF;
-static ffmpeg_buf_seek_time = FILLBUFSEEKTIME;
-static int(*ffmpeg_read_org)(void *opaque, uint8_t *buf, int buf_size) = NULL;
-static int(*ffmpeg_real_read_org)(void *opaque, uint8_t *buf, int buf_size) = NULL;
-
-static int64_t(*ffmpeg_seek_org)(void *opaque, int64_t offset, int whence) = NULL;
-static unsigned char* ffmpeg_buf_read = NULL;
-static unsigned char* ffmpeg_buf_write = NULL;
-static unsigned char* ffmpeg_buf = NULL;
-static pthread_t fillerThread;
-static int hasfillerThreadStarted[10] = {0,0,0,0,0,0,0,0,0,0};
-int hasfillerThreadStartedID = 0;
-static pthread_mutex_t fillermutex;
-static int ffmpeg_buf_valid_size = 0;
-static int ffmpeg_do_seek_ret = 0;
-static int ffmpeg_do_seek = 0;
-static int ffmpeg_buf_stop = 0;
-//for buffered io (end)
-
-
-static int64_t playPts = -1;
-static int32_t finishTimeout = 0;
-static int8_t pauseTimeout = 0;
-static int64_t maxInjectedPTS = INVALID_PTS_VALUE;
-
-void reset_finish_timeout()
-{
-    playPts = -1;
-    finishTimeout = 0;
-}
-
-static int64_t update_max_injected_pts(int64_t pts)
-{
-    if(pts > 0 && pts != INVALID_PTS_VALUE)
-    {
-        if(maxInjectedPTS == INVALID_PTS_VALUE || pts > maxInjectedPTS)
-        {
-            maxInjectedPTS = pts;
-        }
-    }
-    return maxInjectedPTS;
-}
-
-int64_t get_play_pts()
-{
-    return playPts;
-}
-
-static int8_t is_finish_timeout()
-{
-    if (finishTimeout > TIMEOUT_MAX_ITERS)
-    {
-        return 1;
-    }
-    return 0;
-}
-
-static Context_t *context = 0;
-
-static void update_finish_timeout()
-{
-    if(0 == pauseTimeout)
-    {    
-        int64_t maxInjectedPts = update_max_injected_pts(-1);
-        int64_t currPts = -1;
-
-// segfault
-//        int32_t ret = context->playback->Command(context, PLAYBACK_PTS, &currPts);
-        int32_t ret = 0;
-
-        finishTimeout += 1;
-        
-        if(maxInjectedPts < 0 || maxInjectedPts == INVALID_PTS_VALUE)
-        {
-            maxInjectedPts = 0;
-        }
-        
-        //printf("ret[%d] playPts[%lld] currPts[%lld] maxInjectedPts[%lld]\n", ret, playPts, currPts, maxInjectedPts);
-        
-        /* On some STBs PTS readed from decoder is invalid after seek or at start 
-         * this is the reason for additional validation when we what to close immediately
-         */
-
-        if( !progressive_download && 0 == ret && currPts >= maxInjectedPts && 
-            ((currPts - maxInjectedPts) / 90000) < 2 )
-        {
-            /* close immediately 
-             */
-            finishTimeout = TIMEOUT_MAX_ITERS + 1;
-        }
-        else if (0 == ret && (playPts != currPts && maxInjectedPts > currPts))
-        {
-            playPts = currPts;
-            finishTimeout = 0;
-        }
-    }
-}
-
-void set_pause_timeout(uint8_t pause)
-{
-    reset_finish_timeout();
-    pauseTimeout = pause;
-}
-
-
-static int32_t container_set_ffmpeg_buf_seek_time(int32_t* time)
-{
-    ffmpeg_buf_seek_time = (*time);
-    return cERR_CONTAINER_FFMPEG_NO_ERROR;
-}
-
-static int32_t container_set_ffmpeg_buf_size(int32_t* size)
-{
-    if(ffmpeg_buf == NULL)
-    {
-        if(*size == 0)
-        {
-            ffmpeg_buf_size = 0;
-        }
-        else
-        {
-            ffmpeg_buf_size = (*size) + FILLBUFDIFF;
-        }
-    }
-    
-    ffmpeg_printf(10, "size=%d, buffer size=%d\n", (*size), ffmpeg_buf_size);
-    return cERR_CONTAINER_FFMPEG_NO_ERROR;
-}
-
-static int32_t container_get_ffmpeg_buf_size(int32_t* size)
-{
-    *size = ffmpeg_buf_size - FILLBUFDIFF;
-    return cERR_CONTAINER_FFMPEG_NO_ERROR;
-}
-
-static int32_t container_get_fillbufstatus(int32_t* size)
-{
-    int32_t rwdiff = 0;
-
-    if(ffmpeg_buf != NULL && ffmpeg_buf_read != NULL && ffmpeg_buf_write != NULL)
-    {
-        if(ffmpeg_buf_read < ffmpeg_buf_write)
-            rwdiff = ffmpeg_buf_write - ffmpeg_buf_read;
-        if(ffmpeg_buf_read > ffmpeg_buf_write)
-        {
-            rwdiff = (ffmpeg_buf + ffmpeg_buf_size) - ffmpeg_buf_read;
-            rwdiff += ffmpeg_buf_write - ffmpeg_buf;
-        }
-
-        *size = rwdiff;
-    }
-
-    return cERR_CONTAINER_FFMPEG_NO_ERROR;
-}
-
-static int32_t container_stop_buffer()
-{
-    ffmpeg_buf_stop = 1;
-    return 0;
-}
-
-//flag 0: start direct
-//flag 1: from thread
-static void ffmpeg_filler(Context_t *context, int32_t id, int32_t* inpause, int32_t flag)
-{
-    int32_t len = 0;
-    int32_t rwdiff = ffmpeg_buf_size;
-    uint8_t buf[FILLBUFPAKET];
-
-    if(ffmpeg_read_org == NULL || ffmpeg_seek_org == NULL)
-    {
-        ffmpeg_err("ffmpeg_read_org or ffmpeg_seek_org is NULL\n");
-        return;
-    }
-
-    while( (flag == 0 && avContextTab[0] != NULL && avContextTab[0]->pb != NULL && rwdiff > FILLBUFDIFF) || 
-           (flag == 1 && hasfillerThreadStarted[id] == 1 && avContextTab[0] != NULL && avContextTab[0]->pb != NULL && rwdiff > FILLBUFDIFF) )
-    {
-  //       if( 0 == PlaybackDieNow(0))
-  //       {
-  //          break;
-  //       }
-         
-         if(flag == 0 && ffmpeg_buf_stop == 1)
-         {
-             ffmpeg_buf_stop = 0;
-             break;
-         }
-
-         getfillerMutex(__FILE__, __FUNCTION__,__LINE__);
-         //do a seek
-         if(ffmpeg_do_seek != 0)
-         {
-             ffmpeg_do_seek_ret = ffmpeg_seek_org(avContextTab[0]->pb->opaque, avContextTab[0]->pb->pos + ffmpeg_do_seek, SEEK_SET);
-             if(ffmpeg_do_seek_ret >= 0)
-             {
-                 ffmpeg_buf_write = ffmpeg_buf;
-                 ffmpeg_buf_read = ffmpeg_buf;
-             }
-
-             ffmpeg_do_seek = 0;
-         }
-
-         if(ffmpeg_buf_read == ffmpeg_buf_write)
-         {
-             ffmpeg_buf_valid_size = 0;
-             rwdiff = ffmpeg_buf_size;
-         }
-         
-         if(ffmpeg_buf_read < ffmpeg_buf_write)
-         {
-             rwdiff = (ffmpeg_buf + ffmpeg_buf_size) - ffmpeg_buf_write;
-             rwdiff += ffmpeg_buf_read - ffmpeg_buf;
-         }
-         
-         if(ffmpeg_buf_read > ffmpeg_buf_write)
-         {
-            rwdiff = ffmpeg_buf_read - ffmpeg_buf_write;
-         }
-         
-         int32_t size = FILLBUFPAKET;
-         if(rwdiff - FILLBUFDIFF < size)
-         {
-             size = (rwdiff - FILLBUFDIFF);
-         }
-
-         if(ffmpeg_buf_write + size > ffmpeg_buf + ffmpeg_buf_size)
-         {
-             size = (ffmpeg_buf + ffmpeg_buf_size) - ffmpeg_buf_write;
-         }
-
-         if(ffmpeg_buf_write == ffmpeg_buf + ffmpeg_buf_size)
-         {
-             ffmpeg_buf_write = ffmpeg_buf;
-         }
-
-         releasefillerMutex(__FILE__, __FUNCTION__,__LINE__);
-
-         if(size > 0)
-         {
-             if(flag == 1 && hasfillerThreadStarted[id] == 2) break;
-             len = ffmpeg_read_org(avContextTab[0]->pb->opaque, buf, size);
-             if(flag == 1 && hasfillerThreadStarted[id] == 2) break;
-
-             ffmpeg_printf(20, "buffer-status (free buffer=%d)\n", rwdiff - FILLBUFDIFF - len);
-
-             getfillerMutex(__FILE__, __FUNCTION__,__LINE__);
-             if(len > 0)
-             { 
-                 memcpy(ffmpeg_buf_write, buf, len);
-                 ffmpeg_buf_write += len;
-             }
-             else
-             {
-                 releasefillerMutex(__FILE__, __FUNCTION__,__LINE__);
-                 ffmpeg_err("read not ok ret=%d\n", len);
-                 break;
-             }
-             releasefillerMutex(__FILE__, __FUNCTION__,__LINE__);
-        }
-        else
-        {
-            //on long pause the server close the connection, so we use seek to reconnect
-            if(context != NULL && context->playback != NULL && inpause != NULL)
-            {
-                if((*inpause) == 0 && context->playback->isPaused)
-                {
-                    (*inpause) = 1;
-                }
-                else if((*inpause) == 1 && !context->playback->isPaused)
-                {
-                    int32_t buflen = 0;
-                    (*inpause) = 0;
-
-                    getfillerMutex(__FILE__, __FUNCTION__,__LINE__);
-                    if(ffmpeg_buf_read < ffmpeg_buf_write)
-                    {
-                        buflen = ffmpeg_buf_write - ffmpeg_buf_read;
-                    }
-                    
-                    if(ffmpeg_buf_read > ffmpeg_buf_write)
-                    {
-                        buflen = (ffmpeg_buf + ffmpeg_buf_size) - ffmpeg_buf_read;
-                        buflen += ffmpeg_buf_write - ffmpeg_buf;
-                    } 
-                    ffmpeg_seek_org(avContextTab[0]->pb->opaque, avContextTab[0]->pb->pos + buflen, SEEK_SET);
-                    releasefillerMutex(__FILE__, __FUNCTION__,__LINE__);
-                }
-            }
-        }
-    }
-}
-
-static void ffmpeg_fillerTHREAD(Context_t *context)
-{
-    int32_t inpause = 0;
-    int32_t id = hasfillerThreadStartedID;
-
-    ffmpeg_printf(10, "Running ID=%d!\n", id);
-
-    while(hasfillerThreadStarted[id] == 1)
-    {
-        ffmpeg_filler(context, id, &inpause, 1);
-        usleep(10000);
-    }
-
-    hasfillerThreadStarted[id] = 0;
-
-    ffmpeg_printf(10, "terminating ID=%d\n", id);
-}
-
-static int32_t ffmpeg_start_fillerTHREAD(Context_t *context)
-{
-    int32_t error;
-    int32_t ret = 0, i = 0;
-    pthread_attr_t attr;
-
-    ffmpeg_printf(10, "\n");
-
-    if (context && context->playback && context->playback->isPlaying)
-    {
-        ffmpeg_printf(10, "is Playing\n");
-    }
-    else
-    {
-        ffmpeg_printf(10, "is NOT Playing\n");
-    }
-    
-    //get filler thread ID
-    //if the thread hangs for long time, we use a new id
-    for(i = 0; i < 10; i++)
-    {
-        if(hasfillerThreadStarted[i] == 0)
-        {
-            hasfillerThreadStartedID = i;
-            break;
-        }
-    }
-
-    if (hasfillerThreadStarted[hasfillerThreadStartedID] == 0)
-    {
-        pthread_attr_init(&attr);
-        pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
-
-        hasfillerThreadStarted[hasfillerThreadStartedID] = 1;
-        if((error = pthread_create(&fillerThread, &attr, (void *)&ffmpeg_fillerTHREAD, context)) != 0)
-        {
-            hasfillerThreadStarted[hasfillerThreadStartedID] = 0;
-            ffmpeg_printf(10, "Error creating filler thread, error:%d:%s\n", error,strerror(error));
-
-            ret = cERR_CONTAINER_FFMPEG_ERR;
-        }
-        else
-        {
-            ffmpeg_printf(10, "Created filler thread\n");
-        }
-    }
-    else
-    {
-        ffmpeg_printf(10, "All filler thread ID's in use!\n");
-
-        ret = cERR_CONTAINER_FFMPEG_ERR;
-    }
-
-    ffmpeg_printf(10, "exiting with value %d\n", ret);
-    return ret;
-}
-
-static int32_t ffmpeg_read_real(void *opaque, uint8_t *buf, int32_t buf_size)
-{
-    int32_t len = buf_size;
-    int32_t rwdiff = 0;
-
-    if(buf_size > 0)
-    {
-        getfillerMutex(__FILE__, __FUNCTION__,__LINE__);
-
-        if(ffmpeg_buf_read < ffmpeg_buf_write)
-            rwdiff = ffmpeg_buf_write - ffmpeg_buf_read;
-        if(ffmpeg_buf_read > ffmpeg_buf_write)
-        {
-            rwdiff = (ffmpeg_buf + ffmpeg_buf_size) - ffmpeg_buf_read;
-            rwdiff += ffmpeg_buf_write - ffmpeg_buf;
-        }
-        rwdiff--;
-
-        if(len > rwdiff)
-        {
-            len = rwdiff;
-        }
-
-        if (ffmpeg_buf_read + len > ffmpeg_buf + ffmpeg_buf_size)
-        {
-            len = (ffmpeg_buf + ffmpeg_buf_size) - ffmpeg_buf_read;
-        }
-
-        if(len > 0)
-        {
-            memcpy(buf, ffmpeg_buf_read, len);
-            ffmpeg_buf_read += len;
-
-            if(ffmpeg_buf_valid_size < FILLBUFDIFF)
-            {
-                if(ffmpeg_buf_valid_size + len > FILLBUFDIFF)
-                {
-                    ffmpeg_buf_valid_size = FILLBUFDIFF;
-                }
-                else
-                {
-                    ffmpeg_buf_valid_size += len;
-                }
-            }
-
-            if(ffmpeg_buf_read == ffmpeg_buf + ffmpeg_buf_size)
-            {
-                ffmpeg_buf_read = ffmpeg_buf;
-            }
-        }
-        else
-        {
-            len = 0;
-        }
-        releasefillerMutex(__FILE__, __FUNCTION__,__LINE__);
-    }
-
-    return len;
-}
-
-static int32_t ffmpeg_read(void *opaque, uint8_t *buf, int32_t buf_size)
-{
-    int32_t sumlen = 0;
-    int32_t len = 0;
-    int32_t count = 2000;
-
-//    while(sumlen < buf_size && (--count) > 0 && 0 == PlaybackDieNow(0))
-    while(sumlen < buf_size && (--count) > 0)
-    {
-        len = ffmpeg_read_real(opaque, buf, buf_size - sumlen);
-        sumlen += len;
-        buf += len;
-        if(len == 0)
-        {
-            usleep(10000);
-        }
-    }
-
-    if(count == 0)
-    {
-        if(sumlen == 0)
-        {
-            ffmpeg_err( "Timeout waiting for buffered data (buf_size=%d sumlen=%d)!\n", buf_size, sumlen);
-        }
-        else
-        {
-            ffmpeg_err( "Timeout, not all buffered data availabel (buf_size=%d sumlen=%d)!\n", buf_size, sumlen);
-        }
-    }
-
-    return sumlen;
-}
-
-static int64_t ffmpeg_seek(void *opaque, int64_t offset, int32_t whence)
-{
-    int64_t diff;
-    int32_t rwdiff = 0;
-    whence &= ~AVSEEK_FORCE;
-
-    if(whence != SEEK_CUR && whence != SEEK_SET)
-    {
-        return AVERROR(EINVAL);
-    }
-
-    if(whence == SEEK_CUR)
-    {
-        diff = offset;
-    }
-    else
-    {
-        diff = offset - avContextTab[0]->pb->pos;
-    }
-
-    if(diff == 0)
-    {
-        return avContextTab[0]->pb->pos;
-    }
-
-    getfillerMutex(__FILE__, __FUNCTION__,__LINE__);
-
-    if(ffmpeg_buf_read < ffmpeg_buf_write)
-    {
-        rwdiff = ffmpeg_buf_write - ffmpeg_buf_read;
-    }
-    
-    if(ffmpeg_buf_read > ffmpeg_buf_write)
-    {
-        rwdiff = (ffmpeg_buf + ffmpeg_buf_size) - ffmpeg_buf_read;
-        rwdiff += ffmpeg_buf_write - ffmpeg_buf;
-    }
-
-    if(diff > 0 && diff < rwdiff)
-    {
-        /* can do the seek inside the buffer */
-        ffmpeg_printf(20, "buffer-seek diff=%lld\n", diff);
-        if(diff > (ffmpeg_buf + ffmpeg_buf_size) - ffmpeg_buf_read)
-        {
-            ffmpeg_buf_read = ffmpeg_buf + (diff - ((ffmpeg_buf + ffmpeg_buf_size) - ffmpeg_buf_read));
-        }
-        else
-        {
-            ffmpeg_buf_read = ffmpeg_buf_read + diff;
-        }
-    }
-    else if(diff < 0 && diff * -1 < ffmpeg_buf_valid_size)
-    {
-        /* can do the seek inside the buffer */
-        ffmpeg_printf(20, "buffer-seek diff=%lld\n", diff);
-        int32_t tmpdiff = diff * -1;
-        if(tmpdiff > ffmpeg_buf_read - ffmpeg_buf)
-        {
-            ffmpeg_buf_read = (ffmpeg_buf + ffmpeg_buf_size) - (tmpdiff - (ffmpeg_buf_read - ffmpeg_buf));
-        }
-        else
-        {
-            ffmpeg_buf_read = ffmpeg_buf_read - tmpdiff;
-        }
-    }
-    else
-    {
-        releasefillerMutex(__FILE__, __FUNCTION__,__LINE__);
-        ffmpeg_printf(20, "real-seek diff=%lld\n", diff);
-
-        ffmpeg_do_seek_ret = 0;
-        ffmpeg_do_seek = diff;
-        while(ffmpeg_do_seek != 0)
-        {
-            usleep(100000);
-        }
-
-        ffmpeg_do_seek = 0;
-        if(ffmpeg_do_seek_ret < 0)
-        {
-            ffmpeg_err("seek not ok ret=%d\n", ffmpeg_do_seek_ret);
-            return ffmpeg_do_seek_ret;
-        }
-
-        //fill buffer
-        int32_t count = ffmpeg_buf_seek_time * 10;
-        int32_t size = 0;
-
-        container_get_fillbufstatus(&size);
-        while(size < ffmpeg_buf_size - FILLBUFDIFF && (--count) > 0)
-        {
-            usleep(100000);
-            container_get_fillbufstatus(&size);
-        }
-
-        return avContextTab[0]->pb->pos + diff;
-    }
-
-    releasefillerMutex(__FILE__, __FUNCTION__,__LINE__);
-    return avContextTab[0]->pb->pos + diff;
-}
-
-static void ffmpeg_buf_free()
-{
-    ffmpeg_read_org = NULL;
-    ffmpeg_seek_org = NULL;
-    ffmpeg_buf_read = NULL;
-    ffmpeg_buf_write = NULL;
-    free(ffmpeg_buf);
-    ffmpeg_buf = NULL;
-    ffmpeg_buf_valid_size = 0;
-    ffmpeg_do_seek_ret = 0;
-    ffmpeg_do_seek = 0;
-    ffmpeg_buf_stop = 0;
-    hasfillerThreadStartedID = 0;
-}
+#ifdef HAVE_FLV2MPEG4_CONVERTER
+static int32_t flv2mpeg4_converter = 1;
+#else
+static int32_t flv2mpeg4_converter = 0;
+#endif
 
 /* ***************************** */
@@ -771 +203 @@
 /* ***************************** */
 
-///////////////
-#define MINMALLOC 4096
-#include <ctype.h>
-
-int file_exist(char* filename)
-{
-        if(access(filename, F_OK) == 0)
-                return 1;
-        else
-                return 0;
-}
-
-char* strstrip(char *text)
-{
-        char* tmpstr = text;
-
-        if(text == NULL) return NULL;
-        int len = strlen(text);
-
-        while(isspace(tmpstr[len - 1])) tmpstr[--len] = '\0';
-        while(*tmpstr && isspace(*tmpstr)) ++tmpstr, --len;
-
-        if(text != tmpstr) memmove(text, tmpstr, len + 1);
-
-        return text;
-}
-
-char* string_strip_whitechars(char *text)
-{
-        char *p1 = text, *p2 = text;
-
-        if(text == NULL)
-                return NULL;
-
-        while(*p1 != '\0')
-        {
-                if(*p1 == ' ' && *(p1 + 1) == ' ')
-                        ++p1;
-                else
-                        *p2++ = *p1++;
-        }
-        *p2 = '\0';
-
-        return text;
-}
-
-char* readfiletomem(const char* filename, int flag)
-{
-        FILE *fd = NULL;
-        char *fileline = NULL, *buf = NULL, *tmpbuf = NULL;
-        int bufsize = 0, bufoldsize = 0;
-
-        fileline = malloc(MINMALLOC);
-        if(fileline == NULL)
-        {
-//              err("no mem");
-                return NULL;
-        }
-
-        fd = fopen(filename, "r");
-        if(fd == NULL)
-        {
-//              perr("can't open %s", filename);
-                free(fileline);
-                return NULL;
-        }
-
-        while(fgets(fileline, MINMALLOC, fd) != NULL)
-        {
-                if(flag == 1)
-                        if(fileline[0] == '#' || fileline[0] == '\n')
-                                continue;
-
-                bufoldsize = bufsize;
-                bufsize += strlen(fileline);
-                tmpbuf = buf;   buf = realloc(buf, bufsize + 1);
-                if(buf == NULL)
-                {
-//                      err("no mem");
-                        free(fileline);
-                        free(tmpbuf);
-                        fclose(fd);
-                        return NULL;
-                }
-
-                sprintf(buf + bufoldsize, "%s", fileline);
-        }
-
-        free(fileline);
-        fclose(fd);
-        return buf;
-}
-
-struct splitstr
-{
-        char* part;
-};
-
-struct splitstr* strsplit(char *str, char *tok, int* count)
-{
-        char *tmpstr = NULL;
-        struct splitstr *array = NULL, *tmparray = NULL;
-        *count = 0;
-
-        if(str == NULL || tok == NULL)
-                return NULL;
-
-        tmpstr = strtok(str, tok);
-        while(tmpstr != NULL)
-        {
-                *count = *count + 1;
-                tmparray = array; array = (struct splitstr*)realloc(array, sizeof(struct splitstr*) * (*count));
-                if(array == NULL)
-                {
-//                      err("no mem");
-                        free(tmparray);
-                        return NULL;
-                }
-                
-                (&array[(*count) - 1])->part = tmpstr;
-                tmpstr = strtok(NULL, tok);
-        }
-
-        return array;
-}
-
-char* ostrcat(char* value1, char* value2, int free1, int free2)
-{
-        int len = 0, len1 = 0, len2 = 0;
-        char* buf = NULL;
-
-        if(value1 == NULL && value2 == NULL) return NULL;
-
-        if(value1 != NULL) len1 = strlen(value1);
-        if(value2 != NULL) len2 = strlen(value2);
-
-        len = len1 + len2 + 1;
-
-        if(free1 == 1)
-                buf = realloc(value1, len);
-        else
-                buf = malloc(len);
-        if(buf == NULL)
-        {
-                if(free1 == 1) free(value1);
-                if(free2 == 1) free(value2);
-                return NULL;
-        }
-
-        if(free1 == 0 && len1 > 0) memcpy(buf, value1, len1);
-        if(len2 > 0) memcpy(buf + len1, value2, len2);
-        buf[len - 1] = '\0';
-
-        if(free2 == 1) free(value2);
-
-        //helpfull for memleak detect
-        //if(buf != NULL && strlen(buf) == 0x0b - 0x01)
-        //      printf("******** memleak string (%s) (%p) ********\n", buf, buf);
-
-        return buf;
-}
-
-char* ostrstr(char* str, char* search)
-{
-        char* ret = NULL;
-
-        if(str == NULL || search == NULL) return NULL;
-        ret = strstr(str, search);
-
-        return ret;
-}
-
-char* string_replace(char *search, char *replace, char *string, int free1)
-{
-        char* searchpos = NULL;
-        char* tmpstr = NULL;
-
-        if(string == NULL || search == NULL)
-        {
-                tmpstr = ostrcat(tmpstr, string, 1, 0);
-                if(free1 == 1) free(string);
-                return tmpstr;
-        }
-
-        searchpos = ostrstr(string, search);
-
-        if(searchpos == NULL)
-        {
-                tmpstr = ostrcat(tmpstr, string, 1, 0);
-                if(free1 == 1) free(string);
-                return tmpstr;
-        }
-
-        tmpstr = strndup(string, searchpos - string);
-        if(replace != NULL)
-                tmpstr = ostrcat(tmpstr, replace, 1, 0);
-        tmpstr = ostrcat(tmpstr, string + (searchpos - string) + strlen(search), 1, 0);
-
-        if(free1 == 1) free(string);
-
-        return tmpstr;
-}
-
-char* stringreplacechar(char *str, char c1, char c2)
-{
-        char *p1 = str;
-
-        if(str == NULL) return NULL;
-
-        while(*p1 != '\0')
-        {
-                if(*p1 == c1) *p1 = c2;
-                p1++;
-        }
-
-        return str;
-}
-
-char* string_replace_all(char *search, char *replace, char *string, int free1)
-{
-        char* tmpstr = NULL;
-        char* searchpos = NULL;
-
-        if(string == NULL || search == NULL)
-        {
-                tmpstr = ostrcat(tmpstr, string, 1, 0);
-                if(free1 == 1) free(string);
-                return tmpstr;
-        }
-
-        searchpos = strstr(string, search);
-        if(searchpos == NULL)
-        {
-                tmpstr = ostrcat(tmpstr, string, 1, 0);
-                if(free1 == 1) free(string);
-                return tmpstr;
-        }
-
-        int count = 0;
-        int stringlen = strlen(string);
-        int searchlen = strlen(search);
-        int replacelen = strlen(replace);
-
-        while(searchpos != NULL)
-        {
-                count++;
-                searchpos = strstr(searchpos + searchlen, search);
-        }
-
-        int len = stringlen - (searchlen * count) + (replacelen * count);
-        tmpstr = calloc(1, len + 1);
-        if(tmpstr == NULL)
-        {
-//              err("no mem");
-                tmpstr = ostrcat(tmpstr, string, 1, 0);
-                if(free1 == 1) free(string);
-                return tmpstr;
-        }
-
-        len = 0;        
-        char* str = string;
-        char* tmp = tmpstr;
-        searchpos = strstr(str, search);
-        while(searchpos != NULL)
-        {
-                len = searchpos - str;
-                memcpy(tmp, str, len);
-                memcpy(tmp + len, replace, replacelen);
-                tmp += len + replacelen;
-                str += len + searchlen;
-                searchpos = strstr(str, search);
-        }
-        memcpy(tmp, str, strlen(str));
-
-        if(free1 == 1) free(string);
-
-        return tmpstr;
-}
-
-int ostrcmp(char* value1, char* value2)
-{
-        int ret = 1;
-
-        if(value1 != NULL && value2 != NULL)
-                ret = strcmp(value1, value2);
-
-        return ret;
-}
-////////////
-
-static void ffmpeg_silen_callback (void * avcl, int level, const char * fmt, va_list vl)
+static void ffmpeg_silen_callback(void * avcl, int level, const char * fmt, va_list vl)
 {
     return;
@@ -1078 +220 @@
 }
 
+void aac_latm_software_decoder_set(const int32_t val)
+{
+    aac_latm_software_decode = val;
+}
+
 void ac3_software_decoder_set(const int32_t val)
 {
@@ -1116 +263 @@
 {
     rtmp_proto_impl = val;
+}
+
+void flv2mpeg4_converter_set(const int32_t val)
+{
+    flv2mpeg4_converter = val;
 }
 
@@ -1150 +302 @@
 }
 
-//for buffered io
-void getfillerMutex(const char *filename, const char *function, int line) {
-    ffmpeg_printf(100, "::%d requesting mutex\n", line);
-
-    pthread_mutex_lock(&fillermutex);
-
-    ffmpeg_printf(100, "::%d received mutex\n", line);
-}
-
-void releasefillerMutex(const char *filename, const const char *function, int line) {
-    pthread_mutex_unlock(&fillermutex);
-
-    ffmpeg_printf(100, "::%d released mutex\n", line);
-}
-//for buffered io (end)encoding
-
-static char* Codec2Encoding(AVCodecContext *codec, int32_t *version)
-{
-    ffmpeg_printf(10, "Codec ID: %d (%.8d)\n", (int32_t)codec->codec_id, (int32_t)codec->codec_id);
-    switch (codec->codec_id)
+static char* Codec2Encoding(int32_t codec_id, int32_t media_type, uint8_t *extradata, int extradata_size, int profile, int32_t *version)
+{
+    ffmpeg_printf(10, "Codec ID: %d (%.8lx)\n", codec_id, codec_id);
+    switch (codec_id)
     {
     case AV_CODEC_ID_MPEG1VIDEO:
@@ -1180 +316 @@
         return "V_H263";
     case AV_CODEC_ID_FLV1:
-        return "V_FLV";
+        return flv2mpeg4_converter ? "V_MPEG4" : "V_FLV";
     case AV_CODEC_ID_VP5:
     case AV_CODEC_ID_VP6:
     case AV_CODEC_ID_VP6F:
         return "V_VP6";
+    case AV_CODEC_ID_VP8:
+        return "V_VP8";
+#if LIBAVCODEC_VERSION_MAJOR > 54
+    case AV_CODEC_ID_VP9:
+        return "V_VP9";
+#endif
     case AV_CODEC_ID_RV10:
     case AV_CODEC_ID_RV20:
@@ -1213 +355 @@
 #endif
         return "V_MPEG4/ISO/AVC";
+#if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(55, 92, 100)
+    case AV_CODEC_ID_HEVC:
+    // case AV_CODEC_ID_H265:
+        return "V_HEVC";
+#endif
     case AV_CODEC_ID_AVS:
         return "V_AVS";
@@ -1220 +367 @@
         return (mp3_software_decode) ? "A_IPCM" : "A_MP3";
     case AV_CODEC_ID_AAC:
-        return (aac_software_decode) ? "A_IPCM" : "A_AAC";
+        if (extradata_size >= 2)
+        {
+            MPEG4AudioConfig m4ac;
+            int off = avpriv_mpeg4audio_get_config(&m4ac, extradata, extradata_size * 8, 1);
+            ffmpeg_printf(1,"aac [%d] off[%d]\n", m4ac.object_type, off);
+            if (off < 0 || 2 != m4ac.object_type)
+            {
+                return "A_IPCM";
+            }
+        }
+        return (aac_software_decode) ? "A_IPCM" : "A_AAC";  
+    case AV_CODEC_ID_AAC_LATM:
+        return (aac_latm_software_decode) ? "A_IPCM" : "A_AAC_LATM";
     case AV_CODEC_ID_AC3:
         return  (ac3_software_decode) ? "A_IPCM" : "A_AC3";
@@ -1280 +439 @@
     case AV_CODEC_ID_HDMV_PGS_SUBTITLE:
     case AV_CODEC_ID_DVB_TELETEXT:
-//    case AV_CODEC_ID_BITMAP:
+//    case CODEC_ID_DVB_TELETEXT:
+//        return "S_TEXT/SRT"; /* fixme */
     case AV_CODEC_ID_TEXT: ///< raw UTF-8 text
         return "S_TEXT/UTF-8";
@@ -1288 +448 @@
         return "S_TEXT/SUBRIP"; 
     default:
-        ffmpeg_err("Codec ID %d (%.8d) not found\n", (int32_t)codec->codec_id, (int32_t)codec->codec_id);
+        ffmpeg_err("Codec ID %d (%.8lx) not found\n", codec_id, codec_id);
         // Default to injected-pcm for unhandled audio types.
-        if (codec->codec_type == AVMEDIA_TYPE_AUDIO)
+        if (media_type == AVMEDIA_TYPE_AUDIO)
         {
             return "A_IPCM";
         }
-
-        if (codec->codec_type == AVMEDIA_TYPE_SUBTITLE)
-        {
-            return "S_TEXT/SRT";
-        }
-
-        ffmpeg_err("Codec ID %d (%.8d) not found\n", (int32_t)codec->codec_id, (int32_t)codec->codec_id);
+        ffmpeg_err("Codec ID %d (%.8lx) not found\n", codec_id, codec_id);
     }
     return NULL;
@@ -1328 +482 @@
 
     return pts;
-}
-
-/*Hellmaster1024: get the Duration of the subtitle from the SSA line*/
-int64_t getDurationFromSSALine(unsigned char* line){
-
-ffmpeg_printf(0, "obiiii zzzzzz=%s\n", line);
-
-
-    int i,h,m,s,ms;
-    char* Text = strdup((char*) line);
-    char* ptr1;
-    char* ptr[10];
-    int64_t msec;
-
-    ptr1 = Text;
-    ptr[0]=Text;
-    for (i=0; i < 3 && *ptr1 != '\0'; ptr1++) {
-        if (*ptr1 == ',') {
-            ptr[++i]=ptr1+1;
-            *ptr1 = '\0';
-        }
-    }
-
-    sscanf(ptr[2],"%d:%d:%d.%d",&h,&m,&s,&ms);
-    msec = (ms*10) + (s*1000) + (m*60*1000) + (h*24*60*1000);
-    sscanf(ptr[1],"%d:%d:%d.%d",&h,&m,&s,&ms);
-    msec -= (ms*10) + (s*1000) + (m*60*1000) + (h*24*60*1000);
-
-//    ffmpeg_printf(10, "%s %s %f\n", ptr[2], ptr[1], (float) msec / 1000.0);
-  ffmpeg_printf(10, "%s %s %f\n", ptr[2], ptr[1], msec / 1000);
-
-ffmpeg_printf(0, "obiiii xxxxxxxx\n");
-    free(Text);
-ffmpeg_printf(0, "obiiii yyyyyyyy\n");
-
-//    return (float)msec/1000.0;
-    return msec/1000;
 }
 
@@ -1371 +488 @@
  */
 
-#if LIBAVCODEC_VERSION_MAJOR < 54
-static char* searchMeta(AVMetadata *metadata, char* ourTag)
-#else
-static char* searchMeta(AVDictionary * metadata, char* ourTag)
-#endif
+static char* searchMeta(void * metadata, char* ourTag)
 {
 #if LIBAVCODEC_VERSION_MAJOR < 54
@@ -1416 +529 @@
     threadname[16] = 0;
     prctl (PR_SET_NAME, (unsigned long)&threadname);
-//    AVPacket   packet;
-//    av_init_packet(&packet);
-
-//    off_t   lastSeek = -1;
-//    int64_t lastPts = -1;
+    AVPacket   packet;
+    off_t   lastSeek = -1;
+    int64_t lastPts = -1;
     int64_t currentVideoPts = -1;
     int64_t currentAudioPts = -1;
@@ -1430 +541 @@
     int64_t lastAudioDts = -1;
     
-//    int64_t showtime = 0;
-//    int64_t bofcount = 0;
-//    int32_t       err = 0;
+    int64_t showtime = 0;
+    int64_t bofcount = 0;
+    int32_t       err = 0;
     AudioVideoOut_t avOut;
     
-//    g_context = context;
+    g_context = context;
 
     SwrContext *swr = NULL;
@@ -1449 +560 @@
     AVBitStreamFilterContext *mpeg4p2_bsf_context = av_bitstream_filter_init("mpeg4_unpack_bframes");
 #endif
-    
+#ifdef HAVE_FLV2MPEG4_CONVERTER
+    Flv2Mpeg4Context flv2mpeg4_context;
+    memset(&flv2mpeg4_context, 0, sizeof(Flv2Mpeg4Context));
+#endif
     ffmpeg_printf(10, "\n");
     while ( context->playback->isCreationPhase )
@@ -1461 +575 @@
     while ( context && context->playback && context->playback->isPlaying ) 
     {
-            AVPacket   packet;
-        av_init_packet(&packet);
-
         //IF MOVIE IS PAUSED, WAIT
         if (context->playback->isPaused) 
@@ -1504 +615 @@
                     if(NULL != avContextTab[i])
                     {
-                        av_seek_frame(avContextTab[i], -1, seek_target_seconds, 0);
+                        if (avContextTab[i]->start_time != AV_NOPTS_VALUE)
+                        {
+                            seek_target_seconds += avContextTab[i]->start_time;
+                            printf("SEEK SECONDS [%lld]\n", seek_target_seconds);
+                        }
+                        //av_seek_frame(avContextTab[i], -1, seek_target_seconds, 0);
+                        avformat_seek_file(avContextTab[i], -1, INT64_MIN, seek_target_seconds, INT64_MAX, 0);
                     }
                     else
@@ -1532 +649 @@
                 if(NULL != avContextTab[i])
                 {
-                    uint32_t j;
-                    for (j = 0; j < avContextTab[i]->nb_streams; j++)
-                    {
-                        if (avContextTab[i]->streams[j]->codec && avContextTab[i]->streams[j]->codec->codec)
-                        {
-                            avcodec_flush_buffers(avContextTab[i]->streams[j]->codec);
-                        }
-                    }
+                    wrapped_avcodec_flush_buffers(i);
                 }
                 else
@@ -1554 +664 @@
             }
 #endif
+#ifdef HAVE_FLV2MPEG4_CONVERTER
+            flv2mpeg4_context_reset(&flv2mpeg4_context);
+#endif
         }
 
@@ -1568 +681 @@
             }
         }
-
+        
         if (!isWaitingForFinish && (ffmpegStatus = av_read_frame(avContextTab[cAVIdx], &packet)) == 0 )
         {
@@ -1576 +689 @@
             Track_t *audioTrack = NULL;
             Track_t *subtitleTrack = NULL;
-                        Track_t *dvbsubtitleTrack = NULL;
-                        Track_t *teletextTrack = NULL;
 
             int32_t pid = avContextTab[cAVIdx]->streams[packet.stream_index]->id;
@@ -1587 +698 @@
                 ffmpeg_err("error getting video track\n");
             }
-           
+            
             if (context->manager->audio->Command(context, MANAGER_GET_TRACK, &audioTrack) < 0)
             {
@@ -1603 +714 @@
             {
 #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(56, 34, 100)
-                AVCodecContext *codec_context = ((AVStream*)(videoTrack->stream))->codec;
-                if (codec_context->codec_id == AV_CODEC_ID_MPEG4 && NULL != mpeg4p2_bsf_context)
+                AVCodecContext *codec_context = videoTrack->avCodecCtx;
+                if (codec_context && codec_context->codec_id == AV_CODEC_ID_MPEG4 && NULL != mpeg4p2_bsf_context)
                 {
                     // should never happen, if it does print error and exit immediately, so we can easily spot it
@@ -1617 +728 @@
                         exit(1);
                     }
+                    update_max_injected_pts(latestPts);
+                }
+                else
+#endif
+#ifdef HAVE_FLV2MPEG4_CONVERTER
+                if (get_codecpar(avContextTab[cAVIdx]->streams[packet.stream_index])->codec_id == AV_CODEC_ID_FLV1 &&
+                    0 == memcmp(videoTrack->Encoding, "V_MPEG4", 7) )
+                {
+                    flv2mpeg4_write_packet(context, &flv2mpeg4_context, videoTrack, cAVIdx, &currentVideoPts, &latestPts, &packet);
                     update_max_injected_pts(latestPts);
                 }
@@ -1656 +776 @@
                     
                     if (skipPacket)
-                    {
-#if LIBAVCODEC_VERSION_MAJOR >= 56
-                        av_packet_unref(&packet);
-#else
-                        av_free_packet(&packet);
-#endif
+                    {   
+                        wrapped_packet_unref(&packet);
                         releaseMutex(__FILE__, __FUNCTION__,__LINE__);
                         continue;
@@ -1679 +795 @@
                     avOut.height     = videoTrack->height;
                     avOut.type       = "video";
+                    
+                    if (avContextTab[cAVIdx]->iformat->flags & AVFMT_TS_DISCONT)
+                    {
+                        avOut.infoFlags = 1; // TS container
+                    }
 
                     if (context->output->video->Write(context, &avOut) < 0)
@@ -1723 +844 @@
                 if (skipPacket)
                 {
-#if LIBAVCODEC_VERSION_MAJOR >= 56
-                    av_packet_unref(&packet);
-#else
-                    av_free_packet(&packet);
-#endif
+                    wrapped_packet_unref(&packet);
                     releaseMutex(__FILE__, __FUNCTION__,__LINE__);
                     continue;
@@ -1733 +850 @@
                 
                 pcmPrivateData_t pcmExtradata;
-                pcmExtradata.channels              = ((AVStream*) audioTrack->stream)->codec->channels;
-                pcmExtradata.bits_per_coded_sample = ((AVStream*) audioTrack->stream)->codec->bits_per_coded_sample;
-                pcmExtradata.sample_rate           = ((AVStream*) audioTrack->stream)->codec->sample_rate;
-                pcmExtradata.bit_rate              = ((AVStream*) audioTrack->stream)->codec->bit_rate;
-                pcmExtradata.ffmpeg_codec_id       = ((AVStream*) audioTrack->stream)->codec->codec_id;
+                pcmExtradata.channels              = get_codecpar(audioTrack->stream)->channels;
+                pcmExtradata.bits_per_coded_sample = get_codecpar(audioTrack->stream)->bits_per_coded_sample;
+                pcmExtradata.sample_rate           = get_codecpar(audioTrack->stream)->sample_rate;
+                pcmExtradata.bit_rate              = get_codecpar(audioTrack->stream)->bit_rate;
+                pcmExtradata.ffmpeg_codec_id       = get_codecpar(audioTrack->stream)->codec_id;
                 pcmExtradata.bResampling           = restart_audio_resampling;
                 
-                uint8_t *pAudioExtradata    = ((AVStream*) audioTrack->stream)->codec->extradata;
-                uint32_t audioExtradataSize = ((AVStream*) audioTrack->stream)->codec->extradata_size;
+                uint8_t *pAudioExtradata    = get_codecpar(audioTrack->stream)->extradata;
+                uint32_t audioExtradataSize = get_codecpar(audioTrack->stream)->extradata_size;
                     
                 ffmpeg_printf(200, "AudioTrack index = %d\n",pid);
@@ -1765 +882 @@
                     }
                 }
-                else if (audioTrack->inject_as_pcm == 1)
-                {
-                    AVCodecContext *c = ((AVStream*)(audioTrack->stream))->codec;
+                else if (audioTrack->inject_as_pcm == 1 && audioTrack->avCodecCtx)
+                {
+                    AVCodecContext *c = audioTrack->avCodecCtx;
 
                     if (restart_audio_resampling)
@@ -1779 +896 @@
                         if (decoded_frame)
                         {
-
-#if (LIBAVCODEC_VERSION_MAJOR >= 55)
-                            av_frame_free(&decoded_frame);
+                            wrapped_frame_free(&decoded_frame);
+                            decoded_frame = NULL;
+                        }
+                    }
+#if (LIBAVFORMAT_VERSION_MAJOR > 57) || ((LIBAVFORMAT_VERSION_MAJOR == 57) && (LIBAVFORMAT_VERSION_MINOR > 32))
+                    while (packet.size > 0 || (!packet.size && !packet.data)) 
 #else
-                            avcodec_free_frame(&decoded_frame);
-#endif
-                            decoded_frame = NULL;
-                        }
-                        /* It seems that this is not needed and make long black 
-                         * on BRCM STBs, but maybe this is needed for SH4 STBs
-                         * there is need to check
-                         */
-                        //context->output->Command(context, OUTPUT_CLEAR, NULL);
-                        //context->output->Command(context, OUTPUT_PLAY, NULL);
-                    }
-
                     while(packet.size > 0)
+#endif
                     {
                         if(do_seek_target_seconds || do_seek_target_bytes)
@@ -1802 +911 @@
                         }
                         
-                        int32_t got_frame = 0;
                         if (!decoded_frame)
                         {
-#if (LIBAVCODEC_VERSION_MAJOR >= 55)
-                            decoded_frame = av_frame_alloc();
-#else
-                            decoded_frame = avcodec_alloc_frame();
-#endif
+                            decoded_frame = wrapped_frame_alloc();
                             if (!decoded_frame)
                             {
@@ -1818 +922 @@
                         else
                         {
-#if (LIBAVCODEC_VERSION_MAJOR >= 55)
-                            av_frame_unref(decoded_frame);
+                            wrapped_frame_unref(decoded_frame);
+                        }
+#if (LIBAVFORMAT_VERSION_MAJOR > 57) || ((LIBAVFORMAT_VERSION_MAJOR == 57) && (LIBAVFORMAT_VERSION_MINOR > 32))
+                        int ret = avcodec_send_packet(c, &packet);
+                        if (ret < 0 && ret != AVERROR(EAGAIN) && ret != AVERROR_EOF) 
+                        {
+                            restart_audio_resampling = 1;
+                            break;
+                        }
+                        
+                        if (ret >= 0)
+                        {
+                            packet.size = 0;
+                        }
+                        
+                        ret = avcodec_receive_frame(c, decoded_frame);
+                        if (ret < 0)
+                        {
+                            if (ret != AVERROR(EAGAIN) && ret != AVERROR_EOF) 
+                            {
+                                restart_audio_resampling = 1;
+                                break;
+                            }
+                            else
+                            {
+                                continue;
+                            }
+                        }
 #else
-                            avcodec_get_frame_defaults(decoded_frame);
-#endif
-                        }
-
+                        int32_t got_frame = 0;
                         int32_t len = avcodec_decode_audio4(c, decoded_frame, &got_frame, &packet);
                         if (len < 0) 
@@ -1839 +966 @@
                             continue;
                         }
-                        
+#endif
                         int32_t e = 0;
                         if (!swr) 
@@ -1955 +1082 @@
                 {
                     ffmpeg_printf(200, "write audio aac\n");
-                    ffmpeg_printf(200, ">>>>>>> %x %x %x %x %x %x %x\n", packet.data[0], packet.data[1], packet.data[2], packet.data[3], packet.data[4], packet.data[5], packet.data[6]);
+                    ffmpeg_printf(200, ">>>>>>> %x %x %x %x %x %x\n", packet.data[0], packet.data[1], packet.data[2], packet.data[3], packet.data[4], packet.data[5], packet.data[6]);
 
                     avOut.data       = packet.data;
@@ -1992 +1119 @@
                 }
             }
-/*
             else if (subtitleTrack && (subtitleTrack->Id == pid))
             {
@@ -2004 +1130 @@
                     duration = (int64_t)av_rescale(packet.duration, (int64_t)stream->time_base.num * 1000, stream->time_base.den); 
                 }
-                else if(packet.convergence_duration != 0 && packet.convergence_duration != AV_NOPTS_VALUE )
+                else if(get_packet_duration(&packet) != 0 && get_packet_duration(&packet) != AV_NOPTS_VALUE )
                 {
                     // duration in milliseconds
-                    duration = (int64_t)av_rescale(packet.convergence_duration, (int64_t)stream->time_base.num * 1000, stream->time_base.den); 
+                    duration = (int64_t)av_rescale(get_packet_duration(&packet), (int64_t)stream->time_base.num * 1000, stream->time_base.den); 
                 }
 
@@ -2023 +1149 @@
                     }
                 }
-                    }
-*/
-                    else if (subtitleTrack && (subtitleTrack->Id == pid))
-                    {
-                                int64_t duration = -1;
-                int64_t pts = calcPts(cAVIdx, subtitleTrack->stream, packet.pts);
-                AVStream *stream = subtitleTrack->stream;
-
-                if (packet.duration != 0)
-                {
-//mkv1
-                    // duration in milliseconds
-                    duration = (int64_t)av_rescale(packet.duration, (int64_t)stream->time_base.num * 1000, stream->time_base.den); 
-                }
-                else if(packet.convergence_duration != 0 && packet.convergence_duration != AV_NOPTS_VALUE )
-                {
-                    // duration in milliseconds
-                    duration = (int64_t)av_rescale(packet.convergence_duration, (int64_t)stream->time_base.num * 1000, stream->time_base.den); 
-                }
-
-                            if ((pts > latestPts) && (!videoTrack) && (!audioTrack))
-                                        latestPts = pts;
-        
-                            /*Hellmaster1024: in mkv the duration for ID_TEXT is stored in convergence_duration */
-#if (LIBAVFORMAT_VERSION_MAJOR == 57 && LIBAVFORMAT_VERSION_MINOR == 25) 
-                    ffmpeg_printf(20, "Packet duration %lld\n", packet.duration); 
-#else 
-                    ffmpeg_printf(20, "Packet duration %d\n", packet.duration); 
-                    ffmpeg_printf(20, "Packet convergence_duration %lld\n", packet.convergence_duration); 
-#endif
-                            if(packet.duration != 0) // FIXME: packet.duration is 32 bit, AV_NOPTS_VALUE is 64 bit --martii
-                                {
-//mkv2
-                                        duration=(packet.duration)/1000;
-                                }
-                            else if(packet.convergence_duration != 0 && packet.convergence_duration != AV_NOPTS_VALUE )
-                                {
-                                ffmpeg_printf(0, "obiiii a4444444444444444\n");
-                                        duration=(packet.convergence_duration)/1000;
-                                }
-                            else if(((AVStream*)subtitleTrack->stream)->codec->codec_id == AV_CODEC_ID_SSA)
-                            {
-                                        /*Hellmaster1024 if the duration is not stored in packet.duration or
-                                        packet.convergence_duration we need to calculate it any other way, for SSA it is stored in
-                                        the Text line*/
-                                        duration = getDurationFromSSALine(packet.data);
-                            }
-                            else
-                            {
-                                        /* no clue yet */
-                            }
-                            /* konfetti: I've found cases where the duration from getDurationFromSSALine
-                             * is zero (start end and are really the same in text). I think it make's
-                             * no sense to pass those.
-                             */
-//mkv3
-                            if (duration > 0)
-                            {
-//mkv4
-                                        /* is there a decoder ? */
-                                        if (((AVStream*) subtitleTrack->stream)->codec->codec)
-                                        {
-                                                AVSubtitle sub;
-                                                int got_sub_ptr;
-        
-                                                if (avcodec_decode_subtitle2(((AVStream*) subtitleTrack->stream)->codec, &sub, &got_sub_ptr, &packet) < 0)
-                                                {
-                                                        ffmpeg_err("error decoding subtitle\n");
-                                                }
-                                                else
-                                                {
-                                                unsigned int i;
-        
-                                                        ffmpeg_printf(0, "format %d\n", sub.format);
-                                                        ffmpeg_printf(0, "start_display_time %d\n", sub.start_display_time);
-                                                        ffmpeg_printf(0, "end_display_time %d\n", sub.end_display_time);
-                                                        ffmpeg_printf(0, "num_rects %d\n", sub.num_rects);
-                                                        ffmpeg_printf(0, "pts %lld\n", sub.pts);
-                                                        
-                                                        for (i = 0; i < sub.num_rects; i++)
-                                                        {
-                                                                ffmpeg_printf(0, "x %d\n", sub.rects[i]->x);
-                                                                ffmpeg_printf(0, "y %d\n", sub.rects[i]->y);
-                                                                ffmpeg_printf(0, "w %d\n", sub.rects[i]->w);
-                                                                ffmpeg_printf(0, "h %d\n", sub.rects[i]->h);
-                                                                ffmpeg_printf(0, "nb_colors %d\n", sub.rects[i]->nb_colors);
-                                                                ffmpeg_printf(0, "type %d\n", sub.rects[i]->type);
-                                                                ffmpeg_printf(0, "text %s\n", sub.rects[i]->text);
-                                                                ffmpeg_printf(0, "ass %s\n", sub.rects[i]->ass);
-                                                                // pict ->AVPicture                                             
-                                                        }
-                                                }
-                                        }
-                                        else if(((AVStream*)subtitleTrack->stream)->codec->codec_id == AV_CODEC_ID_SSA)
-                                        {
-                                            SubtitleData_t data;
-                
-                                            ffmpeg_printf(10, "videoPts %lld\n", currentVideoPts);
-                
-                                            data.data      = packet.data;
-                                            data.len       = packet.size;
-                                            data.extradata = subtitleTrack->extraData;
-                                            data.extralen  = subtitleTrack->extraSize;
-                                            data.pts       = pts;
-                                            data.duration  = duration;
-                
-                                            context->container->assContainer->Command(context, CONTAINER_DATA, &data);
-                                        }
-                                        else
-                                        {
-//mkv5
-                                            /* hopefully native text ;) */
-                
-                                            unsigned char* line = text_to_ass((char *)packet.data,pts/90,duration);
-                                            ffmpeg_printf(50,"text line is %s\n",(char *)packet.data);
-                                            ffmpeg_printf(50,"Sub line is %s\n",line);
-                                            ffmpeg_printf(20, "videoPts %lld %f\n", currentVideoPts,currentVideoPts/90000.0);
-                                            SubtitleData_t data;
-                                            data.data      = line;
-                                            data.len       = strlen((char*)line);
-                                            data.extradata = (unsigned char *) DEFAULT_ASS_HEAD;
-                                            data.extralen  = strlen(DEFAULT_ASS_HEAD);
-                                            data.pts       = pts;
-                                            data.duration  = duration;
-                
-                                            context->container->assContainer->Command(context, CONTAINER_DATA, &data);
-                                            free(line);
-                                        }
-                            } /* duration */
-//mkv6
-                    }
-                    else if (dvbsubtitleTrack && (dvbsubtitleTrack->Id == pid))
-                    {
-                            dvbsubtitleTrack->pts = pts = calcPts(cAVIdx, dvbsubtitleTrack->stream, packet.pts);
-        
-                            ffmpeg_printf(200, "DvbSubTitle index = %d\n",pid);
-        
-                            avOut.data       = packet.data;
-                            avOut.len        = packet.size;
-                            avOut.pts        = pts;
-                            avOut.extradata  = NULL;
-                            avOut.extralen   = 0;
-                            avOut.frameRate  = 0;
-                            avOut.timeScale  = 0;
-                            avOut.width      = 0;
-                            avOut.height     = 0;
-                            avOut.type       = "dvbsubtitle";
-        
-                            if (context->output->dvbsubtitle->Write(context, &avOut) < 0)
-                            {
-                                        //ffmpeg_err("writing data to dvbsubtitle fifo failed\n");
-                            }
-                    }
-                    else if (teletextTrack && (teletextTrack->Id == pid))
-                    {
-                            teletextTrack->pts = pts = calcPts(cAVIdx, teletextTrack->stream, packet.pts);
-        
-                            ffmpeg_printf(200, "TeleText index = %d\n",pid);
-        
-                            avOut.data       = packet.data;
-                            avOut.len        = packet.size;
-                            avOut.pts        = pts;
-                            avOut.extradata  = NULL;
-                            avOut.extralen   = 0;
-                            avOut.frameRate  = 0;
-                            avOut.timeScale  = 0;
-                            avOut.width      = 0;
-                            avOut.height     = 0;
-                            avOut.type       = "teletext";
-        
-                            if (context->output->teletext->Write(context, &avOut) < 0)
-                            {
-                                        //ffmpeg_err("writing data to teletext fifo failed\n");
-                            }
-                    }
+            }
         }
         else 
@@ -2207 +1159 @@
                 if( 0 == av_strerror(ffmpegStatus, errbuf, sizeof(errbuf)) )
                 {
-                    // In this way we inform user about error within the core
+                    /* In this way we inform user about error within the core
+                     */
                     printf("{\"log\":\"Frame read error: '%s'\"}\n", errbuf);
                 }
                 
-//                if( ffmpegStatus == AVERROR(EAGAIN) )
-//                {
-//                    continue;
-//                }
+                /*
+                if( ffmpegStatus == AVERROR(EAGAIN) )
+                {
+                    continue;
+                }
+                */
                 ffmpegStatus = 0;
             }
-
+            
             if(!is_finish_timeout() && !context->playback->isTSLiveMode)
             {
@@ -2240 +1195 @@
                     if( 0 == container_ffmpeg_get_length(context, &tmpLength) && tmpLength > 0 && get_play_pts() > 0)
                     {
+#if defined(TS_BYTES_SEEKING) && TS_BYTES_SEEKING
                         if (avContextTab[0]->iformat->flags & AVFMT_TS_DISCONT)
                         {
@@ -2246 +1202 @@
                         }
                         else
+#endif
                         {
                             seek_target_seconds = 0;
@@ -2259 +1216 @@
                 // av_read_frame failed
                 ffmpeg_err("no data ->end of file reached ? \n");
-#if LIBAVCODEC_VERSION_MAJOR >= 56
-                av_packet_unref(&packet);
-#else
-                av_free_packet(&packet);
-#endif
+                wrapped_packet_unref(&packet);
                 releaseMutex(__FILE__, __FUNCTION__,__LINE__);
                 if( bEndProcess )
@@ -2273 +1226 @@
                     continue;
                 }
-            }          
-        }
-        
-#if LIBAVCODEC_VERSION_MAJOR >= 56
-        av_packet_unref(&packet);
-#else
-        av_free_packet(&packet);
-#endif
+            }
+        }
+        wrapped_packet_unref(&packet);
         releaseMutex(__FILE__, __FUNCTION__,__LINE__);
     } /* while */
@@ -2288 +1236 @@
         swr_free(&swr);
     }
-   
+    
     if (decoded_frame)
     {
-#if (LIBAVCODEC_VERSION_MAJOR >= 55)
-        av_frame_free(&decoded_frame);
-#else
-        avcodec_free_frame(&decoded_frame);
-#endif
-    }
-   
+        wrapped_frame_free(&decoded_frame);
+    }
+    
 #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(56, 34, 100)
     mpeg4p2_context_reset(&mpeg4p2_context);
@@ -2320 +1264 @@
 {
     PlaybackHandler_t *p = (PlaybackHandler_t *)ctx;
-//    return p->abortRequested || PlaybackDieNow(0);
-//      secound http stream not working with PlaybackDieNow(0)
-    return p->abortRequested;
+    return p->abortRequested;// || PlaybackDieNow(0);
 }
 
@@ -2384 +1326 @@
     avContextTab[AVIdx]->interrupt_callback.callback = interrupt_cb;
     avContextTab[AVIdx]->interrupt_callback.opaque = context->playback;
-ffmpeg_printf(10, "filename2 %s\n", filename);
 
 #ifdef SAM_CUSTOM_IO
@@ -2405 +1346 @@
     AVDictionary **pavio_opts = NULL;
     eRTMPProtoImplType rtmpProtoImplType = RTMP_NONE;
+    uint8_t numOfRTMPImpl = 0;
     if (0 == strncmp(filename, "ffrtmp", 6))
     {
@@ -2433 +1375 @@
         const char *protoName = NULL;
         uint8_t haveNativeProto = 0;
-        uint8_t numOfRTMPImpl = 0;
         
-//        while (protoName = avio_enum_protocols(&opaque, 1))
-        while (protoName == avio_enum_protocols(&opaque, 1))
+        while (protoName = avio_enum_protocols(&opaque, 1))
         {
             if (0 == strcmp("rtmp", protoName))
@@ -2464 +1404 @@
                     /* if we have both impl, we will prefer native
                      * unless uri contain param wich can be understandable
-                     * only by by librtmp
+                     * only by librtmp
                      */
                     if (strstr(filename, " token=") || 
@@ -2599 +1539 @@
                 free(swfUrl);
                 free(swfVfy);
-
-                pavio_opts = &avio_opts;
             }
             
@@ -2761 +1699 @@
 
                 }
-////////
 
                 ffmpeg_printf(10, "check tslivemode\n");
@@ -2770 +1707 @@
                         context->playback->isTSLiveMode = 1;
                 }
+////////
 
         av_dict_set(&avio_opts, "reconnect", "1", 0);
         if (context->playback->isTSLiveMode) // special mode for live TS stream with skip packet 
         {
-                        ffmpeg_printf(10, "use tslivemode\n");
             av_dict_set(&avio_opts, "seekable", "0", 0);
             av_dict_set(&avio_opts, "reconnect_at_eof", "1", 0);
             av_dict_set(&avio_opts, "reconnect_streamed", "1", 0);
         }
-        pavio_opts = &avio_opts;
-    }
-
+    }
+    
+    pavio_opts = &avio_opts;
+    
     if ((err = avformat_open_input(&avContextTab[AVIdx], filename, fmt, pavio_opts)) != 0)
     {
-        char error[512];
-
-        ffmpeg_err("avformat_open_input failed %d (%s)\n", err, filename);
-        av_strerror(err, error, 512);
-        fprintf(stderr, "{\"FF_ERROR\":{\"msg\":\"%s\",\"code\":%i}}\n", error, err);
-
-        if(avio_opts != NULL)
-        {
-            av_dict_free(&avio_opts);
-        }
-        //for buffered io
-        ffmpeg_buf_free();
-        //for buffered io (end)
-
-        releaseMutex(__FILE__, __FUNCTION__,__LINE__);
-        return cERR_CONTAINER_FFMPEG_OPEN;
+        if (rtmp_proto_impl == 0 && //err == AVERROR_UNKNOWN && 
+            rtmpProtoImplType == RTMP_NATIVE &&
+            numOfRTMPImpl > 1)
+        {
+            // retry with librtmp
+            err = avformat_open_input(&avContextTab[AVIdx], filename+2, fmt, pavio_opts);
+            // filename2 - another memory leak, and also only once, so does not matter 
+        }
+        
+        if (err != 0)
+        {
+            char error[512];
+
+            ffmpeg_err("avformat_open_input failed %d (%s)\n", err, filename);
+            av_strerror(err, error, 512);
+            fprintf(stderr, "{\"FF_ERROR\":{\"msg\":\"%s\",\"code\":%i}}\n", error, err);
+
+            if(avio_opts != NULL)
+            {
+                av_dict_free(&avio_opts);
+            }
+            releaseMutex(__FILE__, __FUNCTION__,__LINE__);
+            return cERR_CONTAINER_FFMPEG_OPEN;
+        }
     }
 
@@ -2807 +1753 @@
     if (context->playback->noprobe)
     {
-#if (LIBAVFORMAT_VERSION_MAJOR > 55) && (LIBAVFORMAT_VERSION_MAJOR < 57)
-        avContextTab[AVIdx]->max_analyze_duration2 = 1;
-#else
-        avContextTab[AVIdx]->max_analyze_duration = 1;
-#endif
+        wrapped_set_max_analyze_duration(avContextTab[AVIdx], 1);
     }
 
@@ -2819 +1761 @@
     {
         ffmpeg_err("Error avformat_find_stream_info\n");
-#ifdef this_is_ok
-        /* crow reports that sometimes this returns an error
-         * but the file is played back well. so remove this
-         * until other works are done and we can prove this.
-         */
-        avformat_close_input(&avContextTab[AVIdx]);
-        //for buffered io
-        ffmpeg_buf_free();
-        //for buffered io (end)
-        releaseMutex(__FILE__, __FUNCTION__,__LINE__);
-        return cERR_CONTAINER_FFMPEG_STREAM;
-#endif
     }
 
@@ -2865 +1795 @@
             }
         }
-//        else if (progressive_download)
-//        {
-//            avContextTab[AVIdx]->pb->read_packet = ffmpeg_read_wrapper;
-//        }
+        else if (progressive_playback)
+        {
+            avContextTab[AVIdx]->pb->read_packet = ffmpeg_read_wrapper;
+        }
     }
 //for buffered io (end)
@@ -2877 +1807 @@
 int32_t container_ffmpeg_init(Context_t *context, PlayFiles_t *playFilesNames)
 {
-//    int32_t err = 0;
+    int32_t err = 0;
 
     ffmpeg_printf(10, ">\n");
-
-    //for buffered io
-    ffmpeg_buf_free();
-    //for buffered io end
 
     if (playFilesNames == NULL) 
@@ -2920 +1846 @@
     av_register_all();
     avformat_network_init();
-
-        char* tmpstr = NULL;
-    tmpstr = readfiletomem("/mnt/config/titan.cfg", 1);
-    if(ostrstr(tmpstr, "debuglevel=99") != NULL)
-           av_log_set_level( AV_LOG_DEBUG );
-        free(tmpstr), tmpstr = NULL;
-
+    
     // SULGE DEBUG ENABLED
     // make ffmpeg silen
-    // av_log_set_level( AV_LOG_DEBUG );
+    //av_log_set_level( AV_LOG_DEBUG );
     av_log_set_callback(ffmpeg_silen_callback);
  
@@ -2958 +1878 @@
 int32_t container_ffmpeg_update_tracks(Context_t *context, char *filename, int32_t initial)
 {
-//      Track_t *videoTrack = NULL;
     Track_t *audioTrack = NULL;
     Track_t *subtitleTrack = NULL;
-    Track_t *dvbsubtitleTrack = NULL;
-    Track_t *teletextTrack = NULL;
-
     
     if (terminating)
@@ -2973 +1889 @@
     {
         context->manager->subtitle->Command(context, MANAGER_GET_TRACK, &subtitleTrack);
-    }
-
-    if (initial && context->manager->dvbsubtitle)
-    {
-        context->manager->dvbsubtitle->Command(context, MANAGER_GET_TRACK, &dvbsubtitleTrack);
-    }
-
-    if (initial && context->manager->teletext)
-    {
-        context->manager->teletext->Command(context, MANAGER_GET_TRACK, &teletextTrack);
     }
 
@@ -3029 +1935 @@
             int32_t version = 0;
 
-            char *encoding = Codec2Encoding(stream->codec, &version);
+            char *encoding = Codec2Encoding((int32_t)get_codecpar(stream)->codec_id, (int32_t)get_codecpar(stream)->codec_type, \
+                                            (uint8_t *)get_codecpar(stream)->extradata, \
+                                            (int)get_codecpar(stream)->extradata_size, \
+                                            (int)get_codecpar(stream)->profile, &version);
             
             if(encoding != NULL && !strncmp(encoding, "A_IPCM", 6) && insert_pcm_as_lpcm)
@@ -3050 +1959 @@
              */
             memset(&track, 0, sizeof(track));
-            track.AVIdx = cAVIdx;
-
-            switch (stream->codec->codec_type) 
+            track.AVIdx = cAVIdx; 
+
+            switch (get_codecpar(stream)->codec_type) 
             {
             case AVMEDIA_TYPE_VIDEO:
-                ffmpeg_printf(10, "CODEC_TYPE_VIDEO %d\n",stream->codec->codec_type);
+                ffmpeg_printf(10, "CODEC_TYPE_VIDEO %d\n", get_codecpar(stream)->codec_type);
 
                 if (encoding != NULL) 
@@ -3062 +1971 @@
                     track.version        = version;
 
-                    track.width          = stream->codec->width;
-                    track.height         = stream->codec->height;
+                    track.width          = get_codecpar(stream)->width;
+                    track.height         = get_codecpar(stream)->height;
                     
                     /* We will return here PAR (Pixel Aspect Ratio) client need to calculate DAR(Display Aspect Ratio)
@@ -3075 +1984 @@
                     if (0 == track.aspect_ratio_num  || 0 == track.aspect_ratio_den)
                     {
-                        track.aspect_ratio_num = stream->codec->sample_aspect_ratio.num;
-                        track.aspect_ratio_den = stream->codec->sample_aspect_ratio.den;
-                    }
-
-                    track.extraData      = stream->codec->extradata;
-                    track.extraSize      = stream->codec->extradata_size;
+                        track.aspect_ratio_num = get_codecpar(stream)->sample_aspect_ratio.num;
+                        track.aspect_ratio_den = get_codecpar(stream)->sample_aspect_ratio.den;
+                    }
+
+                    track.extraData      = get_codecpar(stream)->extradata;
+                    track.extraSize      = get_codecpar(stream)->extradata_size;
 
                     track.aacbuf         = 0;
                     track.have_aacheader = -1;
                     
-                    track.frame_rate = (uint32_t)(1000 * (int64_t)(stream->r_frame_rate.num) / (int64_t)(stream->r_frame_rate.den));
-
+                    AVRational rateRational = get_frame_rate(stream);
+                    if (rateRational.den!=0)
+                    {
+                        track.frame_rate = (uint32_t)(1000 * (int64_t)(rateRational.num) / (int64_t)(rateRational.den));
+                    }
+                    
                     /* fixme: revise this */
                     if (track.frame_rate < 23970)
@@ -3097 +2010 @@
                     }
                     
-                    ffmpeg_printf(10, "bit_rate       [%d]\n",stream->codec->bit_rate);
-                    ffmpeg_printf(10, "flags          [%d]\n",stream->codec->flags);
-                    ffmpeg_printf(10, "frame_bits     [%d]\n",stream->codec->frame_bits);
-                    ffmpeg_printf(10, "time_base.den  [%d]\n",stream->time_base.den);
-                    ffmpeg_printf(10, "time_base.num  [%d]\n",stream->time_base.num);
-                    ffmpeg_printf(10, "width          [%d]\n",stream->codec->width);
-                    ffmpeg_printf(10, "height         [%d]\n",stream->codec->height);
-                    ffmpeg_printf(10, "frame_rate num [%d]\n",stream->r_frame_rate.num);
-                    ffmpeg_printf(10, "frame_rate den [%d]\n",stream->r_frame_rate.den);
+                    ffmpeg_printf(10, "bit_rate       [%d]\n", get_codecpar(stream)->bit_rate);
+                    ffmpeg_printf(10, "time_base.den  [%d]\n", stream->time_base.den);
+                    ffmpeg_printf(10, "time_base.num  [%d]\n", stream->time_base.num);
+                    ffmpeg_printf(10, "width          [%d]\n", get_codecpar(stream)->width);
+                    ffmpeg_printf(10, "height         [%d]\n", get_codecpar(stream)->height);
+                    ffmpeg_printf(10, "frame_rate num [%d]\n", rateRational.num);
+                    ffmpeg_printf(10, "frame_rate den [%d]\n", rateRational.den);
 
                     ffmpeg_printf(10, "frame_rate     [%u]\n", track.frame_rate);
@@ -3116 +2027 @@
 
                     track.duration = (int64_t)av_rescale(stream->duration, (int64_t)stream->time_base.num * 1000, stream->time_base.den); 
-                    if(stream->duration == AV_NOPTS_VALUE) 
+                    if(stream->duration == AV_NOPTS_VALUE || 0 == strncmp(avContext->iformat->name, "dash", 4)) 
                     {
                         ffmpeg_printf(10, "Stream has no duration so we take the duration from context\n");
@@ -3124 +2035 @@
                     if (context->manager->video)
                     {
-                        ffmpeg_printf(1, "cAVIdx[%d]: MANAGER_ADD track VIDEO\n", cAVIdx);
+                        if (get_codecpar(stream)->codec_id == AV_CODEC_ID_MPEG4)
+                        {
+                            track.avCodecCtx = wrapped_avcodec_get_context(cAVIdx, stream);
+                        }
+                        ffmpeg_printf(1, "cAVIdx[%d]: MANAGER_ADD track VIDEO\n");
                         if( context->manager->video->Command(context, MANAGER_ADD, &track) < 0) 
                         {
@@ -3134 +2049 @@
                 else 
                 {
-                    ffmpeg_err("codec type video but codec unknown %d\n", stream->codec->codec_id);
+                    ffmpeg_err("codec type video but codec unknown %d\n", get_codecpar(stream)->codec_id);
                 }
                 break;
             case AVMEDIA_TYPE_AUDIO:
-                ffmpeg_printf(10, "CODEC_TYPE_AUDIO %d\n",stream->codec->codec_type);
+                ffmpeg_printf(10, "CODEC_TYPE_AUDIO %d\n",get_codecpar(stream)->codec_type);
 
                 if (encoding != NULL)
                 {
                     AVDictionaryEntry *lang;
-                    track.type           = eTypeES;
+                    track.type = eTypeES;
 
                     lang = av_dict_get(stream->metadata, "language", NULL, 0);
@@ -3167 +2082 @@
                     {
                         track.inject_as_pcm = 1;
-                        ffmpeg_printf(10, " Handle inject_as_pcm = %d\n", track.inject_as_pcm);
-
-                        AVCodec *codec = avcodec_find_decoder(stream->codec->codec_id);
-
-                        //( (AVStream*) audioTrack->stream)->codec->flags |= CODEC_FLAG_TRUNCATED;
-                        int errorCode = avcodec_open2(stream->codec, codec, NULL);
-                        if(codec != NULL && !errorCode)
-                        {
-                           ffmpeg_printf(10, "AVCODEC__INIT__SUCCESS\n");
-                        }
-                        else
-                        {
-                           ffmpeg_printf(10, "AVCODEC__INIT__FAILED error[%d]\n", errorCode);
+                        track.avCodecCtx = wrapped_avcodec_get_context(cAVIdx, stream);
+                        if (track.avCodecCtx)
+                        {
+                            ffmpeg_printf(10, " Handle inject_as_pcm = %d\n", track.inject_as_pcm);
+
+                            AVCodec *codec = avcodec_find_decoder(get_codecpar(stream)->codec_id);
+
+                            int errorCode = avcodec_open2(track.avCodecCtx, codec, NULL);
+                            if(codec != NULL && !errorCode)
+                            {
+                               ffmpeg_printf(10, "AVCODEC__INIT__SUCCESS\n");
+                            }
+                            else
+                            {
+                               ffmpeg_printf(10, "AVCODEC__INIT__FAILED error[%d]\n", errorCode);
+                            }
                         }
                     }
@@ -3186 +2104 @@
                         track.inject_raw_pcm = 1;
                     }
-                    else if(stream->codec->codec_id == AV_CODEC_ID_AAC)
+                    else if (get_codecpar(stream)->codec_id == AV_CODEC_ID_AAC_LATM)
+                    {
+                        const char marker[] = "LATM";
+                        track.aacbuflen = sizeof(marker)/sizeof(char);
+                        track.aacbuf = malloc(track.aacbuflen);
+                        memcpy(track.aacbuf, marker, track.aacbuflen);
+                        
+                        ffmpeg_printf(10, "AV_CODEC_ID_AAC_LATM no extradata ACC header should be available in each frame\n");
+                        track.have_aacheader = 1;
+                    }
+                    else if(!strncmp(encoding, "A_AAC_LATM", 10))
+                    {
+                        ffmpeg_printf(10, "AV_CODEC_ID_AAC_LATM extradata will be used in aac writter\n");
+                    }
+                    else if (get_codecpar(stream)->codec_id == AV_CODEC_ID_AAC)
                     {
                         if( 0 == strncmp(avContext->iformat->name, "mpegts", 6) || 
@@ -3194 +2126 @@
                             track.aacbuflen = sizeof(marker)/sizeof(char);
                             track.aacbuf = malloc(track.aacbuflen);
-                            //assert(track.aacbuf);
                             memcpy(track.aacbuf, marker, track.aacbuflen);
                             
@@ -3203 +2134 @@
                         {
                             ffmpeg_printf(10, "Create AAC ExtraData\n");
-                            ffmpeg_printf(10, "stream->codec->extradata_size %d\n", stream->codec->extradata_size);
-                            //Hexdump(stream->codec->extradata, stream->codec->extradata_size);
+                            ffmpeg_printf(10, "get_codecpar(stream)->extradata_size %d\n", get_codecpar(stream)->extradata_size);
+                            //Hexdump(get_codecpar(stream)->extradata, get_codecpar(stream)->extradata_size);
 
                             /*  extradata:
@@ -3222 +2153 @@
 
                             int32_t object_type = 2; // LC
-                            int32_t sample_index = aac_get_sample_rate_index(stream->codec->sample_rate);
-                            int32_t chan_config = stream->codec->channels;
-                            if(stream->codec->extradata_size >= 2) 
+                            int32_t sample_index = aac_get_sample_rate_index(get_codecpar(stream)->sample_rate);
+                            int32_t chan_config = get_codecpar(stream)->channels - 1;
+                            ffmpeg_printf(1,"aac object_type %d\n", object_type);
+                            ffmpeg_printf(1,"aac sample_index %d\n", sample_index);
+                            ffmpeg_printf(1,"aac chan_config %d\n", chan_config);
+                            
+                            if (get_codecpar(stream)->extradata_size >= 2)
                             {
-                                uint8_t *h = stream->codec->extradata;
-                                object_type = h[0] >> 3;
-                                sample_index = ((h[0] & 0x7) << 1) |((h[1] & 0x80) >> 7);
-                                chan_config = (h[1] & 0x78) >> 3;
+                                MPEG4AudioConfig m4ac;
+                                int off = avpriv_mpeg4audio_get_config(&m4ac, get_codecpar(stream)->extradata, get_codecpar(stream)->extradata_size * 8, 1);
+                                if (off >= 0)
+                                {
+                                    object_type  = m4ac.object_type;
+                                    sample_index = m4ac.sampling_index;
+                                    if (sample_index == 0x0f)
+                                    {
+                                        sample_index = aac_get_sample_rate_index(m4ac.sample_rate);
+                                    }
+                                    chan_config  = m4ac.chan_config;
+                                }
                             }
-
-                            ffmpeg_printf(10,"aac object_type %d\n", object_type);
-                            ffmpeg_printf(10,"aac sample_index %d\n", sample_index);
-                            ffmpeg_printf(10,"aac chan_config %d\n", chan_config);
-                            ffmpeg_printf(10,"aac chan_config %d\n", chan_config);
-
-                            object_type -= 1; // Cause of ADTS
-
+                            
+                            ffmpeg_printf(1,"aac object_type %d\n", object_type);
+                            ffmpeg_printf(1,"aac sample_index %d\n", sample_index);
+                            ffmpeg_printf(1,"aac chan_config %d\n", chan_config);
+
+                            
+                            // https://wiki.multimedia.cx/index.php/ADTS
+                            object_type -= 1; //ADTS - profile, the MPEG-4 Audio Object Type minus 1
+                            
                             track.aacbuflen = AAC_HEADER_LENGTH;
                             track.aacbuf = malloc(8);
@@ -3263 +2207 @@
 
                     }
-                    else if(stream->codec->codec_id == AV_CODEC_ID_WMAV1
-                        || stream->codec->codec_id == AV_CODEC_ID_WMAV2
-                        || stream->codec->codec_id == AV_CODEC_ID_WMAPRO
-                        || stream->codec->codec_id == AV_CODEC_ID_WMALOSSLESS) //if (stream->codec->extradata_size > 0)
+                    else if(get_codecpar(stream)->codec_id == AV_CODEC_ID_WMAV1
+                        || get_codecpar(stream)->codec_id == AV_CODEC_ID_WMAV2
+                        || get_codecpar(stream)->codec_id == AV_CODEC_ID_WMAPRO
+                        || get_codecpar(stream)->codec_id == AV_CODEC_ID_WMALOSSLESS) //if (get_codecpar(stream)->extradata_size > 0)
                     {
                         ffmpeg_printf(10,"Create WMA ExtraData\n");
-                        uint16_t channels = stream->codec->channels;
-                        uint32_t rate = stream->codec->sample_rate;
-                        uint32_t bitrate = stream->codec->bit_rate;
-                        uint16_t block_align = stream->codec->block_align;
-                        uint16_t depth = stream->codec->bits_per_coded_sample;
-                        uint32_t codec_data_size = stream->codec->extradata_size;
-                        uint8_t *codec_data_pointer = stream->codec->extradata;
+                        uint16_t channels = get_codecpar(stream)->channels;
+                        uint32_t rate = get_codecpar(stream)->sample_rate;
+                        uint32_t bitrate = get_codecpar(stream)->bit_rate;
+                        uint16_t block_align = get_codecpar(stream)->block_align;
+                        uint16_t depth = get_codecpar(stream)->bits_per_coded_sample;
+                        uint32_t codec_data_size = get_codecpar(stream)->extradata_size;
+                        uint8_t *codec_data_pointer = get_codecpar(stream)->extradata;
                         
                         // type_specific_data
@@ -3283 +2227 @@
                         #define WMA_LOSSLESS            0x163
                         uint16_t codec_id = 0;
-                        switch(stream->codec->codec_id)
+                        switch(get_codecpar(stream)->codec_id)
                         {
                             //TODO: What code for lossless ?
@@ -3301 +2245 @@
                         }
 #ifdef __sh__
-                        track.aacbuflen = 104 + stream->codec->extradata_size;
+                        track.aacbuflen = 104 + get_codecpar(stream)->extradata_size;
                         track.aacbuf = malloc(track.aacbuflen);
                         memset (track.aacbuf, 0, track.aacbuflen);
@@ -3327 +2271 @@
                         memset(track.aacbuf + 60, 0, 4); // time_offset_hi (not used)
 
-                        uint8_t type_specific_data_length = 18 + stream->codec->extradata_size;
+                        uint8_t type_specific_data_length = 18 + get_codecpar(stream)->extradata_size;
                         memcpy(track.aacbuf + 64, &type_specific_data_length, 4); //type_specific_data_length
 
@@ -3341 +2285 @@
                         memcpy(track.aacbuf + 78, &codec_id, 2); //codec_id
 
-                        uint16_t number_of_channels = stream->codec->channels;
+                        uint16_t number_of_channels = get_codecpar(stream)->channels;
                         memcpy(track.aacbuf + 80, &number_of_channels, 2); //number_of_channels
 
-                        uint32_t samples_per_second = stream->codec->sample_rate;
+                        uint32_t samples_per_second = get_codecpar(stream)->sample_rate;
                         ffmpeg_printf(1, "samples_per_second = %d\n", samples_per_second);
                         memcpy(track.aacbuf + 82, &samples_per_second, 4); //samples_per_second
 
-                        uint32_t average_number_of_bytes_per_second = stream->codec->bit_rate / 8;
+                        uint32_t average_number_of_bytes_per_second = get_codecpar(stream)->bit_rate / 8;
                         ffmpeg_printf(1, "average_number_of_bytes_per_second = %d\n", average_number_of_bytes_per_second);
                         memcpy(track.aacbuf + 86, &average_number_of_bytes_per_second, 4); //average_number_of_bytes_per_second
 
-                        uint16_t block_alignment = stream->codec->block_align;
+                        uint16_t block_alignment = get_codecpar(stream)->block_align;
                         ffmpeg_printf(1, "block_alignment = %d\n", block_alignment);
                         memcpy(track.aacbuf + 90, &block_alignment, 2); //block_alignment
 
-                        uint16_t bits_per_sample =
-                        stream->codec->sample_fmt>=0?(stream->codec->sample_fmt+1)*8:8;
-                        ffmpeg_printf(1, "bits_per_sample = %d (%d)\n", bits_per_sample, stream->codec->sample_fmt);
+#if (LIBAVFORMAT_VERSION_MAJOR > 57) || ((LIBAVFORMAT_VERSION_MAJOR == 57) && (LIBAVFORMAT_VERSION_MINOR > 32))
+                        enum AVSampleFormat sample_fmt = get_codecpar(stream)->format;
+#else
+                        enum AVSampleFormat sample_fmt = get_codecpar(stream)->sample_fmt;
+#endif
+                        uint16_t bits_per_sample = sample_fmt>=0 ? (sample_fmt+1)*8 : 8;
+                        ffmpeg_printf(1, "bits_per_sample = %d (%d)\n", bits_per_sample, sample_fmt);
                         memcpy(track.aacbuf + 92, &bits_per_sample, 2); //bits_per_sample
 
-                        memcpy(track.aacbuf + 94, &stream->codec->extradata_size, 2); //bits_per_sample
-
-                        memcpy(track.aacbuf + 96, stream->codec->extradata, stream->codec->extradata_size);
+                        memcpy(track.aacbuf + 94, &get_codecpar(stream)->extradata_size, 2); //bits_per_sample
+
+                        memcpy(track.aacbuf + 96, get_codecpar(stream)->extradata, get_codecpar(stream)->extradata_size);
 #else
-                        track.aacbuflen = 18 + stream->codec->extradata_size;
+                        track.aacbuflen = 18 + get_codecpar(stream)->extradata_size;
                         track.aacbuf = malloc(track.aacbuflen);
                         memset (track.aacbuf, 0, track.aacbuflen);
@@ -3402 +2350 @@
 
                         //ffmpeg_printf(1, "priv_data:\n");
-                        //Hexdump(stream->codec->priv_data, track.aacbuflen);
+                        //Hexdump(get_codecpar(stream)->priv_data, track.aacbuflen);
 
                         track.have_aacheader = 1;
@@ -3409 +2357 @@
                     if (context->manager->audio)
                     {
-                        ffmpeg_printf(1, "cAVIdx[%d]: MANAGER_ADD track AUDIO\n", cAVIdx);
+                        ffmpeg_printf(1, "cAVIdx[%d]: MANAGER_ADD track AUDIO\n");
                         if (context->manager->audio->Command(context, MANAGER_ADD, &track) < 0) 
                         {
@@ -3419 +2367 @@
                 else //encoding != NULL
                 {
-                    ffmpeg_err("codec type audio but codec unknown %d\n", stream->codec->codec_id);
+                    ffmpeg_err("codec type audio but codec unknown %d\n", get_codecpar(stream)->codec_id);
                 }
                 break;
             case AVMEDIA_TYPE_SUBTITLE:
             {
-                if (stream->codec->codec_id != AV_CODEC_ID_SSA &&
+                if (get_codecpar(stream)->codec_id != AV_CODEC_ID_SSA &&
 #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55, 3, 100)
-                    stream->codec->codec_id != AV_CODEC_ID_ASS &&
-#endif
-                    stream->codec->codec_id != AV_CODEC_ID_SUBRIP && 
-                    stream->codec->codec_id != AV_CODEC_ID_TEXT &&
-                    stream->codec->codec_id != AV_CODEC_ID_SRT)
-                {
-                    ffmpeg_printf(10, "subtitle with not supported codec codec_id[%u]\n", (uint32_t)stream->codec->codec_id);
-                    printf("SULGE subtitle with not supported codec codec_id[%u]\n", (uint32_t)stream->codec->codec_id);
+                    get_codecpar(stream)->codec_id != AV_CODEC_ID_ASS &&
+#endif
+                    get_codecpar(stream)->codec_id != AV_CODEC_ID_SUBRIP && 
+                    get_codecpar(stream)->codec_id != AV_CODEC_ID_TEXT &&
+                    get_codecpar(stream)->codec_id != AV_CODEC_ID_SRT)
+                {
+                    ffmpeg_printf(10, "subtitle with not supported codec codec_id[%u]\n", (uint32_t)get_codecpar(stream)->codec_id);
                 }
                 else if (initial && context->manager->subtitle)
@@ -3440 +2387 @@
                     memset(&track, 0, sizeof(track));
 
-                    ffmpeg_printf(10, "CODEC_TYPE_SUBTITLE %d\n", stream->codec->codec_type);
+                    ffmpeg_printf(10, "CODEC_TYPE_SUBTITLE %d\n", get_codecpar(stream)->codec_type);
                     
                     lang = av_dict_get(stream->metadata, "language", NULL, 0);
@@ -3457 +2404 @@
                     }
 
-                    track.extraData      = stream->codec->extradata;
-                    track.extraSize      = stream->codec->extradata_size;
-
-                    ffmpeg_printf(1, "subtitle codec %d\n", stream->codec->codec_id);
-                    ffmpeg_printf(1, "subtitle width %d\n", stream->codec->width);
-                    ffmpeg_printf(1, "subtitle height %d\n", stream->codec->height);
+                    track.extraData      = get_codecpar(stream)->extradata;
+                    track.extraSize      = get_codecpar(stream)->extradata_size;
+
+                    ffmpeg_printf(1, "subtitle codec %d\n", get_codecpar(stream)->codec_id);
+                    ffmpeg_printf(1, "subtitle width %d\n", get_codecpar(stream)->width);
+                    ffmpeg_printf(1, "subtitle height %d\n", get_codecpar(stream)->height);
                     ffmpeg_printf(1, "subtitle stream %p\n", stream);
 
                     ffmpeg_printf(10, "FOUND SUBTITLE %s\n", track.Name);
+                    
                     if (context->manager->subtitle->Command(context, MANAGER_ADD, &track) < 0)
                     {
                         ffmpeg_err("failed to add subtitle track %d\n", n);
                     }
-/*
-                                    if (stream->codec->codec_id == AV_CODEC_ID_DVB_TELETEXT && context->manager->teletext)
-                                    {
-                                                ffmpeg_printf(10, "dvb_teletext\n");
-                                                int i = 0;
-                                                AVDictionaryEntry *t = NULL;
-                                                do {
-                                                        char tmp[30];
-                                                        snprintf(tmp, sizeof(tmp), "teletext_%d", i);
-                                                        t = av_dict_get(stream->metadata, tmp, NULL, 0);
-                                                        if (t) {
-                                                                track.Name = t->value;
-                                                                if (context->manager->teletext->Command(context, MANAGER_ADD, &track) < 0)
-                                                                        ffmpeg_err("failed to add teletext track %d\n", n);
-                                                        }
-                                                        i++;
-                                                } while (t);
-                                    }
-                                    else if (stream->codec->codec_id == AV_CODEC_ID_DVB_SUBTITLE && context->manager->dvbsubtitle)
-                                    {
-                                                ffmpeg_printf(10, "dvb_subtitle\n");
-                                                lang = av_dict_get(stream->metadata, "language", NULL, 0);
-                                                if (context->manager->dvbsubtitle->Command(context, MANAGER_ADD, &track) < 0) {
-                                                    ffmpeg_err("failed to add dvbsubtitle track %d\n", n);
-                                                }
-                                    }
-                                    else if (initial && context->manager->subtitle)
-                                    {
-                                                if (!stream->codec->codec)
-                                                {
-                                                    stream->codec->codec = avcodec_find_decoder(stream->codec->codec_id);
-                                                    if (!stream->codec->codec)
-                                                                ffmpeg_err("avcodec_find_decoder failed for subtitle track %d\n", n);
-                                                    else if (avcodec_open2(stream->codec, stream->codec->codec, NULL))
-                                                    {
-                                                        ffmpeg_err("avcodec_open2 failed for subtitle track %d\n", n);
-                                                        stream->codec->codec = NULL;
-                                                    }
-                                                }
-                                                if (context->manager->subtitle->Command(context, MANAGER_ADD, &track) < 0)
-                                                {
-                                                    // konfetti: fixme: is this a reason to return with error?
-                                                    ffmpeg_err("failed to add subtitle track %d\n", n);
-                                                }
-                                    }*/
                 }
                 break;
             }
-/*
-        case AVMEDIA_TYPE_SUBTITLE:
-        {
-            AVDictionaryEntry *lang;
-
-            ffmpeg_printf(10, "CODEC_TYPE_SUBTITLE %d\n",stream->codec->codec_type);
-
-                lang = av_dict_get(stream->metadata, "language", NULL, 0);
-                
-                track.Name = lang ? lang->value : "und";
-
-            ffmpeg_printf(10, "Language %s\n", track.Name);
-
-            track.Encoding       = encoding;
-            track.stream         = stream;
-            track.Id             = ((AVStream *) (track.stream))->id;
-//          track.duration       = (double)stream->duration * av_q2d(stream->time_base) * 1000.0;
-            track.duration       = (double)stream->duration * av_q2d(stream->time_base) * 1000;
-
-            track.aacbuf         = 0;
-            track.have_aacheader = -1;
-
-            track.width          = -1; // will be filled online from videotrack
-            track.height         = -1; // will be filled online from videotrack
-
-            track.extraData      = stream->codec->extradata;
-            track.extraSize      = stream->codec->extradata_size;
-
-            ffmpeg_printf(1, "subtitle codec %d\n", stream->codec->codec_id);
-            ffmpeg_printf(1, "subtitle width %d\n", stream->codec->width);
-            ffmpeg_printf(1, "subtitle height %d\n", stream->codec->height);
-            ffmpeg_printf(1, "subtitle stream %p\n", stream);
-
-            if(stream->duration == AV_NOPTS_VALUE) {
-                        ffmpeg_printf(10, "Stream has no duration so we take the duration from context\n");
-                        track.duration = (double) avContext->duration / 1000.0;
-            }
-            else
-            {
-//                      track.duration = (double) stream->duration * av_q2d(stream->time_base) * 1000.0;
-                        track.duration = (double) stream->duration * av_q2d(stream->time_base) * 1000;
-            }
-
-            ffmpeg_printf(10, "FOUND SUBTITLE %s\n", track.Name);
-
-            if (stream->codec->codec_id == AV_CODEC_ID_DVB_TELETEXT && context->manager->teletext)
-            {
-                        ffmpeg_printf(10, "dvb_teletext\n");
-                        int i = 0;
-                        AVDictionaryEntry *t = NULL;
-                        do {
-                                char tmp[30];
-                                snprintf(tmp, sizeof(tmp), "teletext_%d", i);
-                                t = av_dict_get(stream->metadata, tmp, NULL, 0);
-                                if (t) {
-                                        track.Name = t->value;
-                                        if (context->manager->teletext->Command(context, MANAGER_ADD, &track) < 0)
-                                                ffmpeg_err("failed to add teletext track %d\n", n);
-                                }
-                                i++;
-                        } while (t);
-            }
-            else if (stream->codec->codec_id == AV_CODEC_ID_DVB_SUBTITLE && context->manager->dvbsubtitle)
-            {
-                        ffmpeg_printf(10, "dvb_subtitle\n");
-                        lang = av_dict_get(stream->metadata, "language", NULL, 0);
-                        if (context->manager->dvbsubtitle->Command(context, MANAGER_ADD, &track) < 0) {
-                            ffmpeg_err("failed to add dvbsubtitle track %d\n", n);
-                        }
-            }
-            else if (initial && context->manager->subtitle)
-            {
-                        if (!stream->codec->codec)
-                        {
-                            stream->codec->codec = avcodec_find_decoder(stream->codec->codec_id);
-                            if (!stream->codec->codec)
-                                        ffmpeg_err("avcodec_find_decoder failed for subtitle track %d\n", n);
-                            else if (avcodec_open2(stream->codec, stream->codec->codec, NULL))
-                            {
-                                ffmpeg_err("avcodec_open2 failed for subtitle track %d\n", n);
-                                stream->codec->codec = NULL;
-                            }
-                        }
-                        if (context->manager->subtitle->Command(context, MANAGER_ADD, &track) < 0)
-                        {
-                            // konfetti: fixme: is this a reason to return with error?
-                            ffmpeg_err("failed to add subtitle track %d\n", n);
-                        }
-            }
-
-            break;
-        }
-*/
             case AVMEDIA_TYPE_UNKNOWN:
             case AVMEDIA_TYPE_DATA:
@@ -3616 +2426 @@
             case AVMEDIA_TYPE_NB:
             default:
-                ffmpeg_err("not handled or unknown codec_type %d\n", stream->codec->codec_type);
+                ffmpeg_err("not handled or unknown codec_type %d\n", get_codecpar(stream)->codec_type);
              break;
             }
@@ -3684 +2494 @@
         return cERR_CONTAINER_FFMPEG_ERR;
     }
-
-    ffmpeg_printf(10, "111\n");
-
-    //for buffered io
-    wait_time = 100;
-    if(hasfillerThreadStarted[hasfillerThreadStartedID] == 1)
-        hasfillerThreadStarted[hasfillerThreadStartedID] = 2; // should end
-    while ( (hasfillerThreadStarted[hasfillerThreadStartedID] != 0) && (--wait_time) > 0 ) {
-        ffmpeg_printf(10, "Waiting for ffmpeg filler thread to terminate itself, will try another %d times, ID=%d\n", wait_time, hasfillerThreadStartedID);
-        usleep(100000);
-    }
-    ffmpeg_printf(10, "222\n");
-
-
-    if (wait_time == 0) {
-        ffmpeg_err( "Timeout waiting for filler thread!\n");
-
-        ret = cERR_CONTAINER_FFMPEG_ERR;
-    }
-    ffmpeg_printf(10, "333\n");
-
-
-    //for buffered io (end)
-
+    
     if (context->playback)
     {
@@ -3718 +2505 @@
         usleep(100000);
     }
-    ffmpeg_printf(10, "444\n");
-
 
     if (wait_time == 0) 
@@ -3734 +2519 @@
     hasPlayThreadStarted = 0;
     terminating = 1;
-    ffmpeg_printf(10, "555\n");
-
 
     getMutex(__FILE__, __FUNCTION__,__LINE__);
-
+    
+    free_all_stored_avcodec_context();
+    
     uint32_t i = 0;
     for(i=0; i<IPTV_AV_CONTEXT_MAX_NUM; i+=1)
@@ -3763 +2548 @@
         }
     }
-    ffmpeg_printf(10, "666\n");
-
 
     if(avio_opts != NULL)
@@ -3775 +2558 @@
     ffmpeg_buf_free();
 
-    //for buffered io
-    ffmpeg_buf_free();
-    //for buffered io (end)
-    ffmpeg_printf(10, "777\n");
-
-
     releaseMutex(__FILE__, __FUNCTION__,__LINE__);
 
@@ -3811 +2588 @@
 
 /* seeking relative to a given byteposition N seconds ->for reverse playback needed */
-/*
 static int32_t container_ffmpeg_seek_rel(Context_t *context, off_t pos, int64_t pts, int64_t sec) 
 {
@@ -3819 +2595 @@
     seek_target_flag = 0;
 
-    ffmpeg_printf(10, "seeking %lld sec relativ to %lld\n", sec, pos);
+    ffmpeg_printf(10, "seeking %f sec relativ to %lld\n", sec, pos);
 
     context->manager->video->Command(context, MANAGER_GET_TRACK, &videoTrack);
@@ -3855 +2631 @@
 
     ffmpeg_printf(10, "iformat->flags %d\n", avContextTab[0]->iformat->flags);
-
+#if defined(TS_BYTES_SEEKING) && TS_BYTES_SEEKING
     if (avContextTab[0]->iformat->flags & AVFMT_TS_DISCONT)
     {
@@ -3877 +2653 @@
         }
 
-        ffmpeg_printf(10, "1. seeking to position %lld bytes ->sec %lld\n", pos, sec);
+        ffmpeg_printf(10, "1. seeking to position %lld bytes ->sec %f\n", pos, sec);
 
         seek_target_bytes = pos;
@@ -3885 +2661 @@
     }
     else
+#endif
     {
         sec += pts / 90000;
@@ -3893 +2670 @@
         }
 
-        ffmpeg_printf(10, "2. seeking to position %lld sec ->time base %f %d\n", sec, av_q2d(((AVStream*) current->stream)->time_base), AV_TIME_BASE);
+        ffmpeg_printf(10, "2. seeking to position %f sec ->time base %f %d\n", sec, av_q2d(((AVStream*) current->stream)->time_base), AV_TIME_BASE);
 
         seek_target_seconds = sec * AV_TIME_BASE;
@@ -3902 +2679 @@
     return cERR_CONTAINER_FFMPEG_NO_ERROR;
 }
-*/
 
 static int32_t container_ffmpeg_seek(Context_t *context, int64_t sec, uint8_t absolute)
@@ -3913 +2689 @@
     if (!absolute) 
     {
-        ffmpeg_printf(10, "seeking %lld sec\n", sec);
+        ffmpeg_printf(10, "seeking %f sec\n", sec);
         if (sec == 0)
         {
@@ -3932 +2708 @@
     }
     
-    ffmpeg_printf(10, "goto %lld sec\n", sec);
+    ffmpeg_printf(10, "goto %d sec\n", sec);
     if (sec < 0)
     {
@@ -3969 +2745 @@
 
     ffmpeg_printf(10, "iformat->flags %d\n", avContextTab[0]->iformat->flags);
-
+#if defined(TS_BYTES_SEEKING) && TS_BYTES_SEEKING
     if (avContextTab[0]->iformat->flags & AVFMT_TS_DISCONT)
     {
@@ -4000 +2776 @@
         }
         
-        ffmpeg_printf(10, "1. seeking to position %lld bytes ->sec %lld\n", pos, sec);
+        ffmpeg_printf(10, "1. seeking to position %lld bytes ->sec %d\n", pos, sec);
 
         seek_target_bytes = pos;
@@ -4007 +2783 @@
     } 
     else
+#endif
     {
         seek_target_seconds = sec * AV_TIME_BASE;
@@ -4021 +2798 @@
     Track_t * videoTrack = NULL;
     Track_t * audioTrack = NULL;
-    Track_t * subtitleTrack = NULL;
     Track_t * current = NULL;
 
@@ -4032 +2808 @@
     context->manager->video->Command(context, MANAGER_GET_TRACK, &videoTrack);
     context->manager->audio->Command(context, MANAGER_GET_TRACK, &audioTrack);
-    context->manager->subtitle->Command(context, MANAGER_GET_TRACK, &subtitleTrack);
 
     if (videoTrack != NULL)
@@ -4041 +2816 @@
     {
         current = audioTrack;
-    }
-    else if (subtitleTrack != NULL)
-    {
-        current = subtitleTrack;
     }
     
@@ -4095 +2866 @@
      * but now we will not ignore subtitle frame
      */
-//    int64_t sec = -5;
-//    context->playback->Command(context, PLAYBACK_SEEK, (void*)&sec);
-    return cERR_CONTAINER_FFMPEG_NO_ERROR;
-}
-
-static int32_t container_ffmpeg_switch_dvbsubtitle(Context_t* context __attribute__((unused)), int* arg __attribute__((unused)))
-{
-    return cERR_CONTAINER_FFMPEG_NO_ERROR;
-}
-
-static int32_t container_ffmpeg_switch_teletext(Context_t* context __attribute__((unused)), int* arg __attribute__((unused)))
-{
+    int64_t sec = -5;
+    context->playback->Command(context, PLAYBACK_SEEK, (void*)&sec);
     return cERR_CONTAINER_FFMPEG_NO_ERROR;
 }
@@ -4251 +3012 @@
         break;
     }
-    case CONTAINER_SWITCH_DVBSUBTITLE: {
-        ret = container_ffmpeg_switch_dvbsubtitle(context, (int*) argument);
-        break;
-    }
-    case CONTAINER_SWITCH_TELETEXT: {
-        ret = container_ffmpeg_switch_teletext(context, (int*) argument);
-        break;
-    }
-    case CONTAINER_SET_BUFFER_SEEK_TIME: {
-    ret = container_set_ffmpeg_buf_seek_time((int*) argument);
-    break;
+    case CONTAINER_SET_BUFFER_SEEK_TIME:
+    {
+        ret = container_set_ffmpeg_buf_seek_time((int*) argument);
+            break;
     }
     case CONTAINER_SET_BUFFER_SIZE:
@@ -4297 +3051 @@
 }
 
-static char *FFMPEG_Capabilities[] = {"avi", "mkv", "mp4", "ts", "mov", "flv", "flac", "mp3", "mpg", "m2ts", "vob", "evo", "wmv","wma", "asf", "mp2", "m4v", "m4a", "fla", "divx", "dat", "mpeg", "trp", "mts", "vdr", "ogg", "wav", "wtv", "asx", "mvi", "png", "jpg", "ra", "ram", "rm", "3gp", "amr", NULL };
+static char *FFMPEG_Capabilities[] = {"aac", "avi", "mkv", "mp4", "ts", "mov", "flv", "flac", "mp3", "mpg", "m2ts", "vob", "evo", "wmv","wma", "asf", "mp2", "m4v", "m4a", "fla", "divx", "dat", "mpeg", "trp", "mts", "vdr", "ogg", "wav", "wtv", "asx", "mvi", "png", "jpg", "ra", "ram", "rm", "3gp", "amr", "webm", "m3u8", "mpd", NULL };
 
 Container_t FFMPEGContainer = {

titan/libeplayer3/include/container.h

@@ -16 +16 @@
 CONTAINER_SWITCH_AUDIO, 
 CONTAINER_SWITCH_SUBTITLE, 
-CONTAINER_SWITCH_DVBSUBTITLE,
-CONTAINER_SWITCH_TELETEXT,
-CONTAINER_INFO,
+CONTAINER_INFO, 
 CONTAINER_STATUS, 
 CONTAINER_LAST_PTS, 
@@ -41 +39 @@
     char * Name;
     Container_t * selectedContainer;
-    Container_t * textSrtContainer;
-    Container_t * textSsaContainer;
-    Container_t * assContainer;
+
     int (* Command) (/*Context_t*/void  *, ContainerCmd_t, void *);
 } ContainerHandler_t;

titan/libeplayer3/include/manager.h

@@ -53 +53 @@
     /* stream from ffmpeg */
     void               *  stream;
+    /* AVCodecContext  for steam */
+    void               *  avCodecCtx;
     /* codec extra data (header or some other stuff) */
     void               *  extraData;
@@ -97 +99 @@
     Manager_t *video;
     Manager_t *subtitle;
-    Manager_t *dvbsubtitle;
-    Manager_t *teletext;
 } ManagerHandler_t;
 

titan/libeplayer3/include/misc.h

@@ -6 +6 @@
 #include <sys/stat.h>
 #include <unistd.h>
+#include <stdint.h>
 
 /* some useful things needed by many files ... */
@@ -15 +16 @@
 typedef struct BitPacker_s
 {
-    unsigned char*      Ptr;                                    /* write pointer */
-    unsigned int        BitBuffer;                              /* bitreader shifter */
-    int                 Remaining;                              /* number of remaining in the shifter */
+    uint8_t   *Ptr;                                    /* write pointer */
+    uint32_t   BitBuffer;                              /* bitreader shifter */
+    int32_t    Remaining;                              /* number of remaining in the shifter */
 } BitPacker_t;
 
@@ -26 +27 @@
 #define INVALID_PTS_VALUE                       0x200000000ull
 
-/* subtitle hacks ->for file subtitles */
-#define TEXTSRTOFFSET 100
-#define TEXTSSAOFFSET 200
-
 /* ***************************** */
 /* Prototypes                    */
 /* ***************************** */
 
-void PutBits(BitPacker_t * ld, unsigned int code, unsigned int length);
+void PutBits(BitPacker_t * ld, uint32_t code, uint32_t length);
 void FlushBits(BitPacker_t * ld);
+int8_t PlaybackDieNow(int8_t val); 
 
 /* ***************************** */
@@ -77 +75 @@
 {
   static char path[100];
-  unsigned int i = 0;
-  int pos = 0;
+  uint32_t i = 0;
+  int32_t pos = 0;
 
   while((name[i] != 0) && (i < sizeof(path)))
@@ -96 +94 @@
 }
 
-static inline int IsDreambox()
+static inline int32_t IsDreambox()
 {
     struct stat buffer;   
@@ -102 +100 @@
 }
 
+static inline uint32_t ReadUint32(uint8_t *buffer)
+{
+    uint32_t num = (uint32_t)buffer[0] << 24 |
+                   (uint32_t)buffer[1] << 16 |
+                   (uint32_t)buffer[2] << 8  |
+                   (uint32_t)buffer[3];
+    return num;
+}
+
+static inline uint16_t ReadUInt16(uint8_t *buffer)
+{
+    uint16_t num = (uint16_t)buffer[0] << 8 |
+                   (uint16_t)buffer[1];
+    return num;
+}
+
 #endif

titan/libeplayer3/include/output.h

@@ -27 +27 @@
     OUTPUT_GET_FRAME_COUNT,
     OUTPUT_GET_PROGRESSIVE,
-    OUTPUT_SUBTITLE_REGISTER_FUNCTION = 222,
-    OUTPUT_SUBTITLE_REGISTER_BUFFER = 223,
-    OUTPUT_GET_SUBTITLE_OUTPUT,
-    OUTPUT_SET_SUBTITLE_OUTPUT
 } OutputCmd_t;
 
@@ -50 +46 @@
     uint32_t         height;
     
+    uint32_t         infoFlags;
+    
     char            *type;
 } AudioVideoOut_t;
-/*
+
 typedef struct
 {
@@ -64 +62 @@
     char            *type;
 } SubtitleOut_t;
-*/
+
 
 typedef struct Output_s 
@@ -77 +75 @@
 extern Output_t LinuxDvbOutput;
 extern Output_t SubtitleOutput;
-extern Output_t PipeOutput;
 
 typedef struct OutputHandler_s 
@@ -85 +82 @@
     Output_t *video;
     Output_t *subtitle;
-    Output_t *dvbsubtitle;
-    Output_t *teletext;
     int32_t (* Command) (/*Context_t*/void  *, OutputCmd_t, void *);
 } OutputHandler_t;

titan/libeplayer3/include/playback.h

@@ -4 +4 @@
 #include <stdint.h>
 
-int8_t PlaybackDieNow(int8_t val);
-
-typedef enum {PLAYBACK_OPEN, PLAYBACK_CLOSE, PLAYBACK_PLAY, PLAYBACK_STOP, PLAYBACK_PAUSE, PLAYBACK_CONTINUE, PLAYBACK_FLUSH, PLAYBACK_TERM, PLAYBACK_FASTFORWARD, PLAYBACK_SEEK, PLAYBACK_SEEK_ABS, PLAYBACK_PTS, PLAYBACK_LENGTH, PLAYBACK_SWITCH_AUDIO, PLAYBACK_SWITCH_SUBTITLE, PLAYBACK_INFO, PLAYBACK_SLOWMOTION, PLAYBACK_FASTBACKWARD, PLAYBACK_GET_FRAME_COUNT, PLAYBACK_SWITCH_TELETEXT, PLAYBACK_SWITCH_DVBSUBTITLE, PLAYBACK_FRAMEBUFFER_LOCK, PLAYBACK_FRAMEBUFFER_UNLOCK} PlaybackCmd_t;
+typedef enum {PLAYBACK_OPEN, PLAYBACK_CLOSE, PLAYBACK_PLAY, PLAYBACK_STOP, PLAYBACK_PAUSE, PLAYBACK_CONTINUE, PLAYBACK_FLUSH, PLAYBACK_TERM, PLAYBACK_FASTFORWARD, PLAYBACK_SEEK, PLAYBACK_SEEK_ABS, PLAYBACK_PTS, PLAYBACK_LENGTH, PLAYBACK_SWITCH_AUDIO, PLAYBACK_SWITCH_SUBTITLE, PLAYBACK_INFO, PLAYBACK_SLOWMOTION, PLAYBACK_FASTBACKWARD, PLAYBACK_GET_FRAME_COUNT} PlaybackCmd_t;
 
 typedef struct PlaybackHandler_s 
@@ -31 +29 @@
     uint8_t isAudio;
     uint8_t isSubtitle;
-    uint8_t isDvbSubtitle;
-    uint8_t isTeletext;
-    uint8_t mayWriteToFramebuffer;
     uint8_t abortRequested;
 

titan/libeplayer3/include/writer.h

@@ -6 +6 @@
 #include <stdint.h>
 
-typedef enum { eNone, eAudio, eVideo, eGfx} eWriterType_t;
+typedef enum { eNone, eAudio, eVideo} eWriterType_t;
 
 typedef struct {
@@ -21 +21 @@
     unsigned int           Height;
     unsigned char          Version;
+    unsigned int           InfoFlags;
 } WriterAVCallData_t;
 
-typedef struct {
-    unsigned char*         data;
-    unsigned int           Width;
-    unsigned int           Height;
-    unsigned int           Stride;
-    unsigned int           color;
 
-    unsigned int           x;       /* dst x ->given by ass */
-    unsigned int           y;       /* dst y ->given by ass */
-
-    /* destination values if we use a shared framebuffer */
-    int                    fd;
-    unsigned int           Screen_Width;
-    unsigned int           Screen_Height;
-    uint32_t               *destination;
-    unsigned int           destStride;
-} WriterFBCallData_t;
 
 typedef struct WriterCaps_s {
@@ -66 +51 @@
 extern Writer_t WriterAudioEAC3;
 extern Writer_t WriterAudioAAC;
-extern Writer_t WriterAudioAACHE;
+extern Writer_t WriterAudioAACLATM;
 extern Writer_t WriterAudioAACPLUS;
 extern Writer_t WriterAudioDTS;
@@ -86 +71 @@
 extern Writer_t WriterVideoMSCOMP;
 extern Writer_t WriterVideoH263;
+extern Writer_t WriterVideoH265;
 extern Writer_t WriterVideoFLV;
 extern Writer_t WriterVideoVC1;
+extern Writer_t WriterVideoVP6;
+extern Writer_t WriterVideoVP8;
+extern Writer_t WriterVideoVP9;
+extern Writer_t WriterVideoSPARK;
 extern Writer_t WriterFramebuffer;
 extern Writer_t WriterPipe;
-extern Writer_t WriterDVBSubtitle;
 
 Writer_t* getWriter(char* encoding);
@@ -96 +85 @@
 Writer_t* getDefaultVideoWriter();
 Writer_t* getDefaultAudioWriter();
-Writer_t* getDefaultFramebufferWriter();
 ssize_t write_with_retry(int fd, const void *buf, size_t size);
 ssize_t writev_with_retry(int fd, const struct iovec *iov, size_t ic);

titan/libeplayer3/main/exteplayer.c

@@ -39 +39 @@
 
 extern int ffmpeg_av_dict_set(const char *key, const char *value, int flags);
-extern void  aac_software_decoder_set(const int32_t val);
-extern void  dts_software_decoder_set(const int32_t val);
-extern void  wma_software_decoder_set(const int32_t val);
-extern void  ac3_software_decoder_set(const int32_t val);
-extern void eac3_software_decoder_set(const int32_t val);
-extern void  mp3_software_decoder_set(const int32_t val);
-extern void rtmp_proto_impl_set(const int32_t val);
+extern void       aac_software_decoder_set(const int32_t val);
+extern void  aac_latm_software_decoder_set(const int32_t val);
+extern void       dts_software_decoder_set(const int32_t val);
+extern void       wma_software_decoder_set(const int32_t val);
+extern void       ac3_software_decoder_set(const int32_t val);
+extern void      eac3_software_decoder_set(const int32_t val);
+extern void       mp3_software_decoder_set(const int32_t val);
+extern void            rtmp_proto_impl_set(const int32_t val);
+extern void        flv2mpeg4_converter_set(const int32_t val);
 
 extern void pcm_resampling_set(int32_t val);
 extern void stereo_software_decoder_set(int32_t val);
 extern void insert_pcm_as_lpcm_set(int32_t val);
-extern void progressive_download_set(int32_t val);
+extern void progressive_playback_set(int32_t val);
 
 extern OutputHandler_t         OutputHandler;
@@ -275 +277 @@
     int aopt = 0, bopt = 0;
     char *copt = 0, *dopt = 0;
-    while ( (c = getopt(argc, argv, "wae3dlsrimvn:x:u:c:h:o:p:t:9:")) != -1) 
+    while ( (c = getopt(argc, argv, "we3dlsrimva:n:x:u:c:h:o:p:t:9:0:1:4:f:")) != -1) 
     {
         switch (c) 
         {
         case 'a':
+        {
+            int flag = atoi(optarg);
             printf("Software decoder will be used for AAC codec\n");
-            aac_software_decoder_set(1);
-            break;
+            aac_software_decoder_set(flag & 0x01);
+            aac_latm_software_decoder_set(flag & 0x02);
+            break;
+        }
         case 'e':
             printf("Software decoder will be used for EAC3 codec\n");
@@ -317 +323 @@
         case 'o':
             printf("Set progressive download to %d\n", atoi(optarg));
-            progressive_download_set(atoi(optarg));
+            progressive_playback_set(atoi(optarg));
             break;
         case 'p':
@@ -354 +360 @@
             rtmp_proto_impl_set(atoi(optarg));
             break;
+        case '0':
+            ffmpeg_av_dict_set("video_rep_index", optarg, 0);
+            break;
+        case '1':
+            ffmpeg_av_dict_set("audio_rep_index", optarg, 0);
+            break;
+        case '4':
+#ifdef HAVE_FLV2MPEG4_CONVERTER
+            flv2mpeg4_converter_set(atoi(optarg));
+#endif
+            break;
+        case 'f':
+        {
+            char *ffopt = strdup(optarg);
+            char *ffval = strchr(ffopt, '=');
+            if (ffval)
+            {
+                *ffval = '\0';
+                ffval += 1;
+                ffmpeg_av_dict_set(ffopt, ffval, 0);
+            }
+            free(ffopt);
+            break;
+        }
         default:
             printf ("?? getopt returned character code 0%o ??\n", c);
@@ -395 +425 @@
     int commandRetVal = -1;
     /* inform client that we can handle additional commands */
-    fprintf(stderr, "{\"EPLAYER3_EXTENDED\":{\"version\":%d}}\n", 30);
+    fprintf(stderr, "{\"EPLAYER3_EXTENDED\":{\"version\":%d}}\n", 34);
 
     if (0 != ParseParams(argc, argv, file, audioFile, &audioTrackIdx, &subtitleTrackIdx))
     {
         printf("Usage: exteplayer3 filePath [-u user-agent] [-c cookies] [-h headers] [-p prio] [-a] [-d] [-w] [-l] [-s] [-i] [-t audioTrackId] [-9 subtitleTrackId] [-x separateAudioUri] plabackUri\n");
-        printf("[-a] AAC software decoding\n");
+        printf("[-a 0|1|2|3] AAC software decoding - 1 bit - AAC ADTS, 2 - bit AAC LATM\n");
         printf("[-e] EAC3 software decoding\n");
         printf("[-3] AC3 software decoding\n");
@@ -408 +438 @@
         printf("[-l] software decoder use LPCM for injection (otherwise wav PCM will be used)\n");
         printf("[-s] software decoding as stereo [downmix]\n");
+#ifdef HAVE_FLV2MPEG4_CONVERTER
+        printf("[-4 0|1] - disable/enable flv2mpeg4 converter\n");
+#endif
         printf("[-i] play in infinity loop\n");
         printf("[-v] switch to live TS stream mode\n");
@@ -419 +452 @@
         printf("[-c cookies] set cookies - not working at now, please use -h instead\n");
         printf("[-x separateAudioUri]\n");
+        printf("[-0 idx] video MPEG-DASH representation index\n");
+        printf("[-1 idx] audio MPEG-DASH representation index\n");
+        printf("[-f ffopt=ffval] any other ffmpeg option\n");
         
         exit(1);
@@ -436 +472 @@
 
     // make sure to kill myself when parent dies
-//    prctl(PR_SET_PDEATHSIG, SIGKILL);
-
-//    SetBuffering();
+    prctl(PR_SET_PDEATHSIG, SIGKILL);
+
+    SetBuffering();
     
     //Registrating output devices
@@ -560 +596 @@
                 if( 1 == sscanf(argvBuff+1, "%d", &flags) )
                 {
-                    progressive_download_set(flags);
+                    progressive_playback_set(flags);
                     fprintf(stderr, "{\"PROGRESSIVE_DOWNLOAD\":{\"flags\":%d, \"sts\":0}}\n", flags);
                 }

titan/libeplayer3/manager/manager.c

@@ -41 +41 @@
 extern Manager_t VideoManager;
 extern Manager_t SubtitleManager;
-extern Manager_t DvbSubtitleManager;
-extern Manager_t TeletextManager;
 
 ManagerHandler_t ManagerHandler = {
@@ -48 +46 @@
     &AudioManager,
     &VideoManager,
-    &SubtitleManager,
-        &DvbSubtitleManager,
-        &TeletextManager
+    &SubtitleManager
 };
 

titan/libeplayer3/manager/subtitle.c

@@ -33 +33 @@
 #define TRACKWRAP 20
 
-#define SAM_WITH_DEBUG
+//#define SAM_WITH_DEBUG
 #ifdef SAM_WITH_DEBUG
 #define SUBTITLE_MGR_DEBUG
@@ -43 +43 @@
 #ifdef SUBTITLE_MGR_DEBUG
 
-static short debug_level = 20;
+static short debug_level = 10;
 
 #define subtitle_mgr_printf(level, x...) do { \

titan/libeplayer3/manager/video.c

@@ -32 +32 @@
 /* ***************************** */
 #define TRACKWRAP 4
-#define SAM_WITH_DEBUG
+
 #ifdef SAM_WITH_DEBUG
 #define VIDEO_MGR_DEBUG

titan/libeplayer3/output/linuxdvb_mipsel.c

@@ -131 +131 @@
 
     linuxdvb_printf(10, "v%d a%d\n", video, audio);
-                                
+
     if (video && videofd < 0) 
     {
-                fcntl(videofd, F_SETFL, fcntl(videofd, F_GETFL) | O_NONBLOCK);
-
         videofd = open(VIDEODEV, O_RDWR | O_NONBLOCK);
-
-                fcntl(videofd, F_SETFL, fcntl(videofd, F_GETFL) | O_NONBLOCK);
 
         if (videofd < 0)
@@ -168 +164 @@
     if (audio && audiofd < 0) 
     {
-                fcntl(audiofd, F_SETFL, fcntl(audiofd, F_GETFL) | O_NONBLOCK);
-
         audiofd = open(AUDIODEV, O_RDWR | O_NONBLOCK);
-
-                fcntl(audiofd, F_SETFL, fcntl(audiofd, F_GETFL) | O_NONBLOCK);
 
         if (audiofd < 0)
@@ -230 +222 @@
         audiofd = -1;
     }
-
-        fcntl(videofd, F_SETFL, fcntl(videofd, F_GETFL) | O_NONBLOCK);
-
-        fcntl(audiofd, F_SETFL, fcntl(audiofd, F_GETFL) | O_NONBLOCK);
 
     releaseLinuxDVBMutex(FILENAME, __FUNCTION__,__LINE__);
@@ -1022 +1010 @@
             call.Width        = out->width;
             call.Height       = out->height;
+            call.InfoFlags    = out->infoFlags;
             call.Version      = 0; // is unsingned char
 
@@ -1070 +1059 @@
             call.FrameRate      = out->frameRate;
             call.FrameScale     = out->timeScale;
+            call.InfoFlags      = out->infoFlags;
             call.Version        = 0; /* -1; unsigned char cannot be negative */
 

titan/libeplayer3/output/linuxdvb_sh4.c

@@ -1005 +1005 @@
             call.Width        = out->width;
             call.Height       = out->height;
+            call.InfoFlags      = out->infoFlags;
             call.Version      = 0; // is unsingned char
 
@@ -1053 +1054 @@
             call.FrameRate      = out->frameRate;
             call.FrameScale     = out->timeScale;
+            call.InfoFlags      = out->infoFlags;
             call.Version        = 0; /* -1; unsigned char cannot be negative */
 

titan/libeplayer3/output/output.c

@@ -31 +31 @@
 /* Makros/Constants              */
 /* ***************************** */
-//#define SAM_WITH_DEBUG
 
 #ifdef SAM_WITH_DEBUG
@@ -41 +40 @@
 #ifdef OUTPUT_DEBUG
 
-static short debug_level = 300;
+static short debug_level = 0;
 
 #define output_printf(level, x...) do { \
@@ -72 +71 @@
     &LinuxDvbOutput,
     &SubtitleOutput,
-    &PipeOutput,
     NULL
 };
@@ -132 +130 @@
                     return;
                 }
-                else if (!strcmp("dvbsubtitle", port)) 
-                {
-                    context->output->dvbsubtitle = AvailableOutput[i];
-                    return;
-                }
-                else if (!strcmp("teletext", port)) 
-                {
-                    context->output->teletext = AvailableOutput[i];
-                    return;
-                }
             }
         }
@@ -162 +150 @@
     {
         context->output->subtitle = NULL;
-    }
-    else if (!strcmp("dvbsubtitle", port))
-    {
-        context->output->dvbsubtitle = NULL;
-    }
-    else if (!strcmp("teletext", port))
-    {
-        context->output->teletext = NULL;
     }
 }
@@ -198 +178 @@
                 ret |= context->output->subtitle->Command(context, OUTPUT_OPEN, "subtitle");
             }
-            if (context->playback->isDvbSubtitle)
-                        {
-                ret |= context->output->dvbsubtitle->Command(context, command, "dvbsubtitle");
-                        }
-            if (context->playback->isTeletext)
-                        {
-                ret |= context->output->teletext->Command(context, command, "teletext");
-                        }
         } 
         else
@@ -229 +201 @@
                 ret |= context->output->subtitle->Command(context, OUTPUT_CLOSE, "subtitle");
             }
-            if (context->playback->isDvbSubtitle)
-                        {
-                ret |= context->output->dvbsubtitle->Command(context, command, "dvbsubtitle");
-                        }
-            if (context->playback->isTeletext)
-                        {
-                ret |= context->output->teletext->Command(context, command, "teletext");
-                        }
         } 
         else
@@ -282 +246 @@
                 }
             }
-                        if (context->playback->isDvbSubtitle)
-                        {
-                   ret |= context->output->dvbsubtitle->Command(context, command, "dvbsubtitle");
-                        }
-                        if (context->playback->isTeletext)
-                        {
-                                   ret |= context->output->teletext->Command(context, command, "teletext");
-                        }
         } 
         else
@@ -313 +269 @@
                 ret |= context->output->subtitle->Command(context, OUTPUT_STOP, "subtitle");
             }
-                        if (context->playback->isDvbSubtitle)
-                        {
-                   ret |= context->output->dvbsubtitle->Command(context, command, "dvbsubtitle");
-                        }
-                        if (context->playback->isTeletext)
-                        {
-                                   ret |= context->output->teletext->Command(context, command, "teletext");
-                        }
         } 
         else
@@ -344 +292 @@
                 ret |= context->output->subtitle->Command(context, OUTPUT_FLUSH, "subtitle");
             }
-                        if (context->playback->isDvbSubtitle)
-                        {
-                   ret |= context->output->dvbsubtitle->Command(context, command, "dvbsubtitle");
-                        }
-                        if (context->playback->isTeletext)
-                        {
-                                   ret |= context->output->teletext->Command(context, command, "teletext");
-                        }
         } 
         else
@@ -436 +376 @@
                 ret |= context->output->subtitle->Command(context, OUTPUT_CONTINUE, "subtitle");
             }
-                        if (context->playback->isDvbSubtitle)
-                        {
-                   ret |= context->output->dvbsubtitle->Command(context, command, "dvbsubtitle");
-                        }
-                        if (context->playback->isTeletext)
-                        {
-                                   ret |= context->output->teletext->Command(context, command, "teletext");
-                        }
         } 
         else
@@ -482 +414 @@
                 ret |= context->output->subtitle->Command(context, OUTPUT_CLEAR, "subtitle");
             }
-                        if (context->playback->isDvbSubtitle)
-                        {
-                   ret |= context->output->dvbsubtitle->Command(context, command, "dvbsubtitle");
-                        }
-                        if (context->playback->isTeletext)
-                        {
-                                   ret |= context->output->teletext->Command(context, command, "teletext");
-                        }
         } 
         else
@@ -532 +456 @@
                 return context->output->subtitle->Command(context, OUTPUT_SWITCH, "subtitle");
             }
-                        if (context->playback->isDvbSubtitle)
-                        {
-                   return context->output->dvbsubtitle->Command(context, command, "dvbsubtitle");
-                        }
-                        if (context->playback->isTeletext)
-                        {
-                                return context->output->teletext->Command(context, command, "teletext");
-                        }
         } 
         else
@@ -646 +562 @@
     NULL, //video
     NULL, //subtitle
-    NULL, // dvbsubtitle
-    NULL, // teletext
     &Command
 };

titan/libeplayer3/output/output_subtitle.c

@@ -32 +32 @@
 #include <memory.h>
 #include <asm/types.h>
-#include <pthread.h>
 #include <errno.h>
 
 #include "common.h"
 #include "output.h"
-#include "subtitle.h"
 
 /* ***************************** */
@@ -43 +41 @@
 /* ***************************** */
 
+//SULGE DEBUG ENABLED
+//#define SAM_WITH_DEBUG
+#ifdef SAM_WITH_DEBUG
 #define SUBTITLE_DEBUG
+#else
+#define SUBTITLE_SILENT
+#endif
 
 #ifdef SUBTITLE_DEBUG
@@ -65 +69 @@
 #define cERR_SUBTITLE_ERROR            -1
 
-static const char FILENAME[] = "subtitle.c";
+static const char FILENAME[] = __FILE__;
 
 /*
@@ -81 +85 @@
 /* ***************************** */
 
-struct sub_t {
-    char *                 text;
-    unsigned long long int pts;
-    unsigned long int      milliDuration;
-};
-
 
 /* ***************************** */
@@ -93 +91 @@
 
 static pthread_mutex_t mutex;
-
-static pthread_t thread_sub;
-
-void* clientData = NULL;
-void  (*clientFunction) (long int, size_t, char *, void *);
-
-static struct sub_t subPuffer[PUFFERSIZE];
-static int readPointer = 0;
-static int writePointer = 0;
-static int hasThreadStarted = 0;
 static int isSubtitleOpened = 0;
-static int      screen_width            = 0;
-static int      screen_height           = 0;
-static int      destStride              = 0;
-static void     (*framebufferBlit)      = NULL;
-static uint32_t *destination            = NULL;
 
 /* ***************************** */
@@ -117 +100 @@
 /* MISC Functions                */
 /* ***************************** */
-static void getMutex(int line) {
+static void getMutex(int line)
+{
     subtitle_printf(100, "%d requesting mutex\n", line);
 
@@ -125 +109 @@
 }
 
-static void releaseMutex(int line) {
+static void releaseMutex(int line) 
+{
     pthread_mutex_unlock(&mutex);
 
@@ -131 +116 @@
 }
 
-void replace_all(char ** string, char * search, char * replace) {
-    int len = 0;
-    char * ptr = NULL;
-    char tempString[512];
-    char newString[512];
-
-    newString[0] = '\0';
-
-    if ((string == NULL) || (*string == NULL) || (search == NULL) || (replace == NULL))
-    {
-        subtitle_err("null pointer passed\n");
-        return;
-    }
+/* ***************************** */
+/* Functions                     */
+/* ***************************** */
+
+static char * ass_get_text(char *str)
+{
+    // Events are stored in the Block in this order:
+    // ReadOrder, Layer, Style, Name, MarginL, MarginR, MarginV, Effect, Text
+    // 91,0,Default,,0,0,0,,maar hij smaakt vast tof.
+    int i = 0;
+    char *p_str = str;
+    while(i < 8 && *p_str != '\0')
+    {
+        if (*p_str == ',')
+            i++;
+        p_str++;
+    }
+    // standardize hard break: '\N' -> '\n'
+    // http://docs.aegisub.org/3.2/ASS_Tags/
+    char *p_newline = NULL;
+    while((p_newline = strstr(p_str, "\\N")) != NULL)
+        *(p_newline + 1) = 'n';
+    return p_str;
+}
+
+static char * json_string_escape(char *str)
+{
+    static char tmp[2048];
+    char *ptr1 = tmp;
+    char *ptr2 = str;
+    while (*ptr2 != '\0')
+    {
+        switch (*ptr2) 
+        {
+        case '"':
+            *ptr1++ = '\\';
+            *ptr1++ = '\"';
+        break;
+        case '\\':
+            *ptr1++ = '\\';
+            *ptr1++ = '\\';
+        break;
+        case '\b':
+            *ptr1++ = '\\';
+            *ptr1++ = 'b';
+        break;
+        case '\f':
+            *ptr1++ = '\\';
+            *ptr1++ = 'f';
+        break;
+        case '\n':
+            *ptr1++ = '\\';
+            *ptr1++ = 'n';
+        break;
+        case '\r': 
+            *ptr1++ = '\\';
+            *ptr1++ = 'r';
+        break;
+        case '\t': 
+            *ptr1++ = '\\';
+            *ptr1++ = 't';
+        break;
+        default:
+            *ptr1++ = *ptr2;
+            break;
+        }
+        
+        ++ptr2;
+    }
+    *ptr1 = '\0';
+    return tmp;
+}
+
+static int Flush()
+{   
+    fprintf(stderr, "{\"s_f\":{\"r\":0}}\n");
+    return cERR_SUBTITLE_NO_ERROR;
+}
+
+static int Write(void *_context, void *data)
+{
+    Context_t  *context = (Context_t *)_context;
+    char *Encoding      = NULL;
+    SubtitleOut_t *out  = NULL;
+    int32_t curtrackid  = -1;
     
-    strncpy(tempString, *string, 511);
-    tempString[511] = '\0';
-
-    free(*string);
-
-    while ((ptr = strstr(tempString, search)) != NULL) {
-        len  = ptr - tempString;
-        strncpy(newString, tempString, len);
-        newString[len] = '\0';
-        strcat(newString, replace);
-
-        len += strlen(search);
-        strcat(newString, tempString+len);
-
-        strcpy(tempString, newString);
-    }
-
-    subtitle_printf(20, "strdup in line %d\n", __LINE__);
-
-    if(newString[0] != '\0')
-        *string = strdup(newString);
-    else
-        *string = strdup(tempString);
-
-}
-
-int subtitle_ParseASS (char **Line) {
-    char* Text;
-    int   i;
-    char* ptr1;
-
-    if ((Line == NULL) || (*Line == NULL))
+    subtitle_printf(10, "\n");
+
+    if (data == NULL)
     {
         subtitle_err("null pointer passed\n");
         return cERR_SUBTITLE_ERROR;
     }
-    
-    Text = strdup(*Line);
-
-    subtitle_printf(10, "-> Text = %s\n", *Line);
-
-    ptr1 = Text;
-    
-    for (i=0; i < 9 && *ptr1 != '\0'; ptr1++) {
-
-        subtitle_printf(20, "%s",ptr1);
-
-        if (*ptr1 == ',')
-            i++;
-    }
-
-    free(*Line);
-
-    *Line = strdup(ptr1);
-    free(Text);
-
-    replace_all(Line, "\\N", "\n");
-
-    replace_all(Line, "{\\i1}", "<i>");
-    replace_all(Line, "{\\i0}", "</i>");
-
-    subtitle_printf(10, "<- Text=%s\n", *Line);
-
-    return cERR_SUBTITLE_NO_ERROR;
-}
-
-int subtitle_ParseSRT (char **Line) {
-
-    if ((Line == NULL) || (*Line == NULL))
-    {
-        subtitle_err("null pointer passed\n");
-        return cERR_SUBTITLE_ERROR;
-    }
-
-    subtitle_printf(20, "-> Text=%s\n", *Line);
-
-    replace_all(Line, "\x0d", "");
-    replace_all(Line, "\n\n", "\\N");
-    replace_all(Line, "\n", "");
-    replace_all(Line, "\\N", "\n");
-    replace_all(Line, "ö", "oe");
-    replace_all(Line, "ä", "ae");
-    replace_all(Line, "ü", "ue");
-    replace_all(Line, "Ö", "Oe");
-    replace_all(Line, "Ä", "Ae");
-    replace_all(Line, "Ü", "Ue");
-    replace_all(Line, "ß", "ss");
-
-    subtitle_printf(10, "<- Text=%s\n", *Line);
-
-    return cERR_SUBTITLE_NO_ERROR;
-}
-
-int subtitle_ParseSSA (char **Line) {
-
-    if ((Line == NULL) || (*Line == NULL))
-    {
-        subtitle_err("null pointer passed\n");
-        return cERR_SUBTITLE_ERROR;
-    }
-
-    subtitle_printf(20, "-> Text=%s\n", *Line);
-
-    replace_all(Line, "\x0d", "");
-    replace_all(Line, "\n\n", "\\N");
-    replace_all(Line, "\n", "");
-    replace_all(Line, "\\N", "\n");
-    replace_all(Line, "ö", "oe");
-    replace_all(Line, "ä", "ae");
-    replace_all(Line, "ü", "ue");
-    replace_all(Line, "Ö", "Oe");
-    replace_all(Line, "Ä", "Ae");
-    replace_all(Line, "Ü", "Ue");
-    replace_all(Line, "ß", "ss");
-
-    subtitle_printf(10, "<- Text=%s\n", *Line);
-
-    return cERR_SUBTITLE_NO_ERROR;
-}
-
-void addSub(Context_t  *context, char * text, unsigned long long int pts, unsigned long int milliDuration) {
-    int count = 20;
-    
-    subtitle_printf(50, "index %d\n", writePointer);
-
-    if(context && context->playback && !context->playback->isPlaying)
-    {
-        subtitle_err("1. aborting ->no playback\n");
-        return;
-    }
-    
-    if (text == NULL)
-    {
-        subtitle_err("null pointer passed\n");
-        return;
-    }
-
-    if (pts == 0)
-    {
-        subtitle_err("pts 0\n");
-        return;
-    }
-
-    if (milliDuration == 0)
-    {
-        subtitle_err("duration 0\n");
-        return;
-    }
-    
-    while (subPuffer[writePointer].text != NULL) {
-        //List is full, wait till we got some free space
-
-        if(context && context->playback && !context->playback->isPlaying)
-        {
-            subtitle_err("2. aborting ->no playback\n");
-            return;
-        }
-
-/* konfetti: we dont want to block forever here. if no buffer
- * is available we start ring from the beginning and loose some stuff
- * which is acceptable!
- */
-        subtitle_printf(10, "waiting on free buffer %d - %d (%d) ...\n", writePointer, readPointer, count);
-        usleep(10000);
-        count--;
-        
-        if (count == 0)
-        {
-            subtitle_err("abort waiting on buffer...\n");
-            break;
-        }
-    }
-    
-    subtitle_printf(20, "from mkv: %s pts:%lld milliDuration:%lud\n",text,pts,milliDuration);
-
-    getMutex(__LINE__);
-
-    if (count == 0)
-    {
-        int i;
-        subtitle_err("freeing not delivered data\n");
-        
-        //Reset all
-        readPointer = 0;
-        writePointer = 0;
-
-        for (i = 0; i < PUFFERSIZE; i++) {
-            if (subPuffer[i].text != NULL)
-               free(subPuffer[i].text);
-            subPuffer[i].text          = NULL;
-            subPuffer[i].pts           = 0;
-            subPuffer[i].milliDuration = 0;
-        }
-    }
-
-    subPuffer[writePointer].text = strdup(text);
-    subPuffer[writePointer].pts = pts;
-    subPuffer[writePointer].milliDuration = milliDuration;
-
-    writePointer++;
-    
-    if (writePointer == PUFFERSIZE)
-        writePointer = 0;
-
-    if (writePointer == readPointer)
-    {
-        /* this should not happen, and means that there is nor reader or
-         * the reader has performance probs ;)
-         * the recovery is done at startup of this function - but next time
-         */
-        subtitle_err("ups something went wrong. no more readers? \n");
-    }
-
-    releaseMutex(__LINE__);
-
-    subtitle_printf(10, "<\n");
-}
-
-int getNextSub(char ** text, unsigned long long int * pts, long int * milliDuration) {
-
-    subtitle_printf(50, "index %d\n", readPointer);
-
-    if (text == NULL)
-    {
-        subtitle_err("null pointer passed\n");
-        return cERR_SUBTITLE_ERROR;
-    }
-
-    getMutex(__LINE__);
-
-    if (subPuffer[readPointer].text == NULL)
-    {
-        /* this is acutally not an error, because it may happen
-         * that there is no subtitle for a while
-         */
-        subtitle_printf(200, "null in subPuffer\n");
-        releaseMutex(__LINE__);
-        return cERR_SUBTITLE_ERROR;
-    }
-    
-    *text = strdup(subPuffer[readPointer].text);
-    free(subPuffer[readPointer].text);
-    subPuffer[readPointer].text = NULL;
-
-    *pts = subPuffer[readPointer].pts;
-    subPuffer[readPointer].pts = 0;
-
-    *milliDuration = subPuffer[readPointer].milliDuration;
-    subPuffer[readPointer].milliDuration = 0;
-
-    readPointer++;
-
-    if (readPointer == PUFFERSIZE)
-        readPointer = 0;
-
-    if (writePointer == readPointer)
-    {
-        /* this may happen, in normal case the reader is ones ahead the 
-         * writer. So this is the normal case that we eat the data
-         * and have the reader reached.
-         */
-        subtitle_printf(20, "ups something went wrong. no more writers? \n");
-    }
-
-    releaseMutex(__LINE__);
-
-    subtitle_printf(20, "readPointer %d\n",readPointer);
-    subtitle_printf(10, "<\n");
-
-    return cERR_SUBTITLE_NO_ERROR;
-}
-
-/* **************************** */
-/* Worker Thread                */
-/* **************************** */
-
-static void* SubtitleThread(void* data) {
-    Context_t *context = (Context_t*) data;
-    char *                  subText             = NULL;
-    long int                subMilliDuration    = 0;
-    unsigned long long int  subPts              = 0;
-    unsigned long long int  Pts                 = 0;
-
-    subtitle_printf(10, "\n");
-    hasThreadStarted = 1;
-
-    while ( context->playback->isCreationPhase ) {
-        subtitle_err("Thread waiting for end of init phase...\n");
-        usleep(1000);
-    }
-
-    subtitle_printf(10, "done\n");
-
-    while ( context &&
-            context->playback &&
-            context->playback->isPlaying && hasThreadStarted == 1) {
-
-        int curtrackid = -1;
-        
-        if (context && context->manager && context->manager->subtitle)
-            context->manager->subtitle->Command(context, MANAGER_GET, &curtrackid);
-
-        subtitle_printf(50, "curtrackid %d\n", curtrackid);
-
-        if (curtrackid >= 0) {
-            if (getNextSub(&subText, &subPts, &subMilliDuration) != 0) {
-                usleep(500000);
-                continue;
-            }
-
-            if (context && context->playback)
-                context->playback->Command(context, PLAYBACK_PTS, &Pts);
-            else break;
-
-            if(Pts > subPts) {
-                subtitle_printf(10,"subtitle is to late, ignoring\n");
-                if(subText != NULL)
-                    free(subText);
-                continue;
-            }
-
-            subtitle_printf(20, "Pts:%llu < subPts%llu duration %ld\n", Pts, subPts,subMilliDuration);
-
-            while ( context &&
-                    context->playback &&
-                    context->playback->isPlaying &&
-                    Pts < subPts && hasThreadStarted == 1) {
-
-                unsigned long int diff = subPts - Pts;
-                diff = (diff*1000)/90.0;
-
-                subtitle_printf(50, "DIFF: %lud\n", diff);
-                if(diff > 100)
-                    usleep(diff);
-
-                if (context && context->playback)
-                    context->playback->Command(context, PLAYBACK_PTS, &Pts);
-                else
-                { 
-                   subtitle_err("no playback ? terminated?\n");
-                   break;
-                }
-                subtitle_printf(20, "cur: %llu wanted: %llu\n", Pts, subPts);
-            }
-
-            if (    context &&
-                    context->playback &&
-                    context->playback->isPlaying &&
-                    subText != NULL && hasThreadStarted == 1) {
-
-                if(clientFunction != NULL)
-                    clientFunction(subMilliDuration, strlen(subText), subText, clientData);
-                else
-                    subtitle_printf(10, "writing Sub failed (%ld) (%d) \"%s\"\n", subMilliDuration, strlen(subText), subText);
-
-                free(subText);
-            }
-        } /* trackID >= 0 */
-        else //Wait
-            usleep(500000);
-
-    } /* outer while */
-    
-    subtitle_printf(0, "has ended\n");
- 
-    hasThreadStarted = 0;
-   
-    return NULL;
-}
-
-/* ***************************** */
-/* Functions                     */
-/* ***************************** */
-
-static int Write(void* _context, void *data) {
-    Context_t  * context = (Context_t  *) _context;
-    char * Encoding = NULL;
-    char * Text;
-    SubtitleOut_t * out;
-    int DataLength;
-    unsigned long long int Pts;
-    float Duration;
- 
-    subtitle_printf(10, "\n");
-
-    if (data == NULL)
-    {
-        subtitle_err("null pointer passed\n");
-        return cERR_SUBTITLE_ERROR;
-    }
 
     out = (SubtitleOut_t*) data;
     
-    if (out->type == eSub_Txt)
-    {
-        Text = strdup((const char*) out->u.text.data);
-    } else
-    {
-/* fixme handle gfx subs from container_ass and send it to
- * the callback. this must be implemented also in e2/neutrino
- * then.
- */    
-        subtitle_err("subtitle gfx currently not handled\n");
-        return cERR_SUBTITLE_ERROR;
-    } 
-
-    DataLength = out->u.text.len;
-    Pts = out->pts;
-    Duration = out->duration;
+    context->manager->subtitle->Command(context, MANAGER_GET, &curtrackid);
+    if (curtrackid != out->trackId)
+    {
+        Flush();
+    }
+    context->manager->subtitle->Command(context, MANAGER_GETENCODING, &Encoding);
+
+    if (Encoding == NULL)
+    {
+       subtitle_err("encoding unknown\n");
+       return cERR_SUBTITLE_ERROR;
+    }
     
-    context->manager->subtitle->Command(context, MANAGER_GETENCODING, &Encoding);
-
-    if (Encoding == NULL)
-    {
-       subtitle_err("encoding unknown\n");
-       free(Text);
-       return cERR_SUBTITLE_ERROR;
-    }
-    
-    subtitle_printf(20, "Encoding:%s Text:%s Len:%d\n", Encoding,Text, DataLength);
-
-    if (    !strncmp("S_TEXT/SSA",  Encoding, 10) ||
-            !strncmp("S_SSA",       Encoding, 5))
-        subtitle_ParseSSA(&Text);
-    
-    else if(!strncmp("S_TEXT/ASS",  Encoding, 10) ||
-            !strncmp("S_AAS",       Encoding, 5))
-        subtitle_ParseASS(&Text);
-    
-    else if(!strncmp("S_TEXT/SRT",  Encoding, 10) ||
-            !strncmp("S_SRT",       Encoding, 5))
-        subtitle_ParseSRT(&Text);
+    subtitle_printf(20, "Encoding:%s Text:%s Len:%d\n", Encoding, (const char*) out->data, out->len);
+
+    if(!strncmp("S_TEXT/SUBRIP", Encoding, 13))
+    {
+        fprintf(stderr, "{\"s_a\":{\"id\":%d,\"s\":%lld,\"e\":%lld,\"t\":\"%s\"}}\n", out->trackId, out->pts / 90, out->pts / 90 + out->durationMS, json_string_escape((char *)out->data));
+    }
+    else if (!strncmp("S_TEXT/ASS", Encoding, 10))
+    {
+        fprintf(stderr, "{\"s_a\":{\"id\":%d,\"s\":%lld,\"e\":%lld,\"t\":\"%s\"}}\n", out->trackId, out->pts / 90, out->pts / 90 + out->durationMS, ass_get_text((char *)out->data));
+    }
     else
     {
@@ -582 +240 @@
         return  cERR_SUBTITLE_ERROR;
     }
-    
-    subtitle_printf(10, "Text:%s Duration:%f\n", Text,Duration);
-
-    addSub(context, Text, Pts, Duration * 1000);
-    
-    free(Text);
-    free(Encoding);
 
     subtitle_printf(10, "<\n");
-
     return cERR_SUBTITLE_NO_ERROR;
 }
 
-static int subtitle_Open(Context_t* context __attribute__((unused))) {
-    int i;
+static int32_t subtitle_Open(Context_t *context __attribute__((unused))) 
+{
+    uint32_t i = 0 ;
 
     subtitle_printf(10, "\n");
@@ -608 +259 @@
     getMutex(__LINE__);
 
-    //Reset all
-    readPointer = 0;
-    writePointer = 0;
-
-    for (i = 0; i < PUFFERSIZE; i++) {
-        subPuffer[i].text          = NULL;
-        subPuffer[i].pts           = 0;
-        subPuffer[i].milliDuration = 0;
-    }
-
     isSubtitleOpened = 1;
 
@@ -623 +264 @@
 
     subtitle_printf(10, "<\n");
-
     return cERR_SUBTITLE_NO_ERROR;
 }
 
-static int subtitle_Close(Context_t* context __attribute__((unused))) {
-    int i;
+static int32_t subtitle_Close(Context_t *context __attribute__((unused)))
+{
+    uint32_t i = 0 ;
 
     subtitle_printf(10, "\n");
@@ -634 +275 @@
     getMutex(__LINE__);
 
-    //Reset all
-    readPointer = 0;
-    writePointer = 0;
-
-    for (i = 0; i < PUFFERSIZE; i++) {
-        if (subPuffer[i].text != NULL)
-           free(subPuffer[i].text);
-
-        subPuffer[i].text          = NULL;
-        subPuffer[i].pts           = 0;
-        subPuffer[i].milliDuration = 0;
-    }
-
     isSubtitleOpened = 0;
 
@@ -656 +284 @@
 }
 
-static int subtitle_Play(Context_t* context) {
-    subtitle_printf(10, "\n");
-
-    if (hasThreadStarted == 0)
-    {
-        pthread_attr_t attr;
-        
-        pthread_attr_init(&attr);
-        
-        pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
-        
-        if (pthread_create (&thread_sub, &attr, &SubtitleThread, (void*) context) != 0)
-        {
-           subtitle_err("Error creating thread\n");
-           hasThreadStarted = 0;
-        } else
-        {
-           subtitle_printf(10, "Created thread\n");
-        }
-    }
-    else
-    {
-        subtitle_err("thread already created.\n");
-        return cERR_SUBTITLE_ERROR;
-    }
-
-    subtitle_printf(10, "<\n");
-
-    return cERR_SUBTITLE_NO_ERROR;
-}
-
-static int subtitle_Stop(Context_t* context __attribute__((unused))) {
-    int wait_time = 100;
-    int i;
-    
-    subtitle_printf(10, "\n");
-
-                if(hasThreadStarted != 0) {
-            hasThreadStarted = 2;
-            while ( (hasThreadStarted != 0) && (--wait_time) > 0 ) {
-                subtitle_printf(10, "Waiting for subtitle thread to terminate itself, will try another %d times\n", wait_time);
-                usleep(100000);
-            }
-    }
-
-    if (wait_time == 0) {
-        subtitle_err("Timeout waiting for thread!\n");
-
-        return cERR_SUBTITLE_ERROR;
-    }
-    
-    hasThreadStarted = 0;
-
-    /* konfetti: thread has ended, so nobody will eat the date... 
-     * free the data...
-     */
-
-    getMutex(__LINE__);
-
-    //Reset all
-    readPointer = 0;
-    writePointer = 0;
-
-    for (i = 0; i < PUFFERSIZE; i++) {
-        if (subPuffer[i].text != NULL)
-           free(subPuffer[i].text);
-
-        subPuffer[i].text          = NULL;
-        subPuffer[i].pts           = 0;
-        subPuffer[i].milliDuration = 0;
-    }
-
-    releaseMutex(__LINE__);
-
-    subtitle_printf(10, "<\n");
-
-    return cERR_SUBTITLE_NO_ERROR;
-}
-
-void subtitle_SignalConnect(void (*fkt) (long int, size_t, char *, void *))
-{
-    subtitle_printf(10, "%p\n", fkt);
-
-    clientFunction = fkt;
-}
-
-void subtitle_SignalConnectBuffer(void* data)
-{
-    subtitle_printf(10, "%p\n", data);
-
-    clientData = data;
-}
-
-static int Command(void  *_context, OutputCmd_t command, void * argument) {
+static int Command(void  *_context, OutputCmd_t command, void *argument) 
+{
     Context_t  *context = (Context_t*) _context;
     int ret = cERR_SUBTITLE_NO_ERROR;
@@ -755 +291 @@
     subtitle_printf(50, "%d\n", command);
 
-    switch(command) {
-    case OUTPUT_OPEN: {
+    switch(command) 
+    {
+    case OUTPUT_OPEN:
+    {
         ret = subtitle_Open(context);
         break;
     }
-    case OUTPUT_CLOSE: {
+    case OUTPUT_CLOSE:
+    {
         ret = subtitle_Close(context);
         break;
     }
-    case OUTPUT_PLAY: {
-        ret = subtitle_Play(context);
-        break;
-    }
-    case OUTPUT_STOP: {
-        ret = subtitle_Stop(context);
-        break;
-    }
-    case OUTPUT_SWITCH: {
-        subtitle_err("Subtitle Switch not implemented\n");
-        ret = cERR_SUBTITLE_ERROR;
-        break;
-    }
-    case OUTPUT_GET_SUBTITLE_OUTPUT: {
-        SubtitleOutputDef_t* out = (SubtitleOutputDef_t*)argument;
-        out->screen_width = screen_width;
-        out->screen_height = screen_height;
-        out->framebufferBlit = framebufferBlit;
-        out->destination = destination;
-        out->destStride = destStride;
-        break;
-    }
-    case OUTPUT_SET_SUBTITLE_OUTPUT: {
-        SubtitleOutputDef_t* out = (SubtitleOutputDef_t*)argument;
-        screen_width = out->screen_width;
-        screen_height = out->screen_height;
-        framebufferBlit = out->framebufferBlit;
-        destination = out->destination;
-        destStride = out->destStride;
-        break;
-    }
-    case OUTPUT_SUBTITLE_REGISTER_FUNCTION: {
-        subtitle_SignalConnect(argument);
-        break;
-    }
-    case OUTPUT_SUBTITLE_REGISTER_BUFFER: {
-        subtitle_SignalConnectBuffer(argument);
-        break;
-    }
-    case OUTPUT_FLUSH: {
-        subtitle_err("Subtitle Flush not implemented\n");
-        ret = cERR_SUBTITLE_ERROR;
-        break;
-    }
-    case OUTPUT_PAUSE: {
+    case OUTPUT_PLAY: 
+    {
+        break;
+    }
+    case OUTPUT_STOP: 
+    {
+        break;
+    }
+    case OUTPUT_SWITCH:
+    {
+        ret = Flush();
+        break;
+    }
+    case OUTPUT_FLUSH:
+    {
+        ret = Flush();
+        break;
+    }
+    case OUTPUT_CLEAR:
+    {
+        ret = Flush();
+        break;
+    }
+    case OUTPUT_PAUSE: 
+    {
         subtitle_err("Subtitle Pause not implemented\n");
         ret = cERR_SUBTITLE_ERROR;
-        break;
-    }
-    case OUTPUT_CONTINUE: {
+        break;
+    }
+    case OUTPUT_CONTINUE:
+    {
         subtitle_err("Subtitle Continue not implemented\n");
         ret = cERR_SUBTITLE_ERROR;
-        break;
-    }
-
+        break;
+    }
     default:
         subtitle_err("OutputCmd %d not supported!\n", command);
@@ -826 +345 @@
 
     subtitle_printf(50, "exiting with value %d\n", ret);
-
     return ret;
 }
@@ -833 +351 @@
 static char *SubtitleCapabilitis[] = { "subtitle", NULL };
 
-struct Output_s SubtitleOutput = {
+Output_t SubtitleOutput = {
     "Subtitle",
     &Command,

titan/libeplayer3/output/writer/mipsel/writer.c

@@ -62 +62 @@
 static Writer_t * AvailableWriter[] = {
     &WriterAudioAAC,
-    &WriterAudioAACHE,
+    &WriterAudioAACLATM,
     &WriterAudioAACPLUS,
     &WriterAudioAC3,
@@ -76 +76 @@
     
     &WriterVideoH264,
+    &WriterVideoH265,
     &WriterVideoH263,
     &WriterVideoMPEG4,
@@ -82 +83 @@
     &WriterVideoVC1,
     &WriterVideoDIVX3,
-    //&WriterVideoWMV,
+    &WriterVideoVP6,
+    &WriterVideoVP8,
+    &WriterVideoVP9,
+    &WriterVideoSPARK,
+    &WriterVideoWMV,
     NULL
 };
@@ -208 +213 @@
 }
 
-Writer_t* getDefaultFramebufferWriter()
-{
-    int i;
-
-    for (i = 0; AvailableWriter[i] != NULL; i++)
-    {
-        writer_printf(10, "%s\n", AvailableWriter[i]->caps->textEncoding);
-        if (strcmp(AvailableWriter[i]->caps->textEncoding, "framebuffer") == 0)
-        {
-            writer_printf(50, "%s: found writer \"%s\"\n", __func__, AvailableWriter[i]->caps->name);
-            return AvailableWriter[i];
-        }
-    }
-
-    writer_printf(1, "%s: no writer found\n", __func__);
-
-    return NULL;
-}

titan/libeplayer3/output/writer/sh4/writer.c

@@ -84 +84 @@
     &WriterVideoFLV,
     &WriterVideoVC1,
-    &WriterFramebuffer,
     NULL
 };
@@ -152 +151 @@
 }
 
-Writer_t* getDefaultFramebufferWriter()
-{
-    int i;
-
-    for (i = 0; AvailableWriter[i] != NULL; i++)
-    {
-        writer_printf(10, "%s\n", AvailableWriter[i]->caps->textEncoding);
-        if (strcmp(AvailableWriter[i]->caps->textEncoding, "framebuffer") == 0)
-        {
-            writer_printf(50, "%s: found writer \"%s\"\n", __func__, AvailableWriter[i]->caps->name);
-            return AvailableWriter[i];
-        }
-    }
-
-    writer_printf(1, "%s: no writer found\n", __func__);
-
-    return NULL;
-}

titan/libeplayer3/playback/playback.c

@@ -130 +130 @@
             return cERR_PLAYBACK_ERROR;
         }
-        //CHECK FOR SUBTITLES
-        if (context->container && context->container->textSrtContainer)
-            context->container->textSrtContainer->Command(context, CONTAINER_INIT, context->playback->uri+7);
-
-        if (context->container && context->container->textSsaContainer)
-            context->container->textSsaContainer->Command(context, CONTAINER_INIT, context->playback->uri+7);
-
-        if (context->container && context->container->assContainer)
-            context->container->assContainer->Command(context, CONTAINER_INIT, NULL);
     } 
     else if (strstr(uri, "://")) 
@@ -185 +176 @@
     }
 
-    if (context->container && context->container->textSrtContainer)
-        context->container->textSrtContainer->Command(context, CONTAINER_DEL, NULL);
-
-    if (context->container && context->container->textSsaContainer)
-        context->container->textSsaContainer->Command(context, CONTAINER_DEL, NULL);
-
     context->manager->audio->Command(context, MANAGER_DEL, NULL);
     context->manager->video->Command(context, MANAGER_DEL, NULL);
-        context->manager->subtitle->Command(context, MANAGER_DEL, NULL);
-    context->manager->dvbsubtitle->Command(context, MANAGER_DEL, NULL);
-    context->manager->teletext->Command(context, MANAGER_DEL, NULL);
 
     context->playback->isPaused     = 0;
@@ -282 +264 @@
     {
         set_pause_timeout(1);
-                if(context->playback->SlowMotion)
-                        context->output->Command(context, OUTPUT_CLEAR, NULL);
-
+        
         context->output->Command(context, OUTPUT_PAUSE, NULL);
 
@@ -316 +296 @@
 
         set_pause_timeout(0);
-        if(context->playback->SlowMotion)
-            context->output->Command(context, OUTPUT_CLEAR, NULL);
+
         context->output->Command(context, OUTPUT_CONTINUE, NULL);
 
@@ -410 +389 @@
 }
 
-static int PlaybackFastForward(Context_t  *context, int* speed) {
-    int32_t ret = cERR_PLAYBACK_NO_ERROR;
-
-    playback_printf(10, "speed %d\n", *speed);
-
-    /* Audio only forwarding not supported */
-    if (context->playback->isVideo && !context->playback->isHttp && !context->playback->BackWard && (!context->playback->isPaused || context->playback->isPlaying)) {
-
-        if ((*speed <= 0) || (*speed > cMaxSpeed_ff))
-        {
-            playback_err("speed %d out of range (1 - %d) \n", *speed, cMaxSpeed_ff);
-            return cERR_PLAYBACK_ERROR;
-        }
-
-        context->playback->isForwarding = 1;
-        context->playback->Speed = *speed;
-
-        playback_printf(20, "Speed: %d x {%d}\n", *speed, context->playback->Speed);
-
-        context->output->Command(context, OUTPUT_FASTFORWARD, NULL);
-    } else
-    {
-        playback_err("fast forward not possible\n");
-        ret = cERR_PLAYBACK_ERROR;
-    }
-
-    playback_printf(10, "exiting with value %d\n", ret);
-
-    return ret;
-}
-
-static int PlaybackFastBackward(Context_t  *context,int* speed) {
-    int32_t ret = cERR_PLAYBACK_NO_ERROR;
-
-    playback_printf(10, "speed = %d\n", *speed);
-
-    /* Audio only reverse play not supported */
-    if (context->playback->isVideo && !context->playback->isForwarding && (!context->playback->isPaused || context->playback->isPlaying)) {
-
-        if ((*speed > 0) || (*speed < cMaxSpeed_fr))
-        {
-            playback_err("speed %d out of range (0 - %d) \n", *speed, cMaxSpeed_fr);
-            return cERR_PLAYBACK_ERROR;
-        }
-
-        if (*speed == 0)
-        {
-            context->playback->BackWard = 0;
-            context->playback->Speed = 0;    /* reverse end */
-        } else
-        {
-            context->playback->isSeeking = 1;
-            context->playback->Speed = *speed;
-            context->playback->BackWard = 2^(*speed);
-         
-            playback_printf(1, "S %d B %f\n", context->playback->Speed, context->playback->BackWard);
-        }
-
-        context->output->Command(context, OUTPUT_AUDIOMUTE, "1");
-        context->output->Command(context, OUTPUT_CLEAR, NULL);
-        if (context->output->Command(context, OUTPUT_REVERSE, NULL) < 0)
-        {
-            playback_err("OUTPUT_REVERSE failed\n");
-            context->playback->BackWard = 0;
-            context->playback->Speed = 1;
-            context->playback->isSeeking = 0;
-            ret = cERR_PLAYBACK_ERROR;
-        }
-    } else
-    {
-        playback_err("fast backward not possible\n");
-        ret = cERR_PLAYBACK_ERROR;
-    }
-
-    context->playback->isSeeking = 0;
-    playback_printf(10, "exiting with value %d\n", ret);
-
-    return ret;
-}
-
-static int32_t PlaybackSlowMotion(Context_t  *context,int* speed) {
-    int32_t ret = cERR_PLAYBACK_NO_ERROR;
-
-    playback_printf(10, "\n");
-
-    //Audio only forwarding not supported
-    if (context->playback->isVideo && !context->playback->isHttp && context->playback->isPlaying) {
-        if(context->playback->isPaused)
-            PlaybackContinue(context);
-
-        switch(*speed) {
-        case 2:
-            context->playback->SlowMotion = 2;
-            break;
-        case 4:
-            context->playback->SlowMotion = 4;
-            break;
-        case 8:
-            context->playback->SlowMotion = 8;
-            break;
-        }
-
-        playback_printf(20, "SlowMotion: %d x {%d}\n", *speed, context->playback->SlowMotion);
-
-        context->output->Command(context, OUTPUT_SLOWMOTION, NULL);
-    } else
-    {
-        playback_err("slowmotion not possible\n");
-        ret = cERR_PLAYBACK_ERROR;
-    }
-
-    playback_printf(10, "exiting with value %d\n", ret);
-
-    return ret;
-}
-
 static int32_t PlaybackSeek(Context_t  *context, int64_t *pos, uint8_t absolute) 
 {
@@ -683 +546 @@
     playback_printf(10, "Track: %d\n", *track);
 
-        if (context && context->playback && context->playback->isPlaying ) {
-        if (context->manager && context->manager->subtitle) {
-            int trackid;
-            
-            if (context->manager->subtitle->Command(context, MANAGER_SET, track) < 0)
-            {
-                playback_err("manager set track failed\n");
-                        }
-/*
     if (context && context->playback && context->playback->isPlaying )
     {
-        int trackid;
-
         if (context->manager && context->manager->subtitle) 
         {
@@ -714 +566 @@
                 }
             }
-
-*/
-#if 0
-                    if (*track == 0xffff) {
-                        //CHECK FOR SUBTITLES
-                        if (context->container && context->container->textSrtContainer)
-                            context->container->textSrtContainer->Command(context, CONTAINER_INIT, context->playback->uri+7);
-        
-                        if (context->container && context->container->textSsaContainer)
-                            context->container->textSsaContainer->Command(context, CONTAINER_INIT, context->playback->uri+7);
-        
-                        if (context->container && context->container->assContainer)
-                            context->container->assContainer->Command(context, CONTAINER_INIT, NULL);
-                    }
-#endif
-            context->manager->subtitle->Command(context, MANAGER_GET, &trackid);
-
-/* konfetti: I make this hack a little bit nicer,
- * but its still a hack in my opinion ;)
- */
-            if (context->container && context->container->assContainer)
-                context->container->assContainer->Command(context, CONTAINER_SWITCH_SUBTITLE, &trackid);
-
-            if (trackid >= TEXTSRTOFFSET)
-            {
-                if (context->container && context->container->textSrtContainer)
-                     context->container->textSrtContainer->Command(context, CONTAINER_SWITCH_SUBTITLE, &trackid);
-            }
-            if (trackid >= TEXTSSAOFFSET)
-            {
-                 if (context->container && context->container->textSsaContainer)
-                     context->container->textSsaContainer->Command(context, CONTAINER_SWITCH_SUBTITLE, &trackid);
-            }
-
         } 
         else
@@ -760 +578 @@
         ret = cERR_PLAYBACK_ERROR;
     }
-
-    playback_printf(10, "exiting with value %d\n", ret);
-
-    return ret;
-}
-
-static int32_t PlaybackSwitchDVBSubtitle(Context_t  *context, int* pid) {
-    int ret = cERR_PLAYBACK_NO_ERROR;
-
-    playback_printf(10, "Track: %d\n", *pid);
-
-    if (context && context->manager && context->manager->dvbsubtitle ) {
-        if (context->manager->dvbsubtitle->Command(context, *pid == 0xffff ? MANAGER_DEL : MANAGER_SET, pid) < 0) {
-                playback_err("dvbsub manager set track failed\n");
-                ret = cERR_PLAYBACK_ERROR;
-        }
-    } else
-        playback_err("no dvbsubtitle\n");
-
-    if (*pid == 0xffff)
-        container_ffmpeg_update_tracks(context, context->playback->uri, 0);
-
-    playback_printf(10, "exiting with value %d\n", ret);
-
-    return ret;
-}
-
-static int32_t PlaybackSwitchTeletext(Context_t  *context, int* pid) {
-    int ret = cERR_PLAYBACK_NO_ERROR;
-
-    playback_printf(10, "Track: %d\n", *pid);
-
-    if (context && context->manager && context->manager->teletext ) {
-        if (context->manager->teletext->Command(context, *pid == 0xffff ? MANAGER_DEL : MANAGER_SET, pid)) {
-                playback_err("ttxsub manager set track failed\n");
-                ret = cERR_PLAYBACK_ERROR;
-        }
-    } else
-        playback_err("no ttxsubtitle\n");
-
-    if (*pid == 0xffff)
-        container_ffmpeg_update_tracks(context, context->playback->uri, 0);
 
     playback_printf(10, "exiting with value %d\n", ret);
@@ -904 +680 @@
             break;
         }
-        case PLAYBACK_SWITCH_DVBSUBTITLE: 
-        {
-            ret = PlaybackSwitchDVBSubtitle(context, (int*)argument);
-            break;
-        }
-        case PLAYBACK_SWITCH_TELETEXT: 
-        {
-            ret = PlaybackSwitchTeletext(context, (int*)argument);
-            break;
-        }
         case PLAYBACK_INFO: 
         {
@@ -919 +685 @@
             break;
         }
-            case PLAYBACK_SLOWMOTION:
-            {
-                ret = PlaybackSlowMotion(context,(int*)argument);
-                break;
-            }
-            case PLAYBACK_FASTBACKWARD:
-            {
-                ret = PlaybackFastBackward(context,(int*)argument);
-                break;
-            }
-            case PLAYBACK_FASTFORWARD:
-            {
-                ret = PlaybackFastForward(context,(int*)argument);
-                break;
-            }
         case PLAYBACK_GET_FRAME_COUNT: 
         { 
@@ -939 +690 @@
             break;
         }
-            case PLAYBACK_FRAMEBUFFER_LOCK:
-            {
-                context->playback->mayWriteToFramebuffer = 0;
-                ret = cERR_PLAYBACK_NO_ERROR;
-                        break;
-            }
-            case PLAYBACK_FRAMEBUFFER_UNLOCK:
-            {
-                context->playback->mayWriteToFramebuffer = 1;
-                ret = cERR_PLAYBACK_NO_ERROR;
-                        break;
-                }
         default:
-        {
             playback_err("PlaybackCmd %d not supported!\n", command);
             ret = cERR_PLAYBACK_ERROR;
             break;
-                }
     }
 
@@ -984 +721 @@
     0,          //isAudio
     0,          //isSubtitle
-    0,          //isDvbSubtitle
-    0,          //isTeletext
-    1,                  //mayWriteToFramebuffer
     0,          //abortRequested
     &Command,   //Command

titan/titan/player.h

@@ -26 +26 @@
 extern ContainerHandler_t ContainerHandler; 
 extern ManagerHandler_t ManagerHandler;
+
 #ifdef BETA
 #include <stdlib.h>
@@ -58 +59 @@
 extern void insert_pcm_as_lpcm_set(int32_t val);
 extern void progressive_download_set(int32_t val);
+extern void progressive_playback_set(int32_t val);
 
 static void SetBuffering()
@@ -1204 +1206 @@
                         player->container->Command(player, CONTAINER_ADD, "mp3");
 //#endif
+
                 if(player && player->container && player->container->selectedContainer)
                 {
@@ -1210 +1213 @@
                         int32_t seektime = getconfigint("playerbufferseektime", NULL);
 #else
-                        int size = getconfigint("playerbuffersize", NULL);
-                        int seektime = getconfigint("playerbufferseektime", NULL);
+                        int32_t* size = (int32_t*)getconfigint("playerbuffersize", NULL);
+                        int32_t* seektime = (int32_t*)getconfigint("playerbufferseektime", NULL);
+
+                        progressive_playback_set(1);
+//                      container_set_ffmpeg_buf_size(size);
 #endif
 
@@ -1223 +1229 @@
             prctl(PR_SET_PDEATHSIG, SIGKILL);
 
-//          SetBuffering();
+            SetBuffering();
 #endif
                 //Registrating output devices