X-Git-Url: https://granicus.if.org/sourcecode?a=blobdiff_plain;f=ivfenc.c;h=2e8e04283ab773a25efa0b1830c404a54e08f788;hb=23796337ce5b0a2f58eb7386c9aded5e6a4b84f6;hp=4a97c42731c93523379fcd2cb80c2bc5524c3722;hpb=6432ae4902cf07a9751b02c2bc5ff9e9beca8960;p=libvpx diff --git a/ivfenc.c b/ivfenc.c index 4a97c4273..2e8e04283 100644 --- a/ivfenc.c +++ b/ivfenc.c @@ -13,29 +13,35 @@ #include "vpx/vpx_encoder.h" #include "vpx_ports/mem_ops.h" -void ivf_write_file_header(FILE *outfile, - const struct vpx_codec_enc_cfg *cfg, - unsigned int fourcc, - int frame_cnt) { +void ivf_write_file_header_with_video_info(FILE *outfile, unsigned int fourcc, + int frame_cnt, int frame_width, + int frame_height, + vpx_rational_t timebase) { char header[32]; header[0] = 'D'; header[1] = 'K'; header[2] = 'I'; header[3] = 'F'; - mem_put_le16(header + 4, 0); // version - mem_put_le16(header + 6, 32); // header size - mem_put_le32(header + 8, fourcc); // fourcc - mem_put_le16(header + 12, cfg->g_w); // width - mem_put_le16(header + 14, cfg->g_h); // height - mem_put_le32(header + 16, cfg->g_timebase.den); // rate - mem_put_le32(header + 20, cfg->g_timebase.num); // scale - mem_put_le32(header + 24, frame_cnt); // length - mem_put_le32(header + 28, 0); // unused + mem_put_le16(header + 4, 0); // version + mem_put_le16(header + 6, 32); // header size + mem_put_le32(header + 8, fourcc); // fourcc + mem_put_le16(header + 12, frame_width); // width + mem_put_le16(header + 14, frame_height); // height + mem_put_le32(header + 16, timebase.den); // rate + mem_put_le32(header + 20, timebase.num); // scale + mem_put_le32(header + 24, frame_cnt); // length + mem_put_le32(header + 28, 0); // unused fwrite(header, 1, 32, outfile); } +void ivf_write_file_header(FILE *outfile, const struct vpx_codec_enc_cfg *cfg, + unsigned int fourcc, int frame_cnt) { + ivf_write_file_header_with_video_info(outfile, fourcc, frame_cnt, cfg->g_w, + cfg->g_h, cfg->g_timebase); +} + void ivf_write_frame_header(FILE *outfile, int64_t pts, size_t frame_size) { char header[12];