ScummVM/scummvm-tools
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm-tools.git synced 2026-05-21 05:40:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

TOOLS: Allow selecting the compression type in encode_dxa

Browse Source
This commit is contained in:
Cameron Cawley
2023-04-04 22:29:15 +01:00
committed by Eugene Sandulenko
parent 14de6343a7
commit 7fa0ecd7d7
2 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
encode_dxa.cpp
+19 -7
View File
@@ -51,6 +51,7 @@ private:
int _width, _height, _framerate, _framecount, _workheight;
uint8 *_prevframe, *_prevpalette;
ScaleMode _scaleMode;
byte _compType;
byte *_codeBuf, *_dataBuf, *_motBuf, *_maskBuf;
void grabBlock(byte *frame, int x, int y, int blockw, int blockh, byte *block);
@@ -62,14 +63,14 @@ private:
uLong m13encode(byte *frame, byte *outbuf);
public:
DxaEncoder(Tool &tool, Common::Filename filename, int width, int height, int framerate, ScaleMode scaleMode);
DxaEncoder(Tool &tool, Common::Filename filename, int width, int height, int framerate, ScaleMode scaleMode, byte compType);
~DxaEncoder();
void writeHeader();
void writeNULL();
void writeFrame(uint8 *frame, uint8 *palette);
};
DxaEncoder::DxaEncoder(Tool &tool, Common::Filename filename, int width, int height, int framerate, ScaleMode scaleMode) {
DxaEncoder::DxaEncoder(Tool &tool, Common::Filename filename, int width, int height, int framerate, ScaleMode scaleMode, byte compType) {
_dxa.open(filename, "wb");
_width = width;
_height = height;
@@ -79,6 +80,7 @@ DxaEncoder::DxaEncoder(Tool &tool, Common::Filename filename, int width, int hei
_prevpalette = new uint8[768];
_scaleMode = scaleMode;
_workheight = _scaleMode == S_NONE ? _height : _height / 2;
_compType = compType;
_codeBuf = new byte[_width * _height / 16];
_dataBuf = new byte[_width * _height];
@@ -145,7 +147,7 @@ void DxaEncoder::writeFrame(byte *frame, byte *palette) {
if (_framecount == 0)
compType = 2;
else
compType = 13;
compType = _compType;
switch (compType) {
@@ -536,7 +538,7 @@ uLong DxaEncoder::m13encode(byte *frame, byte *outbuf) {
return outb - outbuf;
}
EncodeDXA::EncodeDXA(const std::string &name) : CompressionTool(name, TOOLTYPE_COMPRESSION) {
EncodeDXA::EncodeDXA(const std::string &name) : CompressionTool(name, TOOLTYPE_COMPRESSION), _compType(13) {
ToolInput input;
input.format = "*.*";
@@ -548,6 +550,16 @@ EncodeDXA::EncodeDXA(const std::string &name) : CompressionTool(name, TOOLTYPE_C
"Output will be two files, one with .dxa extension and the other depending on the used audio codec.";
}
void EncodeDXA::parseExtraArguments() {
if (!_arguments.empty()) {
if (_arguments.front() == "-c") {
_arguments.pop_front();
_compType = atoi(_arguments.front().c_str());
_arguments.pop_front();
}
}
}
void EncodeDXA::execute() {
int width, height, framerate, frames;
ScaleMode scaleMode;
@@ -570,12 +582,12 @@ void EncodeDXA::execute() {
// read some data from the Bink or Smacker file.
readVideoInfo(&inpath, width, height, framerate, frames, scaleMode);
print("Width = %d, Height = %d, Framerate = %d, Frames = %d",
width, height, framerate, frames);
print("Width = %d, Height = %d, Framerate = %d, Frames = %d, Compression type = %d",
width, height, framerate, frames, _compType);
// create the encoder object
outpath.setExtension(".dxa");
DxaEncoder dxe(*this, outpath, width, height, framerate, scaleMode);
DxaEncoder dxe(*this, outpath, width, height, framerate, scaleMode, _compType);
// No sound block
dxe.writeNULL();
encode_dxa.h
+2
View File
@@ -35,10 +35,12 @@ class EncodeDXA : public CompressionTool {
public:
EncodeDXA(const std::string &name = "encode_dxa");
virtual void parseExtraArguments();
virtual void execute();
protected:
byte _compType;
void convertWAV(const Common::Filename *inpath, const Common::Filename* outpath);
void readVideoInfo(Common::Filename *filename, int &width, int &height, int &framerate, int &frames, ScaleMode &scaleMode);