diff --git a/.gitignore b/.gitignore index aa95d571c..2cf3680ef 100644 --- a/.gitignore +++ b/.gitignore @@ -28,9 +28,7 @@ /examples/decode_to_md5 /examples/decode_with_drops /examples/decode_with_partial_drops -/examples/error_resilient /examples/example_xma -/examples/force_keyframe /examples/postproc /examples/simple_decoder /examples/simple_encoder diff --git a/examples.mk b/examples.mk index f68c46dfb..bf4c6ff08 100644 --- a/examples.mk +++ b/examples.mk @@ -123,9 +123,6 @@ twopass_encoder.SRCS += video_common.h twopass_encoder.SRCS += video_writer.h video_writer.c twopass_encoder.GUID = 73494FA6-4AF9-4763-8FBB-265C92402FD8 twopass_encoder.DESCRIPTION = Two-pass encoder loop -EXAMPLES-$(CONFIG_VP8_ENCODER) += force_keyframe.c -force_keyframe.GUID = 3C67CADF-029F-4C86-81F5-D6D4F51177F0 -force_keyframe.DESCRIPTION = Force generation of keyframes ifeq ($(CONFIG_DECODERS),yes) EXAMPLES-$(CONFIG_VP8_ENCODER) += decode_with_drops.c decode_with_drops.SRCS += ivfdec.h ivfdec.c diff --git a/examples/force_keyframe.c b/examples/force_keyframe.c deleted file mode 100644 index 6531e4713..000000000 --- a/examples/force_keyframe.c +++ /dev/null @@ -1,225 +0,0 @@ -/* - * Copyright (c) 2010 The WebM project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -// Forcing A Keyframe -// ================== -// -// This is an example demonstrating how to control placement of keyframes -// on a frame-by-frame basis. -// -// Configuration -// ------------- -// Keyframes can be forced by setting the VPX_EFLAG_FORCE_KF bit of the -// flags passed to `vpx_codec_control()`. In this example, we force a -// keyframe every 8 frames. -// -// Observing The Effects -// --------------------- -// The output of the encoder examples shows a 'K' rather than a dot '.' -// when the encoder generates a keyframe. Note that every 8 frames a 'K' -// is output. - -#include -#include -#include -#include -#define VPX_CODEC_DISABLE_COMPAT 1 -#include "vpx/vpx_encoder.h" -#include "vpx/vp8cx.h" -#define interface (vpx_codec_vp8_cx()) -#define fourcc 0x30385056 - -#define IVF_FILE_HDR_SZ (32) -#define IVF_FRAME_HDR_SZ (12) - -static void mem_put_le16(char *mem, unsigned int val) { - mem[0] = val; - mem[1] = val>>8; -} - -static void mem_put_le32(char *mem, unsigned int val) { - mem[0] = val; - mem[1] = val>>8; - mem[2] = val>>16; - mem[3] = val>>24; -} - -static void die(const char *fmt, ...) { - va_list ap; - - va_start(ap, fmt); - vprintf(fmt, ap); - if(fmt[strlen(fmt)-1] != '\n') - printf("\n"); - exit(EXIT_FAILURE); -} - -static void die_codec(vpx_codec_ctx_t *ctx, const char *s) { - const char *detail = vpx_codec_error_detail(ctx); - - printf("%s: %s\n", s, vpx_codec_error(ctx)); - if(detail) - printf(" %s\n",detail); - exit(EXIT_FAILURE); -} - -static int read_frame(FILE *f, vpx_image_t *img) { - size_t nbytes, to_read; - int res = 1; - - to_read = img->w*img->h*3/2; - nbytes = fread(img->planes[0], 1, to_read, f); - if(nbytes != to_read) { - res = 0; - if(nbytes > 0) - printf("Warning: Read partial frame. Check your width & height!\n"); - } - return res; -} - -static void write_ivf_file_header(FILE *outfile, - const vpx_codec_enc_cfg_t *cfg, - 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'; - header[3] = 'F'; - mem_put_le16(header+4, 0); /* version */ - mem_put_le16(header+6, 32); /* headersize */ - mem_put_le32(header+8, fourcc); /* headersize */ - 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 */ - - (void) fwrite(header, 1, 32, outfile); -} - - -static void write_ivf_frame_header(FILE *outfile, - const vpx_codec_cx_pkt_t *pkt) -{ - char header[12]; - vpx_codec_pts_t pts; - - if(pkt->kind != VPX_CODEC_CX_FRAME_PKT) - return; - - pts = pkt->data.frame.pts; - mem_put_le32(header, (unsigned int)pkt->data.frame.sz); - mem_put_le32(header+4, pts&0xFFFFFFFF); - mem_put_le32(header+8, pts >> 32); - - (void) fwrite(header, 1, 12, outfile); -} - -int main(int argc, char **argv) { - FILE *infile, *outfile; - vpx_codec_ctx_t codec; - vpx_codec_enc_cfg_t cfg; - int frame_cnt = 0; - vpx_image_t raw; - vpx_codec_err_t res; - long width; - long height; - int frame_avail; - int got_data; - int flags = 0; - - /* Open files */ - if(argc!=5) - die("Usage: %s \n", argv[0]); - width = strtol(argv[1], NULL, 0); - height = strtol(argv[2], NULL, 0); - if(width < 16 || width%2 || height <16 || height%2) - die("Invalid resolution: %ldx%ld", width, height); - if(!vpx_img_alloc(&raw, VPX_IMG_FMT_I420, width, height, 1)) - die("Faile to allocate image", width, height); - if(!(outfile = fopen(argv[4], "wb"))) - die("Failed to open %s for writing", argv[4]); - - printf("Using %s\n",vpx_codec_iface_name(interface)); - - /* Populate encoder configuration */ - res = vpx_codec_enc_config_default(interface, &cfg, 0); - if(res) { - printf("Failed to get config: %s\n", vpx_codec_err_to_string(res)); - return EXIT_FAILURE; - } - - /* Update the default configuration with our settings */ - cfg.rc_target_bitrate = width * height * cfg.rc_target_bitrate - / cfg.g_w / cfg.g_h; - cfg.g_w = width; - cfg.g_h = height; - - write_ivf_file_header(outfile, &cfg, 0); - - - /* Open input file for this encoding pass */ - if(!(infile = fopen(argv[3], "rb"))) - die("Failed to open %s for reading", argv[3]); - - /* Initialize codec */ - if(vpx_codec_enc_init(&codec, interface, &cfg, 0)) - die_codec(&codec, "Failed to initialize encoder"); - - frame_avail = 1; - got_data = 0; - while(frame_avail || got_data) { - vpx_codec_iter_t iter = NULL; - const vpx_codec_cx_pkt_t *pkt; - - if(!(frame_cnt & 7)) - flags |= VPX_EFLAG_FORCE_KF; - else - flags &= ~VPX_EFLAG_FORCE_KF; - frame_avail = read_frame(infile, &raw); - if(vpx_codec_encode(&codec, frame_avail? &raw : NULL, frame_cnt, - 1, flags, VPX_DL_REALTIME)) - die_codec(&codec, "Failed to encode frame"); - got_data = 0; - while( (pkt = vpx_codec_get_cx_data(&codec, &iter)) ) { - got_data = 1; - switch(pkt->kind) { - case VPX_CODEC_CX_FRAME_PKT: - write_ivf_frame_header(outfile, pkt); - (void) fwrite(pkt->data.frame.buf, 1, pkt->data.frame.sz, - outfile); - break; - default: - break; - } - printf(pkt->kind == VPX_CODEC_CX_FRAME_PKT - && (pkt->data.frame.flags & VPX_FRAME_IS_KEY)? "K":"."); - fflush(stdout); - } - frame_cnt++; - } - printf("\n"); - fclose(infile); - - printf("Processed %d frames.\n",frame_cnt-1); - vpx_img_free(&raw); - if(vpx_codec_destroy(&codec)) - die_codec(&codec, "Failed to destroy codec"); - - /* Try to rewrite the file header with the actual frame count */ - if(!fseek(outfile, 0, SEEK_SET)) - write_ivf_file_header(outfile, &cfg, frame_cnt-1); - fclose(outfile); - return EXIT_SUCCESS; -} diff --git a/examples/simple_encoder.c b/examples/simple_encoder.c index 6ecd4984f..af58091ae 100644 --- a/examples/simple_encoder.c +++ b/examples/simple_encoder.c @@ -64,6 +64,15 @@ // frame is shown for one frame-time in duration. The flags parameter is // unused in this example. The deadline is set to VPX_DL_REALTIME to // make the example run as quickly as possible. + +// Forced Keyframes +// ---------------- +// Keyframes can be forced by setting the VPX_EFLAG_FORCE_KF bit of the +// flags passed to `vpx_codec_control()`. In this example, we force a +// keyframe every frames. Note, the output stream can +// contain additional keyframes beyond those that have been forced using the +// VPX_EFLAG_FORCE_KF flag because of automatic keyframe placement by the +// encoder. // // Processing The Encoded Data // --------------------------- @@ -103,8 +112,8 @@ static const char *exec_name; void usage_exit() { fprintf(stderr, "Usage: %s " - "[]\nSee comments in simple_encoder.c for more " - "information.\n", + " []\nSee comments in " + "simple_encoder.c for more information.\n", exec_name); exit(EXIT_FAILURE); } @@ -112,11 +121,12 @@ void usage_exit() { static void encode_frame(vpx_codec_ctx_t *codec, vpx_image_t *img, int frame_index, + int flags, VpxVideoWriter *writer) { vpx_codec_iter_t iter = NULL; const vpx_codec_cx_pkt_t *pkt = NULL; - const vpx_codec_err_t res = vpx_codec_encode(codec, img, frame_index, 1, 0, - VPX_DL_GOOD_QUALITY); + const vpx_codec_err_t res = vpx_codec_encode(codec, img, frame_index, 1, + flags, VPX_DL_GOOD_QUALITY); if (res != VPX_CODEC_OK) die_codec(codec, "Failed to encode frame"); @@ -148,15 +158,20 @@ int main(int argc, char **argv) { const VpxInterface *encoder = NULL; const int fps = 30; // TODO(dkovalev) add command line argument const int bitrate = 200; // kbit/s TODO(dkovalev) add command line argument + int keyframe_interval = 0; + + // TODO(dkovalev): Add some simple command line parsing code to make the + // command line more flexible. const char *codec_arg = NULL; const char *width_arg = NULL; const char *height_arg = NULL; const char *infile_arg = NULL; const char *outfile_arg = NULL; + const char *keyframe_interval_arg = NULL; exec_name = argv[0]; - if (argc < 6) + if (argc < 7) die("Invalid number of arguments"); codec_arg = argv[1]; @@ -164,6 +179,7 @@ int main(int argc, char **argv) { height_arg = argv[3]; infile_arg = argv[4]; outfile_arg = argv[5]; + keyframe_interval_arg = argv[6]; encoder = get_vpx_encoder_by_name(codec_arg); if (!encoder) @@ -187,6 +203,10 @@ int main(int argc, char **argv) { die("Failed to allocate image."); } + keyframe_interval = strtol(keyframe_interval_arg, NULL, 0); + if (keyframe_interval < 0) + die("Invalid keyframe interval value."); + printf("Using %s\n", vpx_codec_iface_name(encoder->interface())); res = vpx_codec_enc_config_default(encoder->interface(), &cfg, 0); @@ -198,7 +218,7 @@ int main(int argc, char **argv) { cfg.g_timebase.num = info.time_base.numerator; cfg.g_timebase.den = info.time_base.denominator; cfg.rc_target_bitrate = bitrate; - cfg.g_error_resilient = argc > 6 ? strtol(argv[6], NULL, 0) : 0; + cfg.g_error_resilient = argc > 7 ? strtol(argv[7], NULL, 0) : 0; writer = vpx_video_writer_open(outfile_arg, kContainerIVF, &info); if (!writer) @@ -210,9 +230,13 @@ int main(int argc, char **argv) { if (vpx_codec_enc_init(&codec, encoder->interface(), &cfg, 0)) die_codec(&codec, "Failed to initialize encoder"); - while (vpx_img_read(&raw, infile)) - encode_frame(&codec, &raw, frame_count++, writer); - encode_frame(&codec, NULL, -1, writer); // flush the encoder + while (vpx_img_read(&raw, infile)) { + int flags = 0; + if (keyframe_interval > 0 && frame_count % keyframe_interval == 0) + flags |= VPX_EFLAG_FORCE_KF; + encode_frame(&codec, &raw, frame_count++, flags, writer); + } + encode_frame(&codec, NULL, -1, 0, writer); // flush the encoder printf("\n"); fclose(infile);