diff options
| author | Yaowu Xu <yaowu@google.com> | 2015-07-20 14:13:38 -0700 |
|---|---|---|
| committer | Yaowu Xu <yaowu@google.com> | 2015-07-20 18:13:05 -0700 |
| commit | 817be1d2145c1d73f7e953144bcf002d2ccdf878 (patch) | |
| tree | 92a67d11d446faf5ba34de6bd71266d25ec86300 /vpx_dsp | |
| parent | 70ad66805608f711f493a31e19554992206a8f31 (diff) | |
| download | libvpx-817be1d2145c1d73f7e953144bcf002d2ccdf878.tar libvpx-817be1d2145c1d73f7e953144bcf002d2ccdf878.tar.gz libvpx-817be1d2145c1d73f7e953144bcf002d2ccdf878.tar.bz2 libvpx-817be1d2145c1d73f7e953144bcf002d2ccdf878.zip | |
vpx_dsp/bitwriter.h: vp9_->vpx_
changes prefix vp9_ to vpx_ for non codec specific functions and
data structures.
Change-Id: I91a21548e39bd24d2c7caaaa223ae47240bb78c8
Diffstat (limited to 'vpx_dsp')
| -rw-r--r-- | vpx_dsp/bitwriter.c | 8 | ||||
| -rw-r--r-- | vpx_dsp/bitwriter.h | 20 |
2 files changed, 14 insertions, 14 deletions
diff --git a/vpx_dsp/bitwriter.c b/vpx_dsp/bitwriter.c index 1d3493531..5b232e346 100644 --- a/vpx_dsp/bitwriter.c +++ b/vpx_dsp/bitwriter.c @@ -12,20 +12,20 @@ #include "./bitwriter.h" -void vp9_start_encode(vp9_writer *br, uint8_t *source) { +void vpx_start_encode(vpx_writer *br, uint8_t *source) { br->lowvalue = 0; br->range = 255; br->count = -24; br->buffer = source; br->pos = 0; - vp9_write_bit(br, 0); + vpx_write_bit(br, 0); } -void vp9_stop_encode(vp9_writer *br) { +void vpx_stop_encode(vpx_writer *br) { int i; for (i = 0; i < 32; i++) - vp9_write_bit(br, 0); + vpx_write_bit(br, 0); // Ensure there's no ambigous collision with any index marker bytes if ((br->buffer[br->pos - 1] & 0xe0) == 0xc0) diff --git a/vpx_dsp/bitwriter.h b/vpx_dsp/bitwriter.h index a6a858997..f6ca9b916 100644 --- a/vpx_dsp/bitwriter.h +++ b/vpx_dsp/bitwriter.h @@ -19,18 +19,18 @@ extern "C" { #endif -typedef struct vp9_writer { +typedef struct vpx_writer { unsigned int lowvalue; unsigned int range; int count; unsigned int pos; uint8_t *buffer; -} vp9_writer; +} vpx_writer; -void vp9_start_encode(vp9_writer *bc, uint8_t *buffer); -void vp9_stop_encode(vp9_writer *bc); +void vpx_start_encode(vpx_writer *bc, uint8_t *buffer); +void vpx_stop_encode(vpx_writer *bc); -static INLINE void vp9_write(vp9_writer *br, int bit, int probability) { +static INLINE void vpx_write(vpx_writer *br, int bit, int probability) { unsigned int split; int count = br->count; unsigned int range = br->range; @@ -78,18 +78,18 @@ static INLINE void vp9_write(vp9_writer *br, int bit, int probability) { br->range = range; } -static INLINE void vp9_write_bit(vp9_writer *w, int bit) { - vp9_write(w, bit, 128); // vpx_prob_half +static INLINE void vpx_write_bit(vpx_writer *w, int bit) { + vpx_write(w, bit, 128); // vpx_prob_half } -static INLINE void vp9_write_literal(vp9_writer *w, int data, int bits) { +static INLINE void vpx_write_literal(vpx_writer *w, int data, int bits) { int bit; for (bit = bits - 1; bit >= 0; bit--) - vp9_write_bit(w, 1 & (data >> bit)); + vpx_write_bit(w, 1 & (data >> bit)); } -#define vp9_write_prob(w, v) vp9_write_literal((w), (v), 8) +#define vpx_write_prob(w, v) vpx_write_literal((w), (v), 8) #ifdef __cplusplus } // extern "C" |