virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-05-13 21:26:33 +02:00
Code Issues Releases Activity

xsubdec: Convert to the new bitstream reader

Browse Source
This commit is contained in:
Alexandra Hájková 2016-04-15 11:03:55 +02:00 committed by Diego Biurrun
parent be35ef92a4
commit 178b4ea5f9
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/xsubdec.c
View File

@ -21,8 +21,9 @@
#include "libavutil/mathematics.h" #include "libavutil/mathematics.h"
#include "libavutil/imgutils.h" #include "libavutil/imgutils.h"
#include "avcodec.h" #include "avcodec.h"
#include "get_bits.h" #include "bitstream.h"
#include "bytestream.h" #include "bytestream.h"
static av_cold int decode_init(AVCodecContext *avctx) { static av_cold int decode_init(AVCodecContext *avctx) {
@ -55,7 +56,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
uint8_t *bitmap; uint8_t *bitmap;
int w, h, x, y, i; int w, h, x, y, i;
int64_t packet_time = 0; int64_t packet_time = 0;
GetBitContext gb; BitstreamContext bc;
int has_alpha = avctx->codec_tag == MKTAG('D','X','S','A'); int has_alpha = avctx->codec_tag == MKTAG('D','X','S','A');
memset(sub, 0, sizeof(*sub)); memset(sub, 0, sizeof(*sub));
@ -146,15 +147,15 @@ FF_ENABLE_DEPRECATION_WARNINGS
#endif #endif
// process RLE-compressed data // process RLE-compressed data
init_get_bits(&gb, buf, (buf_end - buf) * 8); bitstream_init(&bc, buf, (buf_end - buf) * 8);
bitmap = sub->rects[0]->data[0]; bitmap = sub->rects[0]->data[0];
for (y = 0; y < h; y++) { for (y = 0; y < h; y++) {
// interlaced: do odd lines // interlaced: do odd lines
if (y == (h + 1) / 2) bitmap = sub->rects[0]->data[0] + w; if (y == (h + 1) / 2) bitmap = sub->rects[0]->data[0] + w;
for (x = 0; x < w; ) { for (x = 0; x < w; ) {
int log2 = ff_log2_tab[show_bits(&gb, 8)]; int log2 = ff_log2_tab[bitstream_peek(&bc, 8)];
int run = get_bits(&gb, 14 - 4 * (log2 >> 1)); int run = bitstream_read(&bc, 14 - 4 * (log2 >> 1));
int color = get_bits(&gb, 2); int color = bitstream_read(&bc, 2);
run = FFMIN(run, w - x); run = FFMIN(run, w - x);
// run length 0 means till end of row // run length 0 means till end of row
if (!run) run = w - x; if (!run) run = w - x;
@ -164,7 +165,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
} }
// interlaced, skip every second line // interlaced, skip every second line
bitmap += w; bitmap += w;
align_get_bits(&gb); bitstream_align(&bc);
} }
*data_size = 1; *data_size = 1;
return buf_size; return buf_size;