vpxenc.c 67.1 KB
Newer Older
John Koleszar's avatar
John Koleszar committed
1
/*
2
 *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
John Koleszar's avatar
John Koleszar committed
3
 *
4
 *  Use of this source code is governed by a BSD-style license
5 6
 *  that can be found in the LICENSE file in the root of the source
 *  tree. An additional intellectual property rights grant can be found
7
 *  in the file PATENTS.  All contributing project authors may
8
 *  be found in the AUTHORS file in the root of the source tree.
John Koleszar's avatar
John Koleszar committed
9 10
 */

11
#include "./vpxenc.h"
12
#include "./vpx_config.h"
John Koleszar's avatar
John Koleszar committed
13

14 15
#include <assert.h>
#include <limits.h>
16
#include <math.h>
17
#include <stdarg.h>
John Koleszar's avatar
John Koleszar committed
18 19 20
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
21

22
#include "vpx/vpx_encoder.h"
23
#if CONFIG_DECODERS
John Koleszar's avatar
John Koleszar committed
24
#include "vpx/vpx_decoder.h"
25
#endif
John Koleszar's avatar
John Koleszar committed
26

27
#include "third_party/libyuv/include/libyuv/scale.h"
28 29
#include "./args.h"
#include "./ivfenc.h"
Tom Finegan's avatar
Tom Finegan committed
30
#include "./tools_common.h"
31

32
#if CONFIG_VP8_ENCODER || CONFIG_VP9_ENCODER
33
#include "vpx/vp8cx.h"
John Koleszar's avatar
John Koleszar committed
34
#endif
35
#if CONFIG_VP8_DECODER || CONFIG_VP9_DECODER
36
#include "vpx/vp8dx.h"
John Koleszar's avatar
John Koleszar committed
37 38
#endif

Tom Finegan's avatar
Tom Finegan committed
39
#include "vpx/vpx_integer.h"
John Koleszar's avatar
John Koleszar committed
40 41
#include "vpx_ports/mem_ops.h"
#include "vpx_ports/vpx_timer.h"
42
#include "./rate_hist.h"
43
#include "./vpxstats.h"
44
#include "./warnings.h"
45
#if CONFIG_WEBM_IO
46
#include "./webmenc.h"
47
#endif
48
#include "./y4minput.h"
49

John Koleszar's avatar
John Koleszar committed
50 51
/* Swallow warnings about unused results of fread/fwrite */
static size_t wrap_fread(void *ptr, size_t size, size_t nmemb,
John Koleszar's avatar
John Koleszar committed
52 53
                         FILE *stream) {
  return fread(ptr, size, nmemb, stream);
John Koleszar's avatar
John Koleszar committed
54 55 56 57
}
#define fread wrap_fread

static size_t wrap_fwrite(const void *ptr, size_t size, size_t nmemb,
John Koleszar's avatar
John Koleszar committed
58 59
                          FILE *stream) {
  return fwrite(ptr, size, nmemb, stream);
John Koleszar's avatar
John Koleszar committed
60 61 62 63
}
#define fwrite wrap_fwrite


John Koleszar's avatar
John Koleszar committed
64 65
static const char *exec_name;

66 67
static void warn_or_exit_on_errorv(vpx_codec_ctx_t *ctx, int fatal,
                                   const char *s, va_list ap) {
John Koleszar's avatar
John Koleszar committed
68 69
  if (ctx->err) {
    const char *detail = vpx_codec_error_detail(ctx);
John Koleszar's avatar
John Koleszar committed
70

John Koleszar's avatar
John Koleszar committed
71 72
    vfprintf(stderr, s, ap);
    fprintf(stderr, ": %s\n", vpx_codec_error(ctx));
John Koleszar's avatar
John Koleszar committed
73

John Koleszar's avatar
John Koleszar committed
74 75
    if (detail)
      fprintf(stderr, "    %s\n", detail);
John Koleszar's avatar
John Koleszar committed
76

77 78
    if (fatal)
      exit(EXIT_FAILURE);
John Koleszar's avatar
John Koleszar committed
79
  }
John Koleszar's avatar
John Koleszar committed
80 81
}

82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98
static void ctx_exit_on_error(vpx_codec_ctx_t *ctx, const char *s, ...) {
  va_list ap;

  va_start(ap, s);
  warn_or_exit_on_errorv(ctx, 1, s, ap);
  va_end(ap);
}

static void warn_or_exit_on_error(vpx_codec_ctx_t *ctx, int fatal,
                                  const char *s, ...) {
  va_list ap;

  va_start(ap, s);
  warn_or_exit_on_errorv(ctx, fatal, s, ap);
  va_end(ap);
}

99 100 101
int read_frame(struct VpxInputContext *input_ctx, vpx_image_t *img) {
  FILE *f = input_ctx->file;
  y4m_input *y4m = &input_ctx->y4m;
John Koleszar's avatar
John Koleszar committed
102 103
  int shortread = 0;

104
  if (input_ctx->file_type == FILE_TYPE_Y4M) {
John Koleszar's avatar
John Koleszar committed
105 106 107
    if (y4m_input_fetch_frame(y4m, f, img) < 1)
      return 0;
  } else {
108
    shortread = read_yuv_frame(input_ctx, img);
John Koleszar's avatar
John Koleszar committed
109
  }
John Koleszar's avatar
John Koleszar committed
110

John Koleszar's avatar
John Koleszar committed
111
  return !shortread;
John Koleszar's avatar
John Koleszar committed
112 113
}

114
int file_is_y4m(const char detect[4]) {
John Koleszar's avatar
John Koleszar committed
115 116 117 118
  if (memcmp(detect, "YUV4", 4) == 0) {
    return 1;
  }
  return 0;
119 120
}

121 122 123 124 125 126
int fourcc_is_ivf(const char detect[4]) {
  if (memcmp(detect, "DKIF", 4) == 0) {
    return 1;
  }
  return 0;
}
John Koleszar's avatar
John Koleszar committed
127

128
static const arg_def_t debugmode = ARG_DEF("D", "debug", 0,
John Koleszar's avatar
John Koleszar committed
129
                                           "Debug mode (makes output deterministic)");
130
static const arg_def_t outputfile = ARG_DEF("o", "output", 1,
John Koleszar's avatar
John Koleszar committed
131
                                            "Output filename");
