parse_forced_keyframes() relies in encoder timebase being set, so call
it from transcode_init() after it is known.
---
avconv.c | 59 ++++++++++++++++++++++++++++++++---------------------------
1 file changed, 32 insertions(+), 27 deletions(-)
diff --git a/avconv.c b/avconv.c
index 7abf10d..ef1604e 100644
--- a/avconv.c
+++ b/avconv.c
@@ -270,6 +270,7 @@ typedef struct OutputStream {
int64_t *forced_kf_pts;
int forced_kf_count;
int forced_kf_index;
+ char *forced_keyframes;
FILE *logfile;
@@ -1070,6 +1071,7 @@ void exit_program(int ret)
}
output_streams[i]->bitstream_filters = NULL;
+ av_freep(&output_streams[i]->forced_keyframes);
av_freep(&output_streams[i]->avfilter);
av_freep(&output_streams[i]->filtered_frame);
av_freep(&output_streams[i]);
@@ -2335,6 +2337,29 @@ static InputStream *get_input_stream(OutputStream *ost)
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)
{
int ret = 0, i, j, k;
@@ -2536,6 +2561,9 @@ static int transcode_init(void)
codec->bits_per_raw_sample = 0;
}
+ if (ost->forced_keyframes)
+ parse_forced_key_frames(ost->forced_keyframes, ost,
+ ost->st->codec);
break;
case AVMEDIA_TYPE_SUBTITLE:
codec->time_base = (AVRational){1, 1000};
@@ -3653,29 +3681,6 @@ static int opt_input_file(OptionsContext *o, const char
*opt, const char *filena
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)
{
AVIOContext *line;
@@ -3873,7 +3878,7 @@ static OutputStream *new_video_stream(OptionsContext *o,
AVFormatContext *oc)
if (!ost->stream_copy) {
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 *intra_matrix = NULL, *inter_matrix = NULL;
const char *filters = "null";
@@ -3957,9 +3962,9 @@ static OutputStream *new_video_stream(OptionsContext *o,
AVFormatContext *oc)
}
}
- MATCH_PER_STREAM_OPT(forced_key_frames, str, forced_key_frames, oc,
st);
- if (forced_key_frames)
- parse_forced_key_frames(forced_key_frames, ost, video_enc);
+ MATCH_PER_STREAM_OPT(forced_key_frames, str, ost->forced_keyframes,
oc, st);
+ if (ost->forced_keyframes)
+ ost->forced_keyframes = av_strdup(ost->forced_keyframes);
MATCH_PER_STREAM_OPT(force_fps, i, ost->force_fps, oc, st);
--
1.7.10
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
