summaryrefslogtreecommitdiff
path: root/vp8/encoder/segmentation.c
diff options
context:
space:
mode:
authorAdrian Grange <agrange@google.com>2012-02-02 09:04:40 -0800
committerAdrian Grange <agrange@google.com>2012-02-02 10:30:57 -0800
commit5d0b5a17d9a73b3f4588ae95fbd4b18e7af79f35 (patch)
treeb3281898cf3b700327d079644760f8d268da1c02 /vp8/encoder/segmentation.c
parent92ffb17cc1478d19e8d7ed5f676b962d8f59e4fa (diff)
downloadlibvpx-5d0b5a17d9a73b3f4588ae95fbd4b18e7af79f35.tar
libvpx-5d0b5a17d9a73b3f4588ae95fbd4b18e7af79f35.tar.gz
libvpx-5d0b5a17d9a73b3f4588ae95fbd4b18e7af79f35.tar.bz2
libvpx-5d0b5a17d9a73b3f4588ae95fbd4b18e7af79f35.zip
Added encoding in Superblock Order
As a precursor to encoding 32x32 blocks this cl adds the ability to encode the frame superblock (=32x32 block) at a time. Within a SB the 4 indiviual MBs are encoded in raster-order (NW,NE,SW,SE). This functionality is added as an experiment which can be enabled by ispecifying --enable-superblocks in the command line specified to configure (CONFIG_SUPERBLOCKS macro in the code). To make this work I had to disable the two intra prediction modes that use data from the top-right of the MB. On the tests that I have run the results produce almost exactly the same PSNRs & SSIMs with a very slightly higher average data rate (and slightly higher data rate than just disabling the two intra modes in the original code). NOTE: This will also break the multi-threaded code. This replaces the abandoned change: Iebebe0d1a50ce8c15c79862c537b765a2f67e162 Change-Id: I1bc1a00f236abc1a373c7210d756e25f970fcad8
Diffstat (limited to 'vp8/encoder/segmentation.c')
-rw-r--r--vp8/encoder/segmentation.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/vp8/encoder/segmentation.c b/vp8/encoder/segmentation.c
index 1d2e98bd0..91dffe166 100644
--- a/vp8/encoder/segmentation.c
+++ b/vp8/encoder/segmentation.c
@@ -214,7 +214,7 @@ void choose_segmap_coding_method( VP8_COMP *cpi )
// First of all generate stats regarding how well the last segment map
// predicts this one
- // Initialize macroblod decoder mode info context for to the first mb
+ // Initialize macroblock decoder mode info context for the first mb
// in the frame
xd->mode_info_context = cm->mi;
@@ -244,7 +244,7 @@ void choose_segmap_coding_method( VP8_COMP *cpi )
temporal_predictor_count[pred_context][seg_predicted]++;
if ( !seg_predicted )
- // Update the "undpredicted" segment count
+ // Update the "unpredicted" segment count
t_unpred_seg_counts[segment_id]++;
}