John Koleszar's avatar
John Koleszar committed
132
static const arg_def_t use_yv12 = ARG_DEF(NULL, "yv12", 0,
John Koleszar's avatar
John Koleszar committed
133
                                          "Input file is YV12 ");
John Koleszar's avatar
John Koleszar committed
134
static const arg_def_t use_i420 = ARG_DEF(NULL, "i420", 0,
John Koleszar's avatar
John Koleszar committed
135
                                          "Input file is I420 (default)");
136 137 138 139
static const arg_def_t use_i422 = ARG_DEF(NULL, "i422", 0,
                                          "Input file is I422");
static const arg_def_t use_i444 = ARG_DEF(NULL, "i444", 0,
                                          "Input file is I444");
John Koleszar's avatar
John Koleszar committed
140
static const arg_def_t codecarg = ARG_DEF(NULL, "codec", 1,
John Koleszar's avatar
John Koleszar committed
141
                                          "Codec to use");
John Koleszar's avatar
John Koleszar committed
142
static const arg_def_t passes           = ARG_DEF("p", "passes", 1,
John Koleszar's avatar
John Koleszar committed
143
                                                  "Number of passes (1/2)");
John Koleszar's avatar
John Koleszar committed
144
static const arg_def_t pass_arg         = ARG_DEF(NULL, "pass", 1,
John Koleszar's avatar
John Koleszar committed
145
                                                  "Pass to execute (1/2)");
John Koleszar's avatar
John Koleszar committed
146
static const arg_def_t fpf_name         = ARG_DEF(NULL, "fpf", 1,
John Koleszar's avatar
John Koleszar committed
147
                                                  "First pass statistics file name");
148 149 150 151
#if CONFIG_FP_MB_STATS
static const arg_def_t fpmbf_name         = ARG_DEF(NULL, "fpmbf", 1,
                                      "First pass block statistics file name");
#endif
John Koleszar's avatar
John Koleszar committed
152 153
static const arg_def_t limit = ARG_DEF(NULL, "limit", 1,
                                       "Stop encoding after n input frames");
154
static const arg_def_t skip = ARG_DEF(NULL, "skip", 1,
John Koleszar's avatar
John Koleszar committed
155
                                      "Skip the first n input frames");
John Koleszar's avatar
John Koleszar committed
156
static const arg_def_t deadline         = ARG_DEF("d", "deadline", 1,
John Koleszar's avatar
John Koleszar committed
157
                                                  "Deadline per frame (usec)");
John Koleszar's avatar
John Koleszar committed
158
static const arg_def_t best_dl          = ARG_DEF(NULL, "best", 0,
John Koleszar's avatar
John Koleszar committed
159
                                                  "Use Best Quality Deadline");
John Koleszar's avatar
John Koleszar committed
160
static const arg_def_t good_dl          = ARG_DEF(NULL, "good", 0,
John Koleszar's avatar
John Koleszar committed
161
                                                  "Use Good Quality Deadline");
John Koleszar's avatar
John Koleszar committed
162
static const arg_def_t rt_dl            = ARG_DEF(NULL, "rt", 0,
John Koleszar's avatar
John Koleszar committed
163
                                                  "Use Realtime Quality Deadline");
James Zern's avatar
James Zern committed
164
static const arg_def_t quietarg         = ARG_DEF("q", "quiet", 0,
John Koleszar's avatar
John Koleszar committed
165
                                                  "Do not print encode progress");
John Koleszar's avatar
John Koleszar committed
166
static const arg_def_t verbosearg       = ARG_DEF("v", "verbose", 0,
John Koleszar's avatar
John Koleszar committed
167
                                                  "Show encoder parameters");
John Koleszar's avatar
John Koleszar committed
168
static const arg_def_t psnrarg          = ARG_DEF(NULL, "psnr", 0,
John Koleszar's avatar
John Koleszar committed
169
                                                  "Show PSNR in status line");
170

171 172 173 174 175 176 177 178 179
static const struct arg_enum_list test_decode_enum[] = {
  {"off",   TEST_DECODE_OFF},
  {"fatal", TEST_DECODE_FATAL},
  {"warn",  TEST_DECODE_WARN},
  {NULL, 0}
};
static const arg_def_t recontest = ARG_DEF_ENUM(NULL, "test-decode", 1,
                                                "Test encode/decode mismatch",
                                                test_decode_enum);
180
static const arg_def_t framerate        = ARG_DEF(NULL, "fps", 1,
John Koleszar's avatar
John Koleszar committed
181
                                                  "Stream frame rate (rate/scale)");
John Koleszar's avatar
John Koleszar committed
182
static const arg_def_t use_ivf          = ARG_DEF(NULL, "ivf", 0,
183
                                                  "Output IVF (default is WebM if WebM IO is enabled)");
184
static const arg_def_t out_part = ARG_DEF("P", "output-partitions", 0,
John Koleszar's avatar
John Koleszar committed
185
                                          "Makes encoder output partitions. Requires IVF output!");
186
static const arg_def_t q_hist_n         = ARG_DEF(NULL, "q-hist", 1,
John Koleszar's avatar
John Koleszar committed
187
                                                  "Show quantizer histogram (n-buckets)");
188
static const arg_def_t rate_hist_n         = ARG_DEF(NULL, "rate-hist", 1,
John Koleszar's avatar
John Koleszar committed
189
                                                     "Show rate histogram (n-buckets)");
190 191 192
static const arg_def_t disable_warnings =
    ARG_DEF(NULL, "disable-warnings", 0,
            "Disable warnings about potentially incorrect encode settings.");
193 194 195
static const arg_def_t disable_warning_prompt =
    ARG_DEF("y", "disable-warning-prompt", 0,
            "Display warnings, but do not prompt user to continue.");
196 197 198 199
static const arg_def_t experimental_bitstream =
    ARG_DEF(NULL, "experimental-bitstream", 0,
            "Allow experimental bitstream features.");

200

John Koleszar's avatar
John Koleszar committed
201 202 203
static const arg_def_t *main_args[] = {
  &debugmode,
  &outputfile, &codecarg, &passes, &pass_arg, &fpf_name, &limit, &skip,
John Koleszar's avatar
John Koleszar committed
204
  &deadline, &best_dl, &good_dl, &rt_dl,
205
  &quietarg, &verbosearg, &psnrarg, &use_ivf, &out_part, &q_hist_n,
206
  &rate_hist_n, &disable_warnings, &disable_warning_prompt,
John Koleszar's avatar
John Koleszar committed
207
  NULL
John Koleszar's avatar
John Koleszar committed
208 209 210
};

