diff options
author | Dmitry Kovalev <dkovalev@google.com> | 2014-01-15 12:15:48 -0800 |
---|---|---|
committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-01-15 12:15:48 -0800 |
commit | f1cf4058159fde599b14bcfa1f71b6bf6b686d9a (patch) | |
tree | 3263403dd381e02e594291fb1a5dac08d00b96bb | |
parent | 9adcc4d681ee027c9bc6a77a5aa73780fb6173ea (diff) | |
parent | 096ab11012cd958c9cc3c149f877c37d80b36b2f (diff) | |
download | libvpx-f1cf4058159fde599b14bcfa1f71b6bf6b686d9a.tar libvpx-f1cf4058159fde599b14bcfa1f71b6bf6b686d9a.tar.gz libvpx-f1cf4058159fde599b14bcfa1f71b6bf6b686d9a.tar.bz2 libvpx-f1cf4058159fde599b14bcfa1f71b6bf6b686d9a.zip |
Merge "Removing pass number check from ivf_write_file_header()."
-rw-r--r-- | ivfenc.c | 3 | ||||
-rw-r--r-- | vpxenc.c | 19 |
2 files changed, 14 insertions, 8 deletions
@@ -20,9 +20,6 @@ void ivf_write_file_header(FILE *outfile, int frame_cnt) { char header[32]; - if (cfg->g_pass != VPX_RC_ONE_PASS && cfg->g_pass != VPX_RC_LAST_PASS) - return; - header[0] = 'D'; header[1] = 'K'; header[2] = 'I'; @@ -1393,6 +1393,10 @@ static void show_stream_config(struct stream_state *stream, static void open_output_file(struct stream_state *stream, struct VpxEncoderConfig *global) { const char *fn = stream->config.out_fn; + const struct vpx_codec_enc_cfg *const cfg = &stream->config.cfg; + + if (cfg->g_pass == VPX_RC_FIRST_PASS) + return; stream->file = strcmp(fn, "-") ? fopen(fn, "wb") : set_binary_mode(stdout); @@ -1404,18 +1408,23 @@ static void open_output_file(struct stream_state *stream, if (stream->config.write_webm) { stream->ebml.stream = stream->file; - write_webm_file_header(&stream->ebml, &stream->config.cfg, + write_webm_file_header(&stream->ebml, cfg, &global->framerate, stream->config.stereo_fmt, global->codec->fourcc); - } else - ivf_write_file_header(stream->file, &stream->config.cfg, - global->codec->fourcc, 0); + } else { + ivf_write_file_header(stream->file, cfg, global->codec->fourcc, 0); + } } static void close_output_file(struct stream_state *stream, - unsigned int fourcc) { + unsigned int fourcc) { + const struct vpx_codec_enc_cfg *const cfg = &stream->config.cfg; + + if (cfg->g_pass == VPX_RC_FIRST_PASS) + return; + if (stream->config.write_webm) { write_webm_file_footer(&stream->ebml, stream->hash); free(stream->ebml.cue_list); |