cpp/charls
1
0
Fork 0
mirror of https://github.com/team-charls/charls synced 2025-03-28 21:03:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Linux fixes part 1 (will now compile without warning and link using a single CMakeLists.txt at root level). Unfortunately, test executable crashes for unknown reason.

Browse Source
This commit is contained in:
jdv_cp 2009-03-18 13:22:53 -07:00
parent dcd369a351
commit a64fd28db5
14 changed files with 97 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
CMakeLists.txt
View File

@ -11,8 +11,11 @@ ENDIF(NOT CMAKE_BUILD_TYPE)
OPTION(charls_BUILD_SHARED_LIBS "Build CharLS with shared libraries." OFF)
SET(BUILD_SHARED_LIBS ${charls_BUILD_SHARED_LIBS})
ADD_SUBDIRECTORY(test)
add_library(CharLS header.cpp interface.cpp jpegls.cpp
stdafx.cpp
)
stdafx.cpp
)
add_executable(charlstest test/test.cpp)
target_link_libraries (charlstest CharLS)

2
context.h
View File

@ -29,8 +29,8 @@ public:
UINT A;
int B;
int N;
int C;
int N;
inlinehint int GetErrorCorrection(int k) const
{

2
contextrunmode.h
View File

@ -18,9 +18,9 @@ struct CContextRunMode
}
int A;
int _nRItype;
BYTE N;
BYTE Nn;
int _nRItype;
BYTE _nReset;
CContextRunMode()

2
decoderstrategy.h
View File

@ -205,8 +205,8 @@ public:
private:
// decoding
int _cbitValid;
bufType _valcurrent;
int _cbitValid;
BYTE* _pbyteCompressed;
size_t _cbyteCompressed;
};

2
defaulttraits.h
View File

@ -19,9 +19,9 @@ public:
int MAXVAL;
int RANGE;
int NEAR;
int LIMIT;
int qbpp;
int bpp;
int LIMIT;
int RESET;
DefaultTraitsT(const DefaultTraitsT& src) :

13
encoderstrategy.h
View File

@ -3,6 +3,9 @@
//
#ifndef CHARLS_ENCODERSTRATEGY
#define CHARLS_ENCODERSTRATEGY
@ -13,9 +16,9 @@ class EncoderStrategy
public:
EncoderStrategy() :
_qdecoder(0),
valcurrent(0),
bitpos(0),
_qdecoder(0),
_bFFWritten(false),
_cbyteWritten(0)
{};
@ -57,11 +60,13 @@ protected:
ASSERT((_qdecoder == NULL) || (length == 0 && value == 0) ||( _qdecoder->ReadLongValue(length) == value));
#ifdef _DEBUG
if (length < 32)
{
UINT mask = (1 << (length)) - 1;
ASSERT((value | mask) == mask);
}
#endif
bitpos -= length;
if (bitpos >= 0)
@ -125,19 +130,21 @@ protected:
AppendToBitStream((1 << length) - 1, length);
}
DecoderStrategy* _qdecoder;
private:
UINT valcurrent;
// encoding
int bitpos;
size_t _cbyteCompressed;
// encoding
int bitpos;
BYTE* _pbyteCompressed;
bool _bFFWritten;
size_t _cbyteWritten;
};
#endif

11
header.cpp
View File

@ -96,11 +96,11 @@ JpegSegment* CreateMarkerStartOfFrame(Size size, int cbpp, int ccomp)
// ctor()
//
JLSOutputStream::JLSOutputStream() :
_bCompare(false),
_pdata(NULL),
_cbyteOffset(0),
_cbyteLength(0),
_icompLast(0),
_bCompare(false)
_icompLast(0)
{
}
@ -414,14 +414,13 @@ public:
const void* _pvoidRaw;
Size _size;
int _cbit;
int _nnear;
Size _size;
int _ccompScan;
interleavemode _ilv;
int _icompStart;
int _nnear;
const void* _pvoidRaw;
JlsCustomParameters _presets;
};

2
jpegls.cpp
View File

@ -10,7 +10,7 @@
#include <math.h>
#include <limits>
#include <vector>
#include <STDIO.H>
#include <stdio.h>
#include <iostream>
#include "util.h"

23
scan.h
View File

@ -125,25 +125,25 @@ public:
public:
JlsCodec() :
_bCompare(0),
_size(0,0),
T1(0),
T2(0),
T3(0),
RUNindex(0),
_pquant(0),
_size(0,0)
_bCompare(0)
{
}
JlsCodec(const TRAITS& inTraits) :
traits(inTraits),
_bCompare(0),
_size(0,0),
T1(0),
T2(0),
T3(0),
RUNindex(0),
_pquant(0),
_size(0,0)
_bCompare(0)
{
}
@ -205,6 +205,14 @@ public:
size_t DecodeScan(void* pvoidOut, const Size& size, int components, const void* pvoidIn, size_t cbyte, bool bCompare);
protected:
// codec parameters
TRAITS traits;
Size _size;
int T1;
int T2;
int T3;
int _components; // only set for line interleaved mode
// compression context
JlsContext _contexts[365];
CContextRunMode _contextRunmode[2];
@ -212,13 +220,6 @@ protected:
PIXEL* ptypePrev; // previous line ptr
PIXEL* ptypeCur; // current line ptr
// codec parameters
TRAITS traits;
Size _size;
int _components; // only set for line interleaved mode
int T3;
int T2;
int T1;
// quantization lookup table
signed char* _pquant;

2
test/CMakeLists.txt
View File

@ -1,2 +0,0 @@
# test for charlls
add_executable(charlstest test.cpp)

8
test/stdafx.cpp
View File

@ -1,8 +0,0 @@
// stdafx.cpp : source file that includes just the standard includes
// test.pch will be the pre-compiled header
// stdafx.obj will contain the pre-compiled type information
#include "stdafx.h"
// TODO: reference any additional headers you need in STDAFX.H
// and not in this file

17
test/stdafx.h
View File

@ -3,21 +3,22 @@
// are changed infrequently
//
#pragma once
#ifndef STDAFX
#define STDAFX
#if defined(WIN32)
#include <windows.h>
#pragma warning (disable: 4996)
#endif
#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
#include <stdio.h>
#include <tchar.h>
#ifdef _DEBUG
#include <assert.h>
#define ASSERT(t) assert(t)
#else
#define ASSERT(t) ;
#endif
typedef unsigned int UINT;
typedef unsigned char BYTE;
typedef unsigned short USHORT;
// TODO: reference additional headers your program requires here
#endif

71
test/test.cpp
View File