static const arg_def_t usage            = ARG_DEF("u", "usage", 1,
John Koleszar's avatar
John Koleszar committed
211
                                                  "Usage profile number to use");
John Koleszar's avatar
John Koleszar committed
212
static const arg_def_t threads          = ARG_DEF("t", "threads", 1,
John Koleszar's avatar
John Koleszar committed
213
                                                  "Max number of threads to use");
John Koleszar's avatar
John Koleszar committed
214
static const arg_def_t profile          = ARG_DEF(NULL, "profile", 1,
John Koleszar's avatar
John Koleszar committed
215
                                                  "Bitstream profile number to use");
John Koleszar's avatar
John Koleszar committed
216
static const arg_def_t width            = ARG_DEF("w", "width", 1,
John Koleszar's avatar
John Koleszar committed
217
                                                  "Frame width");
John Koleszar's avatar
John Koleszar committed
218
static const arg_def_t height           = ARG_DEF("h", "height", 1,
John Koleszar's avatar
John Koleszar committed
219
                                                  "Frame height");
220
#if CONFIG_WEBM_IO
221
static const struct arg_enum_list stereo_mode_enum[] = {
John Koleszar's avatar
John Koleszar committed
222 223 224 225 226 227
  {"mono", STEREO_FORMAT_MONO},
  {"left-right", STEREO_FORMAT_LEFT_RIGHT},
  {"bottom-top", STEREO_FORMAT_BOTTOM_TOP},
  {"top-bottom", STEREO_FORMAT_TOP_BOTTOM},
  {"right-left", STEREO_FORMAT_RIGHT_LEFT},
  {NULL, 0}
228 229
};
static const arg_def_t stereo_mode      = ARG_DEF_ENUM(NULL, "stereo-mode", 1,
John Koleszar's avatar
John Koleszar committed
230
                                                       "Stereo 3D video format", stereo_mode_enum);
231
#endif
John Koleszar's avatar
John Koleszar committed
232
static const arg_def_t timebase         = ARG_DEF(NULL, "timebase", 1,
John Koleszar's avatar
John Koleszar committed
233
                                                  "Output timestamp precision (fractional seconds)");
John Koleszar's avatar
John Koleszar committed
234
static const arg_def_t error_resilient  = ARG_DEF(NULL, "error-resilient", 1,
John Koleszar's avatar
John Koleszar committed
235
                                                  "Enable error resiliency features");
John Koleszar's avatar
John Koleszar committed
236
static const arg_def_t lag_in_frames    = ARG_DEF(NULL, "lag-in-frames", 1,
John Koleszar's avatar
John Koleszar committed
237
                                                  "Max number of frames to lag");
John Koleszar's avatar
John Koleszar committed
238

John Koleszar's avatar
John Koleszar committed
239
static const arg_def_t *global_args[] = {
240 241
  &use_yv12, &use_i420, &use_i422, &use_i444,
  &usage, &threads, &profile,
242 243 244 245 246
  &width, &height,
#if CONFIG_WEBM_IO
  &stereo_mode,
#endif
  &timebase, &framerate,
247
  &error_resilient,
John Koleszar's avatar
John Koleszar committed
248
  &lag_in_frames, NULL
John Koleszar's avatar
John Koleszar committed
249 250 251
};

static const arg_def_t dropframe_thresh   = ARG_DEF(NULL, "drop-frame", 1,
John Koleszar's avatar
John Koleszar committed
252
                                                    "Temporal resampling threshold (buf %)");
John Koleszar's avatar
John Koleszar committed
253
static const arg_def_t resize_allowed     = ARG_DEF(NULL, "resize-allowed", 1,
John Koleszar's avatar
John Koleszar committed
254
                                                    "Spatial resampling enabled (bool)");
255 256 257 258
static const arg_def_t resize_width       = ARG_DEF(NULL, "resize-width", 1,
                                                    "Width of encoded frame");
static const arg_def_t resize_height      = ARG_DEF(NULL, "resize-height", 1,
                                                    "Height of encoded frame");
John Koleszar's avatar
John Koleszar committed
259
static const arg_def_t resize_up_thresh   = ARG_DEF(NULL, "resize-up", 1,
John Koleszar's avatar
John Koleszar committed
260
                                                    "Upscale threshold (buf %)");
John Koleszar's avatar
John Koleszar committed
261
static const arg_def_t resize_down_thresh = ARG_DEF(NULL, "resize-down", 1,
John Koleszar's avatar
John Koleszar committed
262
                                                    "Downscale threshold (buf %)");
263
static const struct arg_enum_list end_usage_enum[] = {
John Koleszar's avatar
John Koleszar committed
264 265 266
  {"vbr", VPX_VBR},
  {"cbr", VPX_CBR},
  {"cq",  VPX_CQ},
267
  {"q",   VPX_Q},
John Koleszar's avatar
John Koleszar committed
268
  {NULL, 0}
269 270
};
static const arg_def_t end_usage          = ARG_DEF_ENUM(NULL, "end-usage", 1,
John Koleszar's avatar
John Koleszar committed
271
                                                         "Rate control mode", end_usage_enum);
John Koleszar's avatar
John Koleszar committed
272
static const arg_def_t target_bitrate     = ARG_DEF(NULL, "target-bitrate", 1,
John Koleszar's avatar
John Koleszar committed
273
                                                    "Bitrate (kbps)");
John Koleszar's avatar
John Koleszar committed
274
static const arg_def_t min_quantizer      = ARG_DEF(NULL, "min-q", 1,
John Koleszar's avatar
John Koleszar committed
275
                                                    "Minimum (best) quantizer");
John Koleszar's avatar
John Koleszar committed
276
static const arg_def_t max_quantizer      = ARG_DEF(NULL, "max-q", 1,
John Koleszar's avatar
John Koleszar committed
277
                                                    "Maximum (worst) quantizer");
John Koleszar's avatar
John Koleszar committed
278
static const arg_def_t undershoot_pct     = ARG_DEF(NULL, "undershoot-pct", 1,
John Koleszar's avatar
John Koleszar committed
279
                                                    "Datarate undershoot (min) target (%)");
