0164a1cc5b
Allows building the library with the gcc -pedantic option, for improved
portabilty. In particular, this commit removes usage of C99/C++ style
single-line comments and dynamic struct initializers. This is a
continuation of the work done in commit 97b766a46, which removed most
of these warnings for decode only builds.
Change-Id: Id453d9c1d9f44cc0381b10c3869fabb0184d5966
129 lines
3.2 KiB
C
129 lines
3.2 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.
|
|
*/
|
|
|
|
|
|
/****************************************************************************
|
|
*
|
|
* Module Title : boolhuff.h
|
|
*
|
|
* Description : Bool Coder header file.
|
|
*
|
|
****************************************************************************/
|
|
#ifndef __INC_BOOLHUFF_H
|
|
#define __INC_BOOLHUFF_H
|
|
|
|
#include "vpx_ports/mem.h"
|
|
#include "vpx/internal/vpx_codec_internal.h"
|
|
|
|
typedef struct
|
|
{
|
|
unsigned int lowvalue;
|
|
unsigned int range;
|
|
int count;
|
|
unsigned int pos;
|
|
unsigned char *buffer;
|
|
unsigned char *buffer_end;
|
|
struct vpx_internal_error_info *error;
|
|
|
|
/* Variables used to track bit costs without outputing to the bitstream */
|
|
unsigned int measure_cost;
|
|
unsigned long bit_counter;
|
|
} BOOL_CODER;
|
|
|
|
extern void vp8_start_encode(BOOL_CODER *bc, unsigned char *buffer, unsigned char *buffer_end);
|
|
|
|
extern void vp8_encode_value(BOOL_CODER *br, int data, int bits);
|
|
extern void vp8_stop_encode(BOOL_CODER *bc);
|
|
extern const unsigned int vp8_prob_cost[256];
|
|
|
|
|
|
DECLARE_ALIGNED(16, extern const unsigned char, vp8_norm[256]);
|
|
|
|
static int validate_buffer(const unsigned char *start,
|
|
size_t len,
|
|
const unsigned char *end,
|
|
struct vpx_internal_error_info *error)
|
|
{
|
|
if (start + len > start && start + len < end)
|
|
return 1;
|
|
else
|
|
vpx_internal_error(error, VPX_CODEC_CORRUPT_FRAME,
|
|
"Truncated packet or corrupt partition ");
|
|
|
|
return 0;
|
|
}
|
|
static void vp8_encode_bool(BOOL_CODER *br, int bit, int probability)
|
|
{
|
|
unsigned int split;
|
|
int count = br->count;
|
|
unsigned int range = br->range;
|
|
unsigned int lowvalue = br->lowvalue;
|
|
register unsigned int shift;
|
|
|
|
#ifdef ENTROPY_STATS
|
|
#if defined(SECTIONBITS_OUTPUT)
|
|
|
|
if (bit)
|
|
Sectionbits[active_section] += vp8_prob_cost[255-probability];
|
|
else
|
|
Sectionbits[active_section] += vp8_prob_cost[probability];
|
|
|
|
#endif
|
|
#endif
|
|
|
|
split = 1 + (((range - 1) * probability) >> 8);
|
|
|
|
range = split;
|
|
|
|
if (bit)
|
|
{
|
|
lowvalue += split;
|
|
range = br->range - split;
|
|
}
|
|
|
|
shift = vp8_norm[range];
|
|
|
|
range <<= shift;
|
|
count += shift;
|
|
|
|
if (count >= 0)
|
|
{
|
|
int offset = shift - count;
|
|
|
|
if ((lowvalue << (offset - 1)) & 0x80000000)
|
|
{
|
|
int x = br->pos - 1;
|
|
|
|
while (x >= 0 && br->buffer[x] == 0xff)
|
|
{
|
|
br->buffer[x] = (unsigned char)0;
|
|
x--;
|
|
}
|
|
|
|
br->buffer[x] += 1;
|
|
}
|
|
|
|
validate_buffer(br->buffer + br->pos, 1, br->buffer_end, br->error);
|
|
br->buffer[br->pos++] = (lowvalue >> (24 - offset));
|
|
|
|
lowvalue <<= offset;
|
|
shift = count;
|
|
lowvalue &= 0xffffff;
|
|
count -= 8 ;
|
|
}
|
|
|
|
lowvalue <<= shift;
|
|
br->count = count;
|
|
br->lowvalue = lowvalue;
|
|
br->range = range;
|
|
}
|
|
|
|
#endif
|