From patchwork Thu Jun 14 05:36:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gagandeep Singh X-Patchwork-Id: 9398 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:11c:0:0:0:0:0 with SMTP id c28-v6csp1497338jad; Wed, 13 Jun 2018 22:37:25 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLA9wzksxdCOgYqFL02LK6G4zSr+9nWPPStlc1dd6dgHc0qm+kA+Jy9GvXQk7y1VN2Fiag7 X-Received: by 2002:adf:fa92:: with SMTP id h18-v6mr824265wrr.258.1528954645635; Wed, 13 Jun 2018 22:37:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528954645; cv=none; d=google.com; s=arc-20160816; b=J1uzGiXMqIExbR7YrJG4Xf7ob/UKJqG+9htvWy7ct6TZ6hmXWrwfPg4i70ZUV/yQTy fRLWdWqdStR5PIPdmOrfBzD9dd3r69vCiwda/KK343oh0qVOz3tT9cebGGWQuLsFc9RZ UyvuZvOM9KjPVfl3n2fjwv+mStnoVNWR3invh7FneN/rjFBHb6iAurtGs8CWV1qEg8Kc NCVXnd2rZ4Gm54cnv5iBlalsM7f1qSwCru6u2G2r8wcpTYqpiosWPeNMbNWQ4oEPyIT8 KTVd27pJBVaqLtRC1kHV0wfl2mXAPrr2i1lmuqWKBsrvnyO3aO+IndyHWUqCGpD7UfkY QEGQ== 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=PYUJWZMzT1kKQC8GS5UrDrISxP1DMGWCHvWb8csb6ac=; b=rKvuQ8r6S2LsGYCx+OhC2Eg4bTEKz/7D6PPsvJPIV3ANoWu6OvvARwjVKk1JWWU102 o18vt10g6CS/PASbKwt449/WnC0bw0mi9cszZw+yJJmDHT0X3I4xIs54IY+mPAgkfbxG KrSi+w54c7yHRSN9VIKBNWw+Ut3wRxFPu2mm1oTgbfZTlb23ITIST5UiYz1/XxWW9rxH ES5Bg7axPFAuCwI0lc4vCRywWJlJvsM5TsSl1BXlVzHVYmeg9Ji0rceiEF3Vu4PihvJX MIAWeaqv5AhL4F5y8k5TUi4T0yNQsiDZpi1cV+J6MD0FJBkgzPtYOpS2xhQ16yFZQ2+6 6Zig== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=ib5mvTgC; 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 y67-v6si3336263wmb.111.2018.06.13.22.37.23; Wed, 13 Jun 2018 22:37:25 -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=ib5mvTgC; 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 A971668ADC6; Thu, 14 Jun 2018 08:36:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl0-f47.google.com (mail-pl0-f47.google.com [209.85.160.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3849B68ADC4 for ; Thu, 14 Jun 2018 08:36:25 +0300 (EEST) Received: by mail-pl0-f47.google.com with SMTP id 6-v6so2322781plb.0 for ; Wed, 13 Jun 2018 22:37:15 -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=K3PXe1/wdOq43N2Rv85aDu7tTnSKUw/OXhT6lz99JlQ=; b=ib5mvTgCKazLsdfMWrhudBhSZLUfQmDE5SbO7I1IeZGQQmiL0XWuEhOtdJ3PbFpewr UsJE4jZCR/ZttH0/qp8PWofhYGJ7MvOqbRGugBcGqJLp31423/u/57ZmXBqcJddD6BRX q4GkU3YPmoQqP+WX4/pLREXyOkxJ+SSTiJcC4JfglIYsFSc/1sjpGTFSyu5/RB7UU1mD s1upiG3ZsF9t/PF0HieBPLBvLaxf/X9524ZvhJl4Yp+FteD12lIYmXYMSx1UkGms0tkn jBmM1k23OwTUtanUHVUNVs1149xjsMPmath91MxhKfmWthRF7rhe8xl5AzitvoZpwLLk qhkw== 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=K3PXe1/wdOq43N2Rv85aDu7tTnSKUw/OXhT6lz99JlQ=; b=g9RstIM8ifzRnnmeu9nXDd3yibgvg+hGOyMEXjYW5Tl4uRp0/Cl0+/OnlKFICYKnFh BdEfksG/XtvlkRckSFUxqU2RBsIwuXNygouaVWJaEMkm6zIJsgTpwN512ehjog6UDaDs qECEtMTN0RDL8Ny1zY7SeZU6z65aQch3dUSpFuWoF+44qSeZDzECSbAbkAZ15sFy5WeF WRF8BEZ/PJj30IARACkZmZbq/D4eK4ODWVvoxSEGRRijIY/eo+b2etNagMmHtAJ2wsQJ CMh8lkrAK9NnSutvwGeOF8M9tk34nXXboqqgggi9wEjqrKXkGw2el5ZmbEsaT/gy8UiT 0DoA== X-Gm-Message-State: APt69E0yjXcdckLX7OStRkWxzsH1B4AnM7YcyuqWcikLToGXPUvX+NzD VXX4A+GTy/lFr/qJRuiOnCyj9g== X-Received: by 2002:a17:902:bc4a:: with SMTP id t10-v6mr1327654plz.133.1528954633475; Wed, 13 Jun 2018 22:37:13 -0700 (PDT) Received: from localhost.localdomain ([103.246.106.24]) by smtp.googlemail.com with ESMTPSA id c4-v6sm8391940pfe.53.2018.06.13.22.37.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Jun 2018 22:37:12 -0700 (PDT) From: Gagandeep Singh To: ffmpeg-devel@ffmpeg.org Date: Thu, 14 Jun 2018 11:06:33 +0530 Message-Id: <20180614053633.7000-1-deepgagan231197@gmail.com> X-Mailer: git-send-email 2.14.1 Subject: [FFmpeg-devel] [PATCH] lavc/cfhd: 3d wavelets(temporal transforms) added 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" though the output is not satisfactory, samples are now being processed --- libavcodec/cfhd.c | 469 ++++++++++++++++++++++++++++++++++++++++++++++-------- libavcodec/cfhd.h | 16 +- 2 files changed, 418 insertions(+), 67 deletions(-) diff --git a/libavcodec/cfhd.c b/libavcodec/cfhd.c index 051d210355..bf80cb9c07 100644 --- a/libavcodec/cfhd.c +++ b/libavcodec/cfhd.c @@ -41,12 +41,15 @@ #define ALPHA_COMPAND_GAIN 9400 enum CFHDParam { + TransformType = 10, ChannelCount = 12, SubbandCount = 14, + Pframe = 19, ImageWidth = 20, ImageHeight = 21, LowpassPrecision = 35, SubbandNumber = 48, + EncodingMethod = 52, Quantization = 53, ChannelNumber = 62, SampleFlags = 68, @@ -84,6 +87,11 @@ static void init_peak_table_defaults(CFHDContext *s) static void init_frame_defaults(CFHDContext *s) { + s->sample_type = 0; + s->transform_type = 0; + s->num_frames = 0; + s->pframe = 0; + s->first_wavelet = 0; s->coded_width = 0; s->coded_height = 0; s->cropped_height = 0; @@ -103,8 +111,10 @@ static void init_frame_defaults(CFHDContext *s) } /* TODO: merge with VLC tables or use LUT */ -static inline int dequant_and_decompand(int level, int quantisation, int codebook) +static inline int dequant_and_decompand(int level, int quantisation, int codebook, int lossless) { + if (lossless) + return level; if (codebook == 0 || codebook == 1) { int64_t abslevel = abs(level); if (level < 264) @@ -193,16 +203,21 @@ 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) +static inline void temporal_inverse_filter(int16_t *output, int16_t *low, int16_t *high, + int width, int linesize, int temporal_for_highpass) { int i; int16_t even, odd; for (i = 0; i < width; i++) { even = (low[i] - high[i])/2; odd = (low[i] + high[i])/2; - output[i] = av_clip_uintp2(even, 10); - output[i + linesize] = av_clip_uintp2(odd, 10); + if (!temporal_for_highpass) { + output[i] = av_clip_uintp2(even, 10); + output[i + linesize] = av_clip_uintp2(odd, 10); + } else { + low[i] = even; + high[i] = odd; + } } } static void horiz_filter(int16_t *output, int16_t *low, int16_t *high, @@ -231,9 +246,12 @@ static void free_buffers(CFHDContext *s) for (i = 0; i < FF_ARRAY_ELEMS(s->plane); i++) { av_freep(&s->plane[i].idwt_buf); av_freep(&s->plane[i].idwt_tmp); - - for (j = 0; j < 9; j++) - s->plane[i].subband[j] = NULL; + if (s->transform_type == 0) + for (j = 0; j < 9; j++) + s->plane[i].subband[j] = NULL; + else + for (j = 0; j < 17; j++) + s->plane[i].subband[j] = NULL; for (j = 0; j < 8; j++) s->plane[i].l_h[j] = NULL; @@ -261,6 +279,7 @@ static int alloc_buffers(AVCodecContext *avctx) for (i = 0; i < planes; i++) { int w8, h8, w4, h4, w2, h2; + int16_t *frame2; int width = i ? avctx->width >> chroma_x_shift : avctx->width; int height = i ? avctx->height >> chroma_y_shift : avctx->height; ptrdiff_t stride = FFALIGN(width / 8, 8) * 8; @@ -277,28 +296,85 @@ static int alloc_buffers(AVCodecContext *avctx) w2 = w4 * 2; h2 = h4 * 2; - s->plane[i].idwt_buf = - av_mallocz_array(height * stride, sizeof(*s->plane[i].idwt_buf)); - s->plane[i].idwt_tmp = - av_malloc_array(height * stride, sizeof(*s->plane[i].idwt_tmp)); - if (!s->plane[i].idwt_buf || !s->plane[i].idwt_tmp) - return AVERROR(ENOMEM); - - s->plane[i].subband[0] = s->plane[i].idwt_buf; - s->plane[i].subband[1] = s->plane[i].idwt_buf + 2 * w8 * h8; - s->plane[i].subband[2] = s->plane[i].idwt_buf + 1 * w8 * h8; - s->plane[i].subband[3] = s->plane[i].idwt_buf + 3 * w8 * h8; - s->plane[i].subband[4] = s->plane[i].idwt_buf + 2 * w4 * h4; - s->plane[i].subband[5] = s->plane[i].idwt_buf + 1 * w4 * h4; - s->plane[i].subband[6] = s->plane[i].idwt_buf + 3 * w4 * h4; - s->plane[i].subband[7] = s->plane[i].idwt_buf + 2 * w2 * h2; - s->plane[i].subband[8] = s->plane[i].idwt_buf + 1 * w2 * h2; - s->plane[i].subband[9] = s->plane[i].idwt_buf + 3 * w2 * h2; - - for (j = 0; j < DWT_LEVELS; j++) { - for (k = 0; k < FF_ARRAY_ELEMS(s->plane[i].band[j]); k++) { - s->plane[i].band[j][k].a_width = w8 << j; - s->plane[i].band[j][k].a_height = h8 << j; + if (s->transform_type == 0) { + s->plane[i].idwt_buf = + av_mallocz_array(height * stride, sizeof(*s->plane[i].idwt_buf)); + s->plane[i].idwt_tmp = + av_malloc_array(height * stride, sizeof(*s->plane[i].idwt_tmp)); + if (!s->plane[i].idwt_buf || !s->plane[i].idwt_tmp) + return AVERROR(ENOMEM); + } else if (s->transform_type == 2) { + s->plane[i].idwt_buf = + av_mallocz_array(2 * height * stride, sizeof(*s->plane[i].idwt_buf)); + s->plane[i].idwt_tmp = + av_malloc_array(2 * height * stride, sizeof(*s->plane[i].idwt_tmp)); + if (!s->plane[i].idwt_buf || !s->plane[i].idwt_tmp) + return AVERROR(ENOMEM); + } + + if (s->transform_type == 0) { + s->plane[i].subband[0] = s->plane[i].idwt_buf; + s->plane[i].subband[1] = s->plane[i].idwt_buf + 2 * w8 * h8; + s->plane[i].subband[2] = s->plane[i].idwt_buf + 1 * w8 * h8; + s->plane[i].subband[3] = s->plane[i].idwt_buf + 3 * w8 * h8; + s->plane[i].subband[4] = s->plane[i].idwt_buf + 2 * w4 * h4; + s->plane[i].subband[5] = s->plane[i].idwt_buf + 1 * w4 * h4; + s->plane[i].subband[6] = s->plane[i].idwt_buf + 3 * w4 * h4; + s->plane[i].subband[7] = s->plane[i].idwt_buf + 2 * w2 * h2; + s->plane[i].subband[8] = s->plane[i].idwt_buf + 1 * w2 * h2; + s->plane[i].subband[9] = s->plane[i].idwt_buf + 3 * w2 * h2; + } else if (s->transform_type == 2) { + s->plane[i].subband[0] = s->plane[i].idwt_buf; + s->plane[i].subband[1] = s->plane[i].idwt_buf + 2 * w8 * h8; + s->plane[i].subband[2] = s->plane[i].idwt_buf + 1 * w8 * h8; + s->plane[i].subband[3] = s->plane[i].idwt_buf + 3 * w8 * h8; + s->plane[i].subband[4] = s->plane[i].idwt_buf + 2 * w4 * h4; + s->plane[i].subband[5] = s->plane[i].idwt_buf + 1 * w4 * h4; + s->plane[i].subband[6] = s->plane[i].idwt_buf + 3 * w4 * h4; + frame2 = + s->plane[i].subband[7] = s->plane[i].idwt_buf + 4 * w2 * h2; + s->plane[i].subband[8] = frame2 + 2 * w4 * h4; + s->plane[i].subband[9] = frame2 + 1 * w4 * h4; + s->plane[i].subband[10] = frame2 + 3 * w4 * h4; + s->plane[i].subband[11] = frame2 + 2 * w2 * h2; + s->plane[i].subband[12] = frame2 + 1 * w2 * h2; + s->plane[i].subband[13] = frame2 + 3 * w2 * h2; + s->plane[i].subband[14] = s->plane[i].idwt_buf + 2 * w2 * h2; + s->plane[i].subband[15] = s->plane[i].idwt_buf + 1 * w2 * h2; + s->plane[i].subband[16] = s->plane[i].idwt_buf + 3 * w2 * h2; + } + + if (s->transform_type == 0) { + for (j = 0; j < DWT_LEVELS - 3; j++) { + for (k = 0; k < FF_ARRAY_ELEMS(s->plane[i].band[j]); k++) { + s->plane[i].band[j][k].a_width = w8 << j; + s->plane[i].band[j][k].a_height = h8 << j; + } + } + } else if (s->transform_type == 2) { + for (k = 0; k < FF_ARRAY_ELEMS(s->plane[i].band[0]); k++) { + s->plane[i].band[0][k].a_width = w8; + s->plane[i].band[0][k].a_height = h8; + } + for (k = 0; k < FF_ARRAY_ELEMS(s->plane[i].band[1]); k++) { + s->plane[i].band[1][k].a_width = w8 * 2; + s->plane[i].band[1][k].a_height = h8 * 2; + } + for (k = 0; k < FF_ARRAY_ELEMS(s->plane[i].band[2]); k++) { + s->plane[i].band[2][k].a_width = w8 * 2; + s->plane[i].band[2][k].a_height = h8 * 2; + } + for (k = 0; k < FF_ARRAY_ELEMS(s->plane[i].band[3]); k++) { + s->plane[i].band[3][k].a_width = w8 * 4; + s->plane[i].band[3][k].a_height = h8 * 4; + } + for (k = 0; k < FF_ARRAY_ELEMS(s->plane[i].band[4]); k++) { + s->plane[i].band[4][k].a_width = w8 * 4; + s->plane[i].band[4][k].a_height = h8 * 4; + } + for (k = 0; k < FF_ARRAY_ELEMS(s->plane[i].band[5]); k++) { + s->plane[i].band[5][k].a_width = w8 * 4; + s->plane[i].band[5][k].a_height = h8 * 4; } } @@ -311,6 +387,10 @@ static int alloc_buffers(AVCodecContext *avctx) // s->plane[i].l_h[5] = ll1; s->plane[i].l_h[6] = s->plane[i].idwt_tmp; s->plane[i].l_h[7] = s->plane[i].idwt_tmp + 2 * w2 * h2; + if (s->transform_type == 2) { + s->plane[i].l_h[8] = s->plane[i].idwt_tmp + 4 * w2 * h2; + s->plane[i].l_h[9] = s->plane[i].idwt_tmp + 6 * w2 * h2; + } } s->a_height = s->coded_height; @@ -349,6 +429,9 @@ static int cfhd_decode(AVCodecContext *avctx, void *data, int *got_frame, } else if (tag == SampleFlags) { av_log(avctx, AV_LOG_DEBUG, "Progressive?%"PRIu16"\n", data); s->progressive = data & 0x0001; + } else if (tag == Pframe) { + s->pframe = 1; + av_log(avctx, AV_LOG_DEBUG, "Frame type %"PRIu16"\n", data); } else if (tag == ImageWidth) { av_log(avctx, AV_LOG_DEBUG, "Width %"PRIu16"\n", data); s->coded_width = data; @@ -373,7 +456,7 @@ static int cfhd_decode(AVCodecContext *avctx, void *data, int *got_frame, } } else if (tag == SubbandCount) { av_log(avctx, AV_LOG_DEBUG, "Subband Count: %"PRIu16"\n", data); - if (data != SUBBAND_COUNT) { + if (data != 10 && data != 17) { av_log(avctx, AV_LOG_ERROR, "Subband Count of %"PRIu16" is unsupported\n", data); ret = AVERROR_PATCHWELCOME; break; @@ -405,7 +488,7 @@ static int cfhd_decode(AVCodecContext *avctx, void *data, int *got_frame, } else if (tag == 51) { av_log(avctx, AV_LOG_DEBUG, "Subband number actual %"PRIu16"\n", data); s->subband_num_actual = data; - if (s->subband_num_actual >= 10) { + if (s->subband_num_actual >= 17 && s->subband_num_actual != 255) { av_log(avctx, AV_LOG_ERROR, "Invalid subband number actual\n"); ret = AVERROR(EINVAL); break; @@ -420,9 +503,15 @@ static int cfhd_decode(AVCodecContext *avctx, void *data, int *got_frame, s->prescale_shift[1] = (data >> 3) & 0x7; s->prescale_shift[2] = (data >> 6) & 0x7; av_log(avctx, AV_LOG_DEBUG, "Prescale shift (VC-5): %x\n", data); + } else if (tag == EncodingMethod) { + s->encode_method = data; + av_log(avctx, AV_LOG_DEBUG, "Encode Method for Subband %d : %x\n",s->subband_num_actual, data); } else if (tag == 27) { av_log(avctx, AV_LOG_DEBUG, "Lowpass width %"PRIu16"\n", data); - if (data < 3 || data > s->plane[s->channel_num].band[0][0].a_width) { + if (s->coded_width == 0){ + s->coded_width = data << 3; + } + if (data < 3) { av_log(avctx, AV_LOG_ERROR, "Invalid lowpass width\n"); ret = AVERROR(EINVAL); break; @@ -431,20 +520,21 @@ static int cfhd_decode(AVCodecContext *avctx, void *data, int *got_frame, s->plane[s->channel_num].band[0][0].stride = data; } else if (tag == 28) { av_log(avctx, AV_LOG_DEBUG, "Lowpass height %"PRIu16"\n", data); - if (data < 3 || data > s->plane[s->channel_num].band[0][0].a_height) { + if (s->coded_height == 0) + s->coded_height = data << 3; + if (data < 3) { av_log(avctx, AV_LOG_ERROR, "Invalid lowpass height\n"); ret = AVERROR(EINVAL); break; } s->plane[s->channel_num].band[0][0].height = data; - } else if (tag == 1) + } else if (tag == 1) { + s->sample_type = data; + if (data == 2) + s->pframe = 1; av_log(avctx, AV_LOG_DEBUG, "Sample type? %"PRIu16"\n", data); - else if (tag == 10) { - if (data != 0) { - avpriv_report_missing_feature(avctx, "Transform type of %"PRIu16, data); - ret = AVERROR_PATCHWELCOME; - break; - } + } else if (tag == 10) { + s->transform_type = data; av_log(avctx, AV_LOG_DEBUG, "Transform-type? %"PRIu16"\n", data); } else if (abstag >= 0x4000 && abstag <= 0x40ff) { if (abstag == 0x4001) @@ -547,11 +637,12 @@ static int cfhd_decode(AVCodecContext *avctx, void *data, int *got_frame, } else if (tag == -74 && s->peak.offset) { s->peak.level = data; s->peak.base += s->peak.offset / 2 - 2; - } else + } else if (tag == 82); + else av_log(avctx, AV_LOG_DEBUG, "Unknown tag %i data %x\n", tag, data); /* Some kind of end of header tag */ - if (tag == 4 && data == 0x1a4a && s->coded_width && s->coded_height && + if ((tag == 4 && (data == 0x1a4a || data == 0xf0f) || s->sample_type == 6 || s->sample_type == 1) && s->coded_width && s->coded_height && s->coded_format != AV_PIX_FMT_NONE) { if (s->a_width != s->coded_width || s->a_height != s->coded_height || s->a_format != s->coded_format) { @@ -620,7 +711,7 @@ static int cfhd_decode(AVCodecContext *avctx, void *data, int *got_frame, av_log(avctx, AV_LOG_DEBUG, "Lowpass coefficients %d\n", lowpass_width * lowpass_height); } - if (tag == 55 && s->subband_num_actual != 255 && s->a_width && s->a_height) { + if ((tag == 55 || tag == 82) && s->a_width && s->a_height) { int highpass_height = s->plane[s->channel_num].band[s->level][s->subband_num].height; int highpass_width = s->plane[s->channel_num].band[s->level][s->subband_num].width; int highpass_a_width = s->plane[s->channel_num].band[s->level][s->subband_num].a_width; @@ -638,9 +729,11 @@ static int cfhd_decode(AVCodecContext *avctx, void *data, int *got_frame, } if (highpass_height > highpass_a_height || highpass_width > highpass_a_width || a_expected < highpass_height * (uint64_t)highpass_stride) { - av_log(avctx, AV_LOG_ERROR, "Too many highpass coefficients\n"); - ret = AVERROR(EINVAL); - goto end; + if (s->subband_num_actual != 255) { + av_log(avctx, AV_LOG_ERROR, "Too many highpass coefficients\n"); + ret = AVERROR(EINVAL); + goto end; + } } expected = highpass_height * highpass_stride; @@ -648,8 +741,12 @@ static int cfhd_decode(AVCodecContext *avctx, void *data, int *got_frame, init_get_bits(&s->gb, gb.buffer, bytestream2_get_bytes_left(&gb) * 8); { + if (s->subband_num_actual == 255) { + expected = 0; + goto finish; + } OPEN_READER(re, &s->gb); - if (!s->codebook) { + if (!s->codebook && !(s->transform_type == 2 && s->subband_num_actual == 7)) { while (1) { UPDATE_CACHE(re, &s->gb); GET_RL_VLC(level, run, re, &s->gb, s->table_9_rl_vlc, @@ -664,9 +761,14 @@ static int cfhd_decode(AVCodecContext *avctx, void *data, int *got_frame, if (count > expected) break; - coeff = dequant_and_decompand(level, s->quantisation, 0); + coeff = dequant_and_decompand(level, s->quantisation, 0, (s->sample_type == 2 || s->sample_type == 3) && s->pframe && s->subband_num_actual == 7 && s->encode_method == 5); for (i = 0; i < run; i++) - *coeff_data++ = coeff; + if (tag != 82) + *coeff_data++ = coeff; + else { + *coeff_data |= coeff << 8; + *coeff_data++ *= s->quantisation; + } } if (s->peak.level) peak_table(coeff_data - expected, &s->peak, expected); @@ -688,9 +790,14 @@ static int cfhd_decode(AVCodecContext *avctx, void *data, int *got_frame, if (count > expected) break; - coeff = dequant_and_decompand(level, s->quantisation, s->codebook); + coeff = dequant_and_decompand(level, s->quantisation, s->codebook, (s->sample_type == 2 || s->sample_type == 3) && s->pframe && s->subband_num_actual == 7 && s->encode_method == 5); for (i = 0; i < run; i++) - *coeff_data++ = coeff; + if (tag != 82) + *coeff_data++ = coeff; + else { + *coeff_data |= coeff << 8; + *coeff_data++ *= s->quantisation; + } } if (s->peak.level) peak_table(coeff_data - expected, &s->peak, expected); @@ -701,12 +808,12 @@ static int cfhd_decode(AVCodecContext *avctx, void *data, int *got_frame, CLOSE_READER(re, &s->gb); } - if (count > expected) { + if (count > expected && s->subband_num_actual != 255) { av_log(avctx, AV_LOG_ERROR, "Escape codeword not found, probably corrupt data\n"); ret = AVERROR(EINVAL); goto end; } - + finish: bytes = FFALIGN(AV_CEIL_RSHIFT(get_bits_count(&s->gb), 3), 4); if (bytes > bytestream2_get_bytes_left(&gb)) { av_log(avctx, AV_LOG_ERROR, "Bitstream overread error\n"); @@ -726,14 +833,14 @@ static int cfhd_decode(AVCodecContext *avctx, void *data, int *got_frame, } } } - - if (!s->a_width || !s->a_height || s->a_format == AV_PIX_FMT_NONE || - s->coded_width || s->coded_height || s->coded_format != AV_PIX_FMT_NONE) { +#if 0 + if ((!s->a_width || !s->a_height || s->a_format == AV_PIX_FMT_NONE || + s->coded_width || s->coded_height || s->coded_format != AV_PIX_FMT_NONE) && s->sample_type != 1) { av_log(avctx, AV_LOG_ERROR, "Invalid dimensions\n"); ret = AVERROR(EINVAL); goto end; } - +#endif if (!got_buffer) { av_log(avctx, AV_LOG_ERROR, "No end of header tag found\n"); ret = AVERROR(EINVAL); @@ -741,8 +848,9 @@ static int cfhd_decode(AVCodecContext *avctx, void *data, int *got_frame, } planes = av_pix_fmt_count_planes(avctx->pix_fmt); + if (s->transform_type == 0 && s->sample_type != 1) { for (plane = 0; plane < planes && !ret; plane++) { - /* level 1 */ + /* level 1 */ int lowpass_height = s->plane[plane].band[0][0].height; int lowpass_width = s->plane[plane].band[0][0].width; int highpass_stride = s->plane[plane].band[0][1].stride; @@ -921,14 +1029,251 @@ static int cfhd_decode(AVCodecContext *avctx, void *data, int *got_frame, low = s->plane[plane].l_h[6]; high = s->plane[plane].l_h[7]; for (i = 0; i < lowpass_height; i++) { - interlaced_vertical_filter(dst, low, high, lowpass_width * 2, pic->linesize[act_plane]/2, act_plane); + temporal_inverse_filter(dst, low, high, lowpass_width * 2, pic->linesize[act_plane]/2, 0); low += lowpass_width * 2; high += lowpass_width * 2; dst += pic->linesize[act_plane]; } } } + } else if (s->transform_type == 2 && s->sample_type != 1) { + for (plane = 0; plane < planes && !ret; plane++) { + /* level 1 */ + int lowpass_height = s->plane[plane].band[0][0].height; + int lowpass_width = s->plane[plane].band[0][0].width; + int highpass_stride = s->plane[plane].band[0][1].stride; + int act_plane = plane == 1 ? 2 : plane == 2 ? 1 : plane; + int16_t *low, *high, *output, *dst; + + if (lowpass_height > s->plane[plane].band[0][0].a_height || lowpass_width > s->plane[plane].band[0][0].a_width || + !highpass_stride || s->plane[plane].band[0][1].width > s->plane[plane].band[0][1].a_width) { + av_log(avctx, AV_LOG_ERROR, "Invalid plane dimensions\n"); + ret = AVERROR(EINVAL); + goto end; + } + + av_log(avctx, AV_LOG_DEBUG, "Decoding level 1 plane %i %i %i %i\n", plane, lowpass_height, lowpass_width, highpass_stride); + + low = s->plane[plane].subband[0]; + high = s->plane[plane].subband[2]; + output = s->plane[plane].l_h[0]; + 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[1]; + high = s->plane[plane].subband[3]; + output = s->plane[plane].l_h[1]; + for (i = 0; i < lowpass_width; i++) { + vert_filter(output, lowpass_width, low, highpass_stride, high, highpass_stride, lowpass_height); + low++; + high++; + output++; + } + + low = s->plane[plane].l_h[0]; + high = s->plane[plane].l_h[1]; + output = s->plane[plane].subband[0]; + for (i = 0; i < lowpass_height * 2; i++) { + horiz_filter(output, low, high, lowpass_width); + low += lowpass_width; + high += lowpass_width; + output += lowpass_width * 2; + } + if (s->bpc == 12) { + output = s->plane[plane].subband[0]; + for (i = 0; i < lowpass_height * 2; i++) { + for (j = 0; j < lowpass_width * 2; j++) + output[j] *= 4; + + output += lowpass_width * 2; + } + } + + /* level 2 */ + lowpass_height = s->plane[plane].band[1][1].height; + lowpass_width = s->plane[plane].band[1][1].width; + highpass_stride = s->plane[plane].band[1][1].stride; + + if (lowpass_height > s->plane[plane].band[1][1].a_height || lowpass_width > s->plane[plane].band[1][1].a_width || + !highpass_stride || s->plane[plane].band[1][1].width > s->plane[plane].band[1][1].a_width) { + av_log(avctx, AV_LOG_ERROR, "Invalid plane dimensions\n"); + ret = AVERROR(EINVAL); + goto end; + } + + av_log(avctx, AV_LOG_DEBUG, "Level 2 lowpass plane %i %i %i %i\n", plane, lowpass_height, lowpass_width, highpass_stride); + + low = s->plane[plane].subband[0]; + high = s->plane[plane].subband[5]; + output = s->plane[plane].l_h[3]; + 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[4]; + high = s->plane[plane].subband[6]; + output = s->plane[plane].l_h[4]; + for (i = 0; i < lowpass_width; i++) { + vert_filter(output, lowpass_width, low, highpass_stride, high, highpass_stride, lowpass_height); + low++; + high++; + output++; + } + + low = s->plane[plane].l_h[3]; + high = s->plane[plane].l_h[4]; + output = s->plane[plane].subband[0]; + for (i = 0; i < lowpass_height * 2; i++) { + horiz_filter(output, low, high, lowpass_width); + low += lowpass_width; + high += lowpass_width; + output += lowpass_width * 2; + } + + output = s->plane[plane].subband[0]; + for (i = 0; i < lowpass_height * 2; i++) { + for (j = 0; j < lowpass_width * 2; j++) + output[j] *= 4; + + output += lowpass_width * 2; + } + + lowpass_height = s->plane[plane].band[1][1].height; + lowpass_width = s->plane[plane].band[1][1].width; + highpass_stride = s->plane[plane].band[1][1].stride; + av_log(avctx, AV_LOG_DEBUG, "Level 2 plane for highpass %i %i %i %i\n", plane, lowpass_height, lowpass_width, highpass_stride); + + low = s->plane[plane].subband[7]; + high = s->plane[plane].subband[9]; + output = s->plane[plane].l_h[3]; + 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[8]; + high = s->plane[plane].subband[10]; + output = s->plane[plane].l_h[4]; + for (i = 0; i < lowpass_width; i++) { + vert_filter(output, lowpass_width, low, highpass_stride, high, highpass_stride, lowpass_height); + low++; + high++; + output++; + } + + low = s->plane[plane].l_h[3]; + high = s->plane[plane].l_h[4]; + output = s->plane[plane].subband[7]; + for (i = 0; i < lowpass_height * 2; i++) { + horiz_filter(output, low, high, lowpass_width); + low += lowpass_width; + high += lowpass_width; + output += lowpass_width * 2; + } + + lowpass_height = s->plane[plane].band[3][1].height; + lowpass_width = s->plane[plane].band[4][1].width; + highpass_stride = s->plane[plane].band[4][1].stride; + av_log(avctx, AV_LOG_DEBUG, "temporal level %i %i %i %i\n", plane, lowpass_height, lowpass_width, highpass_stride); + + if (lowpass_height > s->plane[plane].band[3][1].a_height || lowpass_width > s->plane[plane].band[3][1].a_width || + !highpass_stride || s->plane[plane].band[3][1].width > s->plane[plane].band[3][1].a_width) { + av_log(avctx, AV_LOG_ERROR, "Invalid plane dimensions\n"); + ret = AVERROR(EINVAL); + goto end; + } + + low = s->plane[plane].subband[0]; + high = s->plane[plane].subband[7]; + output = s->plane[plane].subband[0]; + for (i = 0; i < lowpass_height; i++) { + temporal_inverse_filter(output, low, high, lowpass_width, 4 * lowpass_width * lowpass_height, 1); + low += lowpass_width; + high += lowpass_width; + } + + av_log(avctx, AV_LOG_DEBUG, "Level 3 plane %i %i %i %i\n", plane, lowpass_height, lowpass_width, highpass_stride); + low = s->plane[plane].subband[0]; + high = s->plane[plane].subband[15]; + 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[14]; + high = s->plane[plane].subband[16]; + 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++; + } + low = s->plane[plane].subband[7]; + high = s->plane[plane].subband[12]; + output = s->plane[plane].l_h[8]; + 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[11]; + high = s->plane[plane].subband[13]; + output = s->plane[plane].l_h[9]; + 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(dst, low, high, lowpass_width); + low += lowpass_width; + high += lowpass_width; + dst += pic->linesize[act_plane] / 2; + } + } + } else if (s->sample_type == 1) { + int16_t *low, *high, *dst; + int lowpass_height, lowpass_width, highpass_stride; + for (plane = 0; plane < planes && !ret; plane++) { + int act_plane = plane == 1 ? 2 : plane == 2 ? 1 : plane; + lowpass_height = s->plane[plane].band[3][1].height; + lowpass_width = s->plane[plane].band[4][1].width; + highpass_stride = s->plane[plane].band[4][1].stride; + av_log(avctx, AV_LOG_DEBUG, "Level 3 plane %i %i %i %i\n", plane, lowpass_height, lowpass_width, highpass_stride); + + + dst = (int16_t *)pic->data[act_plane]; + low = s->plane[plane].l_h[8]; + high = s->plane[plane].l_h[9]; + for (i = 0; i < lowpass_height * 2; i++) { + horiz_filter(dst, low, high, lowpass_width); + low += lowpass_width; + high += lowpass_width; + dst += pic->linesize[act_plane] / 2; + } + } + } end: if (ret < 0) @@ -961,6 +1306,6 @@ AVCodec ff_cfhd_decoder = { .init = cfhd_init, .close = cfhd_close, .decode = cfhd_decode, - .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .capabilities = AV_CODEC_CAP_DR1, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/cfhd.h b/libavcodec/cfhd.h index 7cd251fca7..d827bde450 100644 --- a/libavcodec/cfhd.h +++ b/libavcodec/cfhd.h @@ -30,15 +30,14 @@ #include "vlc.h" #define VLC_BITS 9 -#define SUBBAND_COUNT 10 - +#define SUBBAND_COUNT 17 typedef struct CFHD_RL_VLC_ELEM { int16_t level; int8_t len; uint16_t run; } CFHD_RL_VLC_ELEM; -#define DWT_LEVELS 3 +#define DWT_LEVELS 6 typedef struct SubBand { int level; @@ -63,7 +62,7 @@ typedef struct Plane { /* TODO: merge this into SubBand structure */ int16_t *subband[SUBBAND_COUNT]; - int16_t *l_h[8]; + int16_t *l_h[10]; SubBand band[DWT_LEVELS][4]; } Plane; @@ -82,9 +81,16 @@ typedef struct CFHDContext { CFHD_RL_VLC_ELEM table_18_rl_vlc[4572]; VLC vlc_18; - + AVFrame * next_frame; GetBitContext gb; + int sample_type; + int transform_type; + int num_spatial; + int num_frames; + int encode_method; + int first_wavelet; + int pframe; int coded_width; int coded_height; int cropped_height;