virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-28 12:32:17 +02:00
Code Issues Releases Activity

avconv: fix -force_key_frames

Browse Source 
parse_forced_keyframes() relies in encoder timebase being set, so call
it from transcode_init() after it is known.
This commit is contained in:
Anton Khirnov 2012-06-22 14:36:27 +02:00
parent ea1c5011b3
commit 19ad567311
1 changed files with 32 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
avconv.c
View File

@ -270,6 +270,7 @@ typedef struct OutputStream {
int64_t *forced_kf_pts; int64_t *forced_kf_pts;
int forced_kf_count; int forced_kf_count;
int forced_kf_index; int forced_kf_index;
char *forced_keyframes;
FILE *logfile; FILE *logfile;
@ -1062,6 +1063,7 @@ void exit_program(int ret)
} }
output_streams[i]->bitstream_filters = NULL; output_streams[i]->bitstream_filters = NULL;
av_freep(&output_streams[i]->forced_keyframes);
av_freep(&output_streams[i]->avfilter); av_freep(&output_streams[i]->avfilter);
av_freep(&output_streams[i]->filtered_frame); av_freep(&output_streams[i]->filtered_frame);
av_freep(&output_streams[i]); av_freep(&output_streams[i]);
@ -2327,6 +2329,29 @@ static InputStream *get_input_stream(OutputStream *ost)
return NULL; return NULL;
} }
static void parse_forced_key_frames(char *kf, OutputStream *ost,
AVCodecContext *avctx)
{
char *p;
int n = 1, i;
int64_t t;
for (p = kf; *p; p++)
if (*p == ',')
n++;
ost->forced_kf_count = n;
ost->forced_kf_pts = av_malloc(sizeof(*ost->forced_kf_pts) * n);
if (!ost->forced_kf_pts) {
av_log(NULL, AV_LOG_FATAL, "Could not allocate forced key frames array.\n");
exit_program(1);
}
for (i = 0; i < n; i++) {
p = i ? strchr(p, ',') + 1 : kf;
t = parse_time_or_die("force_key_frames", p, 1);
ost->forced_kf_pts[i] = av_rescale_q(t, AV_TIME_BASE_Q, avctx->time_base);
}
}
static int transcode_init(void) static int transcode_init(void)
{ {
int ret = 0, i, j, k; int ret = 0, i, j, k;
@ -2528,6 +2553,9 @@ static int transcode_init(void)
codec->bits_per_raw_sample = 0; codec->bits_per_raw_sample = 0;
} }
if (ost->forced_keyframes)
parse_forced_key_frames(ost->forced_keyframes, ost,
ost->st->codec);
break; break;
case AVMEDIA_TYPE_SUBTITLE: case AVMEDIA_TYPE_SUBTITLE:
codec->time_base = (AVRational){1, 1000}; codec->time_base = (AVRational){1, 1000};
@ -3645,29 +3673,6 @@ static int opt_input_file(OptionsContext *o, const char *opt, const char *filena
return 0; return 0;
} }
static void parse_forced_key_frames(char *kf, OutputStream *ost,
AVCodecContext *avctx)
{
char *p;
int n = 1, i;
int64_t t;
for (p = kf; *p; p++)
if (*p == ',')
n++;
ost->forced_kf_count = n;
ost->forced_kf_pts = av_malloc(sizeof(*ost->forced_kf_pts) * n);
if (!ost->forced_kf_pts) {
av_log(NULL, AV_LOG_FATAL, "Could not allocate forced key frames array.\n");
exit_program(1);
}
for (i = 0; i < n; i++) {
p = i ? strchr(p, ',') + 1 : kf;
t = parse_time_or_die("force_key_frames", p, 1);
ost->forced_kf_pts[i] = av_rescale_q(t, AV_TIME_BASE_Q, avctx->time_base);
}
}
static uint8_t *get_line(AVIOContext *s) static uint8_t *get_line(AVIOContext *s)
{ {
AVIOContext *line; AVIOContext *line;
@ -3865,7 +3870,7 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc)
if (!ost->stream_copy) { if (!ost->stream_copy) {
const char *p = NULL; const char *p = NULL;
char *forced_key_frames = NULL, *frame_rate = NULL, *frame_size = NULL; char *frame_rate = NULL, *frame_size = NULL;
char *frame_aspect_ratio = NULL, *frame_pix_fmt = NULL; char *frame_aspect_ratio = NULL, *frame_pix_fmt = NULL;
char *intra_matrix = NULL, *inter_matrix = NULL; char *intra_matrix = NULL, *inter_matrix = NULL;
const char *filters = "null"; const char *filters = "null";
@ -3949,9 +3954,9 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc)
} }
} }
MATCH_PER_STREAM_OPT(forced_key_frames, str, forced_key_frames, oc, st); MATCH_PER_STREAM_OPT(forced_key_frames, str, ost->forced_keyframes, oc, st);
if (forced_key_frames) if (ost->forced_keyframes)
parse_forced_key_frames(forced_key_frames, ost, video_enc); ost->forced_keyframes = av_strdup(ost->forced_keyframes);
MATCH_PER_STREAM_OPT(force_fps, i, ost->force_fps, oc, st); MATCH_PER_STREAM_OPT(force_fps, i, ost->force_fps, oc, st);