Skip to content

F
ffmpeg.wasm-core
Commit 5c07cf53 authored by Michel Bardiaux's avatar Michel Bardiaux Committed by Guillaume Poirier
Browse files
Options

Clarified API for numbered sequences, patch by Michel Bardiaux % mbardiaux A mediaxim P be % 

Original thread:
Date: Aug 30, 2006 4:54 PM
Subject: [Ffmpeg-devel] [PATCH] Clarified API for numbered sequences

Originally committed as revision 6166 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 22e46959
Hide whitespace changes
Inline Side-by-side
Showing with 42 additions and 32 deletions
ffmpeg.c
View file @ 5c07cf53
......@@ -3392,7 +3392,7 @@ static void opt_output_file(const char *filename)
/* check filename in case of an image number is expected */
if (oc->oformat->flags & AVFMT_NEEDNUMBER) {
if (filename_number_test(oc->filename) < 0) {
if (!av_filename_number_test(oc->filename)) {
print_error(oc->filename, AVERROR_NUMEXPECTED);
exit(1);
}
......
libavformat/avformat.h
View file @ 5c07cf53
......@@ -515,9 +515,9 @@ void ffm_set_write_index(AVFormatContext *s, offset_t pos, offset_t file_size);
int find_info_tag(char *arg, int arg_size, const char *tag1, const char *info);
int get_frame_filename(char *buf, int buf_size,
const char *path, int number);
int filename_number_test(const char *filename);
int av_get_frame_filename(char *buf, int buf_size,
const char *path, int number);
int av_filename_number_test(const char *filename);
/* grab specific */
int video_grab_init(void);
......
libavformat/img.c
View file @ 5c07cf53
......@@ -44,7 +44,7 @@ static int find_image_range(int *pfirst_index, int *plast_index,
/* find the first image */
for(first_index = 0; first_index < 5; first_index++) {
if (get_frame_filename(buf, sizeof(buf), path, first_index) < 0)
if (av_get_frame_filename(buf, sizeof(buf), path, first_index) < 0)
goto fail;
if (url_exist(buf))
break;
......@@ -61,8 +61,8 @@ static int find_image_range(int *pfirst_index, int *plast_index,
range1 = 1;
else
range1 = 2 * range;
if (get_frame_filename(buf, sizeof(buf), path,
last_index + range1) < 0)
if (av_get_frame_filename(buf, sizeof(buf), path,
last_index + range1) < 0)
goto fail;
if (!url_exist(buf))
break;
......@@ -86,7 +86,7 @@ static int find_image_range(int *pfirst_index, int *plast_index,
static int image_probe(AVProbeData *p)
{
if (filename_number_test(p->filename) >= 0 && guess_image_format(p->filename))
if (av_filename_number_test(p->filename) && guess_image_format(p->filename))
return AVPROBE_SCORE_MAX-1;
else
return 0;
......@@ -144,7 +144,7 @@ static int img_read_header(AVFormatContext *s1, AVFormatParameters *ap)
/* compute duration */
st->start_time = 0;
st->duration = last_index - first_index + 1;
if (get_frame_filename(buf, sizeof(buf), s->path, s->img_number) < 0)
if (av_get_frame_filename(buf, sizeof(buf), s->path, s->img_number) < 0)
goto fail;
if (url_fopen(f, buf, URL_RDONLY) < 0)
goto fail;
......@@ -200,8 +200,8 @@ static int img_read_packet(AVFormatContext *s1, AVPacket *pkt)
if (s1->loop_input && s->img_number > s->img_last) {
s->img_number = s->img_first;
}
if (get_frame_filename(filename, sizeof(filename),
s->path, s->img_number) < 0)
if (av_get_frame_filename(filename, sizeof(filename),
s->path, s->img_number) < 0)
return AVERROR_IO;
f = &f1;
if (url_fopen(f, filename, URL_RDONLY) < 0)
......@@ -307,8 +307,8 @@ static int img_write_packet(AVFormatContext *s, AVPacket *pkt)
picture = (AVPicture *)pkt->data;
if (!img->is_pipe) {
if (get_frame_filename(filename, sizeof(filename),
img->path, img->img_number) < 0)
if (av_get_frame_filename(filename, sizeof(filename),
img->path, img->img_number) < 0)
return AVERROR_IO;
pb = &pb1;
if (url_fopen(pb, filename, URL_WRONLY) < 0)
......
libavformat/img2.c
View file @ 5c07cf53
......@@ -104,7 +104,7 @@ static int find_image_range(int *pfirst_index, int *plast_index,
/* find the first image */
for(first_index = 0; first_index < 5; first_index++) {
if (get_frame_filename(buf, sizeof(buf), path, first_index) < 0){
if (av_get_frame_filename(buf, sizeof(buf), path, first_index) < 0){
*pfirst_index =
*plast_index = 1;
return 0;
......@@ -124,8 +124,8 @@ static int find_image_range(int *pfirst_index, int *plast_index,
range1 = 1;
else
range1 = 2 * range;
if (get_frame_filename(buf, sizeof(buf), path,
last_index + range1) < 0)
if (av_get_frame_filename(buf, sizeof(buf), path,
last_index + range1) < 0)
goto fail;
if (!url_exist(buf))
break;
......@@ -149,7 +149,7 @@ static int find_image_range(int *pfirst_index, int *plast_index,
static int image_probe(AVProbeData *p)
{
if (filename_number_test(p->filename) >= 0 && av_str2id(img_tags, p->filename))
if (av_filename_number_test(p->filename) && av_str2id(img_tags, p->filename))
return AVPROBE_SCORE_MAX;
else
return 0;
......@@ -236,8 +236,8 @@ static int img_read_packet(AVFormatContext *s1, AVPacket *pkt)
if (s1->loop_input && s->img_number > s->img_last) {
s->img_number = s->img_first;
}
if (get_frame_filename(filename, sizeof(filename),
s->path, s->img_number)<0 && s->img_number > 1)
if (av_get_frame_filename(filename, sizeof(filename),
s->path, s->img_number)<0 && s->img_number > 1)
return AVERROR_IO;
for(i=0; i<3; i++){
if (url_fopen(f[i], filename, URL_RDONLY) < 0)
......@@ -317,8 +317,8 @@ static int img_write_packet(AVFormatContext *s, AVPacket *pkt)
int i;
if (!img->is_pipe) {
if (get_frame_filename(filename, sizeof(filename),
img->path, img->img_number) < 0 && img->img_number>1)
if (av_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)
......
libavformat/utils.c
View file @ 5c07cf53
......@@ -93,13 +93,13 @@ AVOutputFormat *guess_format(const char *short_name, const char *filename,
/* specific test for image sequences */
#ifdef CONFIG_IMAGE2_MUXER
if (!short_name && filename &&
filename_number_test(filename) >= 0 &&
av_filename_number_test(filename) &&
av_guess_image2_codec(filename) != CODEC_ID_NONE) {
return guess_format("image2", NULL, NULL);
}
#endif
if (!short_name && filename &&
filename_number_test(filename) >= 0 &&
av_filename_number_test(filename) &&
guess_image_format(filename)) {
return guess_format("image", NULL, NULL);
}
......@@ -403,12 +403,16 @@ int put_fifo(ByteIOContext *pb, FifoBuffer *f, int buf_size, uint8_t **rptr_ptr)
return 0;
}
int filename_number_test(const char *filename)
/**
* Allocate the payload of a packet and intialized its fields to default values.
*
* @param filename possible numbered sequence string
* @return 1 if a valid numbered sequence string, 0 otherwise.
*/
int av_filename_number_test(const char *filename)
{
char buf[1024];
if(!filename)
return -1;
return get_frame_filename(buf, sizeof(buf), filename, 1);
return filename && (av_get_frame_filename(buf, sizeof(buf), filename, 1)>=0);
}
/**
......@@ -635,7 +639,7 @@ int av_open_input_file(AVFormatContext **ic_ptr, const char *filename,
/* check filename in case of an image number is expected */
if (fmt->flags & AVFMT_NEEDNUMBER) {
if (filename_number_test(filename) < 0) {
if (!av_filename_number_test(filename)) {
err = AVERROR_NUMEXPECTED;
goto fail;
}
......@@ -2951,12 +2955,18 @@ int find_info_tag(char *arg, int arg_size, const char *tag1, const char *info)
/**
* Returns in 'buf' the path with '%d' replaced by number.
*
* Also handles the '%0nd' format where 'n' is the total number
* of digits and '%%'. Return 0 if OK, and -1 if format error.
* of digits and '%%'.
*
* @param buf destination buffer
* @param buf_size destination buffer size
* @param path numbered sequence string
* @number frame number
* @return 0 if OK, -1 if format error.
*/
int get_frame_filename(char *buf, int buf_size,
const char *path, int number)
int av_get_frame_filename(char *buf, int buf_size,
const char *path, int number)
{
const char *p;
char *q, buf1[20], c;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment