virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-14 00:58:38 +02:00
Code Issues Releases Activity

rl2: use fixed-width integer types where appropriate

Browse Source
This commit is contained in:
Anton Khirnov 2012-11-17 07:40:45 +01:00
parent 126abaaaae
commit 3c6e5a840c
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libavcodec/rl2.c
View File

@ -43,10 +43,10 @@ typedef struct Rl2Context {
AVCodecContext *avctx; AVCodecContext *avctx;
AVFrame frame; AVFrame frame;
unsigned short video_base; ///< initial drawing offset uint16_t video_base; ///< initial drawing offset
unsigned int clr_count; ///< number of used colors (currently unused) uint32_t clr_count; ///< number of used colors (currently unused)
unsigned char* back_frame; ///< background frame uint8_t *back_frame; ///< background frame
unsigned int palette[AVPALETTE_COUNT]; uint32_t palette[AVPALETTE_COUNT];
} Rl2Context; } Rl2Context;
/** /**
@ -58,16 +58,17 @@ typedef struct Rl2Context {
* @param stride stride of the output buffer * @param stride stride of the output buffer
* @param video_base offset of the rle data inside the frame * @param video_base offset of the rle data inside the frame
*/ */
static void rl2_rle_decode(Rl2Context *s,const unsigned char* in,int size, static void rl2_rle_decode(Rl2Context *s, const uint8_t *in, int size,
unsigned char* out,int stride,int video_base){ uint8_t *out, int stride, int video_base)
{
int base_x = video_base % s->avctx->width; int base_x = video_base % s->avctx->width;
int base_y = video_base / s->avctx->width; int base_y = video_base / s->avctx->width;
int stride_adj = stride - s->avctx->width; int stride_adj = stride - s->avctx->width;
int i; int i;
const unsigned char* back_frame = s->back_frame; const uint8_t *back_frame = s->back_frame;
const unsigned char* in_end = in + size; const uint8_t *in_end = in + size;
const unsigned char* out_end = out + stride * s->avctx->height; const uint8_t *out_end = out + stride * s->avctx->height;
unsigned char* line_end; uint8_t *line_end;
/** copy start of the background frame */ /** copy start of the background frame */
for(i=0;i<=base_y;i++){ for(i=0;i<=base_y;i++){
@ -82,7 +83,7 @@ static void rl2_rle_decode(Rl2Context *s,const unsigned char* in,int size,
/** decode the variable part of the frame */ /** decode the variable part of the frame */
while(in < in_end){ while(in < in_end){
unsigned char val = *in++; uint8_t val = *in++;
int len = 1; int len = 1;
if(val >= 0x80){ if(val >= 0x80){
if(in >= in_end) if(in >= in_end)
@ -160,7 +161,7 @@ static av_cold int rl2_decode_init(AVCodecContext *avctx)
back_size = avctx->extradata_size - EXTRADATA1_SIZE; back_size = avctx->extradata_size - EXTRADATA1_SIZE;
if(back_size > 0){ if(back_size > 0){
unsigned char* back_frame = av_mallocz(avctx->width*avctx->height); uint8_t *back_frame = av_mallocz(avctx->width*avctx->height);
if(!back_frame) if(!back_frame)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
rl2_rle_decode(s,avctx->extradata + EXTRADATA1_SIZE,back_size, rl2_rle_decode(s,avctx->extradata + EXTRADATA1_SIZE,back_size,