diff options
Diffstat (limited to 'contrib/ffmpeg/libavcodec/h264data.h')
| -rw-r--r-- | contrib/ffmpeg/libavcodec/h264data.h | 50 |
1 files changed, 19 insertions, 31 deletions
diff --git a/contrib/ffmpeg/libavcodec/h264data.h b/contrib/ffmpeg/libavcodec/h264data.h index 74e720421..dce1666fc 100644 --- a/contrib/ffmpeg/libavcodec/h264data.h +++ b/contrib/ffmpeg/libavcodec/h264data.h @@ -17,7 +17,6 @@ * You should have received a copy of the GNU Lesser General Public * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * */ /** @@ -27,29 +26,13 @@ * @author Michael Niedermayer <michaelni@gmx.at> */ -#define VERT_PRED 0 -#define HOR_PRED 1 -#define DC_PRED 2 -#define DIAG_DOWN_LEFT_PRED 3 -#define DIAG_DOWN_RIGHT_PRED 4 -#define VERT_RIGHT_PRED 5 -#define HOR_DOWN_PRED 6 -#define VERT_LEFT_PRED 7 -#define HOR_UP_PRED 8 - -#define LEFT_DC_PRED 9 -#define TOP_DC_PRED 10 -#define DC_128_PRED 11 +#ifndef FFMPEG_H264DATA_H +#define FFMPEG_H264DATA_H +#include <stdint.h> +#include "mpegvideo.h" +#include "rational.h" -#define DC_PRED8x8 0 -#define HOR_PRED8x8 1 -#define VERT_PRED8x8 2 -#define PLANE_PRED8x8 3 - -#define LEFT_DC_PRED8x8 4 -#define TOP_DC_PRED8x8 5 -#define DC_128_PRED8x8 6 #define EXTENDED_SAR 255 @@ -71,7 +54,7 @@ NAL_SPS_EXT, NAL_AUXILIARY_SLICE=19 }; -static const AVRational pixel_aspect[14]={ +static const AVRational pixel_aspect[17]={ {0, 1}, {1, 1}, {12, 11}, @@ -86,6 +69,9 @@ static const AVRational pixel_aspect[14]={ {15, 11}, {64, 33}, {160,99}, + {4, 3}, + {3, 2}, + {2, 1}, }; static const uint8_t golomb_to_pict_type[5]= @@ -538,7 +524,7 @@ static const uint8_t default_scaling8[2][64]={ 24,25,27,28,30,32,33,35 }}; -static const int dequant4_coeff_init[6][3]={ +static const uint8_t dequant4_coeff_init[6][3]={ {10,13,16}, {11,14,18}, {13,16,20}, @@ -547,10 +533,10 @@ static const int dequant4_coeff_init[6][3]={ {18,23,29}, }; -static const int dequant8_coeff_init_scan[16] = { +static const uint8_t dequant8_coeff_init_scan[16] = { 0,3,4,3, 3,1,5,1, 4,5,2,5, 3,1,5,1 }; -static const int dequant8_coeff_init[6][6]={ +static const uint8_t dequant8_coeff_init[6][6]={ {20,18,32,19,25,24}, {22,19,35,21,28,26}, {26,23,42,24,33,31}, @@ -618,7 +604,7 @@ static const int quant_coeff[52][16]={ /* Deblocking filter (p153) */ -static const int alpha_table[52*3] = { +static const uint8_t alpha_table[52*3] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -634,7 +620,7 @@ static const int alpha_table[52*3] = { 255,255,255,255,255,255,255,255,255,255,255,255,255, 255,255,255,255,255,255,255,255,255,255,255,255,255, }; -static const int beta_table[52*3] = { +static const uint8_t beta_table[52*3] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -650,7 +636,7 @@ static const int beta_table[52*3] = { 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, }; -static const int tc0_table[52*3][3] = { +static const uint8_t tc0_table[52*3][3] = { { 0, 0, 0 }, { 0, 0, 0 }, { 0, 0, 0 }, { 0, 0, 0 }, { 0, 0, 0 }, { 0, 0, 0 }, { 0, 0, 0 }, { 0, 0, 0 }, { 0, 0, 0 }, { 0, 0, 0 }, { 0, 0, 0 }, { 0, 0, 0 }, { 0, 0, 0 }, { 0, 0, 0 }, { 0, 0, 0 }, { 0, 0, 0 }, { 0, 0, 0 }, { 0, 0, 0 }, @@ -682,7 +668,7 @@ static const int tc0_table[52*3][3] = { /* Cabac pre state table */ -static const int cabac_context_init_I[460][2] = +static const int8_t cabac_context_init_I[460][2] = { /* 0 - 10 */ { 20, -15 }, { 2, 54 }, { 3, 74 }, { 20, -15 }, @@ -851,7 +837,7 @@ static const int cabac_context_init_I[460][2] = { 29, 9 }, { 35, 20 }, { 29, 36 }, { 14, 67 } }; -static const int cabac_context_init_PB[3][460][2] = +static const int8_t cabac_context_init_PB[3][460][2] = { /* i_cabac_init_idc == 0 */ { @@ -1321,3 +1307,5 @@ static const int cabac_context_init_PB[3][460][2] = { 31, 12 }, { 37, 23 }, { 31, 38 }, { 20, 64 }, } }; + +#endif /* FFMPEG_H264DATA_H */ |