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

cinepak: simplify

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-02-20 02:40:50 +01:00
parent 4e635e10e2
commit a3adbedf9b
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libavcodec/cinepak.c
View File

@ -121,11 +121,6 @@ static void cinepak_decode_codebook (cvid_codebook *codebook,
*p++ = av_clip_uint8(g); *p++ = av_clip_uint8(g);
*p++ = av_clip_uint8(b); *p++ = av_clip_uint8(b);
} }
} else {
/* this codebook type indicates either greyscale or
* palettized video, it is already stored as grey rgb24
* which makes it robust even when the frame is considered
* to be rgb24 */
} }
} else { } else {
p += 12; p += 12;
@ -189,16 +184,14 @@ static int cinepak_decode_vectors (CinepakContext *s, cvid_strip *strip,
if (data >= eod) if (data >= eod)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
p = strip->v1_codebook[*data++] + 6; p = strip->v1_codebook[*data++];
if (s->palette_video) { if (s->palette_video) {
*(ip3+0) = *(ip3+1) = *(ip2+0) = *(ip2+1) = *p; ip3[0] = ip3[1] = ip2[0] = ip2[1] = p[6];
p += 3; /* ... + 9 */ ip3[2] = ip3[3] = ip2[2] = ip2[3] = p[9];
*(ip3+2) = *(ip3+3) = *(ip2+2) = *(ip2+3) = *p; ip1[0] = ip1[1] = ip0[0] = ip0[1] = p[0];
p -= 9; /* ... + 0 */ ip1[2] = ip1[3] = ip0[2] = ip0[3] = p[3];
*(ip1+0) = *(ip1+1) = *(ip0+0) = *(ip0+1) = *p;
p += 3; /* ... + 3 */
*(ip1+2) = *(ip1+3) = *(ip0+2) = *(ip0+3) = *p;
} else { } else {
p += 6;
memcpy(ip3 + 0, p, 3); memcpy(ip3 + 3, p, 3); memcpy(ip3 + 0, p, 3); memcpy(ip3 + 3, p, 3);
memcpy(ip2 + 0, p, 3); memcpy(ip2 + 3, p, 3); memcpy(ip2 + 0, p, 3); memcpy(ip2 + 3, p, 3);
p += 3; /* ... + 9 */ p += 3; /* ... + 9 */
@ -412,6 +405,7 @@ static av_cold int cinepak_decode_init(AVCodecContext *avctx)
s->avctx = avctx; s->avctx = avctx;
s->width = (avctx->width + 3) & ~3; s->width = (avctx->width + 3) & ~3;
s->height = (avctx->height + 3) & ~3; s->height = (avctx->height + 3) & ~3;
s->sega_film_skip_bytes = -1; /* uninitialized state */ s->sega_film_skip_bytes = -1; /* uninitialized state */
// check for paletted data // check for paletted data