John Koleszar's avatar
John Koleszar committed
280
static const arg_def_t overshoot_pct      = ARG_DEF(NULL, "overshoot-pct", 1,
John Koleszar's avatar
John Koleszar committed
281
                                                    "Datarate overshoot (max) target (%)");
John Koleszar's avatar
John Koleszar committed
282
static const arg_def_t buf_sz             = ARG_DEF(NULL, "buf-sz", 1,
John Koleszar's avatar
John Koleszar committed
283
                                                    "Client buffer size (ms)");
John Koleszar's avatar
John Koleszar committed
284
static const arg_def_t buf_initial_sz     = ARG_DEF(NULL, "buf-initial-sz", 1,
John Koleszar's avatar
John Koleszar committed
285
                                                    "Client initial buffer size (ms)");
John Koleszar's avatar
John Koleszar committed
286
static const arg_def_t buf_optimal_sz     = ARG_DEF(NULL, "buf-optimal-sz", 1,
John Koleszar's avatar
John Koleszar committed
287 288
                                                    "Client optimal buffer size (ms)");
static const arg_def_t *rc_args[] = {
289 290 291 292
  &dropframe_thresh, &resize_allowed, &resize_width, &resize_height,
  &resize_up_thresh, &resize_down_thresh, &end_usage, &target_bitrate,
  &min_quantizer, &max_quantizer, &undershoot_pct, &overshoot_pct, &buf_sz,
  &buf_initial_sz, &buf_optimal_sz, NULL
John Koleszar's avatar
John Koleszar committed
293 294 295 296
};


static const arg_def_t bias_pct = ARG_DEF(NULL, "bias-pct", 1,
John Koleszar's avatar
John Koleszar committed
297
                                          "CBR/VBR bias (0=CBR, 100=VBR)");
John Koleszar's avatar
John Koleszar committed
298
static const arg_def_t minsection_pct = ARG_DEF(NULL, "minsection-pct", 1,
John Koleszar's avatar
John Koleszar committed
299
                                                "GOP min bitrate (% of target)");
John Koleszar's avatar
John Koleszar committed
300
static const arg_def_t maxsection_pct = ARG_DEF(NULL, "maxsection-pct", 1,
John Koleszar's avatar
John Koleszar committed
301 302 303
                                                "GOP max bitrate (% of target)");
static const arg_def_t *rc_twopass_args[] = {
  &bias_pct, &minsection_pct, &maxsection_pct, NULL
John Koleszar's avatar
John Koleszar committed
304 305 306 307
};


static const arg_def_t kf_min_dist = ARG_DEF(NULL, "kf-min-dist", 1,
John Koleszar's avatar
John Koleszar committed
308
                                             "Minimum keyframe interval (frames)");
John Koleszar's avatar
John Koleszar committed
309
static const arg_def_t kf_max_dist = ARG_DEF(NULL, "kf-max-dist", 1,
John Koleszar's avatar
John Koleszar committed
310
                                             "Maximum keyframe interval (frames)");
311
static const arg_def_t kf_disabled = ARG_DEF(NULL, "disable-kf", 0,
John Koleszar's avatar
John Koleszar committed
312 313 314
                                             "Disable keyframe placement");
static const arg_def_t *kf_args[] = {
  &kf_min_dist, &kf_max_dist, &kf_disabled, NULL
John Koleszar's avatar
John Koleszar committed
315 316 317 318
};


static const arg_def_t noise_sens = ARG_DEF(NULL, "noise-sensitivity", 1,
John Koleszar's avatar
John Koleszar committed
319
                                            "Noise sensitivity (frames to blur)");
John Koleszar's avatar
John Koleszar committed
320
static const arg_def_t sharpness = ARG_DEF(NULL, "sharpness", 1,
John Koleszar's avatar
John Koleszar committed
321
                                           "Filter sharpness (0-7)");
John Koleszar's avatar
John Koleszar committed
322
static const arg_def_t static_thresh = ARG_DEF(NULL, "static-thresh", 1,
John Koleszar's avatar
John Koleszar committed
323
                                               "Motion detection threshold");
John Koleszar's avatar
John Koleszar committed
324
static const arg_def_t cpu_used = ARG_DEF(NULL, "cpu-used", 1,
John Koleszar's avatar
John Koleszar committed
325
                                          "CPU Used (-16..16)");
John Koleszar's avatar
John Koleszar committed
326
static const arg_def_t auto_altref = ARG_DEF(NULL, "auto-alt-ref", 1,
John Koleszar's avatar
John Koleszar committed
327
                                             "Enable automatic alt reference frames");
John Koleszar's avatar
John Koleszar committed
328
static const arg_def_t arnr_maxframes = ARG_DEF(NULL, "arnr-maxframes", 1,
John Koleszar's avatar
John Koleszar committed
329
                                                "AltRef Max Frames");
John Koleszar's avatar
John Koleszar committed
330
static const arg_def_t arnr_strength = ARG_DEF(NULL, "arnr-strength", 1,
John Koleszar's avatar
John Koleszar committed
331
                                               "AltRef Strength");
John Koleszar's avatar
John Koleszar committed
332
static const arg_def_t arnr_type = ARG_DEF(NULL, "arnr-type", 1,
John Koleszar's avatar
John Koleszar committed
333
                                           "AltRef Type");
John Koleszar's avatar
John Koleszar committed
334
static const struct arg_enum_list tuning_enum[] = {
John Koleszar's avatar
John Koleszar committed
335 336 337
  {"psnr", VP8_TUNE_PSNR},
  {"ssim", VP8_TUNE_SSIM},
  {NULL, 0}
John Koleszar's avatar
John Koleszar committed
338 339
};
static const arg_def_t tune_ssim = ARG_DEF_ENUM(NULL, "tune", 1,
John Koleszar's avatar
John Koleszar committed
340
                                                "Material to favor", tuning_enum);
Paul Wilkins's avatar
CQ Mode  
Paul Wilkins committed
341
static const arg_def_t cq_level = ARG_DEF(NULL, "cq-level", 1,
342
                                          "Constant/Constrained Quality level");
343
static const arg_def_t max_intra_rate_pct = ARG_DEF(NULL, "max-intra-rate", 1,
John Koleszar's avatar
John Koleszar committed
344
                                                    "Max I-frame bitrate (pct)");
John Koleszar's avatar
John Koleszar committed
345

346
#if CONFIG_VP8_ENCODER
347 348
static const arg_def_t token_parts =
    ARG_DEF(NULL, "token-parts", 1, "Number of token partitions to use, log2");
