shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Cosmetic - align format in vp9"

--- a/vp9/common/vp9_postproc.c

+++ b/vp9/common/vp9_postproc.c

@@ -26,11 +26,11 @@

 #include "vp9/common/vp9_textblit.h"

 #if CONFIG_VP9_POSTPROC

-static const short kernel5[] = {

+static const int16_t kernel5[] = {

   1, 1, 4, 1, 1

 };

-const short vp9_rv[] = {

+const int16_t vp9_rv[] = {

   8, 5, 2, 2, 8, 12, 4, 9, 8, 3,

   0, 3, 9, 0, 0, 0, 8, 3, 14, 4,

   10, 1, 11, 14, 1, 14, 9, 6, 12, 11,

@@ -320,7 +320,7 @@

     int sumsq = 0;

     int sum   = 0;

     uint8_t d[16];

-    const short *rv2 = rv3 + ((c * 17) & 127);

+    const int16_t *rv2 = rv3 + ((c * 17) & 127);

     for (i = -8; i <= 6; i++) {

       sumsq += s[i * pitch] * s[i * pitch];

--- a/vp9/decoder/vp9_decodeframe.c

+++ b/vp9/decoder/vp9_decodeframe.c

@@ -2219,7 +2219,6 @@

     } else {

       vpx_internal_error(&cm->error, VPX_CODEC_CORRUPT_FRAME,

                          "Decode failed. Frame data is corrupted.");

-

     }

   } else {

     *p_data_end = decode_tiles(pbi, data + first_partition_size, data_end);

--- a/vp9/decoder/vp9_decodemv.c

+++ b/vp9/decoder/vp9_decodemv.c

@@ -560,7 +560,7 @@

                        is_compound, allow_hp, r)) {

           xd->corrupted |= 1;

           break;

-        };

+        }

         mi->bmi[j].as_mv[0].as_int = block[0].as_int;

         if (is_compound)

--- a/vp9/encoder/vp9_encodemb.c

+++ b/vp9/encoder/vp9_encodemb.c

@@ -58,7 +58,7 @@

   int           error;

   int           next;

   int16_t       token;

-  short         qc;

+  int16_t       qc;

 } vp9_token_state;

 // TODO(jimbankoski): experiment to find optimal RD numbers.

--- a/vp9/encoder/vp9_firstpass.c

+++ b/vp9/encoder/vp9_firstpass.c

@@ -237,8 +237,7 @@

 #define MIN_ACTIVE_AREA 0.5

 #define MAX_ACTIVE_AREA 1.0

 static double calculate_active_area(const VP9_COMP *cpi,

-                                    const FIRSTPASS_STATS *this_frame)

-{

+                                    const FIRSTPASS_STATS *this_frame) {

   double active_pct;

   active_pct = 1.0 -

--- a/vp9/encoder/vp9_mcomp.c

+++ b/vp9/encoder/vp9_mcomp.c

@@ -1704,7 +1704,7 @@

           }

         }

         break;

-      };

+      }

 #endif

     } else if (best_address == in_what) {

       (*num00)++;

--- a/vp9/encoder/vp9_ratectrl.c

+++ b/vp9/encoder/vp9_ratectrl.c

@@ -824,7 +824,6 @@

   ASSIGN_MINQ_TABLE(cm->bit_depth, inter_minq);

   if (frame_is_intra_only(cm)) {

-

     // Handle the special case for key frames forced when we have reached

     // the maximum key frame interval. Here force the Q to a range

     // based on the ambient Q to reduce the risk of popping.

--- a/vp9/encoder/vp9_rdopt.c

+++ b/vp9/encoder/vp9_rdopt.c

@@ -1045,7 +1045,6 @@

   memset(x->skip_txfm, SKIP_TXFM_NONE, sizeof(x->skip_txfm));

   /* Y Search for intra prediction mode */

   for (mode = DC_PRED; mode <= TM_PRED; mode++) {

-

     if (cpi->sf.use_nonrd_pick_mode) {

       // These speed features are turned on in hybrid non-RD and RD mode

       // for key frame coding in the context of real-time setting.

-- 

⑨