comparison libmpdemux/demux_film.c @ 5143:3958674b696b

added proper PTS support for FILM demuxer

5142:7fc559dbc607

// chunk types found in a FILM file
#define CHUNK_FILM mmioFOURCC('F', 'I', 'L', 'M')
#define CHUNK_FDSC mmioFOURCC('F', 'D', 'S', 'C')
#define CHUNK_STAB mmioFOURCC('S', 'T', 'A', 'B')

#define VERSION_1_01 mmioFOURCC('1', '.', '0', '1')

#define MAGIC_FPS_CONSTANT 27

typedef struct _film_chunk_t
{
  off_t chunk_offset;
  int chunk_size;

  unsigned int flags1;
  unsigned int flags2;

  unsigned int video_chunk_number;  // in the case of a video chunk
  unsigned int running_audio_sample_count;  // for an audio chunk
} film_chunk_t;

  // position stream and fetch chunk
  stream_seek(demuxer->stream, film_chunk.chunk_offset);

  // load the chunks manually (instead of using ds_read_packet()), since
  // they require some adjustment
  // (all ones in flags1 indicates an audio chunk)
  if (film_chunk.flags1 == 0xFFFFFFFF)
  {
    demux_packet_t* dp=new_demux_packet(film_chunk.chunk_size);
    stream_read(demuxer->stream, dp->buffer, film_chunk.chunk_size);
    dp->pts = 0;
    dp->pos = film_chunk.chunk_offset;

    ds_add_packet(demuxer->audio, dp);
    film_data->current_chunk++;
  }
  else
  {
    // check the tick to see if it's time to dispatch a new frame
    if ((film_data->film_version == VERSION_1_01) &&
        ((film_chunk.flags1 & 0x7FFFFFFF) != film_data->ticks++))
    {
      demux_packet_t* dp=new_demux_packet(0);
      dp->pts = 0;
      dp->pos = 0;
      dp->flags = 0;
      ds_add_packet(demuxer->video, dp);
    }
    // if the demuxer is dealing with CVID data, deal with it a special way
    else if (sh_video->format == mmioFOURCC('c', 'v', 'i', 'd'))
    {
      // account for 2 extra bytes
      demux_packet_t* dp=new_demux_packet(film_chunk.chunk_size - 2);

      // these CVID data chunks appear to have 2 extra bytes; skip them
      stream_read(demuxer->stream, dp->buffer, 10);
      stream_skip(demuxer->stream, 2);
      stream_read(demuxer->stream, dp->buffer + 10, film_chunk.chunk_size - 12);
      dp->pts = film_chunk.video_chunk_number / sh_video->fps;
      dp->pos = film_chunk.chunk_offset;
      dp->flags = (film_chunk.flags1 & 0x80000000) ? 1 : 0;

      // fix the CVID chunk size by adding 6
      cvid_size = (dp->buffer[1] << 16) | (dp->buffer[2] << 8) | dp->buffer[3];
      cvid_size += 6;
      dp->buffer[1] = (cvid_size >> 16) & 0xFF;

      film_data->current_chunk++;
    }
    else
    {
      ds_read_packet(demuxer->video, demuxer->stream, film_chunk.chunk_size,
        film_chunk.video_chunk_number / sh_video->fps,  /* pts */
        film_chunk.chunk_offset, (film_chunk.flags1 & 0x80000000) ? 1 : 0);
      film_data->current_chunk++;
    }
  }

  return 1;

      // FPS hack based on empirical observation
      if (sh_video)
      {
        sh_video->fps = stream_read_dword(demuxer->stream);
        if (film_data->film_version != VERSION_1_01)
          sh_video->fps = MAGIC_FPS_CONSTANT;
        sh_video->frametime = 1 / sh_video->fps;
      }

      // fetch the number of chunks
      film_data->total_chunks = stream_read_dword(demuxer->stream);
      film_data->current_chunk = 0;

      {
        film_chunk = film_data->chunks[i];
        film_chunk.chunk_offset = 
          demuxer->movi_start + stream_read_dword(demuxer->stream);
        film_chunk.chunk_size = stream_read_dword(demuxer->stream);
        film_chunk.flags1 = stream_read_dword(demuxer->stream);
        film_chunk.flags2 = stream_read_dword(demuxer->stream);
        film_data->chunks[i] = film_chunk;

        // audio housekeeping
        if (sh_audio)
        {
          if ((film_chunk.flags1 == 0xFFFFFFFF) && 
            (film_chunk.chunk_size > largest_audio_chunk))
            largest_audio_chunk = film_chunk.chunk_size;
          film_data->total_audio_sample_count +=
            (chunk_size / sh_audio->wf->nChannels);
        }

        // video housekeeping
        if (sh_video)
        {
          if (film_chunk.flags1 != 0xFFFFFFFF)
            film_chunk.video_chunk_number =
              film_data->total_video_chunks++;
        }
      }
      break;

