virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

utvideodec: Convert to the new bitstream reader

Browse Source
This commit is contained in:
Alexandra Hájková 2016-04-14 11:07:15 +02:00 committed by Diego Biurrun
parent 85f760fedd
commit 104a4289f9
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libavcodec/utvideodec.c
View File

@ -28,10 +28,11 @@
#include <stdlib.h> #include <stdlib.h>
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "avcodec.h" #include "avcodec.h"
#include "bitstream.h"
#include "bswapdsp.h" #include "bswapdsp.h"
#include "bytestream.h" #include "bytestream.h"
#include "get_bits.h"
#include "thread.h" #include "thread.h"
#include "utvideo.h" #include "utvideo.h"
@ -85,7 +86,7 @@ static int decode_plane(UtvideoContext *c, int plane_no,
int i, j, slice, pix; int i, j, slice, pix;
int sstart, send; int sstart, send;
VLC vlc; VLC vlc;
GetBitContext gb; BitstreamContext bc;
int prev, fsym; int prev, fsym;
const int cmask = ~(!plane_no && c->avctx->pix_fmt == AV_PIX_FMT_YUV420P); const int cmask = ~(!plane_no && c->avctx->pix_fmt == AV_PIX_FMT_YUV420P);
@ -146,17 +147,17 @@ static int decode_plane(UtvideoContext *c, int plane_no,
c->bdsp.bswap_buf((uint32_t *) c->slice_bits, c->bdsp.bswap_buf((uint32_t *) c->slice_bits,
(uint32_t *) c->slice_bits, (uint32_t *) c->slice_bits,
(slice_data_end - slice_data_start + 3) >> 2); (slice_data_end - slice_data_start + 3) >> 2);
init_get_bits(&gb, c->slice_bits, slice_size * 8); bitstream_init(&bc, c->slice_bits, slice_size * 8);
prev = 0x80; prev = 0x80;
for (j = sstart; j < send; j++) { for (j = sstart; j < send; j++) {
for (i = 0; i < width * step; i += step) { for (i = 0; i < width * step; i += step) {
if (get_bits_left(&gb) <= 0) { if (bitstream_bits_left(&bc) <= 0) {
av_log(c->avctx, AV_LOG_ERROR, av_log(c->avctx, AV_LOG_ERROR,
"Slice decoding ran out of bits\n"); "Slice decoding ran out of bits\n");
goto fail; goto fail;
} }
pix = get_vlc2(&gb, vlc.table, vlc.bits, 4); pix = bitstream_read_vlc(&bc, vlc.table, vlc.bits, 4);
if (pix < 0) { if (pix < 0) {
av_log(c->avctx, AV_LOG_ERROR, "Decoding error\n"); av_log(c->avctx, AV_LOG_ERROR, "Decoding error\n");
goto fail; goto fail;
@ -169,9 +170,9 @@ static int decode_plane(UtvideoContext *c, int plane_no,
} }
dest += stride; dest += stride;
} }
if (get_bits_left(&gb) > 32) if (bitstream_bits_left(&bc) > 32)
av_log(c->avctx, AV_LOG_WARNING, av_log(c->avctx, AV_LOG_WARNING,
"%d bits left after decoding slice\n", get_bits_left(&gb)); "%d bits left after decoding slice\n", bitstream_bits_left(&bc));
} }
ff_free_vlc(&vlc); ff_free_vlc(&vlc);