97259b460c
API was not returning correct partition sizes on arm targets. The armv5 token packing functions were not storing the information to the partition size table. As a fix, have one boolcoder instance allocated for each partition so that partition sizes are internally available after all partitions were encoded. This will also allow more flexibility in producing several partitions in parallel. Use buffer validation (overflow check) in all ARM bitpacking functions. Change-Id: I31c8a11d8a7613676f0ff50928cb2a2ab14fd169
44 lines
2.0 KiB
C
44 lines
2.0 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_BITSTREAM_H
|
|
#define __INC_BITSTREAM_H
|
|
|
|
#if HAVE_ARMV5TE
|
|
void vp8cx_pack_tokens_armv5(vp8_writer *w, const TOKENEXTRA *p, int xcount,
|
|
vp8_token *,
|
|
vp8_extra_bit_struct *,
|
|
const vp8_tree_index *);
|
|
void vp8cx_pack_tokens_into_partitions_armv5(VP8_COMP *,
|
|
unsigned char * cx_data,
|
|
const unsigned char *cx_data_end,
|
|
int num_parts,
|
|
vp8_token *,
|
|
vp8_extra_bit_struct *,
|
|
const vp8_tree_index *);
|
|
void vp8cx_pack_mb_row_tokens_armv5(VP8_COMP *cpi, vp8_writer *w,
|
|
vp8_token *,
|
|
vp8_extra_bit_struct *,
|
|
const vp8_tree_index *);
|
|
# define pack_tokens(a,b,c) \
|
|
vp8cx_pack_tokens_armv5(a,b,c,vp8_coef_encodings,vp8_extra_bits,vp8_coef_tree)
|
|
# define pack_tokens_into_partitions(a,b,c,d) \
|
|
vp8cx_pack_tokens_into_partitions_armv5(a,b,c,d,vp8_coef_encodings,vp8_extra_bits,vp8_coef_tree)
|
|
# define pack_mb_row_tokens(a,b) \
|
|
vp8cx_pack_mb_row_tokens_armv5(a,b,vp8_coef_encodings,vp8_extra_bits,vp8_coef_tree)
|
|
#else
|
|
# define pack_tokens(a,b,c) pack_tokens_c(a,b,c)
|
|
# define pack_tokens_into_partitions(a,b,c,d) pack_tokens_into_partitions_c(a,b,c,d)
|
|
# define pack_mb_row_tokens(a,b) pack_mb_row_tokens_c(a,b)
|
|
#endif
|
|
|
|
#endif
|