eden-emu/FFmpeg
20
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge commit '75439bb31b'

Browse source 
* commit '75439bb31b':
  siff: K&R formatting cosmetics

Conflicts:
	libavformat/siff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-02-03 21:53:29 +01:00
commit 46a16ca15a
1 changed files with 42 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

51
libavformat/siff.c
View file

@ -21,11 +21,12 @@
#include "libavutil/channel_layout.h" #include "libavutil/channel_layout.h"
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "avformat.h" #include "avformat.h"
#include "internal.h" #include "internal.h"
#include "avio_internal.h" #include "avio_internal.h"
enum SIFFTags{ enum SIFFTags {
TAG_SIFF = MKTAG('S', 'I', 'F', 'F'), TAG_SIFF = MKTAG('S', 'I', 'F', 'F'),
TAG_BODY = MKTAG('B', 'O', 'D', 'Y'), TAG_BODY = MKTAG('B', 'O', 'D', 'Y'),
TAG_VBHD = MKTAG('V', 'B', 'H', 'D'), TAG_VBHD = MKTAG('V', 'B', 'H', 'D'),
@ -34,7 +35,7 @@ enum SIFFTags{
TAG_SOUN = MKTAG('S', 'O', 'U', 'N'), TAG_SOUN = MKTAG('S', 'O', 'U', 'N'),
}; };
enum VBFlags{ enum VBFlags {
VB_HAS_GMC = 0x01, VB_HAS_GMC = 0x01,
VB_HAS_AUDIO = 0x04, VB_HAS_AUDIO = 0x04,
VB_HAS_VIDEO = 0x08, VB_HAS_VIDEO = 0x08,
@ -42,7 +43,7 @@ enum VBFlags{
VB_HAS_LENGTH = 0x20 VB_HAS_LENGTH = 0x20
}; };
typedef struct SIFFContext{ typedef struct SIFFContext {
int frames; int frames;
int cur_frame; int cur_frame;
int rate; int rate;
@ -59,7 +60,7 @@ typedef struct SIFFContext{
int flags; int flags;
uint8_t gmc[4]; uint8_t gmc[4];
}SIFFContext; } SIFFContext;
static int siff_probe(AVProbeData *p) static int siff_probe(AVProbeData *p)
{ {
@ -93,15 +94,15 @@ static int siff_parse_vbv1(AVFormatContext *s, SIFFContext *c, AVIOContext *pb)
AVStream *st; AVStream *st;
int width, height; int width, height;
if (avio_rl32(pb) != TAG_VBHD){ if (avio_rl32(pb) != TAG_VBHD) {
av_log(s, AV_LOG_ERROR, "Header chunk is missing\n"); av_log(s, AV_LOG_ERROR, "Header chunk is missing\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
if(avio_rb32(pb) != 32){ if (avio_rb32(pb) != 32) {
av_log(s, AV_LOG_ERROR, "Header chunk size is incorrect\n"); av_log(s, AV_LOG_ERROR, "Header chunk size is incorrect\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
if(avio_rl16(pb) != 1){ if (avio_rl16(pb) != 1) {
av_log(s, AV_LOG_ERROR, "Incorrect header version\n"); av_log(s, AV_LOG_ERROR, "Incorrect header version\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
@ -109,7 +110,7 @@ static int siff_parse_vbv1(AVFormatContext *s, SIFFContext *c, AVIOContext *pb)
height = avio_rl16(pb); height = avio_rl16(pb);
avio_skip(pb, 4); avio_skip(pb, 4);
c->frames = avio_rl16(pb); c->frames = avio_rl16(pb);
if(!c->frames){ if (!c->frames) {
av_log(s, AV_LOG_ERROR, "File contains no frames ???\n"); av_log(s, AV_LOG_ERROR, "File contains no frames ???\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
@ -117,7 +118,7 @@ static int siff_parse_vbv1(AVFormatContext *s, SIFFContext *c, AVIOContext *pb)
c->rate = avio_rl16(pb); c->rate = avio_rl16(pb);
c->block_align = c->rate * (c->bits >> 3); c->block_align = c->rate * (c->bits >> 3);
avio_skip(pb, 16); //zeroes avio_skip(pb, 16); // zeroes
st = avformat_new_stream(s, NULL); st = avformat_new_stream(s, NULL);
if (!st) if (!st)
@ -143,15 +144,15 @@ static int siff_parse_vbv1(AVFormatContext *s, SIFFContext *c, AVIOContext *pb)
static int siff_parse_soun(AVFormatContext *s, SIFFContext *c, AVIOContext *pb) static int siff_parse_soun(AVFormatContext *s, SIFFContext *c, AVIOContext *pb)
{ {
if (avio_rl32(pb) != TAG_SHDR){ if (avio_rl32(pb) != TAG_SHDR) {
av_log(s, AV_LOG_ERROR, "Header chunk is missing\n"); av_log(s, AV_LOG_ERROR, "Header chunk is missing\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
if(avio_rb32(pb) != 8){ if (avio_rb32(pb) != 8) {
av_log(s, AV_LOG_ERROR, "Header chunk size is incorrect\n"); av_log(s, AV_LOG_ERROR, "Header chunk size is incorrect\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
avio_skip(pb, 4); //unknown value avio_skip(pb, 4); // unknown value
c->rate = avio_rl16(pb); c->rate = avio_rl16(pb);
c->bits = avio_rl16(pb); c->bits = avio_rl16(pb);
c->block_align = c->rate * (c->bits >> 3); c->block_align = c->rate * (c->bits >> 3);
@ -167,10 +168,10 @@ static int siff_read_header(AVFormatContext *s)
if (avio_rl32(pb) != TAG_SIFF) if (avio_rl32(pb) != TAG_SIFF)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
avio_skip(pb, 4); //ignore size avio_skip(pb, 4); // ignore size
tag = avio_rl32(pb); tag = avio_rl32(pb);
if (tag != TAG_VBV1 && tag != TAG_SOUN){ if (tag != TAG_VBV1 && tag != TAG_SOUN) {
av_log(s, AV_LOG_ERROR, "Not a VBV file\n"); av_log(s, AV_LOG_ERROR, "Not a VBV file\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
@ -179,11 +180,11 @@ static int siff_read_header(AVFormatContext *s)
return ret; return ret;
if (tag == TAG_SOUN && (ret = siff_parse_soun(s, c, pb)) < 0) if (tag == TAG_SOUN && (ret = siff_parse_soun(s, c, pb)) < 0)
return ret; return ret;
if (avio_rl32(pb) != MKTAG('B', 'O', 'D', 'Y')){ if (avio_rl32(pb) != MKTAG('B', 'O', 'D', 'Y')) {
av_log(s, AV_LOG_ERROR, "'BODY' chunk is missing\n"); av_log(s, AV_LOG_ERROR, "'BODY' chunk is missing\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
avio_skip(pb, 4); //ignore size avio_skip(pb, 4); // ignore size
return 0; return 0;
} }
@ -193,20 +194,20 @@ static int siff_read_packet(AVFormatContext *s, AVPacket *pkt)
SIFFContext *c = s->priv_data; SIFFContext *c = s->priv_data;
int size; int size;
if (c->has_video){ if (c->has_video) {
if (c->cur_frame >= c->frames) if (c->cur_frame >= c->frames)
return AVERROR_EOF; return AVERROR_EOF;
if (c->curstrm == -1){ if (c->curstrm == -1) {
c->pktsize = avio_rl32(s->pb) - 4; c->pktsize = avio_rl32(s->pb) - 4;
c->flags = avio_rl16(s->pb); c->flags = avio_rl16(s->pb);
c->gmcsize = (c->flags & VB_HAS_GMC) ? 4 : 0; c->gmcsize = (c->flags & VB_HAS_GMC) ? 4 : 0;
if (c->gmcsize) if (c->gmcsize)
avio_read(s->pb, c->gmc, c->gmcsize); avio_read(s->pb, c->gmc, c->gmcsize);
c->sndsize = (c->flags & VB_HAS_AUDIO) ? avio_rl32(s->pb): 0; c->sndsize = (c->flags & VB_HAS_AUDIO) ? avio_rl32(s->pb) : 0;
c->curstrm = !!(c->flags & VB_HAS_AUDIO); c->curstrm = !!(c->flags & VB_HAS_AUDIO);
} }
if (!c->curstrm){ if (!c->curstrm) {
size = c->pktsize - c->sndsize - c->gmcsize - 2; size = c->pktsize - c->sndsize - c->gmcsize - 2;
size = ffio_limit(s->pb, size); size = ffio_limit(s->pb, size);
if(size < 0 || c->pktsize < c->sndsize) if(size < 0 || c->pktsize < c->sndsize)
@ -222,22 +223,22 @@ static int siff_read_packet(AVFormatContext *s, AVPacket *pkt)
} }
pkt->stream_index = 0; pkt->stream_index = 0;
c->curstrm = -1; c->curstrm = -1;
}else{ } else {
if ((size = av_get_packet(s->pb, pkt, c->sndsize - 4)) < 0) if ((size = av_get_packet(s->pb, pkt, c->sndsize - 4)) < 0)
return AVERROR(EIO); return AVERROR(EIO);
pkt->stream_index = 1; pkt->stream_index = 1;
pkt->duration = size; pkt->duration = size;
c->curstrm = 0; c->curstrm = 0;
} }
if(!c->cur_frame || c->curstrm) if (!c->cur_frame || c->curstrm)
pkt->flags |= AV_PKT_FLAG_KEY; pkt->flags |= AV_PKT_FLAG_KEY;
if (c->curstrm == -1) if (c->curstrm == -1)
c->cur_frame++; c->cur_frame++;
}else{ } else {
size = av_get_packet(s->pb, pkt, c->block_align); size = av_get_packet(s->pb, pkt, c->block_align);
if(!size) if (!size)
return AVERROR_EOF; return AVERROR_EOF;
if(size < 0) if (size < 0)
return AVERROR(EIO); return AVERROR(EIO);
pkt->duration = size; pkt->duration = size;
} }