5143:3958674b696b

// chunk types found in a FILM file
#define CHUNK_FILM mmioFOURCC('F', 'I', 'L', 'M')
#define CHUNK_FDSC mmioFOURCC('F', 'D', 'S', 'C')
#define CHUNK_STAB mmioFOURCC('S', 'T', 'A', 'B')

typedef struct _film_chunk_t
{
  off_t chunk_offset;
  int chunk_size;

  unsigned int syncinfo1;
  unsigned int syncinfo2;

  unsigned int video_chunk_number;  // in the case of a video chunk
  unsigned int running_audio_sample_count;  // for an audio chunk
} film_chunk_t;

  // position stream and fetch chunk
  stream_seek(demuxer->stream, film_chunk.chunk_offset);

  // load the chunks manually (instead of using ds_read_packet()), since
  // they require some adjustment
  // (all ones in syncinfo1 indicates an audio chunk)
  if (film_chunk.syncinfo1 == 0xFFFFFFFF)
  {
    demux_packet_t* dp=new_demux_packet(film_chunk.chunk_size);
    stream_read(demuxer->stream, dp->buffer, film_chunk.chunk_size);
    dp->pts = 0;
    dp->pos = film_chunk.chunk_offset;

    ds_add_packet(demuxer->audio, dp);
    film_data->current_chunk++;
  }
  else
  {
    // if the demuxer is dealing with CVID data, deal with it a special way
    if (sh_video->format == mmioFOURCC('c', 'v', 'i', 'd'))
    {
      // account for 2 extra bytes
      demux_packet_t* dp=new_demux_packet(film_chunk.chunk_size - 2);

      // these CVID data chunks appear to have 2 extra bytes; skip them
      stream_read(demuxer->stream, dp->buffer, 10);
      stream_skip(demuxer->stream, 2);
      stream_read(demuxer->stream, dp->buffer + 10, film_chunk.chunk_size - 12);
      dp->pts = (film_chunk.syncinfo1 & 0x7FFFFFFF) / sh_video->fps;
      dp->pos = film_chunk.chunk_offset;
      dp->flags = (film_chunk.syncinfo1 & 0x80000000) ? 1 : 0;

      // fix the CVID chunk size by adding 6
      cvid_size = (dp->buffer[1] << 16) | (dp->buffer[2] << 8) | dp->buffer[3];
      cvid_size += 6;
      dp->buffer[1] = (cvid_size >> 16) & 0xFF;

      film_data->current_chunk++;
    }
    else
    {
      ds_read_packet(demuxer->video, demuxer->stream, film_chunk.chunk_size,
        (film_chunk.syncinfo1 & 0x7FFFFFFF) / sh_video->fps,
        film_chunk.chunk_offset, (film_chunk.syncinfo1 & 0x80000000) ? 1 : 0);
      film_data->current_chunk++;
    }
  }

  return 1;

      // FPS hack based on empirical observation
      if (sh_video)
      {
        sh_video->fps = stream_read_dword(demuxer->stream);
//        if (film_data->film_version != VERSION_1_01)
//          sh_video->fps = MAGIC_FPS_CONSTANT;
        sh_video->frametime = 1.0 / sh_video->fps;
      }

      // fetch the number of chunks
      film_data->total_chunks = stream_read_dword(demuxer->stream);
      film_data->current_chunk = 0;

      {
        film_chunk = film_data->chunks[i];
        film_chunk.chunk_offset = 
          demuxer->movi_start + stream_read_dword(demuxer->stream);
        film_chunk.chunk_size = stream_read_dword(demuxer->stream);
        film_chunk.syncinfo1 = stream_read_dword(demuxer->stream);
        film_chunk.syncinfo2 = stream_read_dword(demuxer->stream);
        film_data->chunks[i] = film_chunk;

        // audio housekeeping
        if (sh_audio)
        {
          if ((film_chunk.syncinfo1 == 0xFFFFFFFF) && 
            (film_chunk.chunk_size > largest_audio_chunk))
            largest_audio_chunk = film_chunk.chunk_size;
          film_data->total_audio_sample_count +=
            (chunk_size / sh_audio->wf->nChannels);
        }

        // video housekeeping
        if (sh_video)
        {
          if (film_chunk.syncinfo1 != 0xFFFFFFFF)
            film_chunk.video_chunk_number =
              film_data->total_video_chunks++;
        }
      }
      break;