From 6f9f68edf6e28c30d82164cfadf3929cc486115d Mon Sep 17 00:00:00 2001 From: Martin Vignali Date: Sun, 24 Sep 2017 23:05:17 +0200 Subject: [PATCH 7/8] libavcodec/hapdec : add support for hapqa decoding --- libavcodec/hap.h | 5 ++ libavcodec/hapdec.c | 148 ++++++++++++++++++++++++++++++++++++---------------- 2 files changed, 107 insertions(+), 46 deletions(-) diff --git a/libavcodec/hap.h b/libavcodec/hap.h index 0ee65335d9..4dfbb8cb16 100644 --- a/libavcodec/hap.h +++ b/libavcodec/hap.h @@ -73,6 +73,7 @@ typedef struct HapContext { int *chunk_results; /* Results from threaded operations */ int tex_rat; /* Compression ratio */ + int tex_rat2; /* Compression ratio of the second texture */ const uint8_t *tex_data; /* Compressed texture */ uint8_t *tex_buf; /* Buffer for compressed texture */ size_t tex_size; /* Size of the compressed texture */ @@ -81,8 +82,12 @@ typedef struct HapContext { int slice_count; /* Number of slices for threaded operations */ + int texture_count; /* 2 for HAQA, 1 for other version */ + int texture_section_size; /* size of the part of the texture section (for HAPQA) */ + /* Pointer to the selected compress or decompress function */ int (*tex_fun)(uint8_t *dst, ptrdiff_t stride, const uint8_t *block); + int (*tex_fun2)(uint8_t *dst, ptrdiff_t stride, const uint8_t *block); } HapContext; /* diff --git a/libavcodec/hapdec.c b/libavcodec/hapdec.c index fc9dff10f1..9ab9c23d6e 100644 --- a/libavcodec/hapdec.c +++ b/libavcodec/hapdec.c @@ -3,6 +3,8 @@ * Copyright (C) 2015 Vittorio Giovara * Copyright (C) 2015 Tom Butterworth * + * HapQA and HAPAlphaOnly added by Jokyo Images + * * This file is part of FFmpeg. * * FFmpeg is free software; you can redistribute it and/or @@ -29,6 +31,7 @@ * https://github.com/Vidvox/hap/blob/master/documentation/HapVideoDRAFT.md */ + #include #include "libavutil/imgutils.h" @@ -157,14 +160,16 @@ static int hap_parse_frame_header(AVCodecContext *avctx) const char *compressorstr; int i, ret; - ret = parse_section_header(gbc, §ion_size, §ion_type); + ret = parse_section_header(gbc, &ctx->texture_section_size, §ion_type); if (ret != 0) return ret; if ((avctx->codec_tag == MKTAG('H','a','p','1') && (section_type & 0x0F) != HAP_FMT_RGBDXT1) || (avctx->codec_tag == MKTAG('H','a','p','5') && (section_type & 0x0F) != HAP_FMT_RGBADXT5) || (avctx->codec_tag == MKTAG('H','a','p','Y') && (section_type & 0x0F) != HAP_FMT_YCOCGDXT5) || - (avctx->codec_tag == MKTAG('H','a','p','A') && (section_type & 0x0F) != HAP_FMT_RGTC1)) { + (avctx->codec_tag == MKTAG('H','a','p','A') && (section_type & 0x0F) != HAP_FMT_RGTC1) || + ((avctx->codec_tag == MKTAG('H','a','p','M') && (section_type & 0x0F) != HAP_FMT_RGTC1) && + (section_type & 0x0F) != HAP_FMT_YCOCGDXT5)) { av_log(avctx, AV_LOG_ERROR, "Invalid texture format %#04x.\n", section_type & 0x0F); return AVERROR_INVALIDDATA; @@ -177,7 +182,7 @@ static int hap_parse_frame_header(AVCodecContext *avctx) if (ret == 0) { ctx->chunks[0].compressor = section_type & 0xF0; ctx->chunks[0].compressed_offset = 0; - ctx->chunks[0].compressed_size = section_size; + ctx->chunks[0].compressed_size = ctx->texture_section_size; } if (ctx->chunks[0].compressor == HAP_COMP_NONE) { compressorstr = "none"; @@ -266,9 +271,8 @@ static int decompress_chunks_thread(AVCodecContext *avctx, void *arg, return 0; } -static int decompress_texture_thread(AVCodecContext *avctx, void *arg, - int slice, int thread_nb) -{ +static inline int decompress_texture_thread_internal(AVCodecContext *avctx, void *arg, + int slice, int thread_nb, int texture_num){ HapContext *ctx = avctx->priv_data; AVFrame *frame = arg; const uint8_t *d = ctx->tex_data; @@ -285,79 +289,120 @@ static int decompress_texture_thread(AVCodecContext *avctx, void *arg, start_slice = slice * base_blocks_per_slice; /* Add any extra blocks (one per slice) that have been added before this slice */ start_slice += FFMIN(slice, remainder_blocks); - end_slice = start_slice + base_blocks_per_slice; /* Add an extra block if there are still remainder blocks to be accounted for */ if (slice < remainder_blocks) end_slice++; - for (y = start_slice; y < end_slice; y++) { uint8_t *p = frame->data[0] + y * frame->linesize[0] * TEXTURE_BLOCK_H; int off = y * w_block; for (x = 0; x < w_block; x++) { - ctx->tex_fun(p + x * 16, frame->linesize[0], - d + (off + x) * ctx->tex_rat); + if (texture_num == 0) { + ctx->tex_fun(p + x * 16, frame->linesize[0], + d + (off + x) * ctx->tex_rat); + } else { + ctx->tex_fun2(p + x * 16, frame->linesize[0], + d + (off + x) * ctx->tex_rat2); + } } } return 0; } +static int decompress_texture_thread(AVCodecContext *avctx, void *arg, + int slice, int thread_nb) +{ + return decompress_texture_thread_internal(avctx, arg, slice, thread_nb, 0); +} + +static int decompress_texture2_thread(AVCodecContext *avctx, void *arg, + int slice, int thread_nb) +{ + return decompress_texture_thread_internal(avctx, arg, slice, thread_nb, 1); +} static int hap_decode(AVCodecContext *avctx, void *data, int *got_frame, AVPacket *avpkt) { HapContext *ctx = avctx->priv_data; ThreadFrame tframe; - int ret, i; + int ret, i, t; int tex_size; + int section_size; + enum HapSectionType section_type; + int start_texture_section = 0; + int tex_rat[2] = {0, 0}; bytestream2_init(&ctx->gbc, avpkt->data, avpkt->size); - /* Check for section header */ - ret = hap_parse_frame_header(avctx); - if (ret < 0) - return ret; + tex_rat[0] = ctx->tex_rat; + + /* check for multi texture header */ + if (ctx->texture_count == 2) { + ret = parse_section_header(&ctx->gbc, §ion_size, §ion_type); + if (ret != 0) + return ret; + if ((section_type & 0x0F) != 0x0D) { + av_log(avctx, AV_LOG_ERROR, "Invalid section type in 2 textures mode %#04x.\n", section_type); + return AVERROR_INVALIDDATA; + } + start_texture_section = 4; + tex_rat[1] = ctx->tex_rat2; + } - /* Get the output frame ready to receive data */ tframe.f = data; ret = ff_thread_get_buffer(avctx, &tframe, 0); if (ret < 0) return ret; - if (avctx->codec->update_thread_context) - ff_thread_finish_setup(avctx); - - /* Unpack the DXT texture */ - if (hap_can_use_tex_in_place(ctx)) { - /* Only DXTC texture compression in a contiguous block */ - ctx->tex_data = ctx->gbc.buffer; - tex_size = bytestream2_get_bytes_left(&ctx->gbc); - } else { - /* Perform the second-stage decompression */ - ret = av_reallocp(&ctx->tex_buf, ctx->tex_size); + + for (t = 0; t < ctx->texture_count; t++) { + bytestream2_seek(&ctx->gbc, start_texture_section, SEEK_SET); + + ret = hap_parse_frame_header(avctx); if (ret < 0) return ret; - avctx->execute2(avctx, decompress_chunks_thread, NULL, - ctx->chunk_results, ctx->chunk_count); + start_texture_section += ctx->texture_section_size + 4; - for (i = 0; i < ctx->chunk_count; i++) { - if (ctx->chunk_results[i] < 0) - return ctx->chunk_results[i]; - } + /* Get the output frame ready to receive data */ + if (avctx->codec->update_thread_context) + ff_thread_finish_setup(avctx); + /* Unpack the DXT texture */ + if (hap_can_use_tex_in_place(ctx)) { + /* Only DXTC texture compression in a contiguous block */ + ctx->tex_data = ctx->gbc.buffer; + tex_size = ctx->texture_section_size;//bytestream2_get_bytes_left(&ctx->gbc); + } else { + /* Perform the second-stage decompression */ + ret = av_reallocp(&ctx->tex_buf, ctx->tex_size); + if (ret < 0) + return ret; - ctx->tex_data = ctx->tex_buf; - tex_size = ctx->tex_size; - } + avctx->execute2(avctx, decompress_chunks_thread, NULL, + ctx->chunk_results, ctx->chunk_count); - if (tex_size < (avctx->coded_width / TEXTURE_BLOCK_W) - *(avctx->coded_height / TEXTURE_BLOCK_H) - *ctx->tex_rat) { - av_log(avctx, AV_LOG_ERROR, "Insufficient data\n"); - return AVERROR_INVALIDDATA; - } + for (i = 0; i < ctx->chunk_count; i++) { + if (ctx->chunk_results[i] < 0) + return ctx->chunk_results[i]; + } - /* Use the decompress function on the texture, one block per thread */ - avctx->execute2(avctx, decompress_texture_thread, tframe.f, NULL, ctx->slice_count); + ctx->tex_data = ctx->tex_buf; + tex_size = ctx->tex_size; + } + if (tex_size < (avctx->coded_width / TEXTURE_BLOCK_W) + *(avctx->coded_height / TEXTURE_BLOCK_H) + *tex_rat[t]) { + av_log(avctx, AV_LOG_ERROR, "Insufficient data\n"); + return AVERROR_INVALIDDATA; + } + /* Use the decompress function on the texture, one block per thread */ + if (t == 0){ + avctx->execute2(avctx, decompress_texture_thread, tframe.f, NULL, ctx->slice_count); + } else{ + tframe.f = data; + avctx->execute2(avctx, decompress_texture2_thread, tframe.f, NULL, ctx->slice_count); + } + } /* Frame is ready to be output */ tframe.f->pict_type = AV_PICTURE_TYPE_I; @@ -383,6 +428,7 @@ static av_cold int hap_init(AVCodecContext *avctx) avctx->coded_width = FFALIGN(avctx->width, TEXTURE_BLOCK_W); avctx->coded_height = FFALIGN(avctx->height, TEXTURE_BLOCK_H); + ctx->texture_count = 1; ff_texturedsp_init(&ctx->dxtc); switch (avctx->codec_tag) { @@ -391,28 +437,38 @@ static av_cold int hap_init(AVCodecContext *avctx) ctx->tex_rat = 8; ctx->tex_fun = ctx->dxtc.dxt1_block; avctx->pix_fmt = AV_PIX_FMT_RGB0; + ctx->texture_count = 1; break; case MKTAG('H','a','p','5'): texture_name = "DXT5"; ctx->tex_rat = 16; ctx->tex_fun = ctx->dxtc.dxt5_block; avctx->pix_fmt = AV_PIX_FMT_RGBA; + ctx->texture_count = 1; break; case MKTAG('H','a','p','Y'): texture_name = "DXT5-YCoCg-scaled"; ctx->tex_rat = 16; ctx->tex_fun = ctx->dxtc.dxt5ys_block; avctx->pix_fmt = AV_PIX_FMT_RGB0; + ctx->texture_count = 1; break; case MKTAG('H','a','p','A'): texture_name = "RGTC1"; ctx->tex_rat = 8; ctx->tex_fun = ctx->dxtc.rgtc1u_block; avctx->pix_fmt = AV_PIX_FMT_RGB0; + ctx->texture_count = 1; break; case MKTAG('H','a','p','M'): - avpriv_report_missing_feature(avctx, "HapQAlpha"); - return AVERROR_PATCHWELCOME; + texture_name = "DXT5-YCoCg-scaled / RGTC1"; + ctx->tex_rat = 16; + ctx->tex_rat2 = 8; + ctx->tex_fun = ctx->dxtc.dxt5ys_block; + ctx->tex_fun2 = ctx->dxtc.rgtc1u_alpha_block; + avctx->pix_fmt = AV_PIX_FMT_RGBA; + ctx->texture_count = 2; + break; default: return AVERROR_DECODER_NOT_FOUND; } -- 2.11.0 (Apple Git-81)