John Koleszar's avatar
John Koleszar committed
349 350 351
static const arg_def_t *vp8_args[] = {
  &cpu_used, &auto_altref, &noise_sens, &sharpness, &static_thresh,
  &token_parts, &arnr_maxframes, &arnr_strength, &arnr_type,
John Koleszar's avatar
John Koleszar committed
352
  &tune_ssim, &cq_level, &max_intra_rate_pct,
353
  NULL
John Koleszar's avatar
John Koleszar committed
354
};
355 356 357 358 359 360 361 362 363 364 365
static const int vp8_arg_ctrl_map[] = {
  VP8E_SET_CPUUSED, VP8E_SET_ENABLEAUTOALTREF,
  VP8E_SET_NOISE_SENSITIVITY, VP8E_SET_SHARPNESS, VP8E_SET_STATIC_THRESHOLD,
  VP8E_SET_TOKEN_PARTITIONS,
  VP8E_SET_ARNR_MAXFRAMES, VP8E_SET_ARNR_STRENGTH, VP8E_SET_ARNR_TYPE,
  VP8E_SET_TUNING, VP8E_SET_CQ_LEVEL, VP8E_SET_MAX_INTRA_BITRATE_PCT,
  0
};
#endif

#if CONFIG_VP9_ENCODER
366 367 368 369 370 371 372 373 374
static const arg_def_t tile_cols =
    ARG_DEF(NULL, "tile-columns", 1, "Number of tile columns to use, log2");
static const arg_def_t tile_rows =
    ARG_DEF(NULL, "tile-rows", 1, "Number of tile rows to use, log2");
static const arg_def_t lossless = ARG_DEF(NULL, "lossless", 1, "Lossless mode");
static const arg_def_t frame_parallel_decoding = ARG_DEF(
    NULL, "frame-parallel", 1, "Enable frame parallel decodability features");
static const arg_def_t aq_mode = ARG_DEF(
    NULL, "aq-mode", 1,
375
    "Adaptive quantization mode (0: off (default), 1: variance 2: complexity, "
376 377 378
    "3: cyclic refresh)");
static const arg_def_t frame_periodic_boost = ARG_DEF(
    NULL, "frame_boost", 1,
379
    "Enable frame periodic boost (0: off (default), 1: on)");
380

381 382 383 384 385 386 387 388 389
static const struct arg_enum_list tune_content_enum[] = {
  {"default", VP9E_CONTENT_DEFAULT},
  {"screen", VP9E_CONTENT_SCREEN},
  {NULL, 0}
};

static const arg_def_t tune_content = ARG_DEF_ENUM(
    NULL, "tune-content", 1, "Tune content type", tune_content_enum);

390 391
static const arg_def_t *vp9_args[] = {
  &cpu_used, &auto_altref, &noise_sens, &sharpness, &static_thresh,
392
  &tile_cols, &tile_rows, &arnr_maxframes, &arnr_strength, &arnr_type,
Yaowu Xu's avatar
Yaowu Xu committed
393
  &tune_ssim, &cq_level, &max_intra_rate_pct, &lossless,
394
  &frame_parallel_decoding, &aq_mode, &frame_periodic_boost, &tune_content,
John Koleszar's avatar
John Koleszar committed
395
  NULL
John Koleszar's avatar
John Koleszar committed
396
};
397
static const int vp9_arg_ctrl_map[] = {
John Koleszar's avatar
John Koleszar committed
398 399
  VP8E_SET_CPUUSED, VP8E_SET_ENABLEAUTOALTREF,
  VP8E_SET_NOISE_SENSITIVITY, VP8E_SET_SHARPNESS, VP8E_SET_STATIC_THRESHOLD,
Ronald S. Bultje's avatar
Ronald S. Bultje committed
400
  VP9E_SET_TILE_COLUMNS, VP9E_SET_TILE_ROWS,
401
  VP8E_SET_ARNR_MAXFRAMES, VP8E_SET_ARNR_STRENGTH, VP8E_SET_ARNR_TYPE,
John Koleszar's avatar
John Koleszar committed
402
  VP8E_SET_TUNING, VP8E_SET_CQ_LEVEL, VP8E_SET_MAX_INTRA_BITRATE_PCT,
403
  VP9E_SET_LOSSLESS, VP9E_SET_FRAME_PARALLEL_DECODING, VP9E_SET_AQ_MODE,
404
  VP9E_SET_FRAME_PERIODIC_BOOST, VP9E_SET_TUNE_CONTENT,
John Koleszar's avatar
John Koleszar committed
405
  0
John Koleszar's avatar
John Koleszar committed
406 407 408 409 410
};
#endif

static const arg_def_t *no_args[] = { NULL };

411
void usage_exit() {
John Koleszar's avatar
John Koleszar committed
412 413 414 415 416 417
  int i;

  fprintf(stderr, "Usage: %s <options> -o dst_filename src_filename \n",
          exec_name);

  fprintf(stderr, "\nOptions:\n");
John Koleszar's avatar
John Koleszar committed
418
  arg_show_usage(stderr, main_args);
John Koleszar's avatar
John Koleszar committed
419
  fprintf(stderr, "\nEncoder Global Options:\n");
John Koleszar's avatar
John Koleszar committed
420
  arg_show_usage(stderr, global_args);
John Koleszar's avatar
John Koleszar committed
421
  fprintf(stderr, "\nRate Control Options:\n");
John Koleszar's avatar
John Koleszar committed
422
  arg_show_usage(stderr, rc_args);
John Koleszar's avatar
John Koleszar committed
423
  fprintf(stderr, "\nTwopass Rate Control Options:\n");
John Koleszar's avatar
John Koleszar committed
424
  arg_show_usage(stderr, rc_twopass_args);
John Koleszar's avatar
John Koleszar committed
425
  fprintf(stderr, "\nKeyframe Placement Options:\n");
John Koleszar's avatar
John Koleszar committed
426
  arg_show_usage(stderr, kf_args);
John Koleszar's avatar
John Koleszar committed
427
#if CONFIG_VP8_ENCODER
John Koleszar's avatar
John Koleszar committed
428
  fprintf(stderr, "\nVP8 Specific Options:\n");
John Koleszar's avatar
John Koleszar committed
429
  arg_show_usage(stderr, vp8_args);
John Koleszar's avatar
John Koleszar committed
430
#endif
431 432
#if CONFIG_VP9_ENCODER
  fprintf(stderr, "\nVP9 Specific Options:\n");
John Koleszar's avatar
John Koleszar committed
433
  arg_show_usage(stderr, vp9_args);
John Koleszar's avatar
John Koleszar committed
434
#endif
John Koleszar's avatar
John Koleszar committed
435 436 437
  fprintf(stderr, "\nStream timebase (--timebase):\n"
          "  The desired precision of timestamps in the output, expressed\n"
          "  in fractional seconds. Default is 1/1000.\n");
438
  fprintf(stderr, "\nIncluded encoders:\n\n");
John Koleszar's avatar
John Koleszar committed
439

440 441
  for (i = 0; i < get_vpx_encoder_count(); ++i) {
    const VpxInterface *const encoder = get_vpx_encoder_by_index(i);
John Koleszar's avatar
John Koleszar committed
442
    fprintf(stderr, "    %-6s - %s\n",
443
            encoder->name, vpx_codec_iface_name(encoder->codec_interface()));
444
  }
John Koleszar's avatar
John Koleszar committed
445 446

  exit(EXIT_FAILURE);
John Koleszar's avatar
John Koleszar committed
447 448
}

