*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "avformat.h"
{ CODEC_ID_MPEG4 , "mpg4-img"},
{ CODEC_ID_FFV1 , "ffv1-img"},
{ CODEC_ID_RAWVIDEO , "y"},
+ { CODEC_ID_BMP , "bmp"},
{0, NULL}
};
}
/* return -1 if no image found */
-static int find_image_range(int *pfirst_index, int *plast_index,
+static int find_image_range(int *pfirst_index, int *plast_index,
const char *path)
{
char buf[1024];
/* find the first image */
for(first_index = 0; first_index < 5; first_index++) {
if (get_frame_filename(buf, sizeof(buf), path, first_index) < 0){
- *pfirst_index =
+ *pfirst_index =
*plast_index = 1;
return 0;
}
}
if (first_index == 5)
goto fail;
-
+
/* find the last image */
last_index = first_index;
for(;;) {
range1 = 1;
else
range1 = 2 * range;
- if (get_frame_filename(buf, sizeof(buf), path,
+ if (get_frame_filename(buf, sizeof(buf), path,
last_index + range1) < 0)
goto fail;
if (!url_exist(buf))
pstrcpy(s->path, sizeof(s->path), s1->filename);
s->img_number = 0;
s->img_count = 0;
-
+
/* find format */
if (s1->iformat->flags & AVFMT_NOFILE)
s->is_pipe = 0;
s->is_pipe = 1;
st->need_parsing= 1;
}
-
- if (!ap || !ap->frame_rate) {
- st->codec.frame_rate = 25;
- st->codec.frame_rate_base = 1;
+
+ if (!ap->time_base.num) {
+ av_set_pts_info(st, 60, 1, 25);
} else {
- st->codec.frame_rate = ap->frame_rate;
- st->codec.frame_rate_base = ap->frame_rate_base;
+ av_set_pts_info(st, 60, ap->time_base.num, ap->time_base.den);
}
-
- if(ap && ap->width && ap->height){
- st->codec.width = ap->width;
- st->codec.height= ap->height;
+
+ if(ap->width && ap->height){
+ st->codec->width = ap->width;
+ st->codec->height= ap->height;
}
-
+
if (!s->is_pipe) {
if (find_image_range(&first_index, &last_index, s->path) < 0)
return AVERROR_IO;
s->img_number = first_index;
/* compute duration */
st->start_time = 0;
- st->duration = ((int64_t)AV_TIME_BASE *
- (last_index - first_index + 1) *
- st->codec.frame_rate_base) / st->codec.frame_rate;
+ st->duration = last_index - first_index + 1;
}
-
+
if(ap->video_codec_id){
- st->codec.codec_type = CODEC_TYPE_VIDEO;
- st->codec.codec_id = ap->video_codec_id;
+ st->codec->codec_type = CODEC_TYPE_VIDEO;
+ st->codec->codec_id = ap->video_codec_id;
}else if(ap->audio_codec_id){
- st->codec.codec_type = CODEC_TYPE_AUDIO;
- st->codec.codec_id = ap->audio_codec_id;
+ st->codec->codec_type = CODEC_TYPE_AUDIO;
+ st->codec->codec_id = ap->audio_codec_id;
}else{
- st->codec.codec_type = CODEC_TYPE_VIDEO;
- st->codec.codec_id = av_str2id(img_tags, s->path);
+ st->codec->codec_type = CODEC_TYPE_VIDEO;
+ st->codec->codec_id = av_str2id(img_tags, s->path);
}
- if(st->codec.codec_type == CODEC_TYPE_VIDEO && ap->pix_fmt)
- st->codec.pix_fmt = ap->pix_fmt;
+ if(st->codec->codec_type == CODEC_TYPE_VIDEO && ap->pix_fmt != PIX_FMT_NONE)
+ st->codec->pix_fmt = ap->pix_fmt;
return 0;
}
int i;
int size[3]={0}, ret[3]={0};
ByteIOContext f1[3], *f[3]= {&f1[0], &f1[1], &f1[2]};
- AVCodecContext *codec= &s1->streams[0]->codec;
+ AVCodecContext *codec= s1->streams[0]->codec;
if (!s->is_pipe) {
/* loop over input */
for(i=0; i<3; i++){
if (url_fopen(f[i], filename, URL_RDONLY) < 0)
return AVERROR_IO;
- size[i]= url_filesize(url_fileno(f[i]));
-
+ size[i]= url_fsize(f[i]);
+
if(codec->codec_id != CODEC_ID_RAWVIDEO)
break;
filename[ strlen(filename) - 1 ]= 'U' + i;
}
-
+
if(codec->codec_id == CODEC_ID_RAWVIDEO && !codec->width)
infer_size(&codec->width, &codec->height, size[0]);
} else {
return 0;
}
+#ifdef CONFIG_MUXERS
/******************************************************/
/* image output */
img->is_pipe = 0;
else
img->is_pipe = 1;
-
+
return 0;
}
VideoData *img = s->priv_data;
ByteIOContext pb1[3], *pb[3]= {&pb1[0], &pb1[1], &pb1[2]};
char filename[1024];
- AVCodecContext *codec= &s->streams[ pkt->stream_index ]->codec;
+ AVCodecContext *codec= s->streams[ pkt->stream_index ]->codec;
int i;
if (!img->is_pipe) {
- if (get_frame_filename(filename, sizeof(filename),
+ if (get_frame_filename(filename, sizeof(filename),
img->path, img->img_number) < 0 && img->img_number>1)
return AVERROR_IO;
for(i=0; i<3; i++){
if (url_fopen(pb[i], filename, URL_WRONLY) < 0)
return AVERROR_IO;
-
+
if(codec->codec_id != CODEC_ID_RAWVIDEO)
break;
filename[ strlen(filename) - 1 ]= 'U' + i;
} else {
pb[0] = &s->pb;
}
-
+
if(codec->codec_id == CODEC_ID_RAWVIDEO){
int ysize = codec->width * codec->height;
put_buffer(pb[0], pkt->data , ysize);
return 0;
}
+#endif /* CONFIG_MUXERS */
+
/* input */
static AVInputFormat image2_iformat = {
};
+#ifdef CONFIG_MUXERS
/* output */
static AVOutputFormat image2_oformat = {
img_write_packet,
img_write_trailer,
};
+#endif /* CONFIG_MUXERS */
int img2_init(void)
{
av_register_input_format(&image2_iformat);
- av_register_output_format(&image2_oformat);
-
av_register_input_format(&image2pipe_iformat);
+
+#ifdef CONFIG_MUXERS
+ av_register_output_format(&image2_oformat);
av_register_output_format(&image2pipe_oformat);
-
+#endif
+
return 0;
}