summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/gif.c149
-rw-r--r--libavformat/img2.c16
-rw-r--r--libavformat/matroskadec.c2
-rw-r--r--libavformat/mov.c13
4 files changed, 97 insertions, 83 deletions
diff --git a/libavformat/gif.c b/libavformat/gif.c
index dc63af9778..9cc4c9a2f6 100644
--- a/libavformat/gif.c
+++ b/libavformat/gif.c
@@ -53,7 +53,9 @@
#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 */
+/* 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 {
@@ -65,8 +67,15 @@ typedef struct {
/* we use the standard 216 color palette */
/* this script was used to create the palette:
- * for r in 00 33 66 99 cc ff; do for g in 00 33 66 99 cc ff; do echo -n " "; for b in 00 33 66 99 cc ff; do
- * echo -n "{ 0x$r, 0x$g, 0x$b }, "; done; echo ""; done; done
+ * for r in 00 33 66 99 cc ff; do
+ * for g in 00 33 66 99 cc ff; do
+ * echo -n " "
+ * for b in 00 33 66 99 cc ff; do
+ * echo -n "{ 0x$r, 0x$g, 0x$b }, "
+ * done
+ * echo ""
+ * done
+ * done
*/
static const rgb_triplet gif_clut[216] = {
@@ -109,9 +118,8 @@ static const rgb_triplet gif_clut[216] = {
};
/* GIF header */
-static int gif_image_write_header(AVIOContext *pb,
- int width, int height, int loop_count,
- uint32_t *palette)
+static int gif_image_write_header(AVIOContext *pb, int width, int height,
+ int loop_count, uint32_t *palette)
{
int i;
unsigned int v;
@@ -127,44 +135,45 @@ static int gif_image_write_header(AVIOContext *pb,
/* the global palette */
if (!palette) {
- avio_write(pb, (const unsigned char *)gif_clut, 216*3);
- for(i=0;i<((256-216)*3);i++)
+ avio_write(pb, (const unsigned char *)gif_clut, 216 * 3);
+ for (i = 0; i < ((256 - 216) * 3); i++)
avio_w8(pb, 0);
} else {
- for(i=0;i<256;i++) {
+ for (i = 0; i < 256; i++) {
v = palette[i];
avio_w8(pb, (v >> 16) & 0xff);
- avio_w8(pb, (v >> 8) & 0xff);
- avio_w8(pb, (v) & 0xff);
+ avio_w8(pb, (v >> 8) & 0xff);
+ avio_w8(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
- */
+ /* 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) {
- avio_w8(pb, 0x21);
- avio_w8(pb, 0xff);
- avio_w8(pb, 0x0b);
- avio_write(pb, "NETSCAPE2.0", sizeof("NETSCAPE2.0") - 1); // bytes 4 to 14
+ avio_w8(pb, 0x21);
+ avio_w8(pb, 0xff);
+ avio_w8(pb, 0x0b);
+ // bytes 4 to 14
+ avio_write(pb, "NETSCAPE2.0", sizeof("NETSCAPE2.0") - 1);
avio_w8(pb, 0x03); // byte 15
avio_w8(pb, 0x01); // byte 16
avio_wl16(pb, (uint16_t)loop_count);
@@ -180,7 +189,6 @@ static inline unsigned char gif_clut_index(uint8_t r, uint8_t g, uint8_t b)
return (((r) / 47) % 6) * 6 * 6 + (((g) / 47) % 6) * 6 + (((b) / 47) % 6);
}
-
static int gif_image_write_image(AVIOContext *pb,
int x1, int y1, int width, int height,
const uint8_t *buf, int linesize, int pix_fmt)
@@ -201,45 +209,44 @@ static int gif_image_write_image(AVIOContext *pb,
avio_w8(pb, 0x08);
- left= width * height;
+ left = width * height;
init_put_bits(&p, buffer, 130);
/*
- * the thing here is the bitstream is written as little packets, with a size byte before
- * but it's still the same bitstream between packets (no flush !)
+ * the thing here is the bitstream is written as little packets, with a size
+ * byte before but it's still the same bitstream between packets (no flush !)
*/
ptr = buf;
- w = width;
- while(left>0) {
-
+ w = width;
+ while (left > 0) {
put_bits(&p, 9, 0x0100); /* clear code */
- for(i=(left<GIF_CHUNKS)?left:GIF_CHUNKS;i;i--) {
+ for (i = (left < GIF_CHUNKS) ? left : GIF_CHUNKS; i; i--) {
if (pix_fmt == PIX_FMT_RGB24) {
- v = gif_clut_index(ptr[0], ptr[1], ptr[2]);
- ptr+=3;
+ v = gif_clut_index(ptr[0], ptr[1], ptr[2]);
+ ptr += 3;
} else {
v = *ptr++;
}
put_bits(&p, 9, v);
if (--w == 0) {
- w = width;
+ w = width;
buf += linesize;
- ptr = buf;
+ ptr = buf;
}
}
- if(left<=GIF_CHUNKS) {
+ if (left <= GIF_CHUNKS) {
put_bits(&p, 9, 0x101); /* end of stream */
flush_put_bits(&p);
}
- if(put_bits_ptr(&p) - p.buf > 0) {
+ if (put_bits_ptr(&p) - p.buf > 0) {
avio_w8(pb, put_bits_ptr(&p) - p.buf); /* byte count of the packet */
avio_write(pb, p.buf, put_bits_ptr(&p) - p.buf); /* the actual buffer */
p.buf_ptr = p.buf; /* dequeue the bytes off the bitstream */
}
- left-=GIF_CHUNKS;
+ left -= GIF_CHUNKS;
}
avio_w8(pb, 0x00); /* end of image block */
@@ -261,14 +268,14 @@ static int gif_write_header(AVFormatContext *s)
int i, width, height /*, rate*/;
/* XXX: do we reject audio streams or just ignore them ?
- if(s->nb_streams > 1)
- return -1;
-*/
- gif->time = 0;
+ * if (s->nb_streams > 1)
+ * return -1;
+ */
+ gif->time = 0;
gif->file_time = 0;
video_enc = NULL;
- for(i=0;i<s->nb_streams;i++) {
+ for (i = 0; i < s->nb_streams; i++) {
enc = s->streams[i]->codec;
if (enc->codec_type != AVMEDIA_TYPE_AUDIO)
video_enc = enc;
@@ -278,13 +285,14 @@ static int gif_write_header(AVFormatContext *s)
av_free(gif);
return -1;
} else {
- width = video_enc->width;
+ width = video_enc->width;
height = video_enc->height;
// rate = video_enc->time_base.den;
}
if (video_enc->pix_fmt != PIX_FMT_RGB24) {
- av_log(s, AV_LOG_ERROR, "ERROR: gif only handles the rgb24 pixel format. Use -pix_fmt rgb24.\n");
+ av_log(s, AV_LOG_ERROR,
+ "ERROR: gif only handles the rgb24 pixel format. Use -pix_fmt rgb24.\n");
return AVERROR(EIO);
}
@@ -294,8 +302,8 @@ static int gif_write_header(AVFormatContext *s)
return 0;
}
-static int gif_write_video(AVFormatContext *s,
- AVCodecContext *enc, const uint8_t *buf, int size)
+static int gif_write_video(AVFormatContext *s, AVCodecContext *enc,
+ const uint8_t *buf, int size)
{
AVIOContext *pb = s->pb;
int jiffies;
@@ -311,7 +319,7 @@ static int gif_write_video(AVFormatContext *s,
/* XXX: should use delay, in order to be more accurate */
/* instead of using the same rounded value each time */
/* XXX: don't even remember if I really use it for now */
- jiffies = (70*enc->time_base.num/enc->time_base.den) - 1;
+ jiffies = (70 * enc->time_base.num / enc->time_base.den) - 1;
avio_wl16(pb, jiffies);
@@ -346,7 +354,8 @@ static int gif_write_trailer(AVFormatContext *s)
#define OFFSET(x) offsetof(GIFContext, x)
#define ENC AV_OPT_FLAG_ENCODING_PARAM
static const AVOption options[] = {
- { "loop", "Number of times to loop the output.", OFFSET(loop), AV_OPT_TYPE_INT, {0}, 0, 65535, ENC },
+ { "loop", "Number of times to loop the output.", OFFSET(loop),
+ AV_OPT_TYPE_INT, { 0 }, 0, 65535, ENC },
{ NULL },
};
@@ -358,15 +367,15 @@ static const AVClass gif_muxer_class = {
};
AVOutputFormat ff_gif_muxer = {
- .name = "gif",
- .long_name = NULL_IF_CONFIG_SMALL("GIF Animation"),
- .mime_type = "image/gif",
- .extensions = "gif",
- .priv_data_size = sizeof(GIFContext),
- .audio_codec = CODEC_ID_NONE,
- .video_codec = CODEC_ID_RAWVIDEO,
- .write_header = gif_write_header,
- .write_packet = gif_write_packet,
- .write_trailer = gif_write_trailer,
- .priv_class = &gif_muxer_class,
+ .name = "gif",
+ .long_name = NULL_IF_CONFIG_SMALL("GIF Animation"),
+ .mime_type = "image/gif",
+ .extensions = "gif",
+ .priv_data_size = sizeof(GIFContext),
+ .audio_codec = CODEC_ID_NONE,
+ .video_codec = CODEC_ID_RAWVIDEO,
+ .write_header = gif_write_header,
+ .write_packet = gif_write_packet,
+ .write_trailer = gif_write_trailer,
+ .priv_class = &gif_muxer_class,
};
diff --git a/libavformat/img2.c b/libavformat/img2.c
index 5776c0d1f5..f2af61ee0c 100644
--- a/libavformat/img2.c
+++ b/libavformat/img2.c
@@ -138,6 +138,11 @@ static enum CodecID av_str2id(const IdStrMap *tags, const char *str)
return CODEC_ID_NONE;
}
+enum CodecID ff_guess_image2_codec(const char *filename)
+{
+ return av_str2id(img_tags, filename);
+}
+
/* return -1 if no image found */
static int find_image_range(int *pfirst_index, int *plast_index,
const char *path)
@@ -194,7 +199,7 @@ static int find_image_range(int *pfirst_index, int *plast_index,
static int read_probe(AVProbeData *p)
{
- if (p->filename && av_str2id(img_tags, p->filename)) {
+ if (p->filename && ff_guess_image2_codec(p->filename)) {
if (av_filename_number_test(p->filename))
return AVPROBE_SCORE_MAX;
else
@@ -203,11 +208,6 @@ static int read_probe(AVProbeData *p)
return 0;
}
-enum CodecID ff_guess_image2_codec(const char *filename)
-{
- return av_str2id(img_tags, filename);
-}
-
static int read_header(AVFormatContext *s1)
{
VideoData *s = s1->priv_data;
@@ -277,7 +277,7 @@ static int read_header(AVFormatContext *s1)
const char *str= strrchr(s->path, '.');
s->split_planes = str && !av_strcasecmp(str + 1, "y");
st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
- st->codec->codec_id = av_str2id(img_tags, s->path);
+ st->codec->codec_id = ff_guess_image2_codec(s->path);
if (st->codec->codec_id == CODEC_ID_LJPEG)
st->codec->codec_id = CODEC_ID_MJPEG;
}
@@ -419,7 +419,7 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt)
avio_close(pb[1]);
avio_close(pb[2]);
}else{
- if(av_str2id(img_tags, s->filename) == CODEC_ID_JPEG2000){
+ if (ff_guess_image2_codec(s->filename) == CODEC_ID_JPEG2000) {
AVStream *st = s->streams[0];
if(st->codec->extradata_size > 8 &&
AV_RL32(st->codec->extradata+4) == MKTAG('j','p','2','h')){
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 636a407f07..26db82359e 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -542,7 +542,7 @@ static EbmlSyntax matroska_clusters[] = {
{ 0 }
};
-static const char *matroska_doctypes[] = { "matroska", "webm" };
+static const char *const matroska_doctypes[] = { "matroska", "webm" };
static int matroska_resync(MatroskaDemuxContext *matroska, int64_t last_pos)
{
diff --git a/libavformat/mov.c b/libavformat/mov.c
index c6680274d5..7d9248db59 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -2311,7 +2311,7 @@ static int mov_read_trun(MOVContext *c, AVIOContext *pb, MOVAtom atom)
int64_t dts;
int data_offset = 0;
unsigned entries, first_sample_flags = frag->flags;
- int flags, distance, i;
+ int flags, distance, i, found_keyframe = 0;
for (i = 0; i < c->fc->nb_streams; i++) {
if (c->fc->streams[i]->id == frag->track_id) {
@@ -2365,7 +2365,7 @@ static int mov_read_trun(MOVContext *c, AVIOContext *pb, MOVAtom atom)
unsigned sample_size = frag->size;
int sample_flags = i ? frag->flags : first_sample_flags;
unsigned sample_duration = frag->duration;
- int keyframe;
+ int keyframe = 0;
if (flags & MOV_TRUN_SAMPLE_DURATION) sample_duration = avio_rb32(pb);
if (flags & MOV_TRUN_SAMPLE_SIZE) sample_size = avio_rb32(pb);
@@ -2374,8 +2374,13 @@ static int mov_read_trun(MOVContext *c, AVIOContext *pb, MOVAtom atom)
sc->ctts_data[sc->ctts_count].duration = (flags & MOV_TRUN_SAMPLE_CTS) ?
avio_rb32(pb) : 0;
sc->ctts_count++;
- if ((keyframe = st->codec->codec_type == AVMEDIA_TYPE_AUDIO ||
- (flags & MOV_TRUN_FIRST_SAMPLE_FLAGS && !i && !(sample_flags & ~MOV_FRAG_SAMPLE_FLAG_DEGRADATION_PRIORITY_MASK)) || sample_flags & MOV_FRAG_SAMPLE_FLAG_DEPENDS_NO))
+ if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO)
+ keyframe = 1;
+ else if (!found_keyframe)
+ keyframe = found_keyframe =
+ !(sample_flags & (MOV_FRAG_SAMPLE_FLAG_IS_NON_SYNC |
+ MOV_FRAG_SAMPLE_FLAG_DEPENDS_YES));
+ if (keyframe)
distance = 0;
av_add_index_entry(st, offset, dts, sample_size, distance,
keyframe ? AVINDEX_KEYFRAME : 0);
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-10 11:32:45 +0000