RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

interplayvideo: Convert to the new bitstream reader

This commit is contained in:
Alexandra Hájková 2016-04-12 17:18:09 +02:00 committed by Diego Biurrun
parent 4e25051031
commit bd6496fa07
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/interplayvideo.c
View File

@ -40,8 +40,8 @@
#define BITSTREAM_READER_LE #define BITSTREAM_READER_LE
#include "avcodec.h" #include "avcodec.h"
#include "bitstream.h"
#include "bytestream.h" #include "bytestream.h"
#include "get_bits.h"
#include "hpeldsp.h" #include "hpeldsp.h"
#include "internal.h" #include "internal.h"
@ -881,7 +881,7 @@ static void ipvideo_decode_opcodes(IpvideoContext *s, AVFrame *frame)
int x, y; int x, y;
unsigned char opcode; unsigned char opcode;
int ret; int ret;
GetBitContext gb; BitstreamContext bc;
bytestream2_skip(&s->stream_ptr, 14); /* data starts 14 bytes in */ bytestream2_skip(&s->stream_ptr, 14); /* data starts 14 bytes in */
if (!s->is_16bpp) { if (!s->is_16bpp) {
@ -898,10 +898,10 @@ static void ipvideo_decode_opcodes(IpvideoContext *s, AVFrame *frame)
s->upper_motion_limit_offset = (s->avctx->height - 8) * frame->linesize[0] s->upper_motion_limit_offset = (s->avctx->height - 8) * frame->linesize[0]
+ (s->avctx->width - 8) * (1 + s->is_16bpp); + (s->avctx->width - 8) * (1 + s->is_16bpp);
init_get_bits(&gb, s->decoding_map, s->decoding_map_size * 8); bitstream_init(&bc, s->decoding_map, s->decoding_map_size * 8);
for (y = 0; y < s->avctx->height; y += 8) { for (y = 0; y < s->avctx->height; y += 8) {
for (x = 0; x < s->avctx->width; x += 8) { for (x = 0; x < s->avctx->width; x += 8) {
opcode = get_bits(&gb, 4); opcode = bitstream_read(&bc, 4);
ff_dlog(s->avctx, ff_dlog(s->avctx,
" block @ (%3d, %3d): encoding 0x%X, data ptr offset %d\n", " block @ (%3d, %3d): encoding 0x%X, data ptr offset %d\n",