summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYury Gitman <yuryg@google.com>2016-06-14 18:57:29 -0700
committerYury Gitman <yuryg@google.com>2016-07-18 12:49:00 -0700
commitbdfdd7d993fd217c45b13ed1ab6239bcb9c5025f (patch)
treea8774fb323f5136aa03d66753db0f79514119f94
parent3e04114f3d6d1bc746a376f375dc18c5a941e5aa (diff)
downloadlibvpx-bdfdd7d993fd217c45b13ed1ab6239bcb9c5025f.tar
libvpx-bdfdd7d993fd217c45b13ed1ab6239bcb9c5025f.tar.gz
libvpx-bdfdd7d993fd217c45b13ed1ab6239bcb9c5025f.tar.bz2
libvpx-bdfdd7d993fd217c45b13ed1ab6239bcb9c5025f.zip
cosmetics: Correct grammar/spelling in comments
Change-Id: I1954f9d6e33abff9081fe7a5cf59d5497768e0df
-rw-r--r--vp9/encoder/vp9_encodeframe.c9
-rw-r--r--vp9/encoder/vp9_encoder.c5
-rw-r--r--vp9/encoder/vp9_firstpass.c4
-rw-r--r--vp9/encoder/vp9_temporal_filter.c2
4 files changed, 9 insertions, 11 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c
index 69628669d..063c64113 100644
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -54,7 +54,7 @@ static void encode_superblock(VP9_COMP *cpi, ThreadData * td,
PICK_MODE_CONTEXT *ctx);
// This is used as a reference when computing the source variance for the
-// purposes of activity masking.
+// purpose of activity masking.
// Eventually this should be replaced by custom no-reference routines,
// which will be faster.
static const uint8_t VP9_VAR_OFFS[64] = {
@@ -4301,9 +4301,9 @@ void vp9_encode_frame(VP9_COMP *cpi) {
// either compound, single or hybrid prediction as per whatever has
// worked best for that type of frame in the past.
// It also predicts whether another coding mode would have worked
- // better that this coding mode. If that is the case, it remembers
+ // better than this coding mode. If that is the case, it remembers
// that for subsequent frames.
- // It does the same analysis for transform size selection also.
+ // It also does the same analysis for transform size selection.
const MV_REFERENCE_FRAME frame_type = get_frame_type(cpi);
int64_t *const mode_thrs = rd_opt->prediction_type_threshes[frame_type];
int64_t *const filter_thrs = rd_opt->filter_threshes[frame_type];
@@ -4391,12 +4391,13 @@ void vp9_encode_frame(VP9_COMP *cpi) {
encode_frame_internal(cpi);
}
- // If segmentated AQ is enabled compute the average AQ weighting.
+ // If segmented AQ is enabled compute the average AQ weighting.
if (cm->seg.enabled && (cpi->oxcf.aq_mode != NO_AQ) &&
(cm->seg.update_map || cm->seg.update_data)) {
cm->seg.aq_av_offset = compute_frame_aq_offset(cpi);
}
}
+
static void sum_intra_stats(FRAME_COUNTS *counts, const MODE_INFO *mi) {
const PREDICTION_MODE y_mode = mi->mode;
const PREDICTION_MODE uv_mode = mi->uv_mode;
diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c
index 82fea14df..f61771ad1 100644
--- a/vp9/encoder/vp9_encoder.c
+++ b/vp9/encoder/vp9_encoder.c
@@ -420,7 +420,6 @@ static void dealloc_compressor_data(VP9_COMP *cpi) {
vpx_free(cpi->tile_data);
cpi->tile_data = NULL;
- // Delete sementation map
vpx_free(cpi->segmentation_map);
cpi->segmentation_map = NULL;
vpx_free(cpi->coding_context.last_frame_seg_map_copy);
@@ -3393,11 +3392,10 @@ static void encode_without_recode_loop(VP9_COMP *cpi,
}
apply_active_map(cpi);
- // transform / motion compensation build reconstruction frame
vp9_encode_frame(cpi);
// Check if we should drop this frame because of high overshoot.
- // Only for frames where high temporal-source sad is detected.
+ // Only for frames where high temporal-source SAD is detected.
if (cpi->oxcf.pass == 0 &&
cpi->oxcf.rc_mode == VPX_CBR &&
cpi->resize_state == 0 &&
@@ -3539,7 +3537,6 @@ static void encode_with_recode_loop(VP9_COMP *cpi,
vp9_setup_in_frame_q_adj(cpi);
}
- // transform / motion compensation build reconstruction frame
vp9_encode_frame(cpi);
// Update the skip mb flag probabilities based on the distribution
diff --git a/vp9/encoder/vp9_firstpass.c b/vp9/encoder/vp9_firstpass.c
index 66ccc92c4..2be9b5d4d 100644
--- a/vp9/encoder/vp9_firstpass.c
+++ b/vp9/encoder/vp9_firstpass.c
@@ -931,7 +931,7 @@ void vp9_first_pass(VP9_COMP *cpi, const struct lookahead_entry *source) {
#if CONFIG_FP_MB_STATS
if (cpi->use_fp_mb_stats) {
- // intra predication statistics
+ // intra prediction statistics
cpi->twopass.frame_mb_stats_buf[mb_index] = 0;
cpi->twopass.frame_mb_stats_buf[mb_index] |= FPMB_DCINTRA_MASK;
cpi->twopass.frame_mb_stats_buf[mb_index] |= FPMB_MOTION_ZERO_MASK;
@@ -982,7 +982,7 @@ void vp9_first_pass(VP9_COMP *cpi, const struct lookahead_entry *source) {
#if CONFIG_FP_MB_STATS
if (cpi->use_fp_mb_stats) {
- // inter predication statistics
+ // inter prediction statistics
cpi->twopass.frame_mb_stats_buf[mb_index] = 0;
cpi->twopass.frame_mb_stats_buf[mb_index] &= ~FPMB_DCINTRA_MASK;
cpi->twopass.frame_mb_stats_buf[mb_index] |= FPMB_MOTION_ZERO_MASK;
diff --git a/vp9/encoder/vp9_temporal_filter.c b/vp9/encoder/vp9_temporal_filter.c
index b6323e048..41dd084d1 100644
--- a/vp9/encoder/vp9_temporal_filter.c
+++ b/vp9/encoder/vp9_temporal_filter.c
@@ -401,7 +401,7 @@ static void temporal_filter_iterate_c(VP9_COMP *cpi,
frames[frame]->y_buffer + mb_y_offset,
frames[frame]->y_stride);
- // Assign higher weight to matching MB if it's error
+ // Assign higher weight to matching MB if its error
// score is lower. If not applying MC default behavior
// is to weight all MBs equal.
filter_weight = err < thresh_low