Commit 95ac8fa7 authored by Dmitry Kovalev's avatar Dmitry Kovalev Committed by Gerrit Code Review
Browse files

Merge "twopass_encoder: Flush encoder."

parents 28eaa5f4 1e82bdec
...@@ -66,13 +66,14 @@ void usage_exit() { ...@@ -66,13 +66,14 @@ void usage_exit() {
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
static void get_frame_stats(vpx_codec_ctx_t *ctx, static int get_frame_stats(vpx_codec_ctx_t *ctx,
const vpx_image_t *img, const vpx_image_t *img,
vpx_codec_pts_t pts, vpx_codec_pts_t pts,
unsigned int duration, unsigned int duration,
vpx_enc_frame_flags_t flags, vpx_enc_frame_flags_t flags,
unsigned int deadline, unsigned int deadline,
vpx_fixed_buf_t *stats) { vpx_fixed_buf_t *stats) {
int got_pkts = 0;
vpx_codec_iter_t iter = NULL; vpx_codec_iter_t iter = NULL;
const vpx_codec_cx_pkt_t *pkt = NULL; const vpx_codec_cx_pkt_t *pkt = NULL;
const vpx_codec_err_t res = vpx_codec_encode(ctx, img, pts, duration, flags, const vpx_codec_err_t res = vpx_codec_encode(ctx, img, pts, duration, flags,
...@@ -81,6 +82,8 @@ static void get_frame_stats(vpx_codec_ctx_t *ctx, ...@@ -81,6 +82,8 @@ static void get_frame_stats(vpx_codec_ctx_t *ctx,
die_codec(ctx, "Failed to get frame stats."); die_codec(ctx, "Failed to get frame stats.");
while ((pkt = vpx_codec_get_cx_data(ctx, &iter)) != NULL) { while ((pkt = vpx_codec_get_cx_data(ctx, &iter)) != NULL) {
got_pkts = 1;
if (pkt->kind == VPX_CODEC_STATS_PKT) { if (pkt->kind == VPX_CODEC_STATS_PKT) {
const uint8_t *const pkt_buf = pkt->data.twopass_stats.buf; const uint8_t *const pkt_buf = pkt->data.twopass_stats.buf;
const size_t pkt_size = pkt->data.twopass_stats.sz; const size_t pkt_size = pkt->data.twopass_stats.sz;
...@@ -89,15 +92,18 @@ static void get_frame_stats(vpx_codec_ctx_t *ctx, ...@@ -89,15 +92,18 @@ static void get_frame_stats(vpx_codec_ctx_t *ctx,
stats->sz += pkt_size; stats->sz += pkt_size;
} }
} }
return got_pkts;
} }
static void encode_frame(vpx_codec_ctx_t *ctx, static int encode_frame(vpx_codec_ctx_t *ctx,
const vpx_image_t *img, const vpx_image_t *img,
vpx_codec_pts_t pts, vpx_codec_pts_t pts,
unsigned int duration, unsigned int duration,
vpx_enc_frame_flags_t flags, vpx_enc_frame_flags_t flags,
unsigned int deadline, unsigned int deadline,
VpxVideoWriter *writer) { VpxVideoWriter *writer) {
int got_pkts = 0;
vpx_codec_iter_t iter = NULL; vpx_codec_iter_t iter = NULL;
const vpx_codec_cx_pkt_t *pkt = NULL; const vpx_codec_cx_pkt_t *pkt = NULL;
const vpx_codec_err_t res = vpx_codec_encode(ctx, img, pts, duration, flags, const vpx_codec_err_t res = vpx_codec_encode(ctx, img, pts, duration, flags,
...@@ -106,6 +112,7 @@ static void encode_frame(vpx_codec_ctx_t *ctx, ...@@ -106,6 +112,7 @@ static void encode_frame(vpx_codec_ctx_t *ctx,
die_codec(ctx, "Failed to encode frame."); die_codec(ctx, "Failed to encode frame.");
while ((pkt = vpx_codec_get_cx_data(ctx, &iter)) != NULL) { while ((pkt = vpx_codec_get_cx_data(ctx, &iter)) != NULL) {
got_pkts = 1;
if (pkt->kind == VPX_CODEC_CX_FRAME_PKT) { if (pkt->kind == VPX_CODEC_CX_FRAME_PKT) {
const int keyframe = (pkt->data.frame.flags & VPX_FRAME_IS_KEY) != 0; const int keyframe = (pkt->data.frame.flags & VPX_FRAME_IS_KEY) != 0;
...@@ -117,12 +124,14 @@ static void encode_frame(vpx_codec_ctx_t *ctx, ...@@ -117,12 +124,14 @@ static void encode_frame(vpx_codec_ctx_t *ctx,
fflush(stdout); fflush(stdout);
} }
} }
return got_pkts;
} }
static vpx_fixed_buf_t pass0(vpx_image_t *raw, static vpx_fixed_buf_t pass0(vpx_image_t *raw,
FILE *infile, FILE *infile,
const VpxInterface *encoder, const VpxInterface *encoder,
vpx_codec_enc_cfg_t *cfg) { const vpx_codec_enc_cfg_t *cfg) {
vpx_codec_ctx_t codec; vpx_codec_ctx_t codec;
int frame_count = 0; int frame_count = 0;
vpx_fixed_buf_t stats = {NULL, 0}; vpx_fixed_buf_t stats = {NULL, 0};
...@@ -130,13 +139,16 @@ static vpx_fixed_buf_t pass0(vpx_image_t *raw, ...@@ -130,13 +139,16 @@ static vpx_fixed_buf_t pass0(vpx_image_t *raw,
if (vpx_codec_enc_init(&codec, encoder->codec_interface(), cfg, 0)) if (vpx_codec_enc_init(&codec, encoder->codec_interface(), cfg, 0))
die_codec(&codec, "Failed to initialize encoder"); die_codec(&codec, "Failed to initialize encoder");
// Calculate frame statistics.
while (vpx_img_read(raw, infile)) { while (vpx_img_read(raw, infile)) {
++frame_count; ++frame_count;
get_frame_stats(&codec, raw, frame_count, 1, 0, VPX_DL_BEST_QUALITY, get_frame_stats(&codec, raw, frame_count, 1, 0, VPX_DL_BEST_QUALITY,
&stats); &stats);
} }
get_frame_stats(&codec, NULL, frame_count, 1, 0, VPX_DL_BEST_QUALITY, &stats); // Flush encoder.
while (get_frame_stats(&codec, NULL, frame_count, 1, 0,
VPX_DL_BEST_QUALITY, &stats)) {}
printf("Pass 0 complete. Processed %d frames.\n", frame_count); printf("Pass 0 complete. Processed %d frames.\n", frame_count);
if (vpx_codec_destroy(&codec)) if (vpx_codec_destroy(&codec))
...@@ -149,7 +161,7 @@ static void pass1(vpx_image_t *raw, ...@@ -149,7 +161,7 @@ static void pass1(vpx_image_t *raw,
FILE *infile, FILE *infile,
const char *outfile_name, const char *outfile_name,
const VpxInterface *encoder, const VpxInterface *encoder,
vpx_codec_enc_cfg_t *cfg) { const vpx_codec_enc_cfg_t *cfg) {
VpxVideoInfo info = { VpxVideoInfo info = {
encoder->fourcc, encoder->fourcc,
cfg->g_w, cfg->g_w,
...@@ -167,11 +179,15 @@ static void pass1(vpx_image_t *raw, ...@@ -167,11 +179,15 @@ static void pass1(vpx_image_t *raw,
if (vpx_codec_enc_init(&codec, encoder->codec_interface(), cfg, 0)) if (vpx_codec_enc_init(&codec, encoder->codec_interface(), cfg, 0))
die_codec(&codec, "Failed to initialize encoder"); die_codec(&codec, "Failed to initialize encoder");
// Encode frames.
while (vpx_img_read(raw, infile)) { while (vpx_img_read(raw, infile)) {
++frame_count; ++frame_count;
encode_frame(&codec, raw, frame_count, 1, 0, VPX_DL_BEST_QUALITY, writer); encode_frame(&codec, raw, frame_count, 1, 0, VPX_DL_BEST_QUALITY, writer);
} }
// Flush encoder.
while (encode_frame(&codec, NULL, -1, 1, 0, VPX_DL_BEST_QUALITY, writer)) {}
printf("\n"); printf("\n");
if (vpx_codec_destroy(&codec)) if (vpx_codec_destroy(&codec))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment