From 2a216d94225be30140db94976becf69a095e7520 Mon Sep 17 00:00:00 2001 From: Martin Vignali Date: Thu, 28 Sep 2017 21:40:39 +0200 Subject: [PATCH 4/7] libavcodec/hapenc : add support for HapAlphaOnly encoding encode the alpha channel of an rgba input --- doc/encoders.texi | 1 + libavcodec/hapenc.c | 13 +++++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/doc/encoders.texi b/doc/encoders.texi index fb93ae0094..ab1fef4efa 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -1326,6 +1326,7 @@ Specifies the Hap format to encode. @item hap @item hap_alpha @item hap_q +@item hap_alpha_only @end table Default value is @option{hap}. diff --git a/libavcodec/hapenc.c b/libavcodec/hapenc.c index 3a1bc870b1..54d8f9d72a 100644 --- a/libavcodec/hapenc.c +++ b/libavcodec/hapenc.c @@ -3,6 +3,8 @@ * Copyright (C) 2015 Vittorio Giovara * Copyright (C) 2015 Tom Butterworth * + * HAPAlphaOnly added by Jokyo Images + * * This file is part of FFmpeg. * * FFmpeg is free software; you can redistribute it and/or @@ -24,7 +26,7 @@ * @file * Hap encoder * - * Fourcc: Hap1, Hap5, HapY + * Fourcc: Hap1, Hap5, HapY, HapA * * https://github.com/Vidvox/hap/blob/master/documentation/HapVideoDRAFT.md */ @@ -273,6 +275,12 @@ static av_cold int hap_init(AVCodecContext *avctx) avctx->bits_per_coded_sample = 24; ctx->tex_fun = ctx->dxtc.dxt5ys_block; break; + case HAP_FMT_RGTC1: + ratio = 8; + avctx->codec_tag = MKTAG('H', 'a', 'p', 'A'); + avctx->bits_per_coded_sample = 32; + ctx->tex_fun = ctx->dxtc.rgtc1u_alpha_block; + break; default: av_log(avctx, AV_LOG_ERROR, "Invalid format %02X\n", ctx->opt_tex_fmt); return AVERROR_INVALIDDATA; @@ -331,10 +339,11 @@ static av_cold int hap_close(AVCodecContext *avctx) #define OFFSET(x) offsetof(HapContext, x) #define FLAGS AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM static const AVOption options[] = { - { "format", NULL, OFFSET(opt_tex_fmt), AV_OPT_TYPE_INT, { .i64 = HAP_FMT_RGBDXT1 }, HAP_FMT_RGBDXT1, HAP_FMT_YCOCGDXT5, FLAGS, "format" }, + { "format", NULL, OFFSET(opt_tex_fmt), AV_OPT_TYPE_INT, { .i64 = HAP_FMT_RGBDXT1 }, HAP_FMT_RGTC1, HAP_FMT_YCOCGDXT5, FLAGS, "format" }, { "hap", "Hap 1 (DXT1 textures)", 0, AV_OPT_TYPE_CONST, { .i64 = HAP_FMT_RGBDXT1 }, 0, 0, FLAGS, "format" }, { "hap_alpha", "Hap Alpha (DXT5 textures)", 0, AV_OPT_TYPE_CONST, { .i64 = HAP_FMT_RGBADXT5 }, 0, 0, FLAGS, "format" }, { "hap_q", "Hap Q (DXT5-YCoCg textures)", 0, AV_OPT_TYPE_CONST, { .i64 = HAP_FMT_YCOCGDXT5 }, 0, 0, FLAGS, "format" }, + { "hap_alpha_only", "Hap Alpha Only (RGTC1 textures)", 0, AV_OPT_TYPE_CONST, { .i64 = HAP_FMT_RGTC1 }, 0, 0, FLAGS, "format" }, { "chunks", "chunk count", OFFSET(opt_chunk_count), AV_OPT_TYPE_INT, {.i64 = 1 }, 1, HAP_MAX_CHUNKS, FLAGS, }, { "compressor", "second-stage compressor", OFFSET(opt_compressor), AV_OPT_TYPE_INT, { .i64 = HAP_COMP_SNAPPY }, HAP_COMP_NONE, HAP_COMP_SNAPPY, FLAGS, "compressor" }, { "none", "None", 0, AV_OPT_TYPE_CONST, { .i64 = HAP_COMP_NONE }, 0, 0, FLAGS, "compressor" }, -- 2.11.0 (Apple Git-81)