449
#define mmin(a, b)  ((a) < (b) ? (a) : (b))
James Zern's avatar
James Zern committed
450 451
static void find_mismatch(const vpx_image_t *const img1,
                          const vpx_image_t *const img2,
452
                          int yloc[4], int uloc[4], int vloc[4]) {
453 454 455 456 457 458 459 460 461
  const uint32_t bsize = 64;
  const uint32_t bsizey = bsize >> img1->y_chroma_shift;
  const uint32_t bsizex = bsize >> img1->x_chroma_shift;
  const uint32_t c_w =
      (img1->d_w + img1->x_chroma_shift) >> img1->x_chroma_shift;
  const uint32_t c_h =
      (img1->d_h + img1->y_chroma_shift) >> img1->y_chroma_shift;
  int match = 1;
  uint32_t i, j;
462
  yloc[0] = yloc[1] = yloc[2] = yloc[3] = -1;
463 464
  for (i = 0, match = 1; match && i < img1->d_h; i += bsize) {
    for (j = 0; match && j < img1->d_w; j += bsize) {
465
      int k, l;
James Zern's avatar
James Zern committed
466 467 468 469
      const int si = mmin(i + bsize, img1->d_h) - i;
      const int sj = mmin(j + bsize, img1->d_w) - j;
      for (k = 0; match && k < si; ++k) {
        for (l = 0; match && l < sj; ++l) {
470 471 472 473 474 475
          if (*(img1->planes[VPX_PLANE_Y] +
                (i + k) * img1->stride[VPX_PLANE_Y] + j + l) !=
              *(img2->planes[VPX_PLANE_Y] +
                (i + k) * img2->stride[VPX_PLANE_Y] + j + l)) {
            yloc[0] = i + k;
            yloc[1] = j + l;
476 477 478 479
            yloc[2] = *(img1->planes[VPX_PLANE_Y] +
                        (i + k) * img1->stride[VPX_PLANE_Y] + j + l);
            yloc[3] = *(img2->planes[VPX_PLANE_Y] +
                        (i + k) * img2->stride[VPX_PLANE_Y] + j + l);
480
            match = 0;
481
            break;
482 483
          }
        }
James Zern's avatar
James Zern committed
484
      }
485
    }
486
  }
487

488
  uloc[0] = uloc[1] = uloc[2] = uloc[3] = -1;
489
  for (i = 0, match = 1; match && i < c_h; i += bsizey) {
John Koleszar's avatar
John Koleszar committed
490
    for (j = 0; match && j < c_w; j += bsizex) {
491
      int k, l;
James Zern's avatar
James Zern committed
492 493 494 495
      const int si = mmin(i + bsizey, c_h - i);
      const int sj = mmin(j + bsizex, c_w - j);
      for (k = 0; match && k < si; ++k) {
        for (l = 0; match && l < sj; ++l) {
496 497 498 499 500 501
          if (*(img1->planes[VPX_PLANE_U] +
                (i + k) * img1->stride[VPX_PLANE_U] + j + l) !=
              *(img2->planes[VPX_PLANE_U] +
                (i + k) * img2->stride[VPX_PLANE_U] + j + l)) {
            uloc[0] = i + k;
            uloc[1] = j + l;
502 503 504
            uloc[2] = *(img1->planes[VPX_PLANE_U] +
                        (i + k) * img1->stride[VPX_PLANE_U] + j + l);
            uloc[3] = *(img2->planes[VPX_PLANE_U] +
James Zern's avatar
James Zern committed
505
                        (i + k) * img2->stride[VPX_PLANE_U] + j + l);
506 507 508 509
            match = 0;
            break;
          }
        }
James Zern's avatar
James Zern committed
510
      }
511 512
    }
  }
513
  vloc[0] = vloc[1] = vloc[2] = vloc[3] = -1;
514
  for (i = 0, match = 1; match && i < c_h; i += bsizey) {
John Koleszar's avatar
John Koleszar committed
515
    for (j = 0; match && j < c_w; j += bsizex) {
516
      int k, l;
James Zern's avatar
James Zern committed
517 518 519 520
      const int si = mmin(i + bsizey, c_h - i);
      const int sj = mmin(j + bsizex, c_w - j);
      for (k = 0; match && k < si; ++k) {
        for (l = 0; match && l < sj; ++l) {
521 522 523 524 525 526
          if (*(img1->planes[VPX_PLANE_V] +
                (i + k) * img1->stride[VPX_PLANE_V] + j + l) !=
              *(img2->planes[VPX_PLANE_V] +
                (i + k) * img2->stride[VPX_PLANE_V] + j + l)) {
            vloc[0] = i + k;
            vloc[1] = j + l;
527 528 529 530
            vloc[2] = *(img1->planes[VPX_PLANE_V] +
                        (i + k) * img1->stride[VPX_PLANE_V] + j + l);
            vloc[3] = *(img2->planes[VPX_PLANE_V] +
                        (i + k) * img2->stride[VPX_PLANE_V] + j + l);
531 532 533 534
            match = 0;
            break;
          }
        }
James Zern's avatar
James Zern committed
535
      }
536 537
    }
  }
538 539
}

