From patchwork Mon May 21 18:16:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gagandeep Singh X-Patchwork-Id: 9037 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp584206jad; Mon, 21 May 2018 11:17:45 -0700 (PDT) X-Google-Smtp-Source: AB8JxZphvzQc4feQB0itam7icwea0KkN708jKgby6aFctfZHDux2TOqntx6r2PzQYdNjDvo7jOQL X-Received: by 2002:adf:8406:: with SMTP id 6-v6mr177245wrf.105.1526926665912; Mon, 21 May 2018 11:17:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526926665; cv=none; d=google.com; s=arc-20160816; b=XLsYgj9ds1x/vJEZbaTl3XnE9dWLpKC6RSIbelNHgxuaJOIfVgtj/eFah1xboDi8l2 lisNjhN6kv0BFaPrbhaMwLiE/fNT+5Al7MEXqXk8UitzKbR7bne2poRpvdf64dcrsFMN /2oMUVztAnpw2P6lUVUbWyRjqzT8+Zl7XbA4km3eJMss/U+7+znQOHBNGycBU+sTbktr e3VrUnTytyhvayO28agCl4TNZNOUBPigaOSNcoIhbmIVqC1Xoj79WLdR4g0+AKRmVZL3 iuvci3BQBvs85m5jjzzjOjcXE2ICi2KCF2AwZU7ozVYMJVMBHLKDBt3XYqIRp2io2V2Y YSVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=vzyvxi43QuxmUsU8xZeHqzUOb6BX38F9pu3jXUu7qvk=; b=gBYL7l/lg8e0Ah2Nvn3SBwT1tmzg5IkMW2XOcUcXncvKYbkYH/GFP2PRzYVoyQ7bvv 8czsfWqTsoLqKiLxEfbmPoXuk8JAianIjhpS91amQ4mUYNWuylVG9GVVRZxAET6m7rR6 GPa9XUQ6ldyPGv738hMs2W6XUwjAW0+tp7VdOnqNNmIMza7c9TBp7R70HzWNbXiOLCRc bN2vzxNN6S770mB2PuxQDjGc/NyWB4e2theJPtiPXrDqNysZMh8LUy9nCfb0Y1PZU4d7 znWTHhL/yZsnmQtiI97NNzeddUVG1TX45Jt4/ztCVz1jKkwUYlR2jj5MmsPv3M7HdYHM ZSZA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=GEKbs3qA; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id w3-v6si10432384wma.75.2018.05.21.11.17.45; Mon, 21 May 2018 11:17:45 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=GEKbs3qA; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5F9C368A580; Mon, 21 May 2018 21:17:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f52.google.com (mail-pg0-f52.google.com [74.125.83.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9CCF768A52F for ; Mon, 21 May 2018 21:16:56 +0300 (EEST) Received: by mail-pg0-f52.google.com with SMTP id d14-v6so3113872pgv.8 for ; Mon, 21 May 2018 11:17:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=AUbgCWgwWVnS37bn6D3ly3cMPxRnF6FE6DMuoWjuvr0=; b=GEKbs3qAIM4P7YEsKoF+xZkOP5BN+CbgKrPH1JkVkuF5PnL61cCHUlnVq/kIL5K9kM 7aPqLDwfGGm0gRMpAZT50qu3DIANqaltIAg9va83j+SGaz94a5Jmw9vmIINTPSGpVP1R XA7VSKs0Tro5SsKlfb691Y3B0WyGOVOY6ArIUR8pbih+fnFJi53hE48vOM4s8e27ewhr rmaneGGvoToxb9eoo8urbDxUEcwZ3jPXnmI+medDsxfd4ea6i3Pl5yI8IcEUxJxttMDY 9Y/PJjutngVPBPWtRTnmwYZ9vDvvstWztScFddPuOfnJ/G0zUZv8dv6QpKpAHhBRKv+i 3ZlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=AUbgCWgwWVnS37bn6D3ly3cMPxRnF6FE6DMuoWjuvr0=; b=CED31VqHzstdBSUIb7ZGJwtQ7o9vxh4OPB13EMYpGdSPd8W4ziW+flEsSzsi2t4Rjd Fv1uvKVJ/3cXA21YbaJKaPnwTlK8KS8IAqBlaXlwkGxkr3DopZbq9PY827PtvcZQo1u+ vqrcBk0WlTu4hSc5/Psi1YjaT9WV7Z5gKnX5gytsjXSepbGwXU7SU6sThyxdkyGNWtAX uqh4LENpykXRzU1vPJdItPzB7T7YO9n4gDTASRepkRYIv06bWIlLj2a/3P2YwoCwXny4 Kxsx6OU6oy2+r3TjKJrbwfiCwTKMoLNj8ATSubLHqglTTsr4fNp2Yt7NbMA9mvYYwD3W OhEg== X-Gm-Message-State: ALKqPwdl9AS30gGMTGWL2a3k/RKjMHQ64Ifsoht0bSoWYg3j90uDh3vv Z0VlMP7ACijR/x74LDnVO49A+nc/ X-Received: by 2002:a63:7543:: with SMTP id f3-v6mr16702974pgn.256.1526926655230; Mon, 21 May 2018 11:17:35 -0700 (PDT) Received: from localhost.localdomain ([103.246.106.24]) by smtp.googlemail.com with ESMTPSA id i72-v6sm19069624pgd.60.2018.05.21.11.17.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 May 2018 11:17:34 -0700 (PDT) From: Gagandeep Singh To: ffmpeg-devel@ffmpeg.org Date: Mon, 21 May 2018 23:46:52 +0530 Message-Id: <20180521181652.4004-1-deepgagan231197@gmail.com> X-Mailer: git-send-email 2.14.1 Subject: [FFmpeg-devel] [PATCH] lavc/cfhd: deinterlacing introduced in cfhd X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Gagandeep Singh MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavcodec/cfhd.c | 177 +++++++++++++++++++++++++++++++++++++++++++++--------- libavcodec/cfhd.h | 9 +++ 2 files changed, 158 insertions(+), 28 deletions(-) diff --git a/libavcodec/cfhd.c b/libavcodec/cfhd.c index 7ceb803595..d70c13592c 100644 --- a/libavcodec/cfhd.c +++ b/libavcodec/cfhd.c @@ -49,12 +49,15 @@ enum CFHDParam { SubbandNumber = 48, Quantization = 53, ChannelNumber = 62, + SampleFlags = 68, BitsPerComponent = 101, ChannelWidth = 104, ChannelHeight = 105, PrescaleShift = 109, }; + + static av_cold int cfhd_init(AVCodecContext *avctx) { CFHDContext *s = avctx->priv_data; @@ -72,6 +75,13 @@ static void init_plane_defaults(CFHDContext *s) s->subband_num_actual = 0; } +static void init_peak_table_defaults(CFHDContext *s) +{ + s->peak.level = 0; + s->peak.offset = 0; + s->peak.base = NULL; +} + static void init_frame_defaults(CFHDContext *s) { s->coded_width = 0; @@ -86,15 +96,45 @@ static void init_frame_defaults(CFHDContext *s) s->wavelet_depth = 3; s->pshift = 1; s->codebook = 0; + s->difference_coding = 0; + s->progressive = 0; init_plane_defaults(s); + init_peak_table_defaults(s); } /* TODO: merge with VLC tables or use LUT */ -static inline int dequant_and_decompand(int level, int quantisation) +static inline int dequant_and_decompand(int level, int quantisation, int codebook) { - int64_t abslevel = abs(level); - return (abslevel + ((768 * abslevel * abslevel * abslevel) / (255 * 255 * 255))) * - FFSIGN(level) * quantisation; + if (codebook == 0 || codebook == 1) { + int64_t abslevel = abs(level); + if (level < 264) + return (abslevel + ((768 * abslevel * abslevel * abslevel) / (255 * 255 * 255))) * + FFSIGN(level) * quantisation; + else + return level * quantisation; + } + else + return level * quantisation; +} + +static inline void difference_coding(int16_t *band, int width, int height) +{ + + int i,j; + for (i = 0; i < height; i++) { + for (j = 1; j < width; j++) { + band[j] += band[j-1]; + } + band += width; + } +} + +static inline void peak_table(int16_t *band, Peak *peak, int length) +{ + int i; + for (i = 0; i < length; i++) + if (abs(band[i]) > peak->level) + band[i] = *(++peak->base); } static inline void process_alpha(int16_t *alpha, int width) @@ -154,6 +194,26 @@ static inline void filter(int16_t *output, ptrdiff_t out_stride, } } +static inline void interlaced_vertical_filter(int16_t *output, int16_t *low, int16_t *high, + int width, int linesize, int plane) +{ + int i; + int16_t even, odd; + for (i = 0; i < width; i++) { + even = (*low - *high)/2; + odd = (*low + *high)/2; + + even = FFMIN(1023, even); + even = FFMAX(0, even); + odd = FFMIN(1023, odd); + odd = FFMAX(0, odd); + + output[i] = even; + output[i + linesize] = odd; + low++; + high++; + } +} static void horiz_filter(int16_t *output, int16_t *low, int16_t *high, int width) { @@ -295,6 +355,9 @@ static int cfhd_decode(AVCodecContext *avctx, void *data, int *got_frame, uint16_t data = bytestream2_get_be16(&gb); if (abs_tag8 >= 0x60 && abs_tag8 <= 0x6f) { av_log(avctx, AV_LOG_DEBUG, "large len %x\n", ((tagu & 0xff) << 16) | data); + } else if (tag == SampleFlags) { + av_log(avctx, AV_LOG_DEBUG, "Progressive?%"PRIu16"\n", data); + s->progressive = data & 0x0001; } else if (tag == ImageWidth) { av_log(avctx, AV_LOG_DEBUG, "Width %"PRIu16"\n", data); s->coded_width = data; @@ -393,6 +456,8 @@ static int cfhd_decode(AVCodecContext *avctx, void *data, int *got_frame, } av_log(avctx, AV_LOG_DEBUG, "Transform-type? %"PRIu16"\n", data); } else if (abstag >= 0x4000 && abstag <= 0x40ff) { + if (abstag == 0x4001) + s->peak.level = 0; av_log(avctx, AV_LOG_DEBUG, "Small chunk length %d %s\n", data * 4, tag < 0 ? "optional" : "required"); bytestream2_skipu(&gb, data * 4); } else if (tag == 23) { @@ -450,7 +515,8 @@ static int cfhd_decode(AVCodecContext *avctx, void *data, int *got_frame, s->codebook = data; av_log(avctx, AV_LOG_DEBUG, "Codebook %i\n", s->codebook); } else if (tag == 72) { - s->codebook = data; + s->codebook = data & 0xf; + s->difference_coding = (data >> 4) & 1; av_log(avctx, AV_LOG_DEBUG, "Other codebook? %i\n", s->codebook); } else if (tag == 70) { av_log(avctx, AV_LOG_DEBUG, "Subsampling or bit-depth flag? %i\n", data); @@ -477,6 +543,19 @@ static int cfhd_decode(AVCodecContext *avctx, void *data, int *got_frame, } else if (tag == -85) { av_log(avctx, AV_LOG_DEBUG, "Cropped height %"PRIu16"\n", data); s->cropped_height = data; + } else if (tag == -75) { + s->peak.offset &= ~0xffff; + s->peak.offset |= (data & 0xffff); + s->peak.base = (int16_t *) gb.buffer; + s->peak.level = 0; + } else if (tag == -76) { + s->peak.offset &= 0xffff; + s->peak.offset |= (data & 0xffff)<<16; + s->peak.base = (int16_t *) gb.buffer; + s->peak.level = 0; + } else if (tag == -74 && s->peak.offset) { + s->peak.level = data; + s->peak.base += s->peak.offset / 2 - 3; } else av_log(avctx, AV_LOG_DEBUG, "Unknown tag %i data %x\n", tag, data); @@ -594,10 +673,15 @@ static int cfhd_decode(AVCodecContext *avctx, void *data, int *got_frame, if (count > expected) break; - coeff = dequant_and_decompand(level, s->quantisation); + coeff = dequant_and_decompand(level, s->quantisation, 0); for (i = 0; i < run; i++) *coeff_data++ = coeff; } + if (s->peak.level) + peak_table(coeff_data - expected, &s->peak, expected); + if (s->difference_coding) + difference_coding(s->plane[s->channel_num].subband[s->subband_num_actual], highpass_width, highpass_height); + } else { while (1) { UPDATE_CACHE(re, &s->gb); @@ -613,10 +697,15 @@ static int cfhd_decode(AVCodecContext *avctx, void *data, int *got_frame, if (count > expected) break; - coeff = dequant_and_decompand(level, s->quantisation); + coeff = dequant_and_decompand(level, s->quantisation, s->codebook); for (i = 0; i < run; i++) *coeff_data++ = coeff; } + if (s->peak.level) + peak_table(coeff_data - expected, &s->peak, expected); + if (s->difference_coding) + difference_coding(s->plane[s->channel_num].subband[s->subband_num_actual], highpass_width, highpass_height); + } CLOSE_READER(re, &s->gb); } @@ -784,38 +873,70 @@ static int cfhd_decode(AVCodecContext *avctx, void *data, int *got_frame, } av_log(avctx, AV_LOG_DEBUG, "Level 3 plane %i %i %i %i\n", plane, lowpass_height, lowpass_width, highpass_stride); - + if (s->progressive) { + low = s->plane[plane].subband[0]; + high = s->plane[plane].subband[8]; + output = s->plane[plane].l_h[6]; + for (i = 0; i < lowpass_width; i++) { + vert_filter(output, lowpass_width, low, lowpass_width, high, highpass_stride, lowpass_height); + low++; + high++; + output++; + } + + low = s->plane[plane].subband[7]; + high = s->plane[plane].subband[9]; + output = s->plane[plane].l_h[7]; + for (i = 0; i < lowpass_width; i++) { + vert_filter(output, lowpass_width, low, highpass_stride, high, highpass_stride, lowpass_height); + low++; + high++; + output++; + } + + dst = (int16_t *)pic->data[act_plane]; + low = s->plane[plane].l_h[6]; + 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); + low += lowpass_width; + high += lowpass_width; + dst += pic->linesize[act_plane] / 2; + } + } + else { + av_log(avctx, AV_LOG_DEBUG, "interlaced frame ? %d", pic->interlaced_frame); + pic->interlaced_frame = 1; low = s->plane[plane].subband[0]; - high = s->plane[plane].subband[8]; + high = s->plane[plane].subband[7]; output = s->plane[plane].l_h[6]; - for (i = 0; i < lowpass_width; i++) { - vert_filter(output, lowpass_width, low, lowpass_width, high, highpass_stride, lowpass_height); - low++; - high++; - output++; + for (i = 0; i < lowpass_height; i++) { + horiz_filter(output, low, high, lowpass_width); + low += lowpass_width; + high += lowpass_width; + output += lowpass_width * 2; } - low = s->plane[plane].subband[7]; + low = s->plane[plane].subband[8]; high = s->plane[plane].subband[9]; output = s->plane[plane].l_h[7]; - for (i = 0; i < lowpass_width; i++) { - vert_filter(output, lowpass_width, low, highpass_stride, high, highpass_stride, lowpass_height); - low++; - high++; - output++; + for (i = 0; i < lowpass_height; i++) { + horiz_filter(output, low, high, lowpass_width); + low += lowpass_width; + high += lowpass_width; + output += lowpass_width * 2; } - dst = (int16_t *)pic->data[act_plane]; + dst = (int16_t *)pic->data[act_plane]; low = s->plane[plane].l_h[6]; 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; + for (i = 0; i < lowpass_height; i++) { + interlaced_vertical_filter(dst, low, high, lowpass_width * 2, pic->linesize[act_plane]/2, act_plane); + low += lowpass_width * 2; + high += lowpass_width * 2; + dst += pic->linesize[act_plane]; } + } } diff --git a/libavcodec/cfhd.h b/libavcodec/cfhd.h index 2573e750a6..7cd251fca7 100644 --- a/libavcodec/cfhd.h +++ b/libavcodec/cfhd.h @@ -68,6 +68,12 @@ typedef struct Plane { SubBand band[DWT_LEVELS][4]; } Plane; +typedef struct Peak { + int level; + int offset; + const int16_t *base; +} Peak; + typedef struct CFHDContext { AVCodecContext *avctx; @@ -83,6 +89,7 @@ typedef struct CFHDContext { int coded_height; int cropped_height; enum AVPixelFormat coded_format; + int progressive; int a_width; int a_height; @@ -98,12 +105,14 @@ typedef struct CFHDContext { int pshift; int codebook; + int difference_coding; int subband_num; int level; int subband_num_actual; uint8_t prescale_shift[3]; Plane plane[4]; + Peak peak; } CFHDContext; int ff_cfhd_init_vlcs(CFHDContext *s);