virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

avcodec/bethsoftvideo: Pass GetByteContext into set_palette()

Browse Source 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2022-08-18 22:22:45 +02:00
parent f3e823c2aa
commit e1c0239d5a
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libavcodec/bethsoftvideo.c
View File

@@ -51,16 +51,16 @@ static av_cold int bethsoftvid_decode_init(AVCodecContext *avctx)
return 0; return 0;
} }
static int set_palette(BethsoftvidContext *ctx) static int set_palette(BethsoftvidContext *ctx, GetByteContext *g)
{ {
uint32_t *palette = (uint32_t *)ctx->frame->data[1]; uint32_t *palette = (uint32_t *)ctx->frame->data[1];
int a; int a;
if (bytestream2_get_bytes_left(&ctx->g) < 256*3) if (bytestream2_get_bytes_left(g) < 256*3)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
for(a = 0; a < 256; a++){ for(a = 0; a < 256; a++){
palette[a] = 0xFFU << 24 | bytestream2_get_be24u(&ctx->g) * 4; palette[a] = 0xFFU << 24 | bytestream2_get_be24u(g) * 4;
palette[a] |= palette[a] >> 6 & 0x30303; palette[a] |= palette[a] >> 6 & 0x30303;
} }
ctx->frame->palette_has_changed = 1; ctx->frame->palette_has_changed = 1;
@@ -85,9 +85,10 @@ static int bethsoftvid_decode_frame(AVCodecContext *avctx, AVFrame *rframe,
if (avpkt->side_data_elems > 0 && if (avpkt->side_data_elems > 0 &&
avpkt->side_data[0].type == AV_PKT_DATA_PALETTE) { avpkt->side_data[0].type == AV_PKT_DATA_PALETTE) {
bytestream2_init(&vid->g, avpkt->side_data[0].data, GetByteContext g;
bytestream2_init(&g, avpkt->side_data[0].data,
avpkt->side_data[0].size); avpkt->side_data[0].size);
if ((ret = set_palette(vid)) < 0) if ((ret = set_palette(vid, &g)) < 0)
return ret; return ret;
} }
@@ -98,7 +99,7 @@ static int bethsoftvid_decode_frame(AVCodecContext *avctx, AVFrame *rframe,
switch(block_type = bytestream2_get_byte(&vid->g)){ switch(block_type = bytestream2_get_byte(&vid->g)){
case PALETTE_BLOCK: { case PALETTE_BLOCK: {
*got_frame = 0; *got_frame = 0;
if ((ret = set_palette(vid)) < 0) { if ((ret = set_palette(vid, &vid->g)) < 0) {
av_log(avctx, AV_LOG_ERROR, "error reading palette\n"); av_log(avctx, AV_LOG_ERROR, "error reading palette\n");
return ret; return ret;
} }