RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avutil/frame: deprecate palette_has_changed 

Not only this is information that relies on the concept of a sequence of
frames, which is completely out of place as a field in AVFrame, but there are
no known or intended uses of this field.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2023-05-17 22:39:57 -03:00
parent 01d9a84ef5
commit 63767b79a5
48 changed files with 267 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/APIchanges
View File

@ -2,6 +2,9 @@ The last version increases of all libraries were on 2023-02-09
API changes, most recent first: API changes, most recent first:
2023-05-xx - xxxxxxxxxx - lavu 58 - frame.h
Deprecate AVFrame.palette_has_changed without replacement.
2023-05-xx - xxxxxxxxxx - lavc 60 - avcodec.h 2023-05-xx - xxxxxxxxxx - lavc 60 - avcodec.h
Depreate AVCodecContext.ticks_per_frame in favor of Depreate AVCodecContext.ticks_per_frame in favor of
AVCodecContext.framerate (encoding) and AVCodecContext.framerate (encoding) and

13
libavcodec/8bps.c
View File

@ -47,8 +47,6 @@ typedef struct EightBpsContext {
unsigned char planes; unsigned char planes;
unsigned char planemap[4]; unsigned char planemap[4];
uint32_t pal[256];
} EightBpsContext; } EightBpsContext;
static int decode_frame(AVCodecContext *avctx, AVFrame *frame, static int decode_frame(AVCodecContext *avctx, AVFrame *frame,
@ -123,9 +121,14 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame,
} }
if (avctx->bits_per_coded_sample <= 8) { if (avctx->bits_per_coded_sample <= 8) {
frame->palette_has_changed = ff_copy_palette(c->pal, avpkt, avctx); #if FF_API_PALETTE_HAS_CHANGED
FF_DISABLE_DEPRECATION_WARNINGS
memcpy (frame->data[1], c->pal, AVPALETTE_SIZE); frame->palette_has_changed =
#endif
ff_copy_palette(frame->data[1], avpkt, avctx);
#if FF_API_PALETTE_HAS_CHANGED
FF_ENABLE_DEPRECATION_WARNINGS
#endif
} }
*got_frame = 1; *got_frame = 1;

8
libavcodec/ansi.c
View File

@ -262,7 +262,11 @@ static int execute_code(AVCodecContext * avctx, int c)
AV_GET_BUFFER_FLAG_REF)) < 0) AV_GET_BUFFER_FLAG_REF)) < 0)
return ret; return ret;
s->frame->pict_type = AV_PICTURE_TYPE_I; s->frame->pict_type = AV_PICTURE_TYPE_I;
#if FF_API_PALETTE_HAS_CHANGED
FF_DISABLE_DEPRECATION_WARNINGS
s->frame->palette_has_changed = 1; s->frame->palette_has_changed = 1;
FF_ENABLE_DEPRECATION_WARNINGS
#endif
set_palette((uint32_t *)s->frame->data[1]); set_palette((uint32_t *)s->frame->data[1]);
erase_screen(avctx); erase_screen(avctx);
} else if (c == 'l') { } else if (c == 'l') {
@ -371,7 +375,11 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *rframe,
} }
s->frame->pict_type = AV_PICTURE_TYPE_I; s->frame->pict_type = AV_PICTURE_TYPE_I;
#if FF_API_PALETTE_HAS_CHANGED
FF_DISABLE_DEPRECATION_WARNINGS
s->frame->palette_has_changed = 1; s->frame->palette_has_changed = 1;
FF_ENABLE_DEPRECATION_WARNINGS
#endif
set_palette((uint32_t *)s->frame->data[1]); set_palette((uint32_t *)s->frame->data[1]);
if (!s->first_frame) { if (!s->first_frame) {
erase_screen(avctx); erase_screen(avctx);

4
libavcodec/bethsoftvideo.c
View File

@ -63,7 +63,11 @@ static int set_palette(BethsoftvidContext *ctx, GetByteContext *g)
palette[a] = 0xFFU << 24 | bytestream2_get_be24u(g) * 4; palette[a] = 0xFFU << 24 | bytestream2_get_be24u(g) * 4;
palette[a] |= palette[a] >> 6 & 0x30303; palette[a] |= palette[a] >> 6 & 0x30303;
} }
#if FF_API_PALETTE_HAS_CHANGED
FF_DISABLE_DEPRECATION_WARNINGS
ctx->frame->palette_has_changed = 1; ctx->frame->palette_has_changed = 1;
FF_ENABLE_DEPRECATION_WARNINGS
#endif
return 0; return 0;
} }

8
libavcodec/bfi.c
View File

@ -84,11 +84,19 @@ static int bfi_decode_frame(AVCodecContext *avctx, AVFrame *frame,
pal++; pal++;
} }
memcpy(bfi->pal, frame->data[1], sizeof(bfi->pal)); memcpy(bfi->pal, frame->data[1], sizeof(bfi->pal));
#if FF_API_PALETTE_HAS_CHANGED
FF_DISABLE_DEPRECATION_WARNINGS
frame->palette_has_changed = 1; frame->palette_has_changed = 1;
FF_ENABLE_DEPRECATION_WARNINGS
#endif
} else { } else {
frame->pict_type = AV_PICTURE_TYPE_P; frame->pict_type = AV_PICTURE_TYPE_P;
frame->flags &= ~AV_FRAME_FLAG_KEY; frame->flags &= ~AV_FRAME_FLAG_KEY;
#if FF_API_PALETTE_HAS_CHANGED
FF_DISABLE_DEPRECATION_WARNINGS
frame->palette_has_changed = 0; frame->palette_has_changed = 0;
FF_ENABLE_DEPRECATION_WARNINGS
#endif
memcpy(frame->data[1], bfi->pal, sizeof(bfi->pal)); memcpy(frame->data[1], bfi->pal, sizeof(bfi->pal));
} }

4
libavcodec/bintext.c
View File

