K&R formatting and use local img_ namespace to ease debugging.
---
libavformat/img2dec.c | 117 ++++++++++++++++++++++++++------------------------
1 file changed, 61 insertions(+), 56 deletions(-)
diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c
index 14f7785..bdea539 100644
--- a/libavformat/img2dec.c
+++ b/libavformat/img2dec.c
@@ -59,13 +59,12 @@ static int infer_size(int *width_ptr, int *height_ptr, int
size)
{
int i;
- for(i=0;i<FF_ARRAY_ELEMS(sizes);i++) {
+ for (i = 0; i < FF_ARRAY_ELEMS(sizes); i++)
if ((sizes[i][0] * sizes[i][1]) == size) {
- *width_ptr = sizes[i][0];
+ *width_ptr = sizes[i][0];
*height_ptr = sizes[i][1];
return 0;
}
- }
return -1;
}
@@ -78,9 +77,8 @@ static int find_image_range(int *pfirst_index, int
*plast_index,
/* find the first image */
for (first_index = 0; first_index < max_start; first_index++) {
- if (av_get_frame_filename(buf, sizeof(buf), path, first_index) < 0){
- *pfirst_index =
- *plast_index = 1;
+ if (av_get_frame_filename(buf, sizeof(buf), path, first_index) < 0) {
+ *pfirst_index = *plast_index = 1;
if (avio_check(buf, AVIO_FLAG_READ) > 0)
return 0;
return -1;
@@ -93,9 +91,9 @@ static int find_image_range(int *pfirst_index, int
*plast_index,
/* find the last image */
last_index = first_index;
- for(;;) {
+ for (;;) {
range = 0;
- for(;;) {
+ for (;;) {
if (!range)
range1 = 1;
else
@@ -116,25 +114,24 @@ static int find_image_range(int *pfirst_index, int
*plast_index,
last_index += range;
}
*pfirst_index = first_index;
- *plast_index = last_index;
+ *plast_index = last_index;
return 0;
- fail:
+ fail:
return -1;
}
-
-static int read_probe(AVProbeData *p)
+static int img_read_probe(AVProbeData *p)
{
if (p->filename && ff_guess_image2_codec(p->filename)) {
if (av_filename_number_test(p->filename))
return AVPROBE_SCORE_MAX;
else
- return AVPROBE_SCORE_MAX/2;
+ return AVPROBE_SCORE_MAX / 2;
}
return 0;
}
-static int read_header(AVFormatContext *s1)
+static int img_read_header(AVFormatContext *s1)
{
VideoDemuxData *s = s1->priv_data;
int first_index, last_index, ret = 0;
@@ -150,27 +147,32 @@ static int read_header(AVFormatContext *s1)
return AVERROR(ENOMEM);
}
- if (s->pixel_format && (pix_fmt = av_get_pix_fmt(s->pixel_format)) ==
AV_PIX_FMT_NONE) {
- av_log(s1, AV_LOG_ERROR, "No such pixel format: %s.\n",
s->pixel_format);
+ if (s->pixel_format &&
+ (pix_fmt = av_get_pix_fmt(s->pixel_format)) == AV_PIX_FMT_NONE) {
+ av_log(s1, AV_LOG_ERROR, "No such pixel format: %s.\n",
+ s->pixel_format);
return AVERROR(EINVAL);
}
- if (s->video_size && (ret = av_parse_video_size(&width, &height,
s->video_size)) < 0) {
- av_log(s, AV_LOG_ERROR, "Could not parse video size: %s.\n",
s->video_size);
+ if (s->video_size &&
+ (ret = av_parse_video_size(&width, &height, s->video_size)) < 0) {
+ av_log(s, AV_LOG_ERROR, "Could not parse video size: %s.\n",
+ s->video_size);
return ret;
}
if ((ret = av_parse_video_rate(&framerate, s->framerate)) < 0) {
- av_log(s, AV_LOG_ERROR, "Could not parse framerate: %s.\n",
s->framerate);
+ av_log(s, AV_LOG_ERROR, "Could not parse framerate: %s.\n",
+ s->framerate);
return ret;
}
av_strlcpy(s->path, s1->filename, sizeof(s->path));
s->img_number = 0;
- s->img_count = 0;
+ s->img_count = 0;
/* find format */
if (s1->iformat->flags & AVFMT_NOFILE)
s->is_pipe = 0;
- else{
+ else {
s->is_pipe = 1;
st->need_parsing = AVSTREAM_PARSE_FULL;
}
@@ -186,38 +188,39 @@ static int read_header(AVFormatContext *s1)
if (find_image_range(&first_index, &last_index, s->path,
FFMAX(s->start_number, 5)) < 0)
return AVERROR(ENOENT);
- s->img_first = first_index;
- s->img_last = last_index;
+ s->img_first = first_index;
+ s->img_last = last_index;
s->img_number = first_index;
/* compute duration */
st->start_time = 0;
- st->duration = last_index - first_index + 1;
+ st->duration = last_index - first_index + 1;
}
- if(s1->video_codec_id){
+ if (s1->video_codec_id) {
st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
- st->codec->codec_id = s1->video_codec_id;
- }else if(s1->audio_codec_id){
+ st->codec->codec_id = s1->video_codec_id;
+ } else if (s1->audio_codec_id) {
st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
- st->codec->codec_id = s1->audio_codec_id;
- }else{
+ st->codec->codec_id = s1->audio_codec_id;
+ } else {
st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
- st->codec->codec_id = ff_guess_image2_codec(s->path);
+ st->codec->codec_id = ff_guess_image2_codec(s->path);
}
- if(st->codec->codec_type == AVMEDIA_TYPE_VIDEO && pix_fmt !=
AV_PIX_FMT_NONE)
+ if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO &&
+ pix_fmt != AV_PIX_FMT_NONE)
st->codec->pix_fmt = pix_fmt;
return 0;
}
-static int read_packet(AVFormatContext *s1, AVPacket *pkt)
+static int img_read_packet(AVFormatContext *s1, AVPacket *pkt)
{
VideoDemuxData *s = s1->priv_data;
char filename[1024];
int i;
- int size[3]={0}, ret[3]={0};
- AVIOContext *f[3] = {NULL};
- AVCodecContext *codec= s1->streams[0]->codec;
+ int size[3] = { 0 }, ret[3] = { 0 };
+ AVIOContext *f[3] = { NULL };
+ AVCodecContext *codec = s1->streams[0]->codec;
if (!s->is_pipe) {
/* loop over input */
@@ -227,48 +230,50 @@ static int read_packet(AVFormatContext *s1, AVPacket *pkt)
if (s->img_number > s->img_last)
return AVERROR_EOF;
if (av_get_frame_filename(filename, sizeof(filename),
- s->path, s->img_number)<0 && s->img_number >
1)
+ s->path,
+ s->img_number) < 0 && s->img_number > 1)
return AVERROR(EIO);
- for(i=0; i<3; i++){
+ for (i = 0; i < 3; i++) {
if (avio_open2(&f[i], filename, AVIO_FLAG_READ,
&s1->interrupt_callback, NULL) < 0) {
- if(i>=1)
+ if (i >= 1)
break;
- av_log(s1, AV_LOG_ERROR, "Could not open file :
%s\n",filename);
+ av_log(s1, AV_LOG_ERROR, "Could not open file : %s\n",
+ filename);
return AVERROR(EIO);
}
- size[i]= avio_size(f[i]);
+ size[i] = avio_size(f[i]);
- if(codec->codec_id != AV_CODEC_ID_RAWVIDEO)
+ if (codec->codec_id != AV_CODEC_ID_RAWVIDEO)
break;
- filename[ strlen(filename) - 1 ]= 'U' + i;
+ filename[strlen(filename) - 1] = 'U' + i;
}
- if(codec->codec_id == AV_CODEC_ID_RAWVIDEO && !codec->width)
+ if (codec->codec_id == AV_CODEC_ID_RAWVIDEO && !codec->width)
infer_size(&codec->width, &codec->height, size[0]);
} else {
f[0] = s1->pb;
if (f[0]->eof_reached)
return AVERROR(EIO);
- size[0]= 4096;
+ size[0] = 4096;
}
av_new_packet(pkt, size[0] + size[1] + size[2]);
pkt->stream_index = 0;
- pkt->flags |= AV_PKT_FLAG_KEY;
+ pkt->flags |= AV_PKT_FLAG_KEY;
- pkt->size= 0;
- for(i=0; i<3; i++){
- if(f[i]){
- ret[i]= avio_read(f[i], pkt->data + pkt->size, size[i]);
+ pkt->size = 0;
+ for (i = 0; i < 3; i++) {
+ if (f[i]) {
+ ret[i] = avio_read(f[i], pkt->data + pkt->size, size[i]);
if (!s->is_pipe)
avio_close(f[i]);
- if(ret[i]>0)
+ if (ret[i] > 0)
pkt->size += ret[i];
}
}
- if (ret[0] <= 0 || ret[1]<0 || ret[2]<0) {
+ if (ret[0] <= 0 || ret[1] < 0 || ret[2] < 0) {
av_free_packet(pkt);
return AVERROR(EIO); /* signal EOF */
} else {
@@ -300,9 +305,9 @@ AVInputFormat ff_image2_demuxer = {
.name = "image2",
.long_name = NULL_IF_CONFIG_SMALL("image2 sequence"),
.priv_data_size = sizeof(VideoDemuxData),
- .read_probe = read_probe,
- .read_header = read_header,
- .read_packet = read_packet,
+ .read_probe = img_read_probe,
+ .read_header = img_read_header,
+ .read_packet = img_read_packet,
.flags = AVFMT_NOFILE,
.priv_class = &img2_class,
};
@@ -318,8 +323,8 @@ AVInputFormat ff_image2pipe_demuxer = {
.name = "image2pipe",
.long_name = NULL_IF_CONFIG_SMALL("piped image2 sequence"),
.priv_data_size = sizeof(VideoDemuxData),
- .read_header = read_header,
- .read_packet = read_packet,
+ .read_header = img_read_header,
+ .read_packet = img_read_packet,
.priv_class = &img2pipe_class,
};
#endif
--
1.7.12
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
