Sponsored-by: Sovereign Tech Fund
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>
---
libavcodec/ffv1_parse.c | 5 ++++-
libavcodec/ffv1dec.c | 27 +++++++++++++++++++--------
libavcodec/ffv1enc.c | 2 ++
3 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/libavcodec/ffv1_parse.c b/libavcodec/ffv1_parse.c
index a49f1eb6cef..9745f9de694 100644
--- a/libavcodec/ffv1_parse.c
+++ b/libavcodec/ffv1_parse.c
@@ -288,7 +288,10 @@ int ff_ffv1_parse_header(FFV1Context *f, RangeCoder *c,
uint8_t *state)
f->pix_fmt = AV_PIX_FMT_GRAY14;
} else if (f->avctx->bits_per_raw_sample == 16) {
f->packed_at_lsb = 1;
- f->pix_fmt = AV_PIX_FMT_GRAY16;
+ if (f->flt) {
+ f->pix_fmt = AV_PIX_FMT_GRAYF16;
+ } else
+ f->pix_fmt = AV_PIX_FMT_GRAY16;
} else if (f->avctx->bits_per_raw_sample < 16) {
f->pix_fmt = AV_PIX_FMT_GRAY16;
} else
diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c
index e24c6b8d3a2..968c386f897 100644
--- a/libavcodec/ffv1dec.c
+++ b/libavcodec/ffv1dec.c
@@ -125,16 +125,27 @@ static int decode_plane(FFV1Context *f, FFV1SliceContext
*sc,
int ret = decode_line(f, sc, gb, w, sample, plane_index,
f->avctx->bits_per_raw_sample, ac);
if (ret < 0)
return ret;
- if (sc->remap)
- for (x = 0; x < w; x++)
- sample[1][x] = sc->fltmap[remap_index][sample[1][x]];
- if (f->packed_at_lsb) {
- for (x = 0; x < w; x++) {
- ((uint16_t*)(src + stride*y))[x*pixel_stride] =
sample[1][x];
+
+ if (sc->remap) {
+ if (f->packed_at_lsb || f->avctx->bits_per_raw_sample == 16) {
+ for (x = 0; x < w; x++) {
+ ((uint16_t*)(src + stride*y))[x*pixel_stride] =
sc->fltmap[remap_index][sample[1][x] & 0xFFFF];
+ }
+ } else {
+ for (x = 0; x < w; x++) {
+ int v = sc->fltmap[remap_index][sample[1][x] & 0xFFFF];
+ ((uint16_t*)(src + stride*y))[x*pixel_stride] = v <<
(16 - f->avctx->bits_per_raw_sample) | v >> (2 * f->avctx->bits_per_raw_sample
- 16);
+ }
}
} else {
- for (x = 0; x < w; x++) {
- ((uint16_t*)(src + stride*y))[x*pixel_stride] =
sample[1][x] << (16 - f->avctx->bits_per_raw_sample) | ((uint16_t
**)sample)[1][x] >> (2 * f->avctx->bits_per_raw_sample - 16);
+ if (f->packed_at_lsb || f->avctx->bits_per_raw_sample == 16) {
+ for (x = 0; x < w; x++) {
+ ((uint16_t*)(src + stride*y))[x*pixel_stride] =
sample[1][x];
+ }
+ } else {
+ for (x = 0; x < w; x++) {
+ ((uint16_t*)(src + stride*y))[x*pixel_stride] =
sample[1][x] << (16 - f->avctx->bits_per_raw_sample) | ((uint16_t
**)sample)[1][x] >> (2 * f->avctx->bits_per_raw_sample - 16);
+ }
}
}
}
diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c
index 9fb98c37584..3879d1b19a1 100644
--- a/libavcodec/ffv1enc.c
+++ b/libavcodec/ffv1enc.c
@@ -842,6 +842,7 @@ av_cold int ff_ffv1_encode_setup_plane_info(AVCodecContext
*avctx,
case AV_PIX_FMT_YUVA444P16:
case AV_PIX_FMT_YUVA422P16:
case AV_PIX_FMT_YUVA420P16:
+ case AV_PIX_FMT_GRAYF16:
case AV_PIX_FMT_YAF16:
if (!avctx->bits_per_raw_sample && !s->bits_per_raw_sample) {
s->bits_per_raw_sample = 16;
@@ -1565,6 +1566,7 @@ const FFCodec ff_ffv1_encoder = {
AV_PIX_FMT_YUV420P14, AV_PIX_FMT_YUV422P14, AV_PIX_FMT_YUV444P14,
AV_PIX_FMT_YUV440P10, AV_PIX_FMT_YUV440P12,
AV_PIX_FMT_YAF16,
+ AV_PIX_FMT_GRAYF16,
AV_PIX_FMT_GBRPF16),
.color_ranges = AVCOL_RANGE_MPEG,
.p.priv_class = &ffv1_class,
--
2.48.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