@ -157,7 +157,11 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame,
if ((ret = ff_get_buffer(avctx, s->frame, 0)) < 0) if ((ret = ff_get_buffer(avctx, s->frame, 0)) < 0)
return ret; return ret;
s->frame->pict_type = AV_PICTURE_TYPE_I; s->frame->pict_type = AV_PICTURE_TYPE_I;
#if FF_API_PALETTE_HAS_CHANGED
FF_DISABLE_DEPRECATION_WARNINGS
s->frame->palette_has_changed = 1; s->frame->palette_has_changed = 1;
FF_ENABLE_DEPRECATION_WARNINGS
#endif
memcpy(s->frame->data[1], s->palette, 16 * 4); memcpy(s->frame->data[1], s->palette, 16 * 4);
if (avctx->codec_id == AV_CODEC_ID_XBIN) { if (avctx->codec_id == AV_CODEC_ID_XBIN) {

4
libavcodec/bmvvideo.c
View File

@ -251,7 +251,11 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame,
} }
memcpy(frame->data[1], c->pal, AVPALETTE_SIZE); memcpy(frame->data[1], c->pal, AVPALETTE_SIZE);
#if FF_API_PALETTE_HAS_CHANGED
FF_DISABLE_DEPRECATION_WARNINGS
frame->palette_has_changed = type & BMV_PALETTE; frame->palette_has_changed = type & BMV_PALETTE;
FF_ENABLE_DEPRECATION_WARNINGS
#endif
outptr = frame->data[0]; outptr = frame->data[0];
srcptr = c->frame; srcptr = c->frame;

8
libavcodec/brenderpix.c
View File

@ -245,7 +245,11 @@ static int pix_decode_frame(AVCodecContext *avctx, AVFrame *frame,
*pal_out++ = (0xFFU << 24) | bytestream2_get_be32u(&gb); *pal_out++ = (0xFFU << 24) | bytestream2_get_be32u(&gb);
bytestream2_skip(&gb, 8); bytestream2_skip(&gb, 8);
#if FF_API_PALETTE_HAS_CHANGED
FF_DISABLE_DEPRECATION_WARNINGS
frame->palette_has_changed = 1; frame->palette_has_changed = 1;
FF_ENABLE_DEPRECATION_WARNINGS
#endif
chunk_type = bytestream2_get_be32(&gb); chunk_type = bytestream2_get_be32(&gb);
} else if (avctx->pix_fmt == AV_PIX_FMT_PAL8) { } else if (avctx->pix_fmt == AV_PIX_FMT_PAL8) {
@ -257,7 +261,11 @@ static int pix_decode_frame(AVCodecContext *avctx, AVFrame *frame,
"Using default palette, colors might be off.\n"); "Using default palette, colors might be off.\n");
memcpy(pal_out, std_pal_table, sizeof(uint32_t) * 256); memcpy(pal_out, std_pal_table, sizeof(uint32_t) * 256);
#if FF_API_PALETTE_HAS_CHANGED
FF_DISABLE_DEPRECATION_WARNINGS
frame->palette_has_changed = 1; frame->palette_has_changed = 1;
FF_ENABLE_DEPRECATION_WARNINGS
#endif
} }
data_len = bytestream2_get_be32(&gb); data_len = bytestream2_get_be32(&gb);

4
libavcodec/c93.c
View File

@ -246,7 +246,11 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *rframe,
for (i = 0; i < 256; i++) { for (i = 0; i < 256; i++) {
palette[i] = 0xFFU << 24 | bytestream2_get_be24(&gb); palette[i] = 0xFFU << 24 | bytestream2_get_be24(&gb);
} }
#if FF_API_PALETTE_HAS_CHANGED
FF_DISABLE_DEPRECATION_WARNINGS
newpic->palette_has_changed = 1; newpic->palette_has_changed = 1;
FF_ENABLE_DEPRECATION_WARNINGS
#endif
} else { } else {
if (oldpic->data[1]) if (oldpic->data[1])
memcpy(newpic->data[1], oldpic->data[1], 256 * 4); memcpy(newpic->data[1], oldpic->data[1], 256 * 4);

4
libavcodec/cdgraphics.c
View File

@ -125,7 +125,11 @@ static void cdg_load_palette(CDGraphicsContext *cc, uint8_t *data, int low)
b = ((color ) & 0x000F) * 17; b = ((color ) & 0x000F) * 17;
palette[i + array_offset] = (uint32_t)cc->alpha[i + array_offset] << 24 | r << 16 | g << 8 | b; palette[i + array_offset] = (uint32_t)cc->alpha[i + array_offset] << 24 | r << 16 | g << 8 | b;
} }
#if FF_API_PALETTE_HAS_CHANGED
FF_DISABLE_DEPRECATION_WARNINGS
cc->frame->palette_has_changed = 1; cc->frame->palette_has_changed = 1;
FF_ENABLE_DEPRECATION_WARNINGS
#endif
} }
static int cdg_tile_block(CDGraphicsContext *cc, uint8_t *data, int b) static int cdg_tile_block(CDGraphicsContext *cc, uint8_t *data, int b)

4
libavcodec/cdtoons.c
View File

@ -384,7 +384,11 @@ static int cdtoons_decode_frame(AVCodecContext *avctx, AVFrame *rframe,
} }
/* first palette entry indicates transparency */ /* first palette entry indicates transparency */
c->pal[0] = 0; c->pal[0] = 0;
#if FF_API_PALETTE_HAS_CHANGED
FF_DISABLE_DEPRECATION_WARNINGS
c->frame->palette_has_changed = 1; c->frame->palette_has_changed = 1;
FF_ENABLE_DEPRECATION_WARNINGS
#endif
} }
} }

9
libavcodec/cinepak.c
View File

