From patchwork Tue Jul 9 20:19:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jai Luthra X-Patchwork-Id: 13880 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id EE0D34483BB for ; Tue, 9 Jul 2019 23:19:34 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D6EA268AB97; Tue, 9 Jul 2019 23:19:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f195.google.com (mail-pg1-f195.google.com [209.85.215.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 61A7768AB7E for ; Tue, 9 Jul 2019 23:19:28 +0300 (EEST) Received: by mail-pg1-f195.google.com with SMTP id z75so6860pgz.5 for ; Tue, 09 Jul 2019 13:19:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jailuthra-in.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=rJAqLcctBL0f0+L71eqi4++eAmQ3Nl3N97mEStNrO2g=; b=KRjPPfN1veBdps9zYS0dkiqRMrO/eatnbx64qsVUqHVWQ/yXm6jMsBzmox+ZTXJk8z WDFjYFq0jq+7EyZK4We9/yM3oVoMBb6WYScN8Vr6NkfdKuuZBbJtj7KYJDPYzD9BaWkm 8bf3ygPqphlmqbPM7nJZSAPUkqxXw69Khdvbm2mnf9569zjczHaizfoayazGg0rfVF9p wF207nFs5tdIBqCa/u4zXEmgOtghBtfUoEw0pDSukcSRYdDEvEB/uf3JfLQ1bFjuUYuN 1egcyrLot18DWxmx4V055SWZmR4g/ROWWmr2vnOH6YNTfTV7HdH8/NhkIN20XEXokcEB QTDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rJAqLcctBL0f0+L71eqi4++eAmQ3Nl3N97mEStNrO2g=; b=pZlYoKpsWJEdtQat8WEljH1zi7PtIFM4uf9mdHwq8LRap1B458FDoG0W0phDpTNzIr qG+2bI6GHHBOEVUsaG3ehXqzuwHWAB3pmtAJV9Fe81srA7NhrYZ9u7NiL04B97B7BEka cP6HUr0vFjiO54caS3rpCE7sS5M9XRrZO/y9mnhWymPv50fhb9L+sZHWEveHkgML73q/ Ru1evbL+VVKa06zYDAoqCGB6mahMZMQUphCca8ipfxMjajqruZJ5+IHpq9O9+HrshSE3 UKM788VFOFU85a6mK0KuFgXTVmR71+9SU0kwXD+zOuVey2z6xVwybTl3Ls01nLJn+U8o 6Ypg== X-Gm-Message-State: APjAAAX9b1OLOfAxzQg6BM42HJMPHf49D9ySRiojFwcPul2s5vDQUMMi T2/L1mZ4nMNLagmqfEb2TnmbPGCz X-Google-Smtp-Source: APXvYqyM9sb2nP8JfxI0wOp/MKrpfZMc6oDXzYFxbivIBcO+jySSFeq268cAQTyhhdHkNbU2XOiPFw== X-Received: by 2002:a17:90a:9386:: with SMTP id q6mr2061813pjo.81.1562703566544; Tue, 09 Jul 2019 13:19:26 -0700 (PDT) Received: from localhost.localdomain ([122.180.207.198]) by smtp.googlemail.com with ESMTPSA id b126sm26212575pfa.126.2019.07.09.13.19.25 for (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 09 Jul 2019 13:19:26 -0700 (PDT) From: Jai Luthra To: ffmpeg-devel@ffmpeg.org Date: Wed, 10 Jul 2019 01:49:01 +0530 Message-Id: <20190709201901.26693-5-me@jailuthra.in> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190709201901.26693-1-me@jailuthra.in> References: <20190709201901.26693-1-me@jailuthra.in> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/5] mlpenc: clean up and enable 24-bit encoding 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Jai Luthra --- libavcodec/mlpenc.c | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/libavcodec/mlpenc.c b/libavcodec/mlpenc.c index 9805e7ff23..4124df6d8f 100644 --- a/libavcodec/mlpenc.c +++ b/libavcodec/mlpenc.c @@ -94,8 +94,8 @@ typedef struct BestOffset { int16_t max; } BestOffset; -#define HUFF_OFFSET_MIN -16384 -#define HUFF_OFFSET_MAX 16383 +#define HUFF_OFFSET_MIN (-16384) +#define HUFF_OFFSET_MAX ( 16383) /** Number of possible codebooks (counting "no codebooks") */ #define NUM_CODEBOOKS 4 @@ -808,7 +808,7 @@ static void write_major_sync(MLPEncodeContext *ctx, uint8_t *buf, int buf_size) static void write_restart_header(MLPEncodeContext *ctx, PutBitContext *pb) { RestartHeader *rh = ctx->cur_restart_header; - int32_t lossless_check = xor_32_to_8(rh->lossless_check_data); + uint8_t lossless_check = xor_32_to_8(rh->lossless_check_data); unsigned int start_count = put_bits_count(pb); PutBitContext tmpb; uint8_t checksum; @@ -1017,12 +1017,10 @@ static void write_block_data(MLPEncodeContext *ctx, PutBitContext *pb) codebook_index [ch] = cp->codebook - 1; sign_huff_offset[ch] = cp->huff_offset; - sign_shift = lsb_bits[ch] - 1; + sign_shift = lsb_bits[ch] + (cp->codebook ? 2 - cp->codebook : -1); - if (cp->codebook > 0) { + if (cp->codebook > 0) sign_huff_offset[ch] -= 7 << lsb_bits[ch]; - sign_shift += 3 - cp->codebook; - } /* Unsign if needed. */ if (sign_shift >= 0) @@ -1032,7 +1030,6 @@ static void write_block_data(MLPEncodeContext *ctx, PutBitContext *pb) for (i = 0; i < dp->blocksize; i++) { for (ch = rh->min_channel; ch <= rh->max_channel; ch++) { int32_t sample = *sample_buffer++ >> dp->quant_step_size[ch]; - sample -= sign_huff_offset[ch]; if (codebook_index[ch] >= 0) { @@ -1252,7 +1249,7 @@ static void input_data_internal(MLPEncodeContext *ctx, const uint8_t *samples, uint32_t abs_sample; int32_t sample; - sample = is24 ? *samples_32++ >> 8 : *samples_16++ << 8; + sample = is24 ? *samples_32++ >> 8 : *samples_16++ * 256U; /* TODO Find out if number_sbits can be used for negative values. */ abs_sample = FFABS(sample); @@ -1795,7 +1792,7 @@ static void determine_bits(MLPEncodeContext *ctx) #define SAMPLE_MAX(bitdepth) ((1 << (bitdepth - 1)) - 1) #define SAMPLE_MIN(bitdepth) (~SAMPLE_MAX(bitdepth)) -#define MSB_MASK(bits) (-1u << bits) +#define MSB_MASK(bits) (-(1u << (bits))) /** Applies the filter to the current samples, and saves the residual back * into the samples buffer. If the filter is too bad and overflows the @@ -1899,8 +1896,8 @@ static void generate_2_noise_channels(MLPEncodeContext *ctx) for (i = 0; i < ctx->number_of_samples; i++) { uint16_t seed_shr7 = seed >> 7; - *sample_buffer++ = ((int8_t)(seed >> 15)) << rh->noise_shift; - *sample_buffer++ = ((int8_t) seed_shr7) << rh->noise_shift; + *sample_buffer++ = ((int8_t)(seed >> 15)) * (1 << rh->noise_shift); + *sample_buffer++ = ((int8_t) seed_shr7) * (1 << rh->noise_shift); seed = (seed << 16) ^ seed_shr7 ^ (seed_shr7 << 5); @@ -2071,9 +2068,10 @@ static void set_best_codebook(MLPEncodeContext *ctx) best_codebook = *best_path++ - ZERO_PATH; cur_bo = &ctx->best_offset[index][channel][best_codebook]; - cp->huff_offset = cur_bo->offset; - cp->huff_lsbs = cur_bo->lsb_bits + dp->quant_step_size[channel]; - cp->codebook = best_codebook; + cp->huff_offset = cur_bo->offset; + cp->sign_huff_offset = -(1 << 23); + cp->huff_lsbs = cur_bo->lsb_bits + dp->quant_step_size[channel]; + cp->codebook = best_codebook; } } } @@ -2278,7 +2276,7 @@ static int mlp_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, if (restart_frame) { set_major_params(ctx); if (ctx->min_restart_interval != ctx->max_restart_interval) - process_major_frame(ctx); + process_major_frame(ctx); } if (ctx->min_restart_interval == ctx->max_restart_interval) @@ -2392,7 +2390,7 @@ AVCodec ff_mlp_encoder = { .encode2 = mlp_encode_frame, .close = mlp_encode_close, .capabilities = AV_CODEC_CAP_SMALL_LAST_FRAME | AV_CODEC_CAP_DELAY | AV_CODEC_CAP_EXPERIMENTAL, - .sample_fmts = (const enum AVSampleFormat[]) {AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE}, + .sample_fmts = (const enum AVSampleFormat[]) {AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S32, AV_SAMPLE_FMT_NONE}, .supported_samplerates = (const int[]) {44100, 48000, 88200, 96000, 176400, 192000, 0}, .channel_layouts = ff_mlp_channel_layouts, }; @@ -2408,7 +2406,7 @@ AVCodec ff_truehd_encoder = { .encode2 = mlp_encode_frame, .close = mlp_encode_close, .capabilities = AV_CODEC_CAP_SMALL_LAST_FRAME | AV_CODEC_CAP_DELAY | AV_CODEC_CAP_EXPERIMENTAL, - .sample_fmts = (const enum AVSampleFormat[]) {AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE}, + .sample_fmts = (const enum AVSampleFormat[]) {AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S32, AV_SAMPLE_FMT_NONE}, .supported_samplerates = (const int[]) {44100, 48000, 88200, 96000, 176400, 192000, 0}, .channel_layouts = (const uint64_t[]) {AV_CH_LAYOUT_STEREO, AV_CH_LAYOUT_5POINT0_BACK, AV_CH_LAYOUT_5POINT1_BACK, 0}, };