mirror of
https://github.com/yuzu-emu/FasTC.git
synced 2024-11-23 18:45:48 +01:00
Add initial block mode decoding
This commit is contained in:
Pavel Krajcevski
parent
9eb6eb8692
commit
90448df333
@ -57,10 +57,31 @@
|
||||
|
||||
namespace ASTCC {
|
||||
|
||||
// Takes a stream of compressed PVRTC data and decompresses it into R8G8B8A8
|
||||
// format. The width and height must be specified in order to properly
|
||||
// The size of the block for the ASTC data. This needs to be supplied
|
||||
// for every block stream, since ASTC defines texel weights to be less
|
||||
// than or equal to the block size in order to save bits when decompressing
|
||||
enum EASTCBlockSize {
|
||||
eASTCBlockSize_4x4,
|
||||
eASTCBlockSize_5x4,
|
||||
eASTCBlockSize_5x5,
|
||||
eASTCBlockSize_6x5,
|
||||
eASTCBlockSize_6x6,
|
||||
eASTCBlockSize_8x5,
|
||||
eASTCBlockSize_8x6,
|
||||
eASTCBlockSize_8x8,
|
||||
eASTCBlockSize_10x5,
|
||||
eASTCBlockSize_10x6,
|
||||
eASTCBlockSize_10x8,
|
||||
eASTCBlockSize_10x10,
|
||||
eASTCBlockSize_12x10,
|
||||
eASTCBlockSize_12x12,
|
||||
};
|
||||
|
||||
// Takes a stream of compressed ASTC data and decompresses it into R8G8B8A8
|
||||
// format. The block size must be specified in order to properly
|
||||
// decompress the data.
|
||||
void Decompress(const FasTC::DecompressionJob &);
|
||||
void Decompress(const FasTC::DecompressionJob &,
|
||||
EASTCBlockSize blockSize);
|
||||
|
||||
} // namespace ASTCC
|
||||
|
||||
|
||||
@ -52,9 +52,270 @@
|
||||
|
||||
#include "ASTCCompressor.h"
|
||||
|
||||
namespace PVRTCC {
|
||||
#include <cassert>
|
||||
#include <cstring>
|
||||
|
||||
void Decompress(const FasTC::DecompressionJob &dcj) {
|
||||
#include "Utils.h"
|
||||
|
||||
#include "TexCompTypes.h"
|
||||
#include "BitStream.h"
|
||||
using FasTC::BitStreamReadOnly;
|
||||
|
||||
namespace ASTCC {
|
||||
|
||||
struct TexelWeightParams {
|
||||
uint32 m_Width;
|
||||
uint32 m_Height;
|
||||
bool m_bDualPlane;
|
||||
uint32 m_MaxWeight;
|
||||
bool m_bError;
|
||||
bool m_bVoidExtent;
|
||||
|
||||
TexelWeightParams() {
|
||||
memset(this, 0, sizeof(*this));
|
||||
}
|
||||
|
||||
// According to table C.2.7
|
||||
void GetBitEncoding(uint8 &nQuints, uint8 &nTrits, uint8 &nBits) {
|
||||
nQuints = 0;
|
||||
nTrits = 0;
|
||||
nBits = 0;
|
||||
switch(m_MaxWeight) {
|
||||
case 1: nBits = 1; return;
|
||||
case 2: nTrits = 1; return;
|
||||
case 3: nBits = 2; return;
|
||||
case 4: nQuints = 1; return;
|
||||
case 5: nTrits = 1; nBits = 1; return;
|
||||
case 7: nBits = 3; return;
|
||||
case 9: nQuints = 1; nBits = 1; return;
|
||||
case 11: nTrits = 1; nBits = 2; return;
|
||||
case 15: nBits = 4; return;
|
||||
case 19: nQuints = 1; nBits = 2; return;
|
||||
case 23: nTrits = 1; nBits = 3; return;
|
||||
case 31: nBits = 5; return;
|
||||
|
||||
default:
|
||||
assert(!"Invalid maximum weight");
|
||||
return;
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
TexelWeightParams DecodeBlockInfo(BitStreamReadOnly &strm) {
|
||||
TexelWeightParams params;
|
||||
|
||||
// Read the entire block mode all at once
|
||||
uint16 modeBits = strm.ReadBits(11);
|
||||
|
||||
// Does this match the void extent block mode?
|
||||
if((modeBits & 0x01FF) == 0x1FC) {
|
||||
params.m_bVoidExtent = true;
|
||||
return params;
|
||||
}
|
||||
|
||||
// First check if the last four bits are zero
|
||||
if((modeBits & 0xF) != 0) {
|
||||
params.m_bError = true;
|
||||
return params;
|
||||
}
|
||||
|
||||
// If the last two bits are zero, then if bits
|
||||
// [6-8] are all ones, this is also reserved.
|
||||
if((modeBits & 0x3) != 0 &&
|
||||
(modeBits & 0x1C0) == 0x1C0) {
|
||||
params.m_bError = true;
|
||||
return params;
|
||||
}
|
||||
|
||||
// Otherwise, there is no error... Figure out the layout
|
||||
// of the block mode. Layout is determined by a number
|
||||
// between 0 and 9 corresponding to table C.2.8 of the
|
||||
// ASTC spec.
|
||||
uint32 layout = 0;
|
||||
|
||||
if((modeBits & 0x1) || (modeBits & 0x2)) {
|
||||
// layout is in [0-4]
|
||||
if(modeBits & 0x8) {
|
||||
// layout is in [2-4]
|
||||
if(modeBits & 0x4) {
|
||||
// layout is in [3-4]
|
||||
if(modeBits & 0x100) {
|
||||
layout = 4;
|
||||
} else {
|
||||
layout = 3;
|
||||
}
|
||||
} else {
|
||||
layout = 2;
|
||||
}
|
||||
} else {
|
||||
// layout is in [0-1]
|
||||
if(modeBits & 0x4) {
|
||||
layout = 1;
|
||||
} else {
|
||||
layout = 0;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
// layout is in [5-9]
|
||||
if(modeBits & 0x100) {
|
||||
// layout is in [7-9]
|
||||
if(modeBits & 0x80) {
|
||||
// layout is in [7-8]
|
||||
assert(modeBits & 0x40 == 0);
|
||||
if(modeBits & 0x20) {
|
||||
layout = 8;
|
||||
} else {
|
||||
layout = 7;
|
||||
}
|
||||
} else {
|
||||
layout = 9;
|
||||
}
|
||||
} else {
|
||||
// layout is in [5-6]
|
||||
if(modeBits & 0x80) {
|
||||
layout = 6;
|
||||
} else {
|
||||
layout = 5;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
assert(layout < 10);
|
||||
|
||||
// Determine R
|
||||
uint32 R = !!(modeBits & 0x10);
|
||||
if(layout < 4) {
|
||||
R |= (modeBits & 0x3) << 1;
|
||||
} else {
|
||||
R |= (modeBits & 0xC) >> 1;
|
||||
}
|
||||
assert(2 <= R && R <= 7);
|
||||
|
||||
// Determine width & height
|
||||
switch(layout) {
|
||||
case 0: {
|
||||
uint32 A = (modeBits >> 5) & 0x3;
|
||||
uint32 B = (modeBits >> 7) & 0x3;
|
||||
params.m_Width = B + 4;
|
||||
params.m_Height = A + 2;
|
||||
break;
|
||||
}
|
||||
|
||||
case 1: {
|
||||
uint32 A = (modeBits >> 5) & 0x3;
|
||||
uint32 B = (modeBits >> 7) & 0x3;
|
||||
params.m_Width = B + 8;
|
||||
params.m_Height = A + 2;
|
||||
break;
|
||||
}
|
||||
|
||||
case 2: {
|
||||
uint32 A = (modeBits >> 5) & 0x3;
|
||||
uint32 B = (modeBits >> 7) & 0x3;
|
||||
params.m_Width = A + 2;
|
||||
params.m_Height = B + 8;
|
||||
break;
|
||||
}
|
||||
|
||||
case 3: {
|
||||
uint32 A = (modeBits >> 5) & 0x3;
|
||||
uint32 B = (modeBits >> 7) & 0x1;
|
||||
params.m_Width = A + 2;
|
||||
params.m_Height = B + 6;
|
||||
break;
|
||||
}
|
||||
|
||||
case 4: {
|
||||
uint32 A = (modeBits >> 5) & 0x3;
|
||||
uint32 B = (modeBits >> 7) & 0x1;
|
||||
params.m_Width = B + 2;
|
||||
params.m_Height = A + 2;
|
||||
break;
|
||||
}
|
||||
|
||||
case 5: {
|
||||
uint32 A = (modeBits >> 5) & 0x3;
|
||||
params.m_Width = 12;
|
||||
params.m_Height = A + 2;
|
||||
break;
|
||||
}
|
||||
|
||||
case 6: {
|
||||
uint32 A = (modeBits >> 5) & 0x3;
|
||||
params.m_Width = A + 2;
|
||||
params.m_Height = 12;
|
||||
break;
|
||||
}
|
||||
|
||||
case 7: {
|
||||
params.m_Width = 6;
|
||||
params.m_Height = 10;
|
||||
break;
|
||||
}
|
||||
|
||||
case 8: {
|
||||
params.m_Width = 10;
|
||||
params.m_Height = 6;
|
||||
break;
|
||||
}
|
||||
|
||||
case 9: {
|
||||
uint32 A = (modeBits >> 5) & 0x3;
|
||||
uint32 B = (modeBits >> 9) & 0x3;
|
||||
params.m_Width = A + 6;
|
||||
params.m_Height = B + 6;
|
||||
break;
|
||||
}
|
||||
|
||||
default:
|
||||
assert(!"Don't know this layout...");
|
||||
params.m_bError = true;
|
||||
break;
|
||||
}
|
||||
|
||||
// Determine whether or not we're using dual planes
|
||||
// and/or high precision layouts.
|
||||
bool D = (layout != 9) && (modeBits & 0x400);
|
||||
bool H = (layout != 9) && (modeBits & 0x200);
|
||||
|
||||
if(H) {
|
||||
const uint32 maxWeights[6] = { 9, 11, 15, 19, 23, 31 };
|
||||
params.m_MaxWeight = maxWeights[R-2];
|
||||
} else {
|
||||
const uint32 maxWeights[6] = { 1, 2, 3, 4, 5, 7 };
|
||||
params.m_MaxWeight = maxWeights[R-2];
|
||||
}
|
||||
|
||||
params.m_bDualPlane = D;
|
||||
|
||||
return params;
|
||||
}
|
||||
|
||||
} // namespace PVRTCC
|
||||
void DecompressBlock(const uint8 inBuf[16],
|
||||
const uint32 blockWidth, const uint32 blockHeight,
|
||||
uint8 *outBuf) {
|
||||
BitStreamReadOnly strm(inBuf);
|
||||
TexelWeightParams weightParams = DecodeBlockInfo(strm);
|
||||
|
||||
// Our weights should be smaller than our block size.
|
||||
assert(weightParams.m_Width <= blockWidth);
|
||||
assert(weightParams.m_Height <= blockHeight);
|
||||
|
||||
|
||||
}
|
||||
|
||||
void Decompress(const FasTC::DecompressionJob &dcj, EASTCBlockSize blockSize) {
|
||||
uint32 blockWidth = GetBlockWidth(blockSize);
|
||||
uint32 blockHeight = GetBlockHeight(blockSize);
|
||||
uint32 blockIdx = 0;
|
||||
for(uint32 j = 0; j < dcj.Width(); j++) {
|
||||
for(uint32 i = 0; i < dcj.Height(); i++) {
|
||||
const uint8 *blockPtr = dcj.InBuf() + blockIdx*16;
|
||||
uint8 *dataPtr = dcj.OutBuf() + j*dcj.Width() + i;
|
||||
DecompressBlock(blockPtr, blockWidth, blockHeight, dataPtr);
|
||||
blockIdx++;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
} // namespace ASTCC
|
||||
|
||||
106
ASTCEncoder/src/Utils.h
Normal file
106
ASTCEncoder/src/Utils.h
Normal file
@ -0,0 +1,106 @@
|
||||
/* FasTC
|
||||
* Copyright (c) 2014 University of North Carolina at Chapel Hill.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Permission to use, copy, modify, and distribute this software and its
|
||||
* documentation for educational, research, and non-profit purposes, without
|
||||
* fee, and without a written agreement is hereby granted, provided that the
|
||||
* above copyright notice, this paragraph, and the following four paragraphs
|
||||
* appear in all copies.
|
||||
*
|
||||
* Permission to incorporate this software into commercial products may be
|
||||
* obtained by contacting the authors or the Office of Technology Development
|
||||
* at the University of North Carolina at Chapel Hill <otd@unc.edu>.
|
||||
*
|
||||
* This software program and documentation are copyrighted by the University of
|
||||
* North Carolina at Chapel Hill. The software program and documentation are
|
||||
* supplied "as is," without any accompanying services from the University of
|
||||
* North Carolina at Chapel Hill or the authors. The University of North
|
||||
* Carolina at Chapel Hill and the authors do not warrant that the operation of
|
||||
* the program will be uninterrupted or error-free. The end-user understands
|
||||
* that the program was developed for research purposes and is advised not to
|
||||
* rely exclusively on the program for any reason.
|
||||
*
|
||||
* IN NO EVENT SHALL THE UNIVERSITY OF NORTH CAROLINA AT CHAPEL HILL OR THE
|
||||
* AUTHORS BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL,
|
||||
* OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING OUT OF THE USE OF
|
||||
* THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF NORTH CAROLINA
|
||||
* AT CHAPEL HILL OR THE AUTHORS HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH
|
||||
* DAMAGE.
|
||||
*
|
||||
* THE UNIVERSITY OF NORTH CAROLINA AT CHAPEL HILL AND THE AUTHORS SPECIFICALLY
|
||||
* DISCLAIM ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE AND ANY
|
||||
* STATUTORY WARRANTY OF NON-INFRINGEMENT. THE SOFTWARE PROVIDED HEREUNDER IS ON
|
||||
* AN "AS IS" BASIS, AND THE UNIVERSITY OF NORTH CAROLINA AT CHAPEL HILL AND
|
||||
* THE AUTHORS HAVE NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT, UPDATES,
|
||||
* ENHANCEMENTS, OR MODIFICATIONS.
|
||||
*
|
||||
* Please send all BUG REPORTS to <pavel@cs.unc.edu>.
|
||||
*
|
||||
* The authors may be contacted via:
|
||||
*
|
||||
* Pavel Krajcevski
|
||||
* Dept of Computer Science
|
||||
* 201 S Columbia St
|
||||
* Frederick P. Brooks, Jr. Computer Science Bldg
|
||||
* Chapel Hill, NC 27599-3175
|
||||
* USA
|
||||
*
|
||||
* <http://gamma.cs.unc.edu/FasTC/>
|
||||
*/
|
||||
|
||||
#ifndef ASTCENCODER_SRC_UTILS_H_
|
||||
#define ASTCENCODER_SRC_UTILS_H_
|
||||
|
||||
#include "ASTCCompressor.h"
|
||||
|
||||
#include "TexCompTypes.h"
|
||||
|
||||
namespace ASTCC {
|
||||
|
||||
uint32 GetBlockHeight(EASTCBlockSize blockSize) {
|
||||
switch(blockSize) {
|
||||
case eASTCBlockSize_4x4: return 4;
|
||||
case eASTCBlockSize_5x4: return 4;
|
||||
case eASTCBlockSize_5x5: return 5;
|
||||
case eASTCBlockSize_6x5: return 5;
|
||||
case eASTCBlockSize_6x6: return 6;
|
||||
case eASTCBlockSize_8x5: return 5;
|
||||
case eASTCBlockSize_8x6: return 6;
|
||||
case eASTCBlockSize_8x8: return 8;
|
||||
case eASTCBlockSize_10x5: return 5;
|
||||
case eASTCBlockSize_10x6: return 6;
|
||||
case eASTCBlockSize_10x8: return 8;
|
||||
case eASTCBlockSize_10x10: return 10;
|
||||
case eASTCBlockSize_12x10: return 10;
|
||||
case eASTCBlockSize_12x12: return 12;
|
||||
}
|
||||
assert(false);
|
||||
return -1;
|
||||
};
|
||||
|
||||
uint32 GetBlockWidth(EASTCBlockSize blockSize) {
|
||||
switch(blockSize) {
|
||||
case eASTCBlockSize_4x4: return 4;
|
||||
case eASTCBlockSize_5x4: return 5;
|
||||
case eASTCBlockSize_5x5: return 5;
|
||||
case eASTCBlockSize_6x5: return 6;
|
||||
case eASTCBlockSize_6x6: return 6;
|
||||
case eASTCBlockSize_8x5: return 8;
|
||||
case eASTCBlockSize_8x6: return 8;
|
||||
case eASTCBlockSize_8x8: return 8;
|
||||
case eASTCBlockSize_10x5: return 10;
|
||||
case eASTCBlockSize_10x6: return 10;
|
||||
case eASTCBlockSize_10x8: return 10;
|
||||
case eASTCBlockSize_10x10: return 10;
|
||||
case eASTCBlockSize_12x10: return 12;
|
||||
case eASTCBlockSize_12x12: return 12;
|
||||
}
|
||||
assert(false);
|
||||
return -1;
|
||||
};
|
||||
|
||||
} // namespace ASTCC
|
||||
|
||||
#endif // ASTCENCODER_SRC_UTILS_H_
|
||||
Loading…
Reference in New Issue
Block a user