virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-04 22:03:09 +02:00
Code Issues Releases Activity

avcodec/magicyuv: Set properties via AVPixFmtDescriptor

Browse Source 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2025-04-21 12:20:01 +02:00
parent c33f16db1b
commit 7c7e161437
1 changed files with 6 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
libavcodec/magicyuv.c
View File

@ -462,37 +462,22 @@ static int magy_decode_frame(AVCodecContext *avctx, AVFrame *p,
return AVERROR_PATCHWELCOME; return AVERROR_PATCHWELCOME;
} }
s->hshift[1] =
s->vshift[1] =
s->hshift[2] =
s->vshift[2] = 0;
s->decorrelate = 0;
s->bps = 8;
format = bytestream2_get_byteu(&gb); format = bytestream2_get_byteu(&gb);
switch (format) { switch (format) {
case 0x65: case 0x65:
avctx->pix_fmt = AV_PIX_FMT_GBRP; avctx->pix_fmt = AV_PIX_FMT_GBRP;
s->decorrelate = 1;
break; break;
case 0x66: case 0x66:
avctx->pix_fmt = AV_PIX_FMT_GBRAP; avctx->pix_fmt = AV_PIX_FMT_GBRAP;
s->decorrelate = 1;
break; break;
case 0x67: case 0x67:
avctx->pix_fmt = AV_PIX_FMT_YUV444P; avctx->pix_fmt = AV_PIX_FMT_YUV444P;
break; break;
case 0x68: case 0x68:
avctx->pix_fmt = AV_PIX_FMT_YUV422P; avctx->pix_fmt = AV_PIX_FMT_YUV422P;
s->hshift[1] =
s->hshift[2] = 1;
break; break;
case 0x69: case 0x69:
avctx->pix_fmt = AV_PIX_FMT_YUV420P; avctx->pix_fmt = AV_PIX_FMT_YUV420P;
s->hshift[1] =
s->vshift[1] =
s->hshift[2] =
s->vshift[2] = 1;
break; break;
case 0x6a: case 0x6a:
avctx->pix_fmt = AV_PIX_FMT_YUVA444P; avctx->pix_fmt = AV_PIX_FMT_YUVA444P;
@ -502,60 +487,44 @@ static int magy_decode_frame(AVCodecContext *avctx, AVFrame *p,
break; break;
case 0x6c: case 0x6c:
avctx->pix_fmt = AV_PIX_FMT_YUV422P10; avctx->pix_fmt = AV_PIX_FMT_YUV422P10;
s->hshift[1] =
s->hshift[2] = 1;
s->bps = 10;
break; break;
case 0x76: case 0x76:
avctx->pix_fmt = AV_PIX_FMT_YUV444P10; avctx->pix_fmt = AV_PIX_FMT_YUV444P10;
s->bps = 10;
break; break;
case 0x6d: case 0x6d:
avctx->pix_fmt = AV_PIX_FMT_GBRP10; avctx->pix_fmt = AV_PIX_FMT_GBRP10;
s->decorrelate = 1;
s->bps = 10;
break; break;
case 0x6e: case 0x6e:
avctx->pix_fmt = AV_PIX_FMT_GBRAP10; avctx->pix_fmt = AV_PIX_FMT_GBRAP10;
s->decorrelate = 1;
s->bps = 10;
break; break;
case 0x6f: case 0x6f:
avctx->pix_fmt = AV_PIX_FMT_GBRP12; avctx->pix_fmt = AV_PIX_FMT_GBRP12;
s->decorrelate = 1;
s->bps = 12;
break; break;
case 0x70: case 0x70:
avctx->pix_fmt = AV_PIX_FMT_GBRAP12; avctx->pix_fmt = AV_PIX_FMT_GBRAP12;
s->decorrelate = 1;
s->bps = 12;
break; break;
case 0x71: case 0x71:
avctx->pix_fmt = AV_PIX_FMT_GBRP14; avctx->pix_fmt = AV_PIX_FMT_GBRP14;
s->decorrelate = 1;
s->bps = 14;
break; break;
case 0x72: case 0x72:
avctx->pix_fmt = AV_PIX_FMT_GBRAP14; avctx->pix_fmt = AV_PIX_FMT_GBRAP14;
s->decorrelate = 1;
s->bps = 14;
break; break;
case 0x73: case 0x73:
avctx->pix_fmt = AV_PIX_FMT_GRAY10; avctx->pix_fmt = AV_PIX_FMT_GRAY10;
s->bps = 10;
break; break;
case 0x7b: case 0x7b:
avctx->pix_fmt = AV_PIX_FMT_YUV420P10; avctx->pix_fmt = AV_PIX_FMT_YUV420P10;
s->hshift[1] =
s->vshift[1] =
s->hshift[2] =
s->vshift[2] = 1;
s->bps = 10;
break; break;
default: default:
avpriv_request_sample(avctx, "Format 0x%X", format); avpriv_request_sample(avctx, "Format 0x%X", format);
return AVERROR_PATCHWELCOME; return AVERROR_PATCHWELCOME;
} }
const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(avctx->pix_fmt);
av_assert1(desc);
s->decorrelate = !!(desc->flags & AV_PIX_FMT_FLAG_RGB);
s->hshift[1] = s->hshift[2] = desc->log2_chroma_w;
s->vshift[1] = s->vshift[2] = desc->log2_chroma_h;
s->bps = desc->comp[0].depth;
s->max = 1 << s->bps; s->max = 1 << s->bps;
s->magy_decode_slice = s->bps == 8 ? magy_decode_slice : magy_decode_slice10; s->magy_decode_slice = s->bps == 8 ? magy_decode_slice : magy_decode_slice10;
s->planes = av_pix_fmt_count_planes(avctx->pix_fmt); s->planes = av_pix_fmt_count_planes(avctx->pix_fmt);