@ -3,21 +3,21 @@
#include "stdafx.h"
#include <windows.h>
#include <iostream>
#include <vector>
#include <time.h>
#include "../interface.h"
#include "../util.h"
#include "../defaulttraits.h"
#include "../losslesstraits.h"
#pragma warning (disable: 4996)
typedef const char* SZC;
namespace // local helpers
{
#if defined(WIN32)
double getTime()
{
LARGE_INTEGER time;
@ -28,6 +28,14 @@ double getTime()
return double(time.LowPart) * 1000.0/double(freq.LowPart);
}
#else
double getTime()
{
return clock() * 1000.0 /CLOCKS_PER_SEC;
}
#endif
void ReadFile(SZC strName, std::vector<BYTE>* pvec, int ioffs = 0)
{
FILE* pfile = fopen(strName, "rb");
@ -159,7 +167,7 @@ void TestCompliance(const BYTE* pbyteCompressed, int cbyteCompressed, const BYTE
}
}
int cbyteCompressedActual = 0;
// int cbyteCompressedActual = 0;
JLS_ERROR error = JpegLsVerifyEncode(&rgbyteRaw[0], cbyteRaw, pbyteCompressed, cbyteCompressed);
ASSERT(error == OK);
@ -236,10 +244,10 @@ void TestPerformance()
Size size1024 = Size(1024, 1024);
Size size512 = Size(512, 512);
// TestFile("..\\test\\mars\\phoenixmars.ppm", 40, Size(5300,4300), 8, 3);
TestFile("..\\test\\mr2_unc", 1728, size1024, 16, 1);
TestFile("..\\test\\0015.raw", 0, size1024, 8, 1);
TestFile("..\\test\\lena8b.raw", 0, size512, 8, 1);
// TestFile("../test/mars/phoenixmars.ppm", 40, Size(5300,4300), 8, 3);
TestFile("../test/mr2_unc", 1728, size1024, 16, 1);
TestFile("../test/0015.raw", 0, size1024, 8, 1);
TestFile("../test/lena8b.raw", 0, size512, 8, 1);
}
@ -327,7 +335,7 @@ void TestSampleAnnexH3()
void TestSmallBuffer()
{
std::vector<BYTE> rgbyteCompressed;
ReadFile("..\\test\\lena8b.jls", &rgbyteCompressed, 0);
ReadFile("../test/lena8b.jls", &rgbyteCompressed, 0);
std::vector<BYTE> rgbyteOut;
rgbyteOut.resize(512 * 511);
@ -339,7 +347,7 @@ void TestSmallBuffer()
void TestDamagedBitStream()
{
std::vector<BYTE> rgbyteCompressed;
ReadFile("..\\test\\lena8b.jls", &rgbyteCompressed, 0);
ReadFile("../test/lena8b.jls", &rgbyteCompressed, 0);
rgbyteCompressed.resize(900);
rgbyteCompressed.resize(40000,3);
@ -357,56 +365,69 @@ void TestConformance()
{
// Test 1
DecompressFile("..\\test\\conformance\\t8c0e0.jls", "..\\test\\conformance\\test8.ppm",15);
DecompressFile("../test/conformance/t8c0e0.jls", "../test/conformance/test8.ppm",15);
// Test 2
DecompressFile("..\\test\\conformance\\t8c1e0.jls", "..\\test\\conformance\\test8.ppm",15);
DecompressFile("../test/conformance/t8c1e0.jls", "../test/conformance/test8.ppm",15);
// Test 3
DecompressFile("..\\test\\conformance\\t8c2e0.jls", "..\\test\\conformance\\test8.ppm", 15);
DecompressFile("../test/conformance/t8c2e0.jls", "../test/conformance/test8.ppm", 15);
// Test 4
DecompressFile("..\\test\\conformance\\t8c0e3.jls", "..\\test\\conformance\\test8.ppm",15);
DecompressFile("../test/conformance/t8c0e3.jls", "../test/conformance/test8.ppm",15);
// Test 5
DecompressFile("..\\test\\conformance\\t8c1e3.jls", "..\\test\\conformance\\test8.ppm",15);
DecompressFile("../test/conformance/t8c1e3.jls", "../test/conformance/test8.ppm",15);
// Test 6
DecompressFile("..\\test\\conformance\\t8c2e3.jls", "..\\test\\conformance\\test8.ppm",15);
DecompressFile("../test/conformance/t8c2e3.jls", "../test/conformance/test8.ppm",15);
// Test 7
// Test 8
// Test 9
DecompressFile("..\\test\\conformance\\t8nde0.jls", "..\\test\\conformance\\test8bs2.pgm",15);
DecompressFile("../test/conformance/t8nde0.jls", "../test/conformance/test8bs2.pgm",15);
// Test 10
DecompressFile("..\\test\\conformance\\t8nde3.jls", "..\\test\\conformance\\test8bs2.pgm",15);
DecompressFile("../test/conformance/t8nde3.jls", "../test/conformance/test8bs2.pgm",15);
// Test 11
DecompressFile("..\\test\\conformance\\t16e0.jls", "..\\test\\conformance\\test16.pgm",16);
DecompressFile("../test/conformance/t16e0.jls", "../test/conformance/test16.pgm",16);
// Test 12
DecompressFile("..\\test\\conformance\\t16e3.jls", "..\\test\\conformance\\test16.pgm",16);
DecompressFile("../test/conformance/t16e3.jls", "../test/conformance/test16.pgm",16);
// additional, Lena compressed with other codec (UBC?), vfy with CharLS
DecompressFile("..\\test\\lena8b.jls", "..\\test\\lena8b.raw",0);
DecompressFile("../test/lena8b.jls", "../test/lena8b.raw",0);
}
int _tmain(int argc, _TCHAR* argv[])
int main(int argc, char* argv[])
{
TestDamagedBitStream();
TestSmallBuffer();
TestConformance();
printf("Test Annex H3\r\n");
TestSampleAnnexH3();
printf("Test Traits\r\n");
TestTraits16bit();
TestTraits8bit();
printf("Test Damaged bitstream\r\n");
TestDamagedBitStream();
printf("Test Small buffer\r\n");
TestSmallBuffer();
printf("Test Conformance\r\n");
TestConformance();
printf("Test Perf\r\n");
TestPerformance();
TestNoiseImage();
char c;

42
test/test.vcproj
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="9.00"
Version="9,00"
Name="test"
ProjectGUID="{3E349E7B-30C2-4791-81B7-1108014291B7}"
RootNamespace="test"
@ -49,7 +49,7 @@
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="2"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="4"
@ -129,7 +129,7 @@
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="2"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="3"
@ -347,42 +347,6 @@
Name="Source Files"
Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"
>
<File
RelativePath="stdafx.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="1"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="1"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="1"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="1"
/>
</FileConfiguration>
</File>
<File
RelativePath="test.cpp"
>