comparison src/aac/libmp4.c @ 2997:73ae33c89dc6

Patch from John Lindgren <[e-mail]> to support seeking whilst paused, Debian bug #517692.

2996:b7c181d0b325

static Mp4Config mp4cfg;
static GThread   *decodeThread;
GStaticMutex     mutex = G_STATIC_MUTEX_INIT;
static int       seekPosition = -1;

void getMP4info(char*);
int getAACTrack(mp4ff_t *);

static guint32 mp4_read_callback(void *data, void *buffer, guint32 len)

static void mp4_init(void)
{
    mp4cfg.file_type = FILE_UNKNOWN;
    seekPosition = -1;
    return;
}

static void mp4_play(InputPlayback *playback)
{

    g_free(about_text);
}

static void mp4_pause(InputPlayback *playback, short flag)
{
    playback->output->pause(flag);
}

static void mp4_seek(InputPlayback *data, int time)
{
    seekPosition = time;

        /* Seek if seek position has changed */
        if ( seekPosition!=-1 ) {
            sampleID =  (float)seekPosition*(float)samplerate/(float)(framesize - 1.0);
            playback->output->flush(seekPosition*1000);
            seekPosition = -1;
        }

        /* Otherwise continue playing */
        buffer=NULL;
        bufferSize=0;

2997:73ae33c89dc6

static Mp4Config mp4cfg;
static GThread   *decodeThread;
GStaticMutex     mutex = G_STATIC_MUTEX_INIT;
static int       seekPosition = -1;
static volatile char pause_flag;

void getMP4info(char*);
int getAACTrack(mp4ff_t *);

static guint32 mp4_read_callback(void *data, void *buffer, guint32 len)

static void mp4_init(void)
{
    mp4cfg.file_type = FILE_UNKNOWN;
    seekPosition = -1;
    pause_flag = 0;
    return;
}

static void mp4_play(InputPlayback *playback)
{

    g_free(about_text);
}

static void mp4_pause(InputPlayback *playback, short flag)
{
   pause_flag = flag;
}

static void mp4_seek(InputPlayback *data, int time)
{
    seekPosition = time;

        /* Seek if seek position has changed */
        if ( seekPosition!=-1 ) {
            sampleID =  (float)seekPosition*(float)samplerate/(float)(framesize - 1.0);
            playback->output->flush(seekPosition*1000);
            seekPosition = -1;
        }

        if (pause_flag) {
           playback->output->pause (1);
           while (pause_flag) {
              if (seekPosition != -1) {
                 playback->output->flush (seekPosition * 1000);
                 sampleID = (long long) seekPosition * samplerate / (framesize - 1);
                 seekPosition = -1;
              }
              g_usleep(50000);
           }
           playback->output->pause (0);
        }

        /* Otherwise continue playing */
        buffer=NULL;
        bufferSize=0;