James Zern's avatar
James Zern committed
540 541
static int compare_img(const vpx_image_t *const img1,
                       const vpx_image_t *const img2) {
542 543 544 545 546
  const uint32_t c_w =
      (img1->d_w + img1->x_chroma_shift) >> img1->x_chroma_shift;
  const uint32_t c_h =
      (img1->d_h + img1->y_chroma_shift) >> img1->y_chroma_shift;
  uint32_t i;
John Koleszar's avatar
John Koleszar committed
547
  int match = 1;
548

John Koleszar's avatar
John Koleszar committed
549
  match &= (img1->fmt == img2->fmt);
550 551
  match &= (img1->d_w == img2->d_w);
  match &= (img1->d_h == img2->d_h);
552

James Zern's avatar
James Zern committed
553 554 555
  for (i = 0; i < img1->d_h; ++i)
    match &= (memcmp(img1->planes[VPX_PLANE_Y] + i * img1->stride[VPX_PLANE_Y],
                     img2->planes[VPX_PLANE_Y] + i * img2->stride[VPX_PLANE_Y],
John Koleszar's avatar
John Koleszar committed
556
                     img1->d_w) == 0);
557

James Zern's avatar
James Zern committed
558 559 560
  for (i = 0; i < c_h; ++i)
    match &= (memcmp(img1->planes[VPX_PLANE_U] + i * img1->stride[VPX_PLANE_U],
                     img2->planes[VPX_PLANE_U] + i * img2->stride[VPX_PLANE_U],
561
                     c_w) == 0);
562

James Zern's avatar
James Zern committed
563 564 565
  for (i = 0; i < c_h; ++i)
    match &= (memcmp(img1->planes[VPX_PLANE_V] + i * img1->stride[VPX_PLANE_V],
                     img2->planes[VPX_PLANE_V] + i * img2->stride[VPX_PLANE_V],
566
                     c_w) == 0);
567

John Koleszar's avatar
John Koleszar committed
568
  return match;
569 570
}

571

572
#define NELEMENTS(x) (sizeof(x)/sizeof(x[0]))
573 574
#define MAX(x,y) ((x)>(y)?(x):(y))
#if CONFIG_VP8_ENCODER && !CONFIG_VP9_ENCODER
575
#define ARG_CTRL_CNT_MAX NELEMENTS(vp8_arg_ctrl_map)
576 577 578 579 580 581
#elif !CONFIG_VP8_ENCODER && CONFIG_VP9_ENCODER
#define ARG_CTRL_CNT_MAX NELEMENTS(vp9_arg_ctrl_map)
#else
#define ARG_CTRL_CNT_MAX MAX(NELEMENTS(vp8_arg_ctrl_map), \
                             NELEMENTS(vp9_arg_ctrl_map))
#endif
John Koleszar's avatar
John Koleszar committed
582

583 584 585 586 587
#if !CONFIG_WEBM_IO
typedef int stereo_format_t;
struct EbmlGlobal { int debug; };
#endif

588
/* Per-stream configuration */
John Koleszar's avatar
John Koleszar committed
589 590 591 592
struct stream_config {
  struct vpx_codec_enc_cfg  cfg;
  const char               *out_fn;
  const char               *stats_fn;
593 594 595
#if CONFIG_FP_MB_STATS
  const char               *fpmb_stats_fn;
#endif
John Koleszar's avatar
John Koleszar committed
596 597 598 599 600
  stereo_format_t           stereo_fmt;
  int                       arg_ctrls[ARG_CTRL_CNT_MAX][2];
  int                       arg_ctrl_cnt;
  int                       write_webm;
  int                       have_kf_max_dist;
601 602 603
};


John Koleszar's avatar
John Koleszar committed
604 605 606 607 608
struct stream_state {
  int                       index;
  struct stream_state      *next;
  struct stream_config      config;
  FILE                     *file;
609
  struct rate_hist         *rate_hist;
610
  struct EbmlGlobal         ebml;
John Koleszar's avatar
John Koleszar committed
611 612 613 614 615 616 617 618 619 620
  uint64_t                  psnr_sse_total;
  uint64_t                  psnr_samples_total;
  double                    psnr_totals[4];
  int                       psnr_count;
  int                       counts[64];
  vpx_codec_ctx_t           encoder;
  unsigned int              frames_out;
  uint64_t                  cx_time;
  size_t                    nbytes;
  stats_io_t                stats;
621 622 623
#if CONFIG_FP_MB_STATS
  stats_io_t                fpmb_stats;
#endif
624
  struct vpx_image         *img;
John Koleszar's avatar
John Koleszar committed
625 626
  vpx_codec_ctx_t           decoder;
  int                       mismatch_seen;
627 628 629
};


630
void validate_positive_rational(const char          *msg,
John Koleszar's avatar
John Koleszar committed
631 632 633 634 635
                                struct vpx_rational *rat) {
  if (rat->den < 0) {
    rat->num *= -1;
    rat->den *= -1;
  }
636

John Koleszar's avatar
John Koleszar committed
637 638
  if (rat->num < 0)
    die("Error: %s must be positive\n", msg);
639

John Koleszar's avatar
John Koleszar committed
640 641
  if (!rat->den)
    die("Error: %s has zero denominator\n", msg);
642 643 644
}


