Use more (signed) int types in svc_encoder_rtc.c
I took a closer look at examples/svc_encoder_rtc.c and found that
variables related to the number of spatial or temporal layers and
spatial or temporal layer id should all be declared as (signed) int to
match the types used by libaom itself.
Declare the newly added constants REF_FRAMES and INTER_REFS_PER_FRAME as
static.
Remove an unneeded (and incorrect) unsigned int cast from the third
argument to the aom_codec_decode() call. That argument has the expected
type, size_t, so no cast is needed.
Bug: aomedia:3417
Change-Id: I1cafe9d946ab885ff054e42c9e24020411c62fd1
diff --git a/examples/svc_encoder_rtc.c b/examples/svc_encoder_rtc.c
index eb336d5..161f3f6 100644
--- a/examples/svc_encoder_rtc.c
+++ b/examples/svc_encoder_rtc.c
@@ -437,10 +437,10 @@
enc_cfg->rc_target_bitrate, enc_cfg->kf_max_dist);
}
-static unsigned int mode_to_num_temporal_layers[11] = { 1, 2, 3, 3, 2, 1,
- 1, 3, 3, 3, 3 };
-static unsigned int mode_to_num_spatial_layers[11] = { 1, 1, 1, 1, 1, 2,
- 3, 2, 3, 3, 3 };
+static int mode_to_num_temporal_layers[11] = {
+ 1, 2, 3, 3, 2, 1, 1, 3, 3, 3, 3
+};
+static int mode_to_num_spatial_layers[11] = { 1, 1, 1, 1, 1, 2, 3, 2, 3, 3, 3 };
// For rate control encoding stats.
struct RateControlMetrics {
@@ -470,9 +470,9 @@
int layer_target_bitrate[AOM_MAX_LAYERS];
};
-const unsigned int REF_FRAMES = 8;
+static const int REF_FRAMES = 8;
-const unsigned int INTER_REFS_PER_FRAME = 7;
+static const int INTER_REFS_PER_FRAME = 7;
// Reference frames used in this example encoder.
enum {
@@ -511,9 +511,8 @@
// TODO(marpan): Update these metrics to account for multiple key frames
// in the stream.
static void set_rate_control_metrics(struct RateControlMetrics *rc,
- double framerate,
- unsigned int ss_number_layers,
- unsigned int ts_number_layers) {
+ double framerate, int ss_number_layers,
+ int ts_number_layers) {
int ts_rate_decimator[AOM_MAX_TS_LAYERS] = { 1 };
ts_rate_decimator[0] = 1;
if (ts_number_layers == 2) {
@@ -527,12 +526,12 @@
}
// Set the layer (cumulative) framerate and the target layer (non-cumulative)
// per-frame-bandwidth, for the rate control encoding stats below.
- for (unsigned int sl = 0; sl < ss_number_layers; ++sl) {
- unsigned int i = sl * ts_number_layers;
+ for (int sl = 0; sl < ss_number_layers; ++sl) {
+ int i = sl * ts_number_layers;
rc->layer_framerate[0] = framerate / ts_rate_decimator[0];
rc->layer_pfb[i] =
1000.0 * rc->layer_target_bitrate[i] / rc->layer_framerate[0];
- for (unsigned int tl = 0; tl < ts_number_layers; ++tl) {
+ for (int tl = 0; tl < ts_number_layers; ++tl) {
i = sl * ts_number_layers + tl;
if (tl > 0) {
rc->layer_framerate[tl] = framerate / ts_rate_decimator[tl];
@@ -555,17 +554,16 @@
}
static void printout_rate_control_summary(struct RateControlMetrics *rc,
- int frame_cnt,
- unsigned int ss_number_layers,
- unsigned int ts_number_layers) {
+ int frame_cnt, int ss_number_layers,
+ int ts_number_layers) {
int tot_num_frames = 0;
double perc_fluctuation = 0.0;
printf("Total number of processed frames: %d\n\n", frame_cnt - 1);
- printf("Rate control layer stats for %u layer(s):\n\n", ts_number_layers);
- for (unsigned int sl = 0; sl < ss_number_layers; ++sl) {
+ printf("Rate control layer stats for %d layer(s):\n\n", ts_number_layers);
+ for (int sl = 0; sl < ss_number_layers; ++sl) {
tot_num_frames = 0;
- for (unsigned int tl = 0; tl < ts_number_layers; ++tl) {
- unsigned int i = sl * ts_number_layers + tl;
+ for (int tl = 0; tl < ts_number_layers; ++tl) {
+ int i = sl * ts_number_layers + tl;
const int num_dropped =
tl > 0 ? rc->layer_input_frames[tl] - rc->layer_enc_frames[tl]
: rc->layer_input_frames[tl] - rc->layer_enc_frames[tl] - 1;
@@ -577,7 +575,7 @@
rc->layer_avg_frame_size[i] / rc->layer_enc_frames[tl];
rc->layer_avg_rate_mismatch[i] =
100.0 * rc->layer_avg_rate_mismatch[i] / rc->layer_enc_frames[tl];
- printf("For layer#: %u %u \n", sl, tl);
+ printf("For layer#: %d %d \n", sl, tl);
printf("Bitrate (target vs actual): %d %f\n", rc->layer_target_bitrate[i],
rc->layer_encoding_bitrate[i]);
printf("Average frame size (target vs actual): %f %f\n", rc->layer_pfb[i],
@@ -614,7 +612,7 @@
// Setting this flag to 1 enables simplex example of
// RPS (Reference Picture Selection) for 1 layer.
int use_rps_example = 0;
- unsigned int i;
+ int i;
int enable_longterm_temporal_ref = 1;
int shift = (layering_mode == 8) ? 2 : 0;
*use_svc_control = 1;
@@ -1210,7 +1208,7 @@
int frame_avail;
int got_data = 0;
int flags = 0;
- unsigned int i;
+ int i;
int pts = 0; // PTS starts at 0.
int frame_duration = 1; // 1 timebase tick per frame.
aom_svc_layer_id_t layer_id;
@@ -1281,8 +1279,8 @@
parse_command_line(argc, argv, &app_input, &svc_params, &cfg);
- unsigned int ts_number_layers = svc_params.number_temporal_layers;
- unsigned int ss_number_layers = svc_params.number_spatial_layers;
+ int ts_number_layers = svc_params.number_temporal_layers;
+ int ss_number_layers = svc_params.number_spatial_layers;
unsigned int width = cfg.g_w;
unsigned int height = cfg.g_h;
@@ -1346,11 +1344,11 @@
info.time_base.numerator = cfg.g_timebase.num;
info.time_base.denominator = cfg.g_timebase.den;
// Open an output file for each stream.
- for (unsigned int sl = 0; sl < ss_number_layers; ++sl) {
- for (unsigned tl = 0; tl < ts_number_layers; ++tl) {
+ for (int sl = 0; sl < ss_number_layers; ++sl) {
+ for (int tl = 0; tl < ts_number_layers; ++tl) {
i = sl * ts_number_layers + tl;
char file_name[PATH_MAX];
- snprintf(file_name, sizeof(file_name), "%s_%u.av1",
+ snprintf(file_name, sizeof(file_name), "%s_%d.av1",
app_input.output_filename, i);
if (app_input.output_obu) {
obu_files[i] = fopen(file_name, "wb");
@@ -1454,7 +1452,7 @@
max_intra_size_pct);
}
- for (unsigned int lx = 0; lx < ts_number_layers * ss_number_layers; lx++) {
+ for (int lx = 0; lx < ts_number_layers * ss_number_layers; lx++) {
cx_time_layer[lx] = 0;
frame_cnt_layer[lx] = 0;
}
@@ -1464,7 +1462,7 @@
struct aom_usec_timer timer;
frame_avail = read_frame(&(app_input.input_ctx), &raw);
// Loop over spatial layers.
- for (unsigned int slx = 0; slx < ss_number_layers; slx++) {
+ for (int slx = 0; slx < ss_number_layers; slx++) {
aom_codec_iter_t iter = NULL;
const aom_codec_cx_pkt_t *pkt;
int layer = 0;
@@ -1586,11 +1584,11 @@
while ((pkt = aom_codec_get_cx_data(&codec, &iter))) {
switch (pkt->kind) {
case AOM_CODEC_CX_FRAME_PKT:
- for (unsigned int sl = layer_id.spatial_layer_id;
- sl < ss_number_layers; ++sl) {
- for (unsigned tl = layer_id.temporal_layer_id;
- tl < ts_number_layers; ++tl) {
- unsigned int j = sl * ts_number_layers + tl;
+ for (int sl = layer_id.spatial_layer_id; sl < ss_number_layers;
+ ++sl) {
+ for (int tl = layer_id.temporal_layer_id; tl < ts_number_layers;
+ ++tl) {
+ int j = sl * ts_number_layers + tl;
if (app_input.output_obu) {
fwrite(pkt->data.frame.buf, 1, pkt->data.frame.sz,
obu_files[j]);
@@ -1598,7 +1596,7 @@
aom_video_writer_write_frame(outfile[j], pkt->data.frame.buf,
pkt->data.frame.sz, pts);
}
- if (sl == (unsigned int)layer_id.spatial_layer_id)
+ if (sl == layer_id.spatial_layer_id)
rc.layer_encoding_bitrate[j] += 8.0 * pkt->data.frame.sz;
}
}
@@ -1614,8 +1612,9 @@
}
// Keep count of rate control stats per layer (for non-key).
if (!(pkt->data.frame.flags & AOM_FRAME_IS_KEY)) {
- unsigned int j = layer_id.spatial_layer_id * ts_number_layers +
- layer_id.temporal_layer_id;
+ int j = layer_id.spatial_layer_id * ts_number_layers +
+ layer_id.temporal_layer_id;
+ assert(j >= 0);
rc.layer_avg_frame_size[j] += 8.0 * pkt->data.frame.sz;
rc.layer_avg_rate_mismatch[j] +=
fabs(8.0 * pkt->data.frame.sz - rc.layer_pfb[j]) /
@@ -1657,7 +1656,7 @@
#if CONFIG_AV1_DECODER
if (app_input.decode) {
if (aom_codec_decode(&decoder, pkt->data.frame.buf,
- (unsigned int)pkt->data.frame.sz, NULL))
+ pkt->data.frame.sz, NULL))
die_codec(&decoder, "Failed to decode frame");
}
#endif
@@ -1672,7 +1671,7 @@
// they are non reference frames.
if ((ss_number_layers > 1 || ts_number_layers > 1) &&
!(layer_id.temporal_layer_id > 0 &&
- layer_id.temporal_layer_id == (int)ts_number_layers - 1)) {
+ layer_id.temporal_layer_id == ts_number_layers - 1)) {
if (test_decode(&codec, &decoder, frame_cnt)) {
#if CONFIG_INTERNAL_STATS
fprintf(stats_file, "First mismatch occurred in frame %d\n",
@@ -1694,8 +1693,8 @@
ts_number_layers);
printf("\n");
- for (unsigned int slx = 0; slx < ss_number_layers; slx++)
- for (unsigned int tlx = 0; tlx < ts_number_layers; tlx++) {
+ for (int slx = 0; slx < ss_number_layers; slx++)
+ for (int tlx = 0; tlx < ts_number_layers; tlx++) {
int lx = slx * ts_number_layers + tlx;
printf("Per layer encoding time/FPS stats for encoder: %d %d %d %f %f \n",
slx, tlx, frame_cnt_layer[lx],
