| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  *  Copyright (c) 2010 The WebM project authors. All Rights Reserved. | 2  *  Copyright (c) 2010 The WebM project authors. All Rights Reserved. | 
| 3  * | 3  * | 
| 4  *  Use of this source code is governed by a BSD-style license | 4  *  Use of this source code is governed by a BSD-style license | 
| 5  *  that can be found in the LICENSE file in the root of the source | 5  *  that can be found in the LICENSE file in the root of the source | 
| 6  *  tree. An additional intellectual property rights grant can be found | 6  *  tree. An additional intellectual property rights grant can be found | 
| 7  *  in the file PATENTS.  All contributing project authors may | 7  *  in the file PATENTS.  All contributing project authors may | 
| 8  *  be found in the AUTHORS file in the root of the source tree. | 8  *  be found in the AUTHORS file in the root of the source tree. | 
| 9  */ | 9  */ | 
| 10 | 10 | 
| 11 | 11 | 
| 12 #ifndef __INC_ENTROPYMV_H | 12 #ifndef __INC_ENTROPYMV_H | 
| 13 #define __INC_ENTROPYMV_H | 13 #define __INC_ENTROPYMV_H | 
| 14 | 14 | 
| 15 #include "treecoder.h" | 15 #include "treecoder.h" | 
| 16 | 16 | 
| 17 enum | 17 enum | 
| 18 { | 18 { | 
| 19     mv_max  = 1023,              /* max absolute value of a MV component */ | 19     mv_max  = 1023,              /* max absolute value of a MV component */ | 
| 20     MVvals = (2 * mv_max) + 1,   /* # possible values "" */ | 20     MVvals = (2 * mv_max) + 1,   /* # possible values "" */ | 
|  | 21     mvfp_max  = 255,              /* max absolute value of a full pixel MV compo
    nent */ | 
|  | 22     MVfpvals = (2 * mvfp_max) +1, /* # possible full pixel MV values */ | 
| 21 | 23 | 
| 22     mvlong_width = 10,       /* Large MVs have 9 bit magnitudes */ | 24     mvlong_width = 10,       /* Large MVs have 9 bit magnitudes */ | 
| 23     mvnum_short = 8,         /* magnitudes 0 through 7 */ | 25     mvnum_short = 8,         /* magnitudes 0 through 7 */ | 
| 24 | 26 | 
| 25     /* probability offsets for coding each MV component */ | 27     /* probability offsets for coding each MV component */ | 
| 26 | 28 | 
| 27     mvpis_short = 0,         /* short (<= 7) vs long (>= 8) */ | 29     mvpis_short = 0,         /* short (<= 7) vs long (>= 8) */ | 
| 28     MVPsign,                /* sign for non-zero */ | 30     MVPsign,                /* sign for non-zero */ | 
| 29     MVPshort,               /* 8 short values = 7-position tree */ | 31     MVPshort,               /* 8 short values = 7-position tree */ | 
| 30 | 32 | 
| 31     MVPbits = MVPshort + mvnum_short - 1, /* mvlong_width long value bits */ | 33     MVPbits = MVPshort + mvnum_short - 1, /* mvlong_width long value bits */ | 
| 32     MVPcount = MVPbits + mvlong_width    /* (with independent probabilities) */ | 34     MVPcount = MVPbits + mvlong_width    /* (with independent probabilities) */ | 
| 33 }; | 35 }; | 
| 34 | 36 | 
| 35 typedef struct mv_context | 37 typedef struct mv_context | 
| 36 { | 38 { | 
| 37     vp8_prob prob[MVPcount];  /* often come in row, col pairs */ | 39     vp8_prob prob[MVPcount];  /* often come in row, col pairs */ | 
| 38 } MV_CONTEXT; | 40 } MV_CONTEXT; | 
| 39 | 41 | 
| 40 extern const MV_CONTEXT vp8_mv_update_probs[2], vp8_default_mv_context[2]; | 42 extern const MV_CONTEXT vp8_mv_update_probs[2], vp8_default_mv_context[2]; | 
| 41 | 43 | 
| 42 #endif | 44 #endif | 
| OLD | NEW | 
|---|