645
static void parse_global_config(struct VpxEncoderConfig *global, char **argv) {
John Koleszar's avatar
John Koleszar committed
646 647 648 649 650
  char       **argi, **argj;
  struct arg   arg;

  /* Initialize default parameters */
  memset(global, 0, sizeof(*global));
651
  global->codec = get_vpx_encoder_by_index(0);
652
  global->passes = 0;
653
  global->color_type = I420;
654 655
  /* Assign default deadline to good quality */
  global->deadline = VPX_DL_GOOD_QUALITY;
John Koleszar's avatar
John Koleszar committed
656 657 658 659 660

  for (argi = argj = argv; (*argj = *argi); argi += arg.argv_step) {
    arg.argv_step = 1;

    if (arg_match(&arg, &codecarg, argi)) {
661 662 663
      global->codec = get_vpx_encoder_by_name(arg.val);
      if (!global->codec)
        die("Error: Unrecognized argument (%s) to --codec\n", arg.val);
John Koleszar's avatar
John Koleszar committed
664
    } else if (arg_match(&arg, &passes, argi)) {
John Koleszar's avatar
John Koleszar committed
665
      global->passes = arg_parse_uint(&arg);
John Koleszar's avatar
John Koleszar committed
666

John Koleszar's avatar
John Koleszar committed
667 668
      if (global->passes < 1 || global->passes > 2)
        die("Error: Invalid number of passes (%d)\n", global->passes);
John Koleszar's avatar
John Koleszar committed
669
    } else if (arg_match(&arg, &pass_arg, argi)) {
John Koleszar's avatar
John Koleszar committed
670 671 672 673 674 675 676
      global->pass = arg_parse_uint(&arg);

      if (global->pass < 1 || global->pass > 2)
        die("Error: Invalid pass selected (%d)\n",
            global->pass);
    } else if (arg_match(&arg, &usage, argi))
      global->usage = arg_parse_uint(&arg);
John Koleszar's avatar
John Koleszar committed
677
    else if (arg_match(&arg, &deadline, argi))
John Koleszar's avatar
John Koleszar committed
678
      global->deadline = arg_parse_uint(&arg);
John Koleszar's avatar
John Koleszar committed
679
    else if (arg_match(&arg, &best_dl, argi))
John Koleszar's avatar
John Koleszar committed
680
      global->deadline = VPX_DL_BEST_QUALITY;
John Koleszar's avatar
John Koleszar committed
681
    else if (arg_match(&arg, &good_dl, argi))
John Koleszar's avatar
John Koleszar committed
682
      global->deadline = VPX_DL_GOOD_QUALITY;
John Koleszar's avatar
John Koleszar committed
683
    else if (arg_match(&arg, &rt_dl, argi))
John Koleszar's avatar
John Koleszar committed
684 685
      global->deadline = VPX_DL_REALTIME;
    else if (arg_match(&arg, &use_yv12, argi))
686
      global->color_type = YV12;
John Koleszar's avatar
John Koleszar committed
687
    else if (arg_match(&arg, &use_i420, argi))
688 689 690 691 692
      global->color_type = I420;
    else if (arg_match(&arg, &use_i422, argi))
      global->color_type = I422;
    else if (arg_match(&arg, &use_i444, argi))
      global->color_type = I444;
John Koleszar's avatar
John Koleszar committed
693 694 695 696
    else if (arg_match(&arg, &quietarg, argi))
      global->quiet = 1;
    else if (arg_match(&arg, &verbosearg, argi))
      global->verbose = 1;
John Koleszar's avatar
John Koleszar committed
697
    else if (arg_match(&arg, &limit, argi))
John Koleszar's avatar
John Koleszar committed
698
      global->limit = arg_parse_uint(&arg);
John Koleszar's avatar
John Koleszar committed
699
    else if (arg_match(&arg, &skip, argi))
John Koleszar's avatar
John Koleszar committed
700
      global->skip_frames = arg_parse_uint(&arg);
John Koleszar's avatar
John Koleszar committed
701
    else if (arg_match(&arg, &psnrarg, argi))
John Koleszar's avatar
John Koleszar committed
702
      global->show_psnr = 1;
John Koleszar's avatar
John Koleszar committed
703
    else if (arg_match(&arg, &recontest, argi))
704
      global->test_decode = arg_parse_enum_or_int(&arg);
John Koleszar's avatar
John Koleszar committed
705
    else if (arg_match(&arg, &framerate, argi)) {
John Koleszar's avatar
John Koleszar committed
706 707 708 709 710
      global->framerate = arg_parse_rational(&arg);
      validate_positive_rational(arg.name, &global->framerate);
      global->have_framerate = 1;
    } else if (arg_match(&arg, &out_part, argi))
      global->out_part = 1;
John Koleszar's avatar
John Koleszar committed
711
    else if (arg_match(&arg, &debugmode, argi))
John Koleszar's avatar
John Koleszar committed
712
      global->debug = 1;
John Koleszar's avatar
John Koleszar committed
713
    else if (arg_match(&arg, &q_hist_n, argi))
John Koleszar's avatar
John Koleszar committed
714
      global->show_q_hist_buckets = arg_parse_uint(&arg);
John Koleszar's avatar
John Koleszar committed
715
    else if (arg_match(&arg, &rate_hist_n, argi))
John Koleszar's avatar
John Koleszar committed
716
      global->show_rate_hist_buckets = arg_parse_uint(&arg);
717 718 719 720
    else if (arg_match(&arg, &disable_warnings, argi))
      global->disable_warnings = 1;
    else if (arg_match(&arg, &disable_warning_prompt, argi))
      global->disable_warning_prompt = 1;
721 722
    else if (arg_match(&arg, &experimental_bitstream, argi))
      global->experimental_bitstream = 1;
John Koleszar's avatar
John Koleszar committed
723 724 725
    else
      argj++;
  }
John Koleszar's avatar
John Koleszar committed
726

727 728 729 730 731 732 733 734
  if (global->pass) {
    /* DWIM: Assume the user meant passes=2 if pass=2 is specified */
    if (global->pass > global->passes) {
      warn("Assuming --pass=%d implies --passes=%d\n",
           global->pass, global->pass);
      global->passes = global->pass;
    }
  }
John Koleszar's avatar
John Koleszar committed
735
  /* Validate global config */
736
  if (global->passes == 0) {
James Zern's avatar
James Zern committed
737
#if CONFIG_VP9_ENCODER
738 739
    // Make default VP9 passes = 2 until there is a better quality 1-pass
    // encoder
740 741
    global->passes = (strcmp(global->codec->name, "vp9") == 0 &&
                      global->deadline != VPX_DL_REALTIME) ? 2 : 1;
James Zern's avatar
James Zern committed
742 743 744
#else
    global->passes = 1;
#endif
745
  }
746

747 748 749 750
  if (global->deadline == VPX_DL_REALTIME &&
      global->passes > 1) {
    warn("Enforcing one-pass encoding in realtime mode\n");
    global->passes = 1;
John Koleszar's avatar
John Koleszar committed
751
  }
752 753 754
}


755
void open_input_file(struct VpxInputContext *input) {
John Koleszar's avatar
John Koleszar committed
756
  /* Parse certain options from the input file, if possible */
757 758
  input->file = strcmp(input->filename, "-")
      ? fopen(input->filename, "rb") : set_binary_mode(stdin);
John Koleszar's avatar
John Koleszar committed
759 760 761

  if (!input->file)
    fatal("Failed to open input file");
John Koleszar's avatar
John Koleszar committed