Commit 6eca835f authored by Thomas Daede's avatar Thomas Daede

Remove "best" deadline parameter from aomenc.

This option increases runtime by 20% and is only marginally
better than good cpu-used=0:

   PSNR | PSNR Cb | PSNR Cr | PSNR HVS |    SSIM | MS SSIM | CIEDE 2000
-0.3382 | -0.3911 | -0.4875 |  -0.2982 | -0.2992 | -0.3164 |    -0.3686

It is also not well integrated with speed_features.c, which is
the main reason for the removal.

Change-Id: If88c50367f63b860ad57f650869b978ec7734aad
parent 10fb9fb2
......@@ -699,8 +699,6 @@ aom_fixed_buf_t *aom_codec_get_global_headers(aom_codec_ctx_t *ctx);
#define AOM_DL_REALTIME (1)
/*!\brief deadline parameter analogous to AVx GOOD QUALITY mode. */
#define AOM_DL_GOOD_QUALITY (1000000)
/*!\brief deadline parameter analogous to AVx BEST QUALITY mode. */
#define AOM_DL_BEST_QUALITY (0)
/*!\brief Encode a frame
*
* Encodes a video frame at the given "presentation time." The presentation
......@@ -714,8 +712,7 @@ aom_fixed_buf_t *aom_codec_get_global_headers(aom_codec_ctx_t *ctx);
* best possible frame by specifying a deadline of '0'. This deadline
* supercedes the AVx notion of "best quality, good quality, realtime".
* Applications that wish to map these former settings to the new deadline
* based system can use the symbols #AOM_DL_REALTIME, #AOM_DL_GOOD_QUALITY,
* and #AOM_DL_BEST_QUALITY.
* based system can use the symbols #AOM_DL_REALTIME and #AOM_DL_GOOD_QUALITY.
*
* When the last frame has been passed to the encoder, this function should
* continue to be called, with the img parameter set to NULL. This will
......
......@@ -155,8 +155,6 @@ static const arg_def_t skip =
ARG_DEF(NULL, "skip", 1, "Skip the first n input frames");
static const arg_def_t deadline =
ARG_DEF("d", "deadline", 1, "Deadline per frame (usec)");
static const arg_def_t best_dl =
ARG_DEF(NULL, "best", 0, "Use Best Quality Deadline");
static const arg_def_t good_dl =
ARG_DEF(NULL, "good", 0, "Use Good Quality Deadline");
static const arg_def_t rt_dl =
......@@ -220,7 +218,6 @@ static const arg_def_t *main_args[] = { &debugmode,
&limit,
&skip,
&deadline,
&best_dl,
&good_dl,
&rt_dl,
&quietarg,
......@@ -936,8 +933,6 @@ static void parse_global_config(struct AvxEncoderConfig *global, char **argv) {
global->usage = arg_parse_uint(&arg);
else if (arg_match(&arg, &deadline, argi))
global->deadline = arg_parse_uint(&arg);
else if (arg_match(&arg, &best_dl, argi))
global->deadline = AOM_DL_BEST_QUALITY;
else if (arg_match(&arg, &good_dl, argi))
global->deadline = AOM_DL_GOOD_QUALITY;
else if (arg_match(&arg, &rt_dl, argi))
......
......@@ -912,18 +912,17 @@ static aom_codec_err_t encoder_destroy(aom_codec_alg_priv_t *ctx) {
static void pick_quickcompress_mode(aom_codec_alg_priv_t *ctx,
unsigned long deadline) {
MODE new_mode = BEST;
MODE new_mode = GOOD;
switch (ctx->cfg.g_pass) {
case AOM_RC_ONE_PASS:
switch (deadline) {
case AOM_DL_BEST_QUALITY: new_mode = BEST; break;
case AOM_DL_REALTIME: new_mode = REALTIME; break;
default: new_mode = GOOD; break;
}
break;
case AOM_RC_FIRST_PASS: break;
case AOM_RC_LAST_PASS: new_mode = deadline > 0 ? GOOD : BEST; break;
case AOM_RC_LAST_PASS: new_mode = GOOD;
}
if (ctx->oxcf.mode != new_mode) {
......
......@@ -101,11 +101,6 @@ typedef enum {
// time it takes to encode the output. Speed setting controls how fast.
GOOD,
// The encoder places priority on the quality of the output over encoding
// speed. The output is compressed at the highest possible quality. This
// option takes the longest amount of time to encode. Speed setting ignored.
BEST,
// Realtime/Live Encoding. This mode is optimized for realtime encoding (for
// example, capturing a television signal or feed from a live camera). Speed
// setting controls how fast.
......
......@@ -890,8 +890,7 @@ void av1_set_rd_speed_thresholds(AV1_COMP *cpi) {
SPEED_FEATURES *const sf = &cpi->sf;
// Set baseline threshold values.
for (i = 0; i < MAX_MODES; ++i)
rd->thresh_mult[i] = cpi->oxcf.mode == BEST ? -500 : 0;
for (i = 0; i < MAX_MODES; ++i) rd->thresh_mult[i] = cpi->oxcf.mode == 0;
if (sf->adaptive_rd_thresh) {
rd->thresh_mult[THR_NEARESTMV] = 300;
......@@ -1160,20 +1159,34 @@ void av1_set_rd_speed_thresholds(AV1_COMP *cpi) {
}
void av1_set_rd_speed_thresholds_sub8x8(AV1_COMP *cpi) {
static const int thresh_mult[2][MAX_REFS] = {
static const int thresh_mult[MAX_REFS] = {
#if CONFIG_EXT_REFS
{ 2500, 2500, 2500, 2500, 2500, 2500, 4500, 4500, 4500, 4500, 4500, 4500,
4500, 4500, 2500 },
{ 2000, 2000, 2000, 2000, 2000, 2000, 4000, 4000, 4000, 4000, 4000, 4000,
4000, 4000, 2000 }
2500,
2500,
2500,
2500,
2500,
2500,
4500,
4500,
4500,
4500,
4500,
4500,
4500,
4500,
2500
#else
{ 2500, 2500, 2500, 4500, 4500, 2500 },
{ 2000, 2000, 2000, 4000, 4000, 2000 }
2500,
2500,
2500,
4500,
4500,
2500
#endif // CONFIG_EXT_REFS
};
RD_OPT *const rd = &cpi->rd;
const int idx = cpi->oxcf.mode == BEST;
memcpy(rd->thresh_mult_sub8x8, thresh_mult[idx], sizeof(thresh_mult[idx]));
memcpy(rd->thresh_mult_sub8x8, thresh_mult, sizeof(thresh_mult));
}
void av1_update_rd_thresh_fact(const AV1_COMMON *const cm,
......
......@@ -6090,7 +6090,6 @@ static int64_t rd_pick_inter_best_sub8x8_mode(
* and new motion search. */
if (new_best_rd < label_mv_thresh) break;
if (cpi->oxcf.mode != BEST) {
#if CONFIG_EXT_INTER
bsi->mvp.as_int = bsi->ref_mv[0]->as_int;
#else
......@@ -6103,7 +6102,6 @@ static int64_t rd_pick_inter_best_sub8x8_mode(
}
#endif // !CONFIG_REF_MV
#endif // CONFIG_EXT_INTER
}
max_mv = (index == 0) ? (int)x->max_mv_context[mbmi->ref_frame[0]]
: AOMMAX(abs(bsi->mvp.as_mv.row),
abs(bsi->mvp.as_mv.col)) >>
......
......@@ -17,11 +17,6 @@
#include "aom_dsp/aom_dsp_common.h"
// Mesh search patters for various speed settings
static MESH_PATTERN best_quality_mesh_pattern[MAX_MESH_STEP] = {
{ 64, 4 }, { 28, 2 }, { 15, 1 }, { 7, 1 }
};
#define MAX_MESH_SPEED 5 // Max speed setting for mesh motion method
static MESH_PATTERN
good_quality_mesh_patterns[MAX_MESH_SPEED + 1][MAX_MESH_STEP] = {
......@@ -587,17 +582,6 @@ void av1_set_speed_features_framesize_independent(AV1_COMP *cpi) {
cpi->diamond_search_sad = av1_diamond_search_sad;
sf->allow_exhaustive_searches = 1;
if (oxcf->mode == BEST) {
if (cpi->twopass.fr_content_type == FC_GRAPHICS_ANIMATION)
sf->exhaustive_searches_thresh = (1 << 20);
else
sf->exhaustive_searches_thresh = (1 << 21);
sf->max_exaustive_pct = 100;
for (i = 0; i < MAX_MESH_STEP; ++i) {
sf->mesh_patterns[i].range = best_quality_mesh_pattern[i].range;
sf->mesh_patterns[i].interval = best_quality_mesh_pattern[i].interval;
}
} else {
int speed = (oxcf->speed > MAX_MESH_SPEED) ? MAX_MESH_SPEED : oxcf->speed;
if (cpi->twopass.fr_content_type == FC_GRAPHICS_ANIMATION)
sf->exhaustive_searches_thresh = (1 << 22);
......@@ -612,7 +596,6 @@ void av1_set_speed_features_framesize_independent(AV1_COMP *cpi) {
sf->mesh_patterns[i].interval =
good_quality_mesh_patterns[speed][i].interval;
}
}
#if !CONFIG_XIPHRC
// Slow quant, dct and trellis not worthwhile for first pass
......
......@@ -29,8 +29,7 @@
// Encoding A Frame
// ----------------
// Encoding a frame in two pass mode is identical to the simple encoder
// example. To increase the quality while sacrificing encoding speed,
// AOM_DL_BEST_QUALITY can be used in place of AOM_DL_GOOD_QUALITY.
// example.
//
// Processing Statistics Packets
// -----------------------------
......
......@@ -110,13 +110,10 @@ void EncoderTest::SetMode(TestMode mode) {
case kOnePassGood:
case kTwoPassGood: deadline_ = AOM_DL_GOOD_QUALITY; break;
case kOnePassBest:
case kTwoPassBest: deadline_ = AOM_DL_BEST_QUALITY; break;
default: ASSERT_TRUE(false) << "Unexpected mode " << mode;
}
if (mode == kTwoPassGood || mode == kTwoPassBest)
if (mode == kTwoPassGood)
passes_ = 2;
else
passes_ = 1;
......
......@@ -27,24 +27,15 @@ namespace libaom_test {
class CodecFactory;
class VideoSource;
enum TestMode {
kRealTime,
kOnePassGood,
kOnePassBest,
kTwoPassGood,
kTwoPassBest
};
enum TestMode { kRealTime, kOnePassGood, kTwoPassGood };
#define ALL_TEST_MODES \
::testing::Values(::libaom_test::kRealTime, ::libaom_test::kOnePassGood, \
::libaom_test::kOnePassBest, ::libaom_test::kTwoPassGood, \
::libaom_test::kTwoPassBest)
::libaom_test::kTwoPassGood)
#define ONE_PASS_TEST_MODES \
::testing::Values(::libaom_test::kRealTime, ::libaom_test::kOnePassGood, \
::libaom_test::kOnePassBest)
::testing::Values(::libaom_test::kRealTime, ::libaom_test::kOnePassGood)
#define TWO_PASS_TEST_MODES \
::testing::Values(::libaom_test::kTwoPassGood, ::libaom_test::kTwoPassBest)
#define TWO_PASS_TEST_MODES ::testing::Values(::libaom_test::kTwoPassGood)
// Provides an object to handle the libaom get_cx_data() iteration pattern
class CxDataIterator {
......
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