@ -476,7 +476,14 @@ static int cinepak_decode_frame(AVCodecContext *avctx, AVFrame *rframe,
return ret; return ret;
if (s->palette_video) { if (s->palette_video) {
s->frame->palette_has_changed = ff_copy_palette(s->pal, avpkt, avctx); #if FF_API_PALETTE_HAS_CHANGED
FF_DISABLE_DEPRECATION_WARNINGS
s->frame->palette_has_changed =
#endif
ff_copy_palette(s->pal, avpkt, avctx);
#if FF_API_PALETTE_HAS_CHANGED
FF_ENABLE_DEPRECATION_WARNINGS
#endif
} }
if ((ret = cinepak_decode(s)) < 0) { if ((ret = cinepak_decode(s)) < 0) {

8
libavcodec/dds.c
View File

@ -651,7 +651,11 @@ static int dds_decode(AVCodecContext *avctx, AVFrame *frame,
((unsigned)frame->data[1][3+i*4]<<24) ((unsigned)frame->data[1][3+i*4]<<24)
); );
} }
#if FF_API_PALETTE_HAS_CHANGED
FF_DISABLE_DEPRECATION_WARNINGS
frame->palette_has_changed = 1; frame->palette_has_changed = 1;
FF_ENABLE_DEPRECATION_WARNINGS
#endif
if (bytestream2_get_bytes_left(gbc) < frame->height * frame->width / 2) { if (bytestream2_get_bytes_left(gbc) < frame->height * frame->width / 2) {
av_log(avctx, AV_LOG_ERROR, "Buffer is too small (%d < %d).\n", av_log(avctx, AV_LOG_ERROR, "Buffer is too small (%d < %d).\n",
@ -682,7 +686,11 @@ static int dds_decode(AVCodecContext *avctx, AVFrame *frame,
((unsigned)frame->data[1][3+i*4]<<24) ((unsigned)frame->data[1][3+i*4]<<24)
); );
#if FF_API_PALETTE_HAS_CHANGED
FF_DISABLE_DEPRECATION_WARNINGS
frame->palette_has_changed = 1; frame->palette_has_changed = 1;
FF_ENABLE_DEPRECATION_WARNINGS
#endif
} }
if (bytestream2_get_bytes_left(gbc) < frame->height * linesize) { if (bytestream2_get_bytes_left(gbc) < frame->height * linesize) {

4
libavcodec/dfa.c
View File

@ -367,7 +367,11 @@ static int dfa_decode_frame(AVCodecContext *avctx, AVFrame *frame,
s->pal[i] = bytestream2_get_be24(&gb) << 2; s->pal[i] = bytestream2_get_be24(&gb) << 2;
s->pal[i] |= 0xFFU << 24 | (s->pal[i] >> 6) & 0x30303; s->pal[i] |= 0xFFU << 24 | (s->pal[i] >> 6) & 0x30303;
} }
#if FF_API_PALETTE_HAS_CHANGED
FF_DISABLE_DEPRECATION_WARNINGS
frame->palette_has_changed = 1; frame->palette_has_changed = 1;
FF_ENABLE_DEPRECATION_WARNINGS
#endif
} else if (chunk_type <= 9) { } else if (chunk_type <= 9) {
if (decoder[chunk_type - 2](&gb, s->frame_buf, avctx->width, avctx->height)) { if (decoder[chunk_type - 2](&gb, s->frame_buf, avctx->width, avctx->height)) {
av_log(avctx, AV_LOG_ERROR, "Error decoding %s chunk\n", av_log(avctx, AV_LOG_ERROR, "Error decoding %s chunk\n",

4
libavcodec/dsicinvideo.c
View File

@ -293,7 +293,11 @@ static int cinvideo_decode_frame(AVCodecContext *avctx, AVFrame *rframe,
return res; return res;
memcpy(cin->frame->data[1], cin->palette, sizeof(cin->palette)); memcpy(cin->frame->data[1], cin->palette, sizeof(cin->palette));
#if FF_API_PALETTE_HAS_CHANGED
FF_DISABLE_DEPRECATION_WARNINGS
cin->frame->palette_has_changed = 1; cin->frame->palette_has_changed = 1;
FF_ENABLE_DEPRECATION_WARNINGS
#endif
for (y = 0; y < cin->avctx->height; ++y) for (y = 0; y < cin->avctx->height; ++y)
memcpy(cin->frame->data[0] + (cin->avctx->height - 1 - y) * cin->frame->linesize[0], memcpy(cin->frame->data[0] + (cin->avctx->height - 1 - y) * cin->frame->linesize[0],
cin->bitmap_table[CIN_CUR_BMP] + y * cin->avctx->width, cin->bitmap_table[CIN_CUR_BMP] + y * cin->avctx->width,

4
libavcodec/dxa.c
View File

@ -230,7 +230,11 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame,
if ((ret = ff_get_buffer(avctx, frame, AV_GET_BUFFER_FLAG_REF)) < 0) if ((ret = ff_get_buffer(avctx, frame, AV_GET_BUFFER_FLAG_REF)) < 0)
return ret; return ret;
memcpy(frame->data[1], c->pal, AVPALETTE_SIZE); memcpy(frame->data[1], c->pal, AVPALETTE_SIZE);
#if FF_API_PALETTE_HAS_CHANGED
FF_DISABLE_DEPRECATION_WARNINGS
frame->palette_has_changed = pc; frame->palette_has_changed = pc;
FF_ENABLE_DEPRECATION_WARNINGS
#endif
outptr = frame->data[0]; outptr = frame->data[0];
srcptr = c->decomp_buf; srcptr = c->decomp_buf;

4
libavcodec/flicvideo.c
View File

@ -473,7 +473,11 @@ static int flic_decode_frame_8BPP(AVCodecContext *avctx,
/* make the palette available on the way out */ /* make the palette available on the way out */
memcpy(s->frame->data[1], s->palette, AVPALETTE_SIZE); memcpy(s->frame->data[1], s->palette, AVPALETTE_SIZE);
if (s->new_palette) { if (s->new_palette) {
#if FF_API_PALETTE_HAS_CHANGED
FF_DISABLE_DEPRECATION_WARNINGS
s->frame->palette_has_changed = 1; s->frame->palette_has_changed = 1;
FF_ENABLE_DEPRECATION_WARNINGS
#endif
s->new_palette = 0; s->new_palette = 0;
} }

4
libavcodec/gemdec.c
View File

@ -181,7 +181,11 @@ static int gem_decode_frame(AVCodecContext *avctx, AVFrame *p,
p->pict_type = AV_PICTURE_TYPE_I; p->pict_type = AV_PICTURE_TYPE_I;
p->flags |= AV_FRAME_FLAG_KEY; p->flags |= AV_FRAME_FLAG_KEY;
#if FF_API_PALETTE_HAS_CHANGED
FF_DISABLE_DEPRECATION_WARNINGS
p->palette_has_changed = 1; p->palette_has_changed = 1;
FF_ENABLE_DEPRECATION_WARNINGS
#endif
palette = (uint32_t *)p->data[1]; palette = (uint32_t *)p->data[1];
if (tag == AV_RB32("STTT")) { if (tag == AV_RB32("STTT")) {

9
libavcodec/idcinvideo.c
View File

@ -224,7 +224,14 @@ static int idcin_decode_frame(AVCodecContext *avctx, AVFrame *frame,
if (idcin_decode_vlcs(s, frame)) if (idcin_decode_vlcs(s, frame))
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
frame->palette_has_changed = ff_copy_palette(s->pal, avpkt, avctx); #if FF_API_PALETTE_HAS_CHANGED
FF_DISABLE_DEPRECATION_WARNINGS
frame->palette_has_changed =
#endif
ff_copy_palette(s->pal, avpkt, avctx);
#if FF_API_PALETTE_HAS_CHANGED
FF_ENABLE_DEPRECATION_WARNINGS
#endif
/* make the palette available on the way out */ /* make the palette available on the way out */
memcpy(frame->data[1], s->pal, AVPALETTE_SIZE); memcpy(frame->data[1], s->pal, AVPALETTE_SIZE);

8
libavcodec/imx.c
View File

@ -58,11 +58,19 @@ static int imx_decode_frame(AVCodecContext *avctx, AVFrame *rframe,
return ret; return ret;
if (ff_copy_palette(imx->pal, avpkt, avctx)) { if (ff_copy_palette(imx->pal, avpkt, avctx)) {
#if FF_API_PALETTE_HAS_CHANGED
FF_DISABLE_DEPRECATION_WARNINGS
frame->palette_has_changed = 1; frame->palette_has_changed = 1;
FF_ENABLE_DEPRECATION_WARNINGS
#endif
frame->flags |= AV_FRAME_FLAG_KEY; frame->flags |= AV_FRAME_FLAG_KEY;
} else { } else {
frame->flags &= ~AV_FRAME_FLAG_KEY; frame->flags &= ~AV_FRAME_FLAG_KEY;
#if FF_API_PALETTE_HAS_CHANGED
FF_DISABLE_DEPRECATION_WARNINGS
frame->palette_has_changed = 0; frame->palette_has_changed = 0;
FF_ENABLE_DEPRECATION_WARNINGS
#endif
} }
bytestream2_init(&gb, avpkt->data, avpkt->size); bytestream2_init(&gb, avpkt->data, avpkt->size);

9
libavcodec/interplayvideo.c
View File

@ -1315,7 +1315,14 @@ static int ipvideo_decode_frame(AVCodecContext *avctx, AVFrame *frame,
return ret; return ret;
if (!s->is_16bpp) { if (!s->is_16bpp) {
frame->palette_has_changed = ff_copy_palette(s->pal, avpkt, avctx); #if FF_API_PALETTE_HAS_CHANGED
FF_DISABLE_DEPRECATION_WARNINGS
frame->palette_has_changed =
#endif
ff_copy_palette(s->pal, avpkt, avctx);
#if FF_API_PALETTE_HAS_CHANGED
FF_ENABLE_DEPRECATION_WARNINGS
#endif
} }
switch (frame_format) { switch (frame_format) {

8
libavcodec/jvdec.c
View File

@ -37,7 +37,9 @@ typedef struct JvContext {
BlockDSPContext bdsp; BlockDSPContext bdsp;
AVFrame *frame; AVFrame *frame;
uint32_t palette[AVPALETTE_COUNT]; uint32_t palette[AVPALETTE_COUNT];
#if FF_API_PALETTE_HAS_CHANGED
int palette_has_changed; int palette_has_changed;
#endif
} JvContext; } JvContext;
static av_cold int decode_init(AVCodecContext *avctx) static av_cold int decode_init(AVCodecContext *avctx)
@ -207,14 +209,20 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *rframe,
s->palette[i] = 0xFFU << 24 | pal << 2 | ((pal >> 4) & 0x30303); s->palette[i] = 0xFFU << 24 | pal << 2 | ((pal >> 4) & 0x30303);
buf += 3; buf += 3;
} }
#if FF_API_PALETTE_HAS_CHANGED
s->palette_has_changed = 1; s->palette_has_changed = 1;
#endif
} }
if (video_size) { if (video_size) {
s->frame->flags |= AV_FRAME_FLAG_KEY; s->frame->flags |= AV_FRAME_FLAG_KEY;
s->frame->pict_type = AV_PICTURE_TYPE_I; s->frame->pict_type = AV_PICTURE_TYPE_I;
#if FF_API_PALETTE_HAS_CHANGED
FF_DISABLE_DEPRECATION_WARNINGS
s->frame->palette_has_changed = s->palette_has_changed; s->frame->palette_has_changed = s->palette_has_changed;
s->palette_has_changed = 0; s->palette_has_changed = 0;
FF_ENABLE_DEPRECATION_WARNINGS
#endif
memcpy(s->frame->data[1], s->palette, AVPALETTE_SIZE); memcpy(s->frame->data[1], s->palette, AVPALETTE_SIZE);
if ((ret = av_frame_ref(rframe, s->frame)) < 0) if ((ret = av_frame_ref(rframe, s->frame)) < 0)

17
libavcodec/kmvc.c
View File

@ -273,7 +273,14 @@ static int decode_frame(AVCodecContext * avctx, AVFrame *frame,
if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) if ((ret = ff_get_buffer(avctx, frame, 0)) < 0)
return ret; return ret;
frame->palette_has_changed = ff_copy_palette(ctx->pal, avpkt, avctx); #if FF_API_PALETTE_HAS_CHANGED
FF_DISABLE_DEPRECATION_WARNINGS
frame->palette_has_changed =
#endif
ff_copy_palette(ctx->pal, avpkt, avctx);
#if FF_API_PALETTE_HAS_CHANGED
FF_ENABLE_DEPRECATION_WARNINGS
#endif
header = bytestream2_get_byte(&ctx->g); header = bytestream2_get_byte(&ctx->g);
@ -296,7 +303,11 @@ static int decode_frame(AVCodecContext * avctx, AVFrame *frame,
} }
if (header & KMVC_PALETTE) { if (header & KMVC_PALETTE) {
#if FF_API_PALETTE_HAS_CHANGED
FF_DISABLE_DEPRECATION_WARNINGS
frame->palette_has_changed = 1; frame->palette_has_changed = 1;
FF_ENABLE_DEPRECATION_WARNINGS
#endif
// palette starts from index 1 and has 127 entries // palette starts from index 1 and has 127 entries
for (i = 1; i <= ctx->palsize; i++) { for (i = 1; i <= ctx->palsize; i++) {
ctx->pal[i] = 0xFFU << 24 | bytestream2_get_be24(&ctx->g); ctx->pal[i] = 0xFFU << 24 | bytestream2_get_be24(&ctx->g);
@ -305,7 +316,11 @@ static int decode_frame(AVCodecContext * avctx, AVFrame *frame,
if (ctx->setpal) { if (ctx->setpal) {
ctx->setpal = 0; ctx->setpal = 0;
#if FF_API_PALETTE_HAS_CHANGED
FF_DISABLE_DEPRECATION_WARNINGS
frame->palette_has_changed = 1; frame->palette_has_changed = 1;
FF_ENABLE_DEPRECATION_WARNINGS
#endif
} }
/* make the palette available on the way out */ /* make the palette available on the way out */

4
libavcodec/mscc.c
View File

@ -150,7 +150,11 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame,
const uint8_t *pal = av_packet_get_side_data(avpkt, AV_PKT_DATA_PALETTE, &size); const uint8_t *pal = av_packet_get_side_data(avpkt, AV_PKT_DATA_PALETTE, &size);
if (pal && size == AVPALETTE_SIZE) { if (pal && size == AVPALETTE_SIZE) {
#if FF_API_PALETTE_HAS_CHANGED
FF_DISABLE_DEPRECATION_WARNINGS
frame->palette_has_changed = 1; frame->palette_has_changed = 1;
FF_ENABLE_DEPRECATION_WARNINGS
#endif
for (j = 0; j < 256; j++) for (j = 0; j < 256; j++)
s->pal[j] = 0xFF000000 | AV_RL32(pal + j * 4); s->pal[j] = 0xFF000000 | AV_RL32(pal + j * 4);
} else if (pal) { } else if (pal) {

9
libavcodec/msrle.c
View File

@ -95,7 +95,14 @@ static int msrle_decode_frame(AVCodecContext *avctx, AVFrame *rframe,
return ret; return ret;
if (avctx->bits_per_coded_sample > 1 && avctx->bits_per_coded_sample <= 8) { if (avctx->bits_per_coded_sample > 1 && avctx->bits_per_coded_sample <= 8) {
s->frame->palette_has_changed = ff_copy_palette(s->pal, avpkt, avctx); #if FF_API_PALETTE_HAS_CHANGED
FF_DISABLE_DEPRECATION_WARNINGS
s->frame->palette_has_changed =
#endif
ff_copy_palette(s->pal, avpkt, avctx);
#if FF_API_PALETTE_HAS_CHANGED
FF_ENABLE_DEPRECATION_WARNINGS
#endif
/* make the palette available */ /* make the palette available */
memcpy(s->frame->data[1], s->pal, AVPALETTE_SIZE); memcpy(s->frame->data[1], s->pal, AVPALETTE_SIZE);

4
libavcodec/mss1.c
View File

@ -178,7 +178,11 @@ static int mss1_decode_frame(AVCodecContext *avctx, AVFrame *rframe,
if (c->corrupted) if (c->corrupted)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
memcpy(ctx->pic->data[1], c->pal, AVPALETTE_SIZE); memcpy(ctx->pic->data[1], c->pal, AVPALETTE_SIZE);
#if FF_API_PALETTE_HAS_CHANGED
FF_DISABLE_DEPRECATION_WARNINGS
ctx->pic->palette_has_changed = pal_changed; ctx->pic->palette_has_changed = pal_changed;
FF_ENABLE_DEPRECATION_WARNINGS
#endif
if ((ret = av_frame_ref(rframe, ctx->pic)) < 0) if ((ret = av_frame_ref(rframe, ctx->pic)) < 0)
return ret; return ret;

9
libavcodec/msvideo1.c
View File

@ -312,7 +312,14 @@ static int msvideo1_decode_frame(AVCodecContext *avctx, AVFrame *rframe,
return ret; return ret;
if (s->mode_8bit) { if (s->mode_8bit) {
s->frame->palette_has_changed = ff_copy_palette(s->pal, avpkt, avctx); #if FF_API_PALETTE_HAS_CHANGED
FF_DISABLE_DEPRECATION_WARNINGS
s->frame->palette_has_changed =
#endif
ff_copy_palette(s->pal, avpkt, avctx);
#if FF_API_PALETTE_HAS_CHANGED
FF_ENABLE_DEPRECATION_WARNINGS
#endif
} }
if (s->mode_8bit) if (s->mode_8bit)

4
libavcodec/pafvideo.c
View File

@ -327,7 +327,11 @@ static int paf_video_decode(AVCodecContext *avctx, AVFrame *rframe,
b = b << 2 | b >> 4; b = b << 2 | b >> 4;
*out++ = (0xFFU << 24) | (r << 16) | (g << 8) | b; *out++ = (0xFFU << 24) | (r << 16) | (g << 8) | b;
} }
#if FF_API_PALETTE_HAS_CHANGED
FF_DISABLE_DEPRECATION_WARNINGS
c->pic->palette_has_changed = 1; c->pic->palette_has_changed = 1;
FF_ENABLE_DEPRECATION_WARNINGS
#endif
} }
c->dirty[c->current_frame] = 1; c->dirty[c->current_frame] = 1;

4
libavcodec/pictordec.c
View File

@ -191,7 +191,11 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame,
return ret; return ret;
memset(frame->data[0], 0, s->height * frame->linesize[0]); memset(frame->data[0], 0, s->height * frame->linesize[0]);
frame->pict_type = AV_PICTURE_TYPE_I; frame->pict_type = AV_PICTURE_TYPE_I;
#if FF_API_PALETTE_HAS_CHANGED
FF_DISABLE_DEPRECATION_WARNINGS
frame->palette_has_changed = 1; frame->palette_has_changed = 1;
FF_ENABLE_DEPRECATION_WARNINGS
#endif
pos_after_pal = bytestream2_tell(&s->g) + esize; pos_after_pal = bytestream2_tell(&s->g) + esize;
palette = (uint32_t*)frame->data[1]; palette = (uint32_t*)frame->data[1];

4
libavcodec/psd.c
View File

@ -532,7 +532,11 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *picture,
} }
if (s->color_mode == PSD_INDEXED) { if (s->color_mode == PSD_INDEXED) {
#if FF_API_PALETTE_HAS_CHANGED
FF_DISABLE_DEPRECATION_WARNINGS
picture->palette_has_changed = 1; picture->palette_has_changed = 1;
FF_ENABLE_DEPRECATION_WARNINGS
#endif
memcpy(picture->data[1], s->palette, AVPALETTE_SIZE); memcpy(picture->data[1], s->palette, AVPALETTE_SIZE);
} }

4
libavcodec/qdrw.c
View File

@ -384,7 +384,11 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *p,
ret = parse_palette(avctx, &gbc, (uint32_t *)p->data[1], colors, flags & 0x8000); ret = parse_palette(avctx, &gbc, (uint32_t *)p->data[1], colors, flags & 0x8000);
if (ret < 0) if (ret < 0)
return ret; return ret;
#if FF_API_PALETTE_HAS_CHANGED
FF_DISABLE_DEPRECATION_WARNINGS
p->palette_has_changed = 1; p->palette_has_changed = 1;
FF_ENABLE_DEPRECATION_WARNINGS
#endif
/* jump to image data */ /* jump to image data */
bytestream2_skip(&gbc, 18); bytestream2_skip(&gbc, 18);

9
libavcodec/qpeg.c
View File

@ -297,7 +297,14 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *p,
} }
/* make the palette available on the way out */ /* make the palette available on the way out */
p->palette_has_changed = ff_copy_palette(a->pal, avpkt, avctx); #if FF_API_PALETTE_HAS_CHANGED
FF_DISABLE_DEPRECATION_WARNINGS
p->palette_has_changed =
#endif
ff_copy_palette(a->pal, avpkt, avctx);
#if FF_API_PALETTE_HAS_CHANGED
FF_ENABLE_DEPRECATION_WARNINGS
#endif
memcpy(p->data[1], a->pal, AVPALETTE_SIZE); memcpy(p->data[1], a->pal, AVPALETTE_SIZE);
av_frame_unref(ref); av_frame_unref(ref);

9
libavcodec/qtrle.c
View File

@ -537,7 +537,14 @@ static int qtrle_decode_frame(AVCodecContext *avctx, AVFrame *rframe,
} }
if(has_palette) { if(has_palette) {
s->frame->palette_has_changed = ff_copy_palette(s->pal, avpkt, avctx); #if FF_API_PALETTE_HAS_CHANGED
FF_DISABLE_DEPRECATION_WARNINGS
s->frame->palette_has_changed =
#endif
ff_copy_palette(s->pal, avpkt, avctx);
#if FF_API_PALETTE_HAS_CHANGED
FF_ENABLE_DEPRECATION_WARNINGS
#endif
/* make the palette available on the way out */ /* make the palette available on the way out */
memcpy(s->frame->data[1], s->pal, AVPALETTE_SIZE); memcpy(s->frame->data[1], s->pal, AVPALETTE_SIZE);

8
libavcodec/rawdec.c
View File

@ -373,7 +373,11 @@ static int raw_decode(AVCodecContext *avctx, AVFrame *frame,
} }
if (ff_copy_palette(context->palette->data, avpkt, avctx)) { if (ff_copy_palette(context->palette->data, avpkt, avctx)) {
#if FF_API_PALETTE_HAS_CHANGED
FF_DISABLE_DEPRECATION_WARNINGS
frame->palette_has_changed = 1; frame->palette_has_changed = 1;
FF_ENABLE_DEPRECATION_WARNINGS
#endif
} else if (context->is_nut_pal8) { } else if (context->is_nut_pal8) {
int vid_size = avctx->width * avctx->height; int vid_size = avctx->width * avctx->height;
int pal_size = avpkt->size - vid_size; int pal_size = avpkt->size - vid_size;
@ -381,7 +385,11 @@ static int raw_decode(AVCodecContext *avctx, AVFrame *frame,
if (avpkt->size > vid_size && pal_size <= AVPALETTE_SIZE) { if (avpkt->size > vid_size && pal_size <= AVPALETTE_SIZE) {
const uint8_t *pal = avpkt->data + vid_size; const uint8_t *pal = avpkt->data + vid_size;
memcpy(context->palette->data, pal, pal_size); memcpy(context->palette->data, pal, pal_size);
#if FF_API_PALETTE_HAS_CHANGED
FF_DISABLE_DEPRECATION_WARNINGS
frame->palette_has_changed = 1; frame->palette_has_changed = 1;
FF_ENABLE_DEPRECATION_WARNINGS
#endif
} }
} }
} }

9
libavcodec/rscc.c
View File

@ -346,7 +346,14 @@ static int rscc_decode_frame(AVCodecContext *avctx, AVFrame *frame,
/* Palette handling */ /* Palette handling */
if (avctx->pix_fmt == AV_PIX_FMT_PAL8) { if (avctx->pix_fmt == AV_PIX_FMT_PAL8) {
frame->palette_has_changed = ff_copy_palette(ctx->palette, avpkt, avctx); #if FF_API_PALETTE_HAS_CHANGED
FF_DISABLE_DEPRECATION_WARNINGS
frame->palette_has_changed =
#endif
ff_copy_palette(ctx->palette, avpkt, avctx);
#if FF_API_PALETTE_HAS_CHANGED
FF_ENABLE_DEPRECATION_WARNINGS
#endif
memcpy(frame->data[1], ctx->palette, AVPALETTE_SIZE); memcpy(frame->data[1], ctx->palette, AVPALETTE_SIZE);
} }
// We only return a picture when enough of it is undamaged, this avoids copying nearly broken frames around // We only return a picture when enough of it is undamaged, this avoids copying nearly broken frames around

4
libavcodec/sga.c
View File

@ -497,7 +497,11 @@ static int sga_decode_frame(AVCodecContext *avctx, AVFrame *frame,
} }
memcpy(frame->data[1], s->pal, AVPALETTE_SIZE); memcpy(frame->data[1], s->pal, AVPALETTE_SIZE);
#if FF_API_PALETTE_HAS_CHANGED
FF_DISABLE_DEPRECATION_WARNINGS
frame->palette_has_changed = 1; frame->palette_has_changed = 1;
FF_ENABLE_DEPRECATION_WARNINGS
#endif
frame->pict_type = AV_PICTURE_TYPE_I; frame->pict_type = AV_PICTURE_TYPE_I;
frame->flags |= AV_FRAME_FLAG_KEY; frame->flags |= AV_FRAME_FLAG_KEY;

4
libavcodec/smacker.c
View File

@ -392,7 +392,11 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *rframe,
pal = (uint32_t*)smk->pic->data[1]; pal = (uint32_t*)smk->pic->data[1];
bytestream2_init(&gb2, avpkt->data, avpkt->size); bytestream2_init(&gb2, avpkt->data, avpkt->size);
flags = bytestream2_get_byteu(&gb2); flags = bytestream2_get_byteu(&gb2);
#if FF_API_PALETTE_HAS_CHANGED
FF_DISABLE_DEPRECATION_WARNINGS
smk->pic->palette_has_changed = flags & 1; smk->pic->palette_has_changed = flags & 1;
FF_ENABLE_DEPRECATION_WARNINGS
#endif
if (flags & 2) { if (flags & 2) {
smk->pic->flags |= AV_FRAME_FLAG_KEY; smk->pic->flags |= AV_FRAME_FLAG_KEY;
smk->pic->pict_type = AV_PICTURE_TYPE_I; smk->pic->pict_type = AV_PICTURE_TYPE_I;

9
libavcodec/smc.c
View File

@ -437,7 +437,14 @@ static int smc_decode_frame(AVCodecContext *avctx, AVFrame *rframe,
if ((ret = ff_reget_buffer(avctx, s->frame, 0)) < 0) if ((ret = ff_reget_buffer(avctx, s->frame, 0)) < 0)
return ret; return ret;
s->frame->palette_has_changed = ff_copy_palette(s->pal, avpkt, avctx); #if FF_API_PALETTE_HAS_CHANGED
FF_DISABLE_DEPRECATION_WARNINGS
s->frame->palette_has_changed =
#endif
ff_copy_palette(s->pal, avpkt, avctx);
#if FF_API_PALETTE_HAS_CHANGED
FF_ENABLE_DEPRECATION_WARNINGS
#endif
bytestream2_init(&gb, buf, buf_size); bytestream2_init(&gb, buf, buf_size);
ret = smc_decode_stream(s, &gb); ret = smc_decode_stream(s, &gb);

4
libavcodec/targa.c
View File

@ -249,7 +249,11 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *p,
} }
break; break;
} }
#if FF_API_PALETTE_HAS_CHANGED
FF_DISABLE_DEPRECATION_WARNINGS
p->palette_has_changed = 1; p->palette_has_changed = 1;
FF_ENABLE_DEPRECATION_WARNINGS
#endif
} }
} }

4
libavcodec/tiertexseqv.c
View File

@ -182,7 +182,11 @@ static int seqvideo_decode(SeqVideoContext *seq, const unsigned char *data, int
c[j] = (*data << 2) | (*data >> 4); c[j] = (*data << 2) | (*data >> 4);
palette[i] = 0xFFU << 24 | AV_RB24(c); palette[i] = 0xFFU << 24 | AV_RB24(c);
} }
#if FF_API_PALETTE_HAS_CHANGED
FF_DISABLE_DEPRECATION_WARNINGS
seq->frame->palette_has_changed = 1; seq->frame->palette_has_changed = 1;
FF_ENABLE_DEPRECATION_WARNINGS
#endif
} }
if (flags & 2) { if (flags & 2) {

4
libavcodec/tmv.c
View File

@ -60,7 +60,11 @@ static int tmv_decode_frame(AVCodecContext *avctx, AVFrame *frame,
frame->flags |= AV_FRAME_FLAG_KEY; frame->flags |= AV_FRAME_FLAG_KEY;
dst = frame->data[0]; dst = frame->data[0];
#if FF_API_PALETTE_HAS_CHANGED
FF_DISABLE_DEPRECATION_WARNINGS
frame->palette_has_changed = 1; frame->palette_has_changed = 1;
FF_ENABLE_DEPRECATION_WARNINGS
#endif
memcpy(frame->data[1], ff_cga_palette, 16 * 4); memcpy(frame->data[1], ff_cga_palette, 16 * 4);
memset(frame->data[1] + 16 * 4, 0, AVPALETTE_SIZE - 16 * 4); memset(frame->data[1] + 16 * 4, 0, AVPALETTE_SIZE - 16 * 4);

4
libavcodec/tscc.c
View File

@ -106,7 +106,11 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *rframe,
/* make the palette available on the way out */ /* make the palette available on the way out */
if (c->avctx->pix_fmt == AV_PIX_FMT_PAL8) { if (c->avctx->pix_fmt == AV_PIX_FMT_PAL8) {
#if FF_API_PALETTE_HAS_CHANGED
FF_DISABLE_DEPRECATION_WARNINGS
frame->palette_has_changed = palette_has_changed; frame->palette_has_changed = palette_has_changed;
FF_ENABLE_DEPRECATION_WARNINGS
#endif
memcpy(frame->data[1], c->pal, AVPALETTE_SIZE); memcpy(frame->data[1], c->pal, AVPALETTE_SIZE);
} }

4
libavcodec/vb.c
View File

@ -230,7 +230,11 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame,
} }
memcpy(frame->data[1], c->pal, AVPALETTE_SIZE); memcpy(frame->data[1], c->pal, AVPALETTE_SIZE);
#if FF_API_PALETTE_HAS_CHANGED
FF_DISABLE_DEPRECATION_WARNINGS
frame->palette_has_changed = flags & VB_HAS_PALETTE; frame->palette_has_changed = flags & VB_HAS_PALETTE;
FF_ENABLE_DEPRECATION_WARNINGS
#endif
outptr = frame->data[0]; outptr = frame->data[0];
srcptr = c->frame; srcptr = c->frame;

4
libavcodec/vqavideo.c
View File

@ -809,7 +809,11 @@ static int vqa_decode_frame(AVCodecContext *avctx, AVFrame *rframe,
/* make the palette available on the way out */ /* make the palette available on the way out */
memcpy(s->frame->data[1], s->palette, PALETTE_COUNT * 4); memcpy(s->frame->data[1], s->palette, PALETTE_COUNT * 4);
#if FF_API_PALETTE_HAS_CHANGED
FF_DISABLE_DEPRECATION_WARNINGS
s->frame->palette_has_changed = 1; s->frame->palette_has_changed = 1;
FF_ENABLE_DEPRECATION_WARNINGS
#endif
} else if (avctx->pix_fmt == AV_PIX_FMT_RGB555LE) { } else if (avctx->pix_fmt == AV_PIX_FMT_RGB555LE) {
if ((res = vqa_decode_frame_hicolor(s, s->frame)) < 0) if ((res = vqa_decode_frame_hicolor(s, s->frame)) < 0)
return res; return res;

4
libavcodec/yop.c
View File

@ -232,7 +232,11 @@ static int yop_decode_frame(AVCodecContext *avctx, AVFrame *rframe,
(palette[i + firstcolor] >> 6) & 0x30303; (palette[i + firstcolor] >> 6) & 0x30303;
} }
#if FF_API_PALETTE_HAS_CHANGED
FF_DISABLE_DEPRECATION_WARNINGS
frame->palette_has_changed = 1; frame->palette_has_changed = 1;
FF_ENABLE_DEPRECATION_WARNINGS
#endif
for (y = 0; y < avctx->height; y += 2) { for (y = 0; y < avctx->height; y += 2) {
for (x = 0; x < avctx->width; x += 2) { for (x = 0; x < avctx->width; x += 2) {

4
libavutil/frame.c
View File

@ -284,7 +284,11 @@ FF_DISABLE_DEPRECATION_WARNINGS
dst->top_field_first = src->top_field_first; dst->top_field_first = src->top_field_first;
FF_ENABLE_DEPRECATION_WARNINGS FF_ENABLE_DEPRECATION_WARNINGS
#endif #endif
#if FF_API_PALETTE_HAS_CHANGED
FF_DISABLE_DEPRECATION_WARNINGS
dst->palette_has_changed = src->palette_has_changed; dst->palette_has_changed = src->palette_has_changed;
FF_ENABLE_DEPRECATION_WARNINGS
#endif
dst->sample_rate = src->sample_rate; dst->sample_rate = src->sample_rate;
dst->opaque = src->opaque; dst->opaque = src->opaque;
dst->pkt_dts = src->pkt_dts; dst->pkt_dts = src->pkt_dts;

3
libavutil/frame.h
View File

@ -528,10 +528,13 @@ typedef struct AVFrame {
int top_field_first; int top_field_first;
#endif #endif
#if FF_API_PALETTE_HAS_CHANGED
/** /**
* Tell user application that palette has changed from previous frame. * Tell user application that palette has changed from previous frame.
*/ */
attribute_deprecated
int palette_has_changed; int palette_has_changed;
#endif
#if FF_API_REORDERED_OPAQUE #if FF_API_REORDERED_OPAQUE
/** /**

1
libavutil/version.h
View File

@ -117,6 +117,7 @@
#define FF_API_FRAME_PKT (LIBAVUTIL_VERSION_MAJOR < 59) #define FF_API_FRAME_PKT (LIBAVUTIL_VERSION_MAJOR < 59)
#define FF_API_INTERLACED_FRAME (LIBAVUTIL_VERSION_MAJOR < 59) #define FF_API_INTERLACED_FRAME (LIBAVUTIL_VERSION_MAJOR < 59)
#define FF_API_FRAME_KEY (LIBAVUTIL_VERSION_MAJOR < 59) #define FF_API_FRAME_KEY (LIBAVUTIL_VERSION_MAJOR < 59)
#define FF_API_PALETTE_HAS_CHANGED (LIBAVUTIL_VERSION_MAJOR < 59)
/** /**
* @} * @}