Merge "vp9_write_bit_buffer: fix function name typo"

This commit is contained in:
James Zern 2014-08-11 18:43:51 -07:00 committed by Gerrit Code Review
commit 2ee221a2dc
3 changed files with 4 additions and 5 deletions

View File

@ -1216,7 +1216,7 @@ void vp9_pack_bitstream(VP9_COMP *cpi, uint8_t *dest, size_t *size) {
saved_wb = wb; saved_wb = wb;
vp9_wb_write_literal(&wb, 0, 16); // don't know in advance first part. size vp9_wb_write_literal(&wb, 0, 16); // don't know in advance first part. size
uncompressed_hdr_size = vp9_rb_bytes_written(&wb); uncompressed_hdr_size = vp9_wb_bytes_written(&wb);
data += uncompressed_hdr_size; data += uncompressed_hdr_size;
vp9_clear_system_state(); vp9_clear_system_state();

View File

@ -8,9 +8,10 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include <limits.h>
#include "vp9/encoder/vp9_write_bit_buffer.h" #include "vp9/encoder/vp9_write_bit_buffer.h"
size_t vp9_rb_bytes_written(struct vp9_write_bit_buffer *wb) { size_t vp9_wb_bytes_written(const struct vp9_write_bit_buffer *wb) {
return wb->bit_offset / CHAR_BIT + (wb->bit_offset % CHAR_BIT > 0); return wb->bit_offset / CHAR_BIT + (wb->bit_offset % CHAR_BIT > 0);
} }

View File

@ -11,8 +11,6 @@
#ifndef VP9_ENCODER_VP9_WRITE_BIT_BUFFER_H_ #ifndef VP9_ENCODER_VP9_WRITE_BIT_BUFFER_H_
#define VP9_ENCODER_VP9_WRITE_BIT_BUFFER_H_ #define VP9_ENCODER_VP9_WRITE_BIT_BUFFER_H_
#include <limits.h>
#include "vpx/vpx_integer.h" #include "vpx/vpx_integer.h"
#ifdef __cplusplus #ifdef __cplusplus
@ -24,7 +22,7 @@ struct vp9_write_bit_buffer {
size_t bit_offset; size_t bit_offset;
}; };
size_t vp9_rb_bytes_written(struct vp9_write_bit_buffer *wb); size_t vp9_wb_bytes_written(const struct vp9_write_bit_buffer *wb);
void vp9_wb_write_bit(struct vp9_write_bit_buffer *wb, int bit); void vp9_wb_write_bit(struct vp9_write_bit_buffer *wb, int bit);