Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
83044 Commits
37 Branches
400 Tags
465 MiB
Tag: Branch: Tree: eaff1aa09e
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'eaff1aa09e'
${ noResults }
FFmpeg/libavformat/gifdec.c

347 lines
10 KiB
Raw Normal View History Unescape

Gif demuxer Gif demuxer is capable of extracting multiple frames from gif file. In conjunction with gif decoder it implements support for reading animated gifs. Demuxer has two options available to user: default_delay and min_delay. These options are for protection from too rapid gif animations. In practice it is standard approach to slow down rendering of this kind of gifs. If you try to play gif with delay between frames of one hundredth of second (100fps) using one of major web browsers, you get significantly slower playback, around 10 fps. This is because browser detects that delay value is less than some threshold (usually 2 hundredths of second) and reset it to default value (usually 10 hundredths of second, which corresponds to 10fps). Manipulating these options user can achieve the same effect during conversion to some video format. Otherwise user can set them to not protect from rapid animations at all. The other case when these options necessary is for gif images encoded according to gif87a standard since prior to gif89a there was no delay information included in file. Bump lavf minor version. Signed-off-by: Vitaliy E Sugrobov <vsugrob@hotmail.com>
12 years ago
/*
* GIF demuxer
* Copyright (c) 2012 Vitaliy E Sugrobov
*
* This file is part of FFmpeg.
*
* FFmpeg is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* FFmpeg is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
/**
* @file
* GIF demuxer.
*/
#include "avformat.h"
#include "libavutil/intreadwrite.h"
#include "libavutil/opt.h"
#include "internal.h"
#include "libavcodec/gif.h"
typedef struct GIFDemuxContext {
const AVClass *class;
/**
* Time span in hundredths of second before
* the next frame should be drawn on screen.
*/
int delay;
/**
* Minimum allowed delay between frames in hundredths of
* second. Values below this threshold considered to be
* invalid and set to value of default_delay.
*/
int min_delay;
lavf/gif: Add an option max_gif_delay to limit the frame duration. Allows playback for the sample from ticket #4369 in less than 18 hours.
10 years ago
int max_delay;
Gif demuxer Gif demuxer is capable of extracting multiple frames from gif file. In conjunction with gif decoder it implements support for reading animated gifs. Demuxer has two options available to user: default_delay and min_delay. These options are for protection from too rapid gif animations. In practice it is standard approach to slow down rendering of this kind of gifs. If you try to play gif with delay between frames of one hundredth of second (100fps) using one of major web browsers, you get significantly slower playback, around 10 fps. This is because browser detects that delay value is less than some threshold (usually 2 hundredths of second) and reset it to default value (usually 10 hundredths of second, which corresponds to 10fps). Manipulating these options user can achieve the same effect during conversion to some video format. Otherwise user can set them to not protect from rapid animations at all. The other case when these options necessary is for gif images encoded according to gif87a standard since prior to gif89a there was no delay information included in file. Bump lavf minor version. Signed-off-by: Vitaliy E Sugrobov <vsugrob@hotmail.com>
12 years ago
int default_delay;
lavf/gifdec: add loop support. Loop is ignored by default.
12 years ago
/**
* loop options
*/
int total_iter;
int iter_count;
int ignore_loop;
avformat/gifdec: correct r_frame_rate for single frame gifs Fixes Ticket4650 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
int nb_frames;
int last_duration;
Gif demuxer Gif demuxer is capable of extracting multiple frames from gif file. In conjunction with gif decoder it implements support for reading animated gifs. Demuxer has two options available to user: default_delay and min_delay. These options are for protection from too rapid gif animations. In practice it is standard approach to slow down rendering of this kind of gifs. If you try to play gif with delay between frames of one hundredth of second (100fps) using one of major web browsers, you get significantly slower playback, around 10 fps. This is because browser detects that delay value is less than some threshold (usually 2 hundredths of second) and reset it to default value (usually 10 hundredths of second, which corresponds to 10fps). Manipulating these options user can achieve the same effect during conversion to some video format. Otherwise user can set them to not protect from rapid animations at all. The other case when these options necessary is for gif images encoded according to gif87a standard since prior to gif89a there was no delay information included in file. Bump lavf minor version. Signed-off-by: Vitaliy E Sugrobov <vsugrob@hotmail.com>
12 years ago
} GIFDemuxContext;
/**
* Major web browsers display gifs at ~10-15fps when rate
* is not explicitly set or have too low values. We assume default rate to be 10.
* Default delay = 100hundredths of second / 10fps = 10hos per frame.
*/
#define GIF_DEFAULT_DELAY 10
/**
* By default delay values less than this threshold considered to be invalid.
*/
#define GIF_MIN_DELAY 2
static int gif_probe(AVProbeData *p)
{
/* check magick */
if (memcmp(p->buf, gif87a_sig, 6) && memcmp(p->buf, gif89a_sig, 6))
return 0;
/* width or height contains zero? */
if (!AV_RL16(&p->buf[6]) || !AV_RL16(&p->buf[8]))
return 0;
return AVPROBE_SCORE_MAX;
}
gifdec: resync support This allows decoding gifs that have junk at the begin and also allows byte wise seeking Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
static int resync(AVIOContext *pb)
{
int i;
for (i = 0; i < 6; i++) {
int b = avio_r8(pb);
if (b != gif87a_sig[i] && b != gif89a_sig[i])
i = -(b != 'G');
replace calls to url_feof() with avio_feof() Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
if (avio_feof(pb))
gifdec: resync support This allows decoding gifs that have junk at the begin and also allows byte wise seeking Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
return AVERROR_EOF;
}
return 0;
}
Gif demuxer Gif demuxer is capable of extracting multiple frames from gif file. In conjunction with gif decoder it implements support for reading animated gifs. Demuxer has two options available to user: default_delay and min_delay. These options are for protection from too rapid gif animations. In practice it is standard approach to slow down rendering of this kind of gifs. If you try to play gif with delay between frames of one hundredth of second (100fps) using one of major web browsers, you get significantly slower playback, around 10 fps. This is because browser detects that delay value is less than some threshold (usually 2 hundredths of second) and reset it to default value (usually 10 hundredths of second, which corresponds to 10fps). Manipulating these options user can achieve the same effect during conversion to some video format. Otherwise user can set them to not protect from rapid animations at all. The other case when these options necessary is for gif images encoded according to gif87a standard since prior to gif89a there was no delay information included in file. Bump lavf minor version. Signed-off-by: Vitaliy E Sugrobov <vsugrob@hotmail.com>
12 years ago
static int gif_read_header(AVFormatContext *s)
{
GIFDemuxContext *gdc = s->priv_data;
AVIOContext *pb = s->pb;
AVStream *st;
gifdec: remove width and height from demuxer context Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years ago
int width, height, ret;
Gif demuxer Gif demuxer is capable of extracting multiple frames from gif file. In conjunction with gif decoder it implements support for reading animated gifs. Demuxer has two options available to user: default_delay and min_delay. These options are for protection from too rapid gif animations. In practice it is standard approach to slow down rendering of this kind of gifs. If you try to play gif with delay between frames of one hundredth of second (100fps) using one of major web browsers, you get significantly slower playback, around 10 fps. This is because browser detects that delay value is less than some threshold (usually 2 hundredths of second) and reset it to default value (usually 10 hundredths of second, which corresponds to 10fps). Manipulating these options user can achieve the same effect during conversion to some video format. Otherwise user can set them to not protect from rapid animations at all. The other case when these options necessary is for gif images encoded according to gif87a standard since prior to gif89a there was no delay information included in file. Bump lavf minor version. Signed-off-by: Vitaliy E Sugrobov <vsugrob@hotmail.com>
12 years ago
gifdec: resync support This allows decoding gifs that have junk at the begin and also allows byte wise seeking Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
if ((ret = resync(pb)) < 0)
Gif demuxer Gif demuxer is capable of extracting multiple frames from gif file. In conjunction with gif decoder it implements support for reading animated gifs. Demuxer has two options available to user: default_delay and min_delay. These options are for protection from too rapid gif animations. In practice it is standard approach to slow down rendering of this kind of gifs. If you try to play gif with delay between frames of one hundredth of second (100fps) using one of major web browsers, you get significantly slower playback, around 10 fps. This is because browser detects that delay value is less than some threshold (usually 2 hundredths of second) and reset it to default value (usually 10 hundredths of second, which corresponds to 10fps). Manipulating these options user can achieve the same effect during conversion to some video format. Otherwise user can set them to not protect from rapid animations at all. The other case when these options necessary is for gif images encoded according to gif87a standard since prior to gif89a there was no delay information included in file. Bump lavf minor version. Signed-off-by: Vitaliy E Sugrobov <vsugrob@hotmail.com>
12 years ago
return ret;
gdc->delay = gdc->default_delay;
gifdec: remove width and height from demuxer context Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years ago
width = avio_rl16(pb);
height = avio_rl16(pb);
Gif demuxer Gif demuxer is capable of extracting multiple frames from gif file. In conjunction with gif decoder it implements support for reading animated gifs. Demuxer has two options available to user: default_delay and min_delay. These options are for protection from too rapid gif animations. In practice it is standard approach to slow down rendering of this kind of gifs. If you try to play gif with delay between frames of one hundredth of second (100fps) using one of major web browsers, you get significantly slower playback, around 10 fps. This is because browser detects that delay value is less than some threshold (usually 2 hundredths of second) and reset it to default value (usually 10 hundredths of second, which corresponds to 10fps). Manipulating these options user can achieve the same effect during conversion to some video format. Otherwise user can set them to not protect from rapid animations at all. The other case when these options necessary is for gif images encoded according to gif87a standard since prior to gif89a there was no delay information included in file. Bump lavf minor version. Signed-off-by: Vitaliy E Sugrobov <vsugrob@hotmail.com>
12 years ago
gifdec: remove width and height from demuxer context Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years ago
if (width == 0 || height == 0)
Gif demuxer Gif demuxer is capable of extracting multiple frames from gif file. In conjunction with gif decoder it implements support for reading animated gifs. Demuxer has two options available to user: default_delay and min_delay. These options are for protection from too rapid gif animations. In practice it is standard approach to slow down rendering of this kind of gifs. If you try to play gif with delay between frames of one hundredth of second (100fps) using one of major web browsers, you get significantly slower playback, around 10 fps. This is because browser detects that delay value is less than some threshold (usually 2 hundredths of second) and reset it to default value (usually 10 hundredths of second, which corresponds to 10fps). Manipulating these options user can achieve the same effect during conversion to some video format. Otherwise user can set them to not protect from rapid animations at all. The other case when these options necessary is for gif images encoded according to gif87a standard since prior to gif89a there was no delay information included in file. Bump lavf minor version. Signed-off-by: Vitaliy E Sugrobov <vsugrob@hotmail.com>
12 years ago
return AVERROR_INVALIDDATA;
st = avformat_new_stream(s, NULL);
if (!st)
return AVERROR(ENOMEM);
/* GIF format operates with time in "hundredths of second",
* therefore timebase is 1/100 */
avpriv_set_pts_info(st, 64, 1, 100);
Merge commit '9200514ad8717c63f82101dc394f4378854325bf' * commit '9200514ad8717c63f82101dc394f4378854325bf': lavf: replace AVStream.codec with AVStream.codecpar This has been a HUGE effort from: - Derek Buitenhuis <derek.buitenhuis@gmail.com> - Hendrik Leppkes <h.leppkes@gmail.com> - wm4 <nfxjfg@googlemail.com> - Clément Bœsch <clement@stupeflix.com> - James Almer <jamrial@gmail.com> - Michael Niedermayer <michael@niedermayer.cc> - Rostislav Pehlivanov <atomnuker@gmail.com> Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago
st->codecpar->codec_type = AVMEDIA_TYPE_VIDEO;
st->codecpar->codec_id = AV_CODEC_ID_GIF;
st->codecpar->width = width;
st->codecpar->height = height;
Gif demuxer Gif demuxer is capable of extracting multiple frames from gif file. In conjunction with gif decoder it implements support for reading animated gifs. Demuxer has two options available to user: default_delay and min_delay. These options are for protection from too rapid gif animations. In practice it is standard approach to slow down rendering of this kind of gifs. If you try to play gif with delay between frames of one hundredth of second (100fps) using one of major web browsers, you get significantly slower playback, around 10 fps. This is because browser detects that delay value is less than some threshold (usually 2 hundredths of second) and reset it to default value (usually 10 hundredths of second, which corresponds to 10fps). Manipulating these options user can achieve the same effect during conversion to some video format. Otherwise user can set them to not protect from rapid animations at all. The other case when these options necessary is for gif images encoded according to gif87a standard since prior to gif89a there was no delay information included in file. Bump lavf minor version. Signed-off-by: Vitaliy E Sugrobov <vsugrob@hotmail.com>
12 years ago
/* jump to start because gif decoder needs header data too */
if (avio_seek(pb, 0, SEEK_SET) != 0)
return AVERROR(EIO);
return 0;
}
static int gif_skip_subblocks(AVIOContext *pb)
{
int sb_size, ret = 0;
while (0x00 != (sb_size = avio_r8(pb))) {
if ((ret = avio_skip(pb, sb_size)) < 0)
return ret;
}
return ret;
}
static int gif_read_ext(AVFormatContext *s)
{
GIFDemuxContext *gdc = s->priv_data;
AVIOContext *pb = s->pb;
int sb_size, ext_label = avio_r8(pb);
int ret;
if (ext_label == GIF_GCE_EXT_LABEL) {
if ((sb_size = avio_r8(pb)) < 4) {
av_log(s, AV_LOG_FATAL, "Graphic Control Extension block's size less than 4.\n");
return AVERROR_INVALIDDATA;
}
/* skip packed fields */
if ((ret = avio_skip(pb, 1)) < 0)
return ret;
gdc->delay = avio_rl16(pb);
if (gdc->delay < gdc->min_delay)
gdc->delay = gdc->default_delay;
lavf/gif: Add an option max_gif_delay to limit the frame duration. Allows playback for the sample from ticket #4369 in less than 18 hours.
10 years ago
gdc->delay = FFMIN(gdc->delay, gdc->max_delay);
Gif demuxer Gif demuxer is capable of extracting multiple frames from gif file. In conjunction with gif decoder it implements support for reading animated gifs. Demuxer has two options available to user: default_delay and min_delay. These options are for protection from too rapid gif animations. In practice it is standard approach to slow down rendering of this kind of gifs. If you try to play gif with delay between frames of one hundredth of second (100fps) using one of major web browsers, you get significantly slower playback, around 10 fps. This is because browser detects that delay value is less than some threshold (usually 2 hundredths of second) and reset it to default value (usually 10 hundredths of second, which corresponds to 10fps). Manipulating these options user can achieve the same effect during conversion to some video format. Otherwise user can set them to not protect from rapid animations at all. The other case when these options necessary is for gif images encoded according to gif87a standard since prior to gif89a there was no delay information included in file. Bump lavf minor version. Signed-off-by: Vitaliy E Sugrobov <vsugrob@hotmail.com>
12 years ago
/* skip the rest of the Graphic Control Extension block */
if ((ret = avio_skip(pb, sb_size - 3)) < 0 )
return ret;
lavf/gifdec: add loop support. Loop is ignored by default.
12 years ago
} else if (ext_label == GIF_APP_EXT_LABEL) {
avformat/gifdec: make GIF_APP_EXT_LABEL parsing more robust Fixes Ticket3021 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
uint8_t data[256];
lavf/gifdec: add loop support. Loop is ignored by default.
12 years ago
avformat/gifdec: make GIF_APP_EXT_LABEL parsing more robust Fixes Ticket3021 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
sb_size = avio_r8(pb);
ret = avio_read(pb, data, sb_size);
if (ret < 0 || !sb_size)
lavf/gifdec: add loop support. Loop is ignored by default.
12 years ago
return ret;
avformat/gifdec: make GIF_APP_EXT_LABEL parsing more robust Fixes Ticket3021 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
if (sb_size == strlen(NETSCAPE_EXT_STR)) {
sb_size = avio_r8(pb);
ret = avio_read(pb, data, sb_size);
if (ret < 0 || !sb_size)
return ret;
if (sb_size == 3 && data[0] == 1) {
gdc->total_iter = AV_RL16(data+1);
if (gdc->total_iter == 0)
gdc->total_iter = -1;
}
}
Gif demuxer Gif demuxer is capable of extracting multiple frames from gif file. In conjunction with gif decoder it implements support for reading animated gifs. Demuxer has two options available to user: default_delay and min_delay. These options are for protection from too rapid gif animations. In practice it is standard approach to slow down rendering of this kind of gifs. If you try to play gif with delay between frames of one hundredth of second (100fps) using one of major web browsers, you get significantly slower playback, around 10 fps. This is because browser detects that delay value is less than some threshold (usually 2 hundredths of second) and reset it to default value (usually 10 hundredths of second, which corresponds to 10fps). Manipulating these options user can achieve the same effect during conversion to some video format. Otherwise user can set them to not protect from rapid animations at all. The other case when these options necessary is for gif images encoded according to gif87a standard since prior to gif89a there was no delay information included in file. Bump lavf minor version. Signed-off-by: Vitaliy E Sugrobov <vsugrob@hotmail.com>
12 years ago
}
if ((ret = gif_skip_subblocks(pb)) < 0)
return ret;
return 0;
}
static int gif_read_packet(AVFormatContext *s, AVPacket *pkt)
{
GIFDemuxContext *gdc = s->priv_data;
AVIOContext *pb = s->pb;
int packed_fields, block_label, ct_size,
keyframe, frame_parsed = 0, ret;
int64_t frame_start = avio_tell(pb), frame_end;
unsigned char buf[6];
if ((ret = avio_read(pb, buf, 6)) == 6) {
keyframe = memcmp(buf, gif87a_sig, 6) == 0 ||
memcmp(buf, gif89a_sig, 6) == 0;
} else if (ret < 0) {
return ret;
} else {
keyframe = 0;
}
if (keyframe) {
gifdec: resync support This allows decoding gifs that have junk at the begin and also allows byte wise seeking Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
parse_keyframe:
Gif demuxer Gif demuxer is capable of extracting multiple frames from gif file. In conjunction with gif decoder it implements support for reading animated gifs. Demuxer has two options available to user: default_delay and min_delay. These options are for protection from too rapid gif animations. In practice it is standard approach to slow down rendering of this kind of gifs. If you try to play gif with delay between frames of one hundredth of second (100fps) using one of major web browsers, you get significantly slower playback, around 10 fps. This is because browser detects that delay value is less than some threshold (usually 2 hundredths of second) and reset it to default value (usually 10 hundredths of second, which corresponds to 10fps). Manipulating these options user can achieve the same effect during conversion to some video format. Otherwise user can set them to not protect from rapid animations at all. The other case when these options necessary is for gif images encoded according to gif87a standard since prior to gif89a there was no delay information included in file. Bump lavf minor version. Signed-off-by: Vitaliy E Sugrobov <vsugrob@hotmail.com>
12 years ago
/* skip 2 bytes of width and 2 of height */
if ((ret = avio_skip(pb, 4)) < 0)
return ret;
packed_fields = avio_r8(pb);
/* skip 1 byte of Background Color Index and 1 byte of Pixel Aspect Ratio */
if ((ret = avio_skip(pb, 2)) < 0)
return ret;
lavf/gifdec: fix typo Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years ago
/* global color table presence */
Gif demuxer Gif demuxer is capable of extracting multiple frames from gif file. In conjunction with gif decoder it implements support for reading animated gifs. Demuxer has two options available to user: default_delay and min_delay. These options are for protection from too rapid gif animations. In practice it is standard approach to slow down rendering of this kind of gifs. If you try to play gif with delay between frames of one hundredth of second (100fps) using one of major web browsers, you get significantly slower playback, around 10 fps. This is because browser detects that delay value is less than some threshold (usually 2 hundredths of second) and reset it to default value (usually 10 hundredths of second, which corresponds to 10fps). Manipulating these options user can achieve the same effect during conversion to some video format. Otherwise user can set them to not protect from rapid animations at all. The other case when these options necessary is for gif images encoded according to gif87a standard since prior to gif89a there was no delay information included in file. Bump lavf minor version. Signed-off-by: Vitaliy E Sugrobov <vsugrob@hotmail.com>
12 years ago
if (packed_fields & 0x80) {
ct_size = 3 * (1 << ((packed_fields & 0x07) + 1));
if ((ret = avio_skip(pb, ct_size)) < 0)
return ret;
}
} else {
avio_seek(pb, -ret, SEEK_CUR);
ret = AVERROR_EOF;
}
replace calls to url_feof() with avio_feof() Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
while (GIF_TRAILER != (block_label = avio_r8(pb)) && !avio_feof(pb)) {
Gif demuxer Gif demuxer is capable of extracting multiple frames from gif file. In conjunction with gif decoder it implements support for reading animated gifs. Demuxer has two options available to user: default_delay and min_delay. These options are for protection from too rapid gif animations. In practice it is standard approach to slow down rendering of this kind of gifs. If you try to play gif with delay between frames of one hundredth of second (100fps) using one of major web browsers, you get significantly slower playback, around 10 fps. This is because browser detects that delay value is less than some threshold (usually 2 hundredths of second) and reset it to default value (usually 10 hundredths of second, which corresponds to 10fps). Manipulating these options user can achieve the same effect during conversion to some video format. Otherwise user can set them to not protect from rapid animations at all. The other case when these options necessary is for gif images encoded according to gif87a standard since prior to gif89a there was no delay information included in file. Bump lavf minor version. Signed-off-by: Vitaliy E Sugrobov <vsugrob@hotmail.com>
12 years ago
if (block_label == GIF_EXTENSION_INTRODUCER) {
if ((ret = gif_read_ext (s)) < 0 )
gifdec: resync support This allows decoding gifs that have junk at the begin and also allows byte wise seeking Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
goto resync;
Gif demuxer Gif demuxer is capable of extracting multiple frames from gif file. In conjunction with gif decoder it implements support for reading animated gifs. Demuxer has two options available to user: default_delay and min_delay. These options are for protection from too rapid gif animations. In practice it is standard approach to slow down rendering of this kind of gifs. If you try to play gif with delay between frames of one hundredth of second (100fps) using one of major web browsers, you get significantly slower playback, around 10 fps. This is because browser detects that delay value is less than some threshold (usually 2 hundredths of second) and reset it to default value (usually 10 hundredths of second, which corresponds to 10fps). Manipulating these options user can achieve the same effect during conversion to some video format. Otherwise user can set them to not protect from rapid animations at all. The other case when these options necessary is for gif images encoded according to gif87a standard since prior to gif89a there was no delay information included in file. Bump lavf minor version. Signed-off-by: Vitaliy E Sugrobov <vsugrob@hotmail.com>
12 years ago
} else if (block_label == GIF_IMAGE_SEPARATOR) {
/* skip to last byte of Image Descriptor header */
if ((ret = avio_skip(pb, 8)) < 0)
return ret;
packed_fields = avio_r8(pb);
/* local color table presence */
if (packed_fields & 0x80) {
ct_size = 3 * (1 << ((packed_fields & 0x07) + 1));
if ((ret = avio_skip(pb, ct_size)) < 0)
return ret;
}
/* read LZW Minimum Code Size */
if (avio_r8(pb) < 1) {
av_log(s, AV_LOG_ERROR, "lzw minimum code size must be >= 1\n");
gifdec: resync support This allows decoding gifs that have junk at the begin and also allows byte wise seeking Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
goto resync;
Gif demuxer Gif demuxer is capable of extracting multiple frames from gif file. In conjunction with gif decoder it implements support for reading animated gifs. Demuxer has two options available to user: default_delay and min_delay. These options are for protection from too rapid gif animations. In practice it is standard approach to slow down rendering of this kind of gifs. If you try to play gif with delay between frames of one hundredth of second (100fps) using one of major web browsers, you get significantly slower playback, around 10 fps. This is because browser detects that delay value is less than some threshold (usually 2 hundredths of second) and reset it to default value (usually 10 hundredths of second, which corresponds to 10fps). Manipulating these options user can achieve the same effect during conversion to some video format. Otherwise user can set them to not protect from rapid animations at all. The other case when these options necessary is for gif images encoded according to gif87a standard since prior to gif89a there was no delay information included in file. Bump lavf minor version. Signed-off-by: Vitaliy E Sugrobov <vsugrob@hotmail.com>
12 years ago
}
if ((ret = gif_skip_subblocks(pb)) < 0)
gifdec: resync support This allows decoding gifs that have junk at the begin and also allows byte wise seeking Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
goto resync;
Gif demuxer Gif demuxer is capable of extracting multiple frames from gif file. In conjunction with gif decoder it implements support for reading animated gifs. Demuxer has two options available to user: default_delay and min_delay. These options are for protection from too rapid gif animations. In practice it is standard approach to slow down rendering of this kind of gifs. If you try to play gif with delay between frames of one hundredth of second (100fps) using one of major web browsers, you get significantly slower playback, around 10 fps. This is because browser detects that delay value is less than some threshold (usually 2 hundredths of second) and reset it to default value (usually 10 hundredths of second, which corresponds to 10fps). Manipulating these options user can achieve the same effect during conversion to some video format. Otherwise user can set them to not protect from rapid animations at all. The other case when these options necessary is for gif images encoded according to gif87a standard since prior to gif89a there was no delay information included in file. Bump lavf minor version. Signed-off-by: Vitaliy E Sugrobov <vsugrob@hotmail.com>
12 years ago
frame_end = avio_tell(pb);
if (avio_seek(pb, frame_start, SEEK_SET) != frame_start)
return AVERROR(EIO);
ret = av_get_packet(pb, pkt, frame_end - frame_start);
if (ret < 0)
return ret;
if (keyframe)
pkt->flags |= AV_PKT_FLAG_KEY;
pkt->stream_index = 0;
pkt->duration = gdc->delay;
avformat/gifdec: correct r_frame_rate for single frame gifs Fixes Ticket4650 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
gdc->nb_frames ++;
gdc->last_duration = pkt->duration;
Gif demuxer Gif demuxer is capable of extracting multiple frames from gif file. In conjunction with gif decoder it implements support for reading animated gifs. Demuxer has two options available to user: default_delay and min_delay. These options are for protection from too rapid gif animations. In practice it is standard approach to slow down rendering of this kind of gifs. If you try to play gif with delay between frames of one hundredth of second (100fps) using one of major web browsers, you get significantly slower playback, around 10 fps. This is because browser detects that delay value is less than some threshold (usually 2 hundredths of second) and reset it to default value (usually 10 hundredths of second, which corresponds to 10fps). Manipulating these options user can achieve the same effect during conversion to some video format. Otherwise user can set them to not protect from rapid animations at all. The other case when these options necessary is for gif images encoded according to gif87a standard since prior to gif89a there was no delay information included in file. Bump lavf minor version. Signed-off-by: Vitaliy E Sugrobov <vsugrob@hotmail.com>
12 years ago
/* Graphic Control Extension's scope is single frame.
* Remove its influence. */
gdc->delay = gdc->default_delay;
frame_parsed = 1;
break;
} else {
av_log(s, AV_LOG_ERROR, "invalid block label\n");
gifdec: resync support This allows decoding gifs that have junk at the begin and also allows byte wise seeking Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
resync:
if (!keyframe)
avio_seek(pb, frame_start, SEEK_SET);
if ((ret = resync(pb)) < 0)
return ret;
frame_start = avio_tell(pb) - 6;
keyframe = 1;
goto parse_keyframe;
Gif demuxer Gif demuxer is capable of extracting multiple frames from gif file. In conjunction with gif decoder it implements support for reading animated gifs. Demuxer has two options available to user: default_delay and min_delay. These options are for protection from too rapid gif animations. In practice it is standard approach to slow down rendering of this kind of gifs. If you try to play gif with delay between frames of one hundredth of second (100fps) using one of major web browsers, you get significantly slower playback, around 10 fps. This is because browser detects that delay value is less than some threshold (usually 2 hundredths of second) and reset it to default value (usually 10 hundredths of second, which corresponds to 10fps). Manipulating these options user can achieve the same effect during conversion to some video format. Otherwise user can set them to not protect from rapid animations at all. The other case when these options necessary is for gif images encoded according to gif87a standard since prior to gif89a there was no delay information included in file. Bump lavf minor version. Signed-off-by: Vitaliy E Sugrobov <vsugrob@hotmail.com>
12 years ago
}
}
lavf/gifdec: add loop support. Loop is ignored by default.
12 years ago
if ((ret >= 0 && !frame_parsed) || ret == AVERROR_EOF) {
avformat/gifdec: correct r_frame_rate for single frame gifs Fixes Ticket4650 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
if (gdc->nb_frames == 1) {
s->streams[0]->r_frame_rate = (AVRational) {100, gdc->last_duration};
}
Gif demuxer Gif demuxer is capable of extracting multiple frames from gif file. In conjunction with gif decoder it implements support for reading animated gifs. Demuxer has two options available to user: default_delay and min_delay. These options are for protection from too rapid gif animations. In practice it is standard approach to slow down rendering of this kind of gifs. If you try to play gif with delay between frames of one hundredth of second (100fps) using one of major web browsers, you get significantly slower playback, around 10 fps. This is because browser detects that delay value is less than some threshold (usually 2 hundredths of second) and reset it to default value (usually 10 hundredths of second, which corresponds to 10fps). Manipulating these options user can achieve the same effect during conversion to some video format. Otherwise user can set them to not protect from rapid animations at all. The other case when these options necessary is for gif images encoded according to gif87a standard since prior to gif89a there was no delay information included in file. Bump lavf minor version. Signed-off-by: Vitaliy E Sugrobov <vsugrob@hotmail.com>
12 years ago
/* This might happen when there is no image block
* between extension blocks and GIF_TRAILER or EOF */
replace calls to url_feof() with avio_feof() Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
if (!gdc->ignore_loop && (block_label == GIF_TRAILER || avio_feof(pb))
lavf/gifdec: add loop support. Loop is ignored by default.
12 years ago
&& (gdc->total_iter < 0 || ++gdc->iter_count < gdc->total_iter))
return avio_seek(pb, 0, SEEK_SET);
lavf/gifdec: cosmetics: remove extra whitespace Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years ago
return AVERROR_EOF;
Gif demuxer Gif demuxer is capable of extracting multiple frames from gif file. In conjunction with gif decoder it implements support for reading animated gifs. Demuxer has two options available to user: default_delay and min_delay. These options are for protection from too rapid gif animations. In practice it is standard approach to slow down rendering of this kind of gifs. If you try to play gif with delay between frames of one hundredth of second (100fps) using one of major web browsers, you get significantly slower playback, around 10 fps. This is because browser detects that delay value is less than some threshold (usually 2 hundredths of second) and reset it to default value (usually 10 hundredths of second, which corresponds to 10fps). Manipulating these options user can achieve the same effect during conversion to some video format. Otherwise user can set them to not protect from rapid animations at all. The other case when these options necessary is for gif images encoded according to gif87a standard since prior to gif89a there was no delay information included in file. Bump lavf minor version. Signed-off-by: Vitaliy E Sugrobov <vsugrob@hotmail.com>
12 years ago
} else
return ret;
}
static const AVOption options[] = {
{ "min_delay" , "minimum valid delay between frames (in hundredths of second)", offsetof(GIFDemuxContext, min_delay) , AV_OPT_TYPE_INT, {.i64 = GIF_MIN_DELAY} , 0, 100 * 60, AV_OPT_FLAG_DECODING_PARAM },
lavf/gif: Add an option max_gif_delay to limit the frame duration. Allows playback for the sample from ticket #4369 in less than 18 hours.
10 years ago
{ "max_gif_delay", "maximum valid delay between frames (in hundredths of seconds)", offsetof(GIFDemuxContext, max_delay) , AV_OPT_TYPE_INT, {.i64 = 65535} , 0, 65535 , AV_OPT_FLAG_DECODING_PARAM },
Gif demuxer Gif demuxer is capable of extracting multiple frames from gif file. In conjunction with gif decoder it implements support for reading animated gifs. Demuxer has two options available to user: default_delay and min_delay. These options are for protection from too rapid gif animations. In practice it is standard approach to slow down rendering of this kind of gifs. If you try to play gif with delay between frames of one hundredth of second (100fps) using one of major web browsers, you get significantly slower playback, around 10 fps. This is because browser detects that delay value is less than some threshold (usually 2 hundredths of second) and reset it to default value (usually 10 hundredths of second, which corresponds to 10fps). Manipulating these options user can achieve the same effect during conversion to some video format. Otherwise user can set them to not protect from rapid animations at all. The other case when these options necessary is for gif images encoded according to gif87a standard since prior to gif89a there was no delay information included in file. Bump lavf minor version. Signed-off-by: Vitaliy E Sugrobov <vsugrob@hotmail.com>
12 years ago
{ "default_delay", "default delay between frames (in hundredths of second)" , offsetof(GIFDemuxContext, default_delay), AV_OPT_TYPE_INT, {.i64 = GIF_DEFAULT_DELAY}, 0, 100 * 60, AV_OPT_FLAG_DECODING_PARAM },
avformat: use AV_OPT_TYPE_BOOL in a bunch of places
9 years ago
{ "ignore_loop" , "ignore loop setting (netscape extension)" , offsetof(GIFDemuxContext, ignore_loop) , AV_OPT_TYPE_BOOL,{.i64 = 1} , 0, 1, AV_OPT_FLAG_DECODING_PARAM },
Gif demuxer Gif demuxer is capable of extracting multiple frames from gif file. In conjunction with gif decoder it implements support for reading animated gifs. Demuxer has two options available to user: default_delay and min_delay. These options are for protection from too rapid gif animations. In practice it is standard approach to slow down rendering of this kind of gifs. If you try to play gif with delay between frames of one hundredth of second (100fps) using one of major web browsers, you get significantly slower playback, around 10 fps. This is because browser detects that delay value is less than some threshold (usually 2 hundredths of second) and reset it to default value (usually 10 hundredths of second, which corresponds to 10fps). Manipulating these options user can achieve the same effect during conversion to some video format. Otherwise user can set them to not protect from rapid animations at all. The other case when these options necessary is for gif images encoded according to gif87a standard since prior to gif89a there was no delay information included in file. Bump lavf minor version. Signed-off-by: Vitaliy E Sugrobov <vsugrob@hotmail.com>
12 years ago
{ NULL },
};
static const AVClass demuxer_class = {
.class_name = "GIF demuxer",
.item_name = av_default_item_name,
.option = options,
.version = LIBAVUTIL_VERSION_INT,
.category = AV_CLASS_CATEGORY_DEMUXER,
};
AVInputFormat ff_gif_demuxer = {
.name = "gif",
.long_name = NULL_IF_CONFIG_SMALL("CompuServe Graphics Interchange Format (GIF)"),
.priv_data_size = sizeof(GIFDemuxContext),
.read_probe = gif_probe,
.read_header = gif_read_header,
.read_packet = gif_read_packet,
gifdec: rudimentary seeking With this ffplay -loop X successfully seeks to start. Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years ago
.flags = AVFMT_GENERIC_INDEX,
Gif demuxer Gif demuxer is capable of extracting multiple frames from gif file. In conjunction with gif decoder it implements support for reading animated gifs. Demuxer has two options available to user: default_delay and min_delay. These options are for protection from too rapid gif animations. In practice it is standard approach to slow down rendering of this kind of gifs. If you try to play gif with delay between frames of one hundredth of second (100fps) using one of major web browsers, you get significantly slower playback, around 10 fps. This is because browser detects that delay value is less than some threshold (usually 2 hundredths of second) and reset it to default value (usually 10 hundredths of second, which corresponds to 10fps). Manipulating these options user can achieve the same effect during conversion to some video format. Otherwise user can set them to not protect from rapid animations at all. The other case when these options necessary is for gif images encoded according to gif87a standard since prior to gif89a there was no delay information included in file. Bump lavf minor version. Signed-off-by: Vitaliy E Sugrobov <vsugrob@hotmail.com>
12 years ago
.priv_class = &demuxer_class,
};