videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

Revert "img2 encoder: allow %t in filename, based on patch from Yuval Adam" 

breaks API

Found-by: jamrial
This reverts commit 1a956c64c8.
This commit is contained in:
Michael Niedermayer 2016-11-01 22:58:01 +01:00
parent 6f2ad32a16
commit 2b09a3ad19
5 changed files with 10 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
doc/muxers.texi
View File

@ -619,12 +619,6 @@ If the pattern contains "%d" or "%0@var{N}d", the first filename of
the file list specified will contain the number 1, all the following
numbers will be sequential.
If the pattern contains "%t", the frame's timestamps will be inserted
in the filename like "00.00.00.000" for hours, minutes, seconds,
and milliseconds.
The "%t" and "%d" patterns may be used simultaneously.
The pattern may contain a suffix which is used to automatically
determine the format of the image files to write.
@ -670,13 +664,6 @@ can be used:
ffmpeg -f v4l2 -r 1 -i /dev/video0 -f image2 -strftime 1 "%Y-%m-%d_%H-%M-%S.jpg"
@end example
The following example uses the timestamp parameter to generate one
image file per video frame from the input, and name it including its original
timestamp.
@example
ffmpeg -i in.avi -vsync vfr -copyts img-%t.jpg
@end example
@subsection Options
@table @option

3
libavformat/avformat.h
View File

@ -2780,11 +2780,10 @@ void av_dump_format(AVFormatContext *ic,
* @param path numbered sequence string
* @param number frame number
* @param flags AV_FRAME_FILENAME_FLAGS_*
* @param ts frame timestamp in AV_TIME_BASE fractional seconds.
* @return 0 if OK, -1 on format error
*/
int av_get_frame_filename2(char *buf, int buf_size,
const char *path, int number, int flags, int64_t ts);
const char *path, int number, int flags);
int av_get_frame_filename(char *buf, int buf_size,
const char *path, int number);

6
libavformat/hlsenc.c
View File

@ -654,7 +654,7 @@ static int hls_start(AVFormatContext *s)
} else if (c->max_seg_size > 0) {
if (av_get_frame_filename2(oc->filename, sizeof(oc->filename),
c->basename, c->wrap ? c->sequence % c->wrap : c->sequence,
AV_FRAME_FILENAME_FLAGS_MULTIPLE, 0) < 0) {
AV_FRAME_FILENAME_FLAGS_MULTIPLE) < 0) {
av_log(oc, AV_LOG_ERROR, "Invalid segment filename template '%s', you can try to use -use_localtime 1 with it\n", c->basename);
return AVERROR(EINVAL);
}
@ -685,14 +685,14 @@ static int hls_start(AVFormatContext *s)
}
} else if (av_get_frame_filename2(oc->filename, sizeof(oc->filename),
c->basename, c->wrap ? c->sequence % c->wrap : c->sequence,
AV_FRAME_FILENAME_FLAGS_MULTIPLE, 0) < 0) {
AV_FRAME_FILENAME_FLAGS_MULTIPLE) < 0) {
av_log(oc, AV_LOG_ERROR, "Invalid segment filename template '%s' you can try to use -use_localtime 1 with it\n", c->basename);
return AVERROR(EINVAL);
}
if( c->vtt_basename) {
if (av_get_frame_filename2(vtt_oc->filename, sizeof(vtt_oc->filename),
c->vtt_basename, c->wrap ? c->sequence % c->wrap : c->sequence,
AV_FRAME_FILENAME_FLAGS_MULTIPLE, 0) < 0) {
AV_FRAME_FILENAME_FLAGS_MULTIPLE) < 0) {
av_log(vtt_oc, AV_LOG_ERROR, "Invalid segment filename template '%s'\n", c->vtt_basename);
return AVERROR(EINVAL);
}

6
libavformat/img2enc.c
View File

@ -80,12 +80,10 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt)
VideoMuxData *img = s->priv_data;
AVIOContext *pb[4];
char filename[1024];
AVStream *stream = s->streams[ pkt->stream_index ];
AVCodecParameters *par = stream->codecpar;
AVCodecParameters *par = s->streams[pkt->stream_index]->codecpar;
const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(par->format);
int i;
int nb_renames = 0;
int64_t ts = av_rescale_q(pkt->pts, stream->time_base, AV_TIME_BASE_Q);
if (!img->is_pipe) {
if (img->update) {
@ -101,7 +99,7 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt)
}
} else if (av_get_frame_filename2(filename, sizeof(filename), img->path,
img->img_number,
AV_FRAME_FILENAME_FLAGS_MULTIPLE, ts) < 0 &&
AV_FRAME_FILENAME_FLAGS_MULTIPLE) < 0 &&
img->img_number > 1) {
av_log(s, AV_LOG_ERROR,
"Could not get frame filename number %d from pattern '%s' (either set updatefirst or use a pattern like %%03d within the filename pattern)\n",

42
libavformat/utils.c
View File

@ -4379,18 +4379,15 @@ uint64_t ff_ntp_time(void)
return (av_gettime() / 1000) * 1000 + NTP_OFFSET_US;
}
int av_get_frame_filename2(char *buf, int buf_size, const char *path, int number, int flags, int64_t ts)
int av_get_frame_filename2(char *buf, int buf_size, const char *path, int number, int flags)
{
const char *p;
char *q, buf1[20], c;
int nd, len, percentd_found, percentt_found;
int hours, mins, secs, ms;
int64_t abs_ts;
int nd, len, percentd_found;
q = buf;
p = path;
percentd_found = 0;
percentt_found = 0;
for (;;) {
c = *p++;
if (c == '\0')
@ -4419,37 +4416,6 @@ int av_get_frame_filename2(char *buf, int buf_size, const char *path, int number
memcpy(q, buf1, len);
q += len;
break;
case 't':
if (!(flags & AV_FRAME_FILENAME_FLAGS_MULTIPLE) && percentt_found) {
av_log(NULL, AV_LOG_ERROR, "double %%t not allowed");
goto fail;
}
if (ts == 0) {
av_log(NULL, AV_LOG_DEBUG, "%%t but no ts, using 0"); // necessary for first frame on some streams
}
percentt_found = 1;
abs_ts = llabs(ts);
ms = abs_ts % AV_TIME_BASE;
abs_ts /= AV_TIME_BASE;
secs = abs_ts % 60;
abs_ts /= 60;
mins = abs_ts % 60;
abs_ts /= 60;
hours = abs_ts;
if (ts < 0)
snprintf(buf1, sizeof(buf1),
"-%02d.%02d.%02d.%03d", hours, mins, secs, ms);
else
snprintf(buf1, sizeof(buf1),
"%02d.%02d.%02d.%03d", hours, mins, secs, ms);
len = strlen(buf1);
if ((q - buf + len) > buf_size - 1) {
av_log(NULL, AV_LOG_ERROR, "%%t size overflow");
goto fail;
}
memcpy(q, buf1, len);
q += len;
break;
default:
goto fail;
}
@ -4459,7 +4425,7 @@ addchar:
*q++ = c;
}
}
if (!percentd_found && !percentt_found)
if (!percentd_found)
goto fail;
*q = '\0';
return 0;
@ -4470,7 +4436,7 @@ fail:
int av_get_frame_filename(char *buf, int buf_size, const char *path, int number)
{
return av_get_frame_filename2(buf, buf_size, path, number, 0, 0);
return av_get_frame_filename2(buf, buf_size, path, number, 0);
}
void av_url_split(char *proto, int proto_size,