comparison libmpdemux/demux_gif.c @ 9344:bd7b5078475e

1) codecs.conf changed recently and demux_gif no longer needs to spit out BGR8 upside-down. the workaround for this is removed. 2) fixes a bug so that streaming gifs now works, and removes a workaround no longer needed. now libgif uses mplayer's stream_read function and thus http streaming, etc, works with demux_gif. 3) cosmetic clean-up because i no longer plan to support certain GIF extensions that would be more difficult to implement. patch by Joey Parrish <[e-mail]>

9343:5ac2ce9c0462

static int current_pts = 0;
static unsigned char *pallete = NULL;

#define GIF_SIGNATURE (('G' << 16) | ('I' << 8) | 'F')

int gif_check_file(demuxer_t *demuxer)
{
  stream_reset(demuxer->stream);
  stream_seek(demuxer->stream, 0);
  if (stream_read_int24(demuxer->stream) == GIF_SIGNATURE)
    return 1;
  return 0;
}

            PrintGifError();
            return 0; // oops
          }
	}
	printf("\n");
      // FIXME  support these:
      } else if (code == 0x01) { // plaintext extension
      } else if (code == 0xFF) { // application extension
      }
      while (p != NULL) {
        if (DGifGetExtensionNext(gif, &p) == GIF_ERROR) {
          PrintGifError();
          return 0; // oops

	pallete[(y * 4) + 3] = 0;
    }

    for (y = 0; y < gif->Image.Height; y++) {
      unsigned char *drow = dp->buffer;
      int x = gif->Image.Height - y - 1; // BGR8 is flipped
      unsigned char *gbuf = buf + (x * gif->Image.Width);

      drow += gif->Image.Width * (y + gif->Image.Top);
      drow += gif->Image.Left;

      memcpy(drow, gbuf, gif->Image.Width);

  current_pts = 0;
  demuxer->seekable = 0; // FIXME

  // go back to the beginning
  stream_reset(demuxer->stream);
  stream_seek(demuxer->stream, 0);
  lseek(demuxer->stream->fd, 0, SEEK_SET);

  gif = DGifOpenFileHandle(demuxer->stream->fd);
  if (!gif) {
    PrintGifError();
    return NULL;
  }

9344:bd7b5078475e

static int current_pts = 0;
static unsigned char *pallete = NULL;

#define GIF_SIGNATURE (('G' << 16) | ('I' << 8) | 'F')

int my_read_gif(GifFileType *gif, uint8_t *buf, int len) {
  return stream_read(gif->UserData, buf, len);
}
  
int gif_check_file(demuxer_t *demuxer)
{
  if (stream_read_int24(demuxer->stream) == GIF_SIGNATURE)
    return 1;
  return 0;
}

            PrintGifError();
            return 0; // oops
          }
	}
	printf("\n");
      }
      while (p != NULL) {
        if (DGifGetExtensionNext(gif, &p) == GIF_ERROR) {
          PrintGifError();
          return 0; // oops

	pallete[(y * 4) + 3] = 0;
    }

    for (y = 0; y < gif->Image.Height; y++) {
      unsigned char *drow = dp->buffer;
      unsigned char *gbuf = buf + (y * gif->Image.Width);

      drow += gif->Image.Width * (y + gif->Image.Top);
      drow += gif->Image.Left;

      memcpy(drow, gbuf, gif->Image.Width);

  current_pts = 0;
  demuxer->seekable = 0; // FIXME

  // go back to the beginning
  stream_seek(stream,stream->start_pos);

  gif = DGifOpen(demuxer->stream, my_read_gif);
  if (!gif) {
    PrintGifError();
    return NULL;
  }