History

avcodec/ffv1*: add GBRAP14, GRAY14, YUVA422P12, YUVA444P12 formats support

Paul B Mahol committed 3 years ago

Commit 3bbc7d71 parent 41f5b732 files · +18 −2Browse files

Unified · Split

2 files
  1. libavcodec/ffv1dec.c +11 −0
  2. libavcodec/ffv1enc.c +7 −2
libavcodec/ffv1dec.c+11−0
@@ -626,6 +626,9 @@ static int read_header(FFV1Context *f) · 625 unmodified lines
626626 } else if (f->avctx->bits_per_raw_sample == 12) {
627627 f->packed_at_lsb = 1;
628628 f->avctx->pix_fmt = AV_PIX_FMT_GRAY12;
629+ } else if (f->avctx->bits_per_raw_sample == 14) {
630+ f->packed_at_lsb = 1;
631+ f->avctx->pix_fmt = AV_PIX_FMT_GRAY14;
629632 } else if (f->avctx->bits_per_raw_sample == 16) {
630633 f->packed_at_lsb = 1;
631634 f->avctx->pix_fmt = AV_PIX_FMT_GRAY16;
@@ -690,6 +693,12 @@ static int read_header(FFV1Context *f) · 58 unmodified lines
690693 case 0x10: f->avctx->pix_fmt = AV_PIX_FMT_YUV422P12; break;
691694 case 0x11: f->avctx->pix_fmt = AV_PIX_FMT_YUV420P12; break;
692695 }
696+ } else if (f->avctx->bits_per_raw_sample == 12 && f->transparency) {
697+ f->packed_at_lsb = 1;
698+ switch(16 * f->chroma_h_shift + f->chroma_v_shift) {
699+ case 0x00: f->avctx->pix_fmt = AV_PIX_FMT_YUVA444P12; break;
700+ case 0x10: f->avctx->pix_fmt = AV_PIX_FMT_YUVA422P12; break;
701+ }
693702 } else if (f->avctx->bits_per_raw_sample == 14 && !f->transparency) {
694703 f->packed_at_lsb = 1;
695704 switch(16 * f->chroma_h_shift + f->chroma_v_shift) {
@@ -734,6 +743,8 @@ static int read_header(FFV1Context *f) · 38 unmodified lines
734743 f->avctx->pix_fmt = AV_PIX_FMT_GBRAP12;
735744 else if (f->avctx->bits_per_raw_sample == 14 && !f->transparency)
736745 f->avctx->pix_fmt = AV_PIX_FMT_GBRP14;
746+ else if (f->avctx->bits_per_raw_sample == 14 && f->transparency)
747+ f->avctx->pix_fmt = AV_PIX_FMT_GBRAP14;
737748 else if (f->avctx->bits_per_raw_sample == 16 && !f->transparency) {
738749 f->avctx->pix_fmt = AV_PIX_FMT_GBRP16;
739750 f->use32bit = 1;
libavcodec/ffv1enc.c+7−2
@@ -585,8 +585,11 @@ static av_cold int encode_init(AVCodecContext *avctx) · 584 unmodified lines
585585 case AV_PIX_FMT_YUV440P12:
586586 case AV_PIX_FMT_YUV420P12:
587587 case AV_PIX_FMT_YUV422P12:
588+ case AV_PIX_FMT_YUVA444P12:
589+ case AV_PIX_FMT_YUVA422P12:
588590 if (!avctx->bits_per_raw_sample && !s->bits_per_raw_sample)
589591 s->bits_per_raw_sample = 12;
592+ case AV_PIX_FMT_GRAY14:
590593 case AV_PIX_FMT_YUV444P14:
591594 case AV_PIX_FMT_YUV420P14:
592595 case AV_PIX_FMT_YUV422P14:
@@ -667,6 +670,7 @@ static av_cold int encode_init(AVCodecContext *avctx) · 74 unmodified lines
667670 if (!avctx->bits_per_raw_sample && !s->bits_per_raw_sample)
668671 s->bits_per_raw_sample = 12;
669672 case AV_PIX_FMT_GBRP14:
673+ case AV_PIX_FMT_GBRAP14:
670674 if (!avctx->bits_per_raw_sample && !s->bits_per_raw_sample)
671675 s->bits_per_raw_sample = 14;
672676 case AV_PIX_FMT_GBRP16:
@@ -1284,13 +1288,14 @@ const FFCodec ff_ffv1_encoder = { · 611 unmodified lines
12841288 AV_PIX_FMT_YUV420P9, AV_PIX_FMT_YUV420P10, AV_PIX_FMT_YUV422P10, AV_PIX_FMT_YUV444P10,
12851289 AV_PIX_FMT_YUV420P12, AV_PIX_FMT_YUV422P12, AV_PIX_FMT_YUV444P12,
12861290 AV_PIX_FMT_YUVA444P16, AV_PIX_FMT_YUVA422P16, AV_PIX_FMT_YUVA420P16,
1291+ AV_PIX_FMT_YUVA444P12, AV_PIX_FMT_YUVA422P12,
12871292 AV_PIX_FMT_YUVA444P10, AV_PIX_FMT_YUVA422P10, AV_PIX_FMT_YUVA420P10,
12881293 AV_PIX_FMT_YUVA444P9, AV_PIX_FMT_YUVA422P9, AV_PIX_FMT_YUVA420P9,
12891294 AV_PIX_FMT_GRAY16, AV_PIX_FMT_GRAY8, AV_PIX_FMT_GBRP9, AV_PIX_FMT_GBRP10,
1290− AV_PIX_FMT_GBRP12, AV_PIX_FMT_GBRP14,
1295+ AV_PIX_FMT_GBRP12, AV_PIX_FMT_GBRP14, AV_PIX_FMT_GBRAP14,
12911296 AV_PIX_FMT_GBRAP10, AV_PIX_FMT_GBRAP12,
12921297 AV_PIX_FMT_YA8,
1293− AV_PIX_FMT_GRAY10, AV_PIX_FMT_GRAY12,
1298+ AV_PIX_FMT_GRAY10, AV_PIX_FMT_GRAY12, AV_PIX_FMT_GRAY14,
12941299 AV_PIX_FMT_GBRP16, AV_PIX_FMT_RGB48,
12951300 AV_PIX_FMT_GBRAP16, AV_PIX_FMT_RGBA64,
12961301 AV_PIX_FMT_GRAY9,

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t