diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2013-06-10 16:13:08 -0700 |
|---|---|---|
| committer | Dmitry Kovalev <dkovalev@google.com> | 2013-06-10 16:13:08 -0700 |
| commit | 85381e34167c2d7be4b6220a91250a29223c659e (patch) | |
| tree | d2352a69cd58b58dc5f4ba370f6eb0bab9537e63 /vp9/decoder | |
| parent | ba2af976cb6a28e94235741f6954fb05149a5d86 (diff) | |
| download | libvpx-85381e34167c2d7be4b6220a91250a29223c659e.tar libvpx-85381e34167c2d7be4b6220a91250a29223c659e.tar.gz libvpx-85381e34167c2d7be4b6220a91250a29223c659e.tar.bz2 libvpx-85381e34167c2d7be4b6220a91250a29223c659e.zip | |
Using network byte order (big-endian) to encode tile size.
This is consistent with uncompressed header encoding.
Change-Id: Iccf40a44b493ed36ee085b81ed56f7952cde70a9
Diffstat (limited to 'vp9/decoder')
| -rw-r--r-- | vp9/decoder/vp9_decodframe.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/vp9/decoder/vp9_decodframe.c b/vp9/decoder/vp9_decodframe.c index 21ac3987f..8b4447207 100644 --- a/vp9/decoder/vp9_decodframe.c +++ b/vp9/decoder/vp9_decodframe.c @@ -40,8 +40,8 @@ int dec_debug = 0; #endif -static int read_le32(const uint8_t *p) { - return (p[3] << 24) | (p[2] << 16) | (p[1] << 8) | p[0]; +static int read_be32(const uint8_t *p) { + return (p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3]; } // len == 0 is not allowed @@ -914,13 +914,13 @@ static void decode_tiles(VP9D_COMP *pbi, data_ptr2[0][0] = data_ptr; for (tile_row = 0; tile_row < pc->tile_rows; tile_row++) { if (tile_row) { - const int size = read_le32(data_ptr2[tile_row - 1][n_cols - 1]); + const int size = read_be32(data_ptr2[tile_row - 1][n_cols - 1]); data_ptr2[tile_row - 1][n_cols - 1] += 4; data_ptr2[tile_row][0] = data_ptr2[tile_row - 1][n_cols - 1] + size; } for (tile_col = 1; tile_col < n_cols; tile_col++) { - const int size = read_le32(data_ptr2[tile_row][tile_col - 1]); + const int size = read_be32(data_ptr2[tile_row][tile_col - 1]); data_ptr2[tile_row][tile_col - 1] += 4; data_ptr2[tile_row][tile_col] = data_ptr2[tile_row][tile_col - 1] + size; @@ -953,7 +953,7 @@ static void decode_tiles(VP9D_COMP *pbi, decode_tile(pbi, residual_bc); if (has_more) { - const int size = read_le32(data_ptr); + const int size = read_be32(data_ptr); data_ptr += 4 + size; } } |