Unified · Split
| @@ -54,8 +54,10 @@ enum ExrPixelType { · 53 unmodified lines | |||
| 54 | 54 | ||
| 55 | static const char abgr_chlist[4] = { 'A', 'B', 'G', 'R' }; | 55 | static const char abgr_chlist[4] = { 'A', 'B', 'G', 'R' }; |
| 56 | static const char bgr_chlist[4] = { 'B', 'G', 'R', 'A' }; | 56 | static const char bgr_chlist[4] = { 'B', 'G', 'R', 'A' }; |
| 57 | static const char y_chlist[4] = { 'Y' }; | ||
| 57 | static const uint8_t gbra_order[4] = { 3, 1, 0, 2 }; | 58 | static const uint8_t gbra_order[4] = { 3, 1, 0, 2 }; |
| 58 | static const uint8_t gbr_order[4] = { 1, 0, 2, 0 }; | 59 | static const uint8_t gbr_order[4] = { 1, 0, 2, 0 }; |
| 60 | static const uint8_t y_order[4] = { 0 }; | ||
| 59 | 61 | ||
| 60 | typedef struct EXRScanlineData { | 62 | typedef struct EXRScanlineData { |
| 61 | uint8_t *compressed_data; | 63 | uint8_t *compressed_data; |
| @@ -106,6 +108,11 @@ static int encode_init(AVCodecContext *avctx) · 44 unmodified lines | |||
| 106 | s->ch_names = abgr_chlist; | 108 | s->ch_names = abgr_chlist; |
| 107 | s->ch_order = gbra_order; | 109 | s->ch_order = gbra_order; |
| 108 | break; | 110 | break; |
| 111 | case AV_PIX_FMT_GRAYF32: | ||
| 112 | s->planes = 1; | ||
| 113 | s->ch_names = y_chlist; | ||
| 114 | s->ch_order = y_order; | ||
| 115 | break; | ||
| 109 | default: | 116 | default: |
| 110 | av_assert0(0); | 117 | av_assert0(0); |
| 111 | } | 118 | } |
| @@ -546,6 +553,7 @@ const FFCodec ff_exr_encoder = { · 434 unmodified lines | |||
| 546 | FF_CODEC_ENCODE_CB(encode_frame), | 553 | FF_CODEC_ENCODE_CB(encode_frame), |
| 547 | .close = encode_close, | 554 | .close = encode_close, |
| 548 | .p.pix_fmts = (const enum AVPixelFormat[]) { | 555 | .p.pix_fmts = (const enum AVPixelFormat[]) { |
| 556 | AV_PIX_FMT_GRAYF32, | ||
| 549 | AV_PIX_FMT_GBRPF32, | 557 | AV_PIX_FMT_GBRPF32, |
| 550 | AV_PIX_FMT_GBRAPF32, | 558 | AV_PIX_FMT_GBRAPF32, |
| 551 | AV_PIX_FMT_NONE }, | 559 | AV_PIX_FMT_NONE }, |