summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorGagandeep Singh <deepgagan231197@gmail.com>2018-03-22 15:03:37 +0530
committerPaul B Mahol <onemda@gmail.com>2018-03-22 19:27:22 +0100
commitc64c97b972c7325a71440a352a7d541a8c92b2da (patch)
tree6f50b337d9e5551945256783548b9865d75e0937 /libavcodec
parent59347c2474801fda88c9a231b888c354362641b6 (diff)
lavc/cfhd: add alpha decompanding in rgba12
Alpha decompanding curve added to post process the decoded alpha channel. Fixes ticket #6265.
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/cfhd.c19
1 files changed, 19 insertions, 0 deletions
diff --git a/libavcodec/cfhd.c b/libavcodec/cfhd.c
index fd5555834b..e35732df45 100644
--- a/libavcodec/cfhd.c
+++ b/libavcodec/cfhd.c
@@ -37,6 +37,9 @@
#include "thread.h"
#include "cfhd.h"
+#define ALPHA_COMPAND_DC_OFFSET 256
+#define ALPHA_COMPAND_GAIN 9400
+
enum CFHDParam {
ChannelCount = 12,
SubbandCount = 14,
@@ -94,6 +97,20 @@ static inline int dequant_and_decompand(int level, int quantisation)
FFSIGN(level) * quantisation;
}
+static inline void process_alpha(int16_t *alpha, int width)
+{
+ int i, channel;
+ for (i = 0; i < width; i++) {
+ channel = alpha[i];
+ channel -= ALPHA_COMPAND_DC_OFFSET;
+ channel <<= 3;
+ channel *= ALPHA_COMPAND_GAIN;
+ channel >>= 16;
+ channel = av_clip_uintp2(channel, 12);
+ alpha[i] = channel;
+ }
+}
+
static inline void filter(int16_t *output, ptrdiff_t out_stride,
int16_t *low, ptrdiff_t low_stride,
int16_t *high, ptrdiff_t high_stride,
@@ -792,6 +809,8 @@ static int cfhd_decode(AVCodecContext *avctx, void *data, int *got_frame,
high = s->plane[plane].l_h[7];
for (i = 0; i < lowpass_height * 2; i++) {
horiz_filter_clip(dst, low, high, lowpass_width, s->bpc);
+ if (act_plane == 3)
+ process_alpha(dst, lowpass_width * 2);
low += lowpass_width;
high += lowpass_width;
dst += pic->linesize[act_plane] / 2;