comparison gif.c @ 790:80aec794c2ed libavformat

Animated GIF looping patch by (Todd Kirby // ffmpeg.php gmail com)

789:411b75055a43

#include "bitstream.h"

/* bitstream minipacket size */
#define GIF_CHUNKS 100

/* slows down the decoding (and some browsers doesn't like it) */
/* #define GIF_ADD_APP_HEADER */

typedef struct {
    unsigned char r;
    unsigned char g;
    unsigned char b;

/* !RevPutBitContext */

/* GIF header */
static int gif_image_write_header(ByteIOContext *pb, 
                                  int width, int height, uint32_t *palette)
{
    int i;
    unsigned int v;

    put_tag(pb, "GIF");

            put_byte(pb, (v >> 8) & 0xff);
            put_byte(pb, (v) & 0xff);
        }
    }

    /* application extension header */
    /* XXX: not really sure what to put in here... */
#ifdef GIF_ADD_APP_HEADER
    put_byte(pb, 0x21);
    put_byte(pb, 0xff);
    put_byte(pb, 0x0b);
    put_tag(pb, "NETSCAPE2.0");
    put_byte(pb, 0x03);
    put_byte(pb, 0x01);
    put_byte(pb, 0x00);
    put_byte(pb, 0x00);
#endif
    return 0;
}

/* this is maybe slow, but allows for extensions */

static int gif_write_header(AVFormatContext *s)
{
    GIFContext *gif = s->priv_data;
    ByteIOContext *pb = &s->pb;
    AVCodecContext *enc, *video_enc;
    int i, width, height/*, rate*/;

/* XXX: do we reject audio streams or just ignore them ?
    if(s->nb_streams > 1)
        return -1;
*/

        av_free(gif);
        return -1;
    } else {
        width = video_enc->width;
        height = video_enc->height;
//        rate = video_enc->time_base.den;
    }

    /* XXX: is it allowed ? seems to work so far... */
    video_enc->pix_fmt = PIX_FMT_RGB24;

    gif_image_write_header(pb, width, height, NULL);

    put_flush_packet(&s->pb);
    return 0;
}

}

/* better than nothing gif image writer */
int gif_write(ByteIOContext *pb, AVImageInfo *info)
{
    gif_image_write_header(pb, info->width, info->height, 
                           (uint32_t *)info->pict.data[1]);
    gif_image_write_image(pb, 0, 0, info->width, info->height, 
                          info->pict.data[0], info->pict.linesize[0], 
                          PIX_FMT_PAL8);
    put_byte(pb, 0x3b);

790:80aec794c2ed

#include "bitstream.h"

/* bitstream minipacket size */
#define GIF_CHUNKS 100

/* slows down the decoding (and some browsers don't like it) */
/* update on the 'some browsers don't like it issue from above: this was probably due to missing 'Data Sub-block Terminator' (byte 19) in the app_header */
#define GIF_ADD_APP_HEADER // required to enable looping of animated gif

typedef struct {
    unsigned char r;
    unsigned char g;
    unsigned char b;

/* !RevPutBitContext */

/* GIF header */
static int gif_image_write_header(ByteIOContext *pb, 
                                  int width, int height, int loop_count,
                                  uint32_t *palette)
{
    int i;
    unsigned int v;

    put_tag(pb, "GIF");

            put_byte(pb, (v >> 8) & 0xff);
            put_byte(pb, (v) & 0xff);
        }
    }

	/*	update: this is the 'NETSCAPE EXTENSION' that allows for looped animated gif
		see http://members.aol.com/royalef/gifabout.htm#net-extension

		byte   1       : 33 (hex 0x21) GIF Extension code
		byte   2       : 255 (hex 0xFF) Application Extension Label
		byte   3       : 11 (hex (0x0B) Length of Application Block 
					 (eleven bytes of data to follow)
		bytes  4 to 11 : "NETSCAPE"
		bytes 12 to 14 : "2.0"
		byte  15       : 3 (hex 0x03) Length of Data Sub-Block 
					 (three bytes of data to follow)
		byte  16       : 1 (hex 0x01)
		bytes 17 to 18 : 0 to 65535, an unsigned integer in 
					 lo-hi byte format. This indicate the 
					 number of iterations the loop should 
					 be executed.
		bytes 19       : 0 (hex 0x00) a Data Sub-block Terminator
	*/

    /* application extension header */
#ifdef GIF_ADD_APP_HEADER
    if (loop_count >= 0 && loop_count <= 65535) {
    put_byte(pb, 0x21);
    put_byte(pb, 0xff);
    put_byte(pb, 0x0b);
        put_tag(pb, "NETSCAPE2.0");  // bytes 4 to 14
        put_byte(pb, 0x03); // byte 15
        put_byte(pb, 0x01); // byte 16
        put_le16(pb, (uint16_t)loop_count);
        put_byte(pb, 0x00); // byte 19
    }
#endif
    return 0;
}

/* this is maybe slow, but allows for extensions */

static int gif_write_header(AVFormatContext *s)
{
    GIFContext *gif = s->priv_data;
    ByteIOContext *pb = &s->pb;
    AVCodecContext *enc, *video_enc;
    int i, width, height, loop_count /*, rate*/;

/* XXX: do we reject audio streams or just ignore them ?
    if(s->nb_streams > 1)
        return -1;
*/

        av_free(gif);
        return -1;
    } else {
        width = video_enc->width;
        height = video_enc->height;
        loop_count = s->loop_output;
//        rate = video_enc->time_base.den;
    }

    /* XXX: is it allowed ? seems to work so far... */
    video_enc->pix_fmt = PIX_FMT_RGB24;

    gif_image_write_header(pb, width, height, loop_count, NULL);

    put_flush_packet(&s->pb);
    return 0;
}

}

/* better than nothing gif image writer */
int gif_write(ByteIOContext *pb, AVImageInfo *info)
{
    gif_image_write_header(pb, info->width, info->height, AVFMT_NOOUTPUTLOOP, 
                           (uint32_t *)info->pict.data[1]);
    gif_image_write_image(pb, 0, 0, info->width, info->height, 
                          info->pict.data[0], info->pict.linesize[0], 
                          PIX_FMT_PAL8);
    put_byte(pb, 0x3b);