c4d7e5e67e
This eliminates a large set of warnings exposed by the Mozilla build system (Use of C++ comments in ISO C90 source, commas at the end of enum lists, a couple incomplete initializers, and signed/unsigned comparisons). It also eliminates many (but not all) of the warnings expose by newer GCC versions and _FORTIFY_SOURCE (e.g., calling fread and fwrite without checking the return values). There are a few spurious warnings left on my system: ../vp8/encoder/encodemb.c:274:9: warning: 'sz' may be used uninitialized in this function gcc seems to be unable to figure out that the value shortcut doesn't change between the two if blocks that test it here. ../vp8/encoder/onyx_if.c:5314:5: warning: comparison of unsigned expression >= 0 is always true ../vp8/encoder/onyx_if.c:5319:5: warning: comparison of unsigned expression >= 0 is always true This is true, so far as it goes, but it's comparing against an enum, and the C standard does not mandate that enums be unsigned, so the checks can't be removed. Change-Id: Iaf689ae3e3d0ddc5ade00faa474debe73b8d3395
161 lines
3.7 KiB
C
161 lines
3.7 KiB
C
/*
|
|
* Copyright (c) 2010 The WebM project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
|
|
#ifndef __INC_VP8D_INT_H
|
|
#define __INC_VP8D_INT_H
|
|
#include "vpx_ports/config.h"
|
|
#include "onyxd.h"
|
|
#include "treereader.h"
|
|
#include "onyxc_int.h"
|
|
#include "threading.h"
|
|
#include "dequantize.h"
|
|
|
|
typedef struct
|
|
{
|
|
int ithread;
|
|
void *ptr1;
|
|
void *ptr2;
|
|
} DECODETHREAD_DATA;
|
|
|
|
typedef struct
|
|
{
|
|
MACROBLOCKD mbd;
|
|
int mb_row;
|
|
int current_mb_col;
|
|
short *coef_ptr;
|
|
} MB_ROW_DEC;
|
|
|
|
typedef struct
|
|
{
|
|
INT64 time_stamp;
|
|
int size;
|
|
} DATARATE;
|
|
|
|
typedef struct
|
|
{
|
|
INT16 min_val;
|
|
INT16 Length;
|
|
UINT8 Probs[12];
|
|
} TOKENEXTRABITS;
|
|
|
|
typedef struct
|
|
{
|
|
int const *scan;
|
|
UINT8 const *ptr_block2leftabove;
|
|
vp8_tree_index const *vp8_coef_tree_ptr;
|
|
TOKENEXTRABITS const *teb_base_ptr;
|
|
unsigned char *norm_ptr;
|
|
UINT8 *ptr_coef_bands_x;
|
|
|
|
ENTROPY_CONTEXT_PLANES *A;
|
|
ENTROPY_CONTEXT_PLANES *L;
|
|
|
|
INT16 *qcoeff_start_ptr;
|
|
BOOL_DECODER *current_bc;
|
|
|
|
vp8_prob const *coef_probs[4];
|
|
|
|
UINT8 eob[25];
|
|
|
|
} DETOK;
|
|
|
|
typedef struct VP8Decompressor
|
|
{
|
|
DECLARE_ALIGNED(16, MACROBLOCKD, mb);
|
|
|
|
DECLARE_ALIGNED(16, VP8_COMMON, common);
|
|
|
|
vp8_reader bc, bc2;
|
|
|
|
VP8D_CONFIG oxcf;
|
|
|
|
|
|
const unsigned char *Source;
|
|
unsigned int source_sz;
|
|
|
|
|
|
unsigned int CPUFreq;
|
|
unsigned int decode_microseconds;
|
|
unsigned int time_decoding;
|
|
unsigned int time_loop_filtering;
|
|
|
|
volatile int b_multithreaded_rd;
|
|
int max_threads;
|
|
int current_mb_col_main;
|
|
int decoding_thread_count;
|
|
int allocated_decoding_thread_count;
|
|
|
|
/* variable for threading */
|
|
#if CONFIG_MULTITHREAD
|
|
int mt_baseline_filter_level[MAX_MB_SEGMENTS];
|
|
int sync_range;
|
|
int *mt_current_mb_col; /* Each row remembers its already decoded column. */
|
|
|
|
unsigned char **mt_yabove_row; /* mb_rows x width */
|
|
unsigned char **mt_uabove_row;
|
|
unsigned char **mt_vabove_row;
|
|
unsigned char **mt_yleft_col; /* mb_rows x 16 */
|
|
unsigned char **mt_uleft_col; /* mb_rows x 8 */
|
|
unsigned char **mt_vleft_col; /* mb_rows x 8 */
|
|
|
|
MB_ROW_DEC *mb_row_di;
|
|
DECODETHREAD_DATA *de_thread_data;
|
|
|
|
pthread_t *h_decoding_thread;
|
|
sem_t *h_event_start_decoding;
|
|
sem_t h_event_end_decoding;
|
|
/* end of threading data */
|
|
#endif
|
|
|
|
vp8_reader *mbc;
|
|
INT64 last_time_stamp;
|
|
int ready_for_new_data;
|
|
|
|
DATARATE dr[16];
|
|
|
|
DETOK detoken;
|
|
|
|
#if CONFIG_RUNTIME_CPU_DETECT
|
|
vp8_dequant_rtcd_vtable_t dequant;
|
|
struct vp8_dboolhuff_rtcd_vtable dboolhuff;
|
|
#endif
|
|
|
|
|
|
vp8_prob prob_intra;
|
|
vp8_prob prob_last;
|
|
vp8_prob prob_gf;
|
|
vp8_prob prob_skip_false;
|
|
|
|
} VP8D_COMP;
|
|
|
|
int vp8_decode_frame(VP8D_COMP *cpi);
|
|
void vp8_dmachine_specific_config(VP8D_COMP *pbi);
|
|
|
|
|
|
#if CONFIG_DEBUG
|
|
#define CHECK_MEM_ERROR(lval,expr) do {\
|
|
lval = (expr); \
|
|
if(!lval) \
|
|
vpx_internal_error(&pbi->common.error, VPX_CODEC_MEM_ERROR,\
|
|
"Failed to allocate "#lval" at %s:%d", \
|
|
__FILE__,__LINE__);\
|
|
} while(0)
|
|
#else
|
|
#define CHECK_MEM_ERROR(lval,expr) do {\
|
|
lval = (expr); \
|
|
if(!lval) \
|
|
vpx_internal_error(&pbi->common.error, VPX_CODEC_MEM_ERROR,\
|
|
"Failed to allocate "#lval);\
|
|
} while(0)
|
|
#endif
|
|
|
|
#endif
|