Skip to content

Commit

Permalink
Fix parsing and logic errors
Browse files Browse the repository at this point in the history 
Video clips with varying lengths are no longer valid in ReplaceFrameSimple and RemapFrames (as they shouldn't be).
RemapFrames now functions properly (Fixed #3)
  • Loading branch information
@blaze077
blaze077 authored Sep 2, 2019
1 parent 0232654 commit 4676f0d
Show file tree
Hide file tree
Showing 4 changed files with 68 additions and 70 deletions.
9 changes: 5 additions & 4 deletions Common.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,18 +101,19 @@ MismatchCauses findCommonVi(VSVideoInfo *outVi, VSNodeRef *node2, const VSAPI *v
mismatch = MismatchCauses::DIFFERENT_DIMENSIONS;
}

if (outVi->format != vi->format) {
else if (outVi->format != vi->format) {
outVi->format = 0;
mismatch = MismatchCauses::DIFFERENT_FORMATS;
}

if (outVi->fpsNum != vi->fpsNum || outVi->fpsDen != vi->fpsDen) {
else if (outVi->fpsNum != vi->fpsNum || outVi->fpsDen != vi->fpsDen) {
outVi->fpsDen = 0;
outVi->fpsNum = 0;
mismatch = MismatchCauses::DIFFERENT_FRAMERATES;
}
if (outVi->numFrames < vi->numFrames) {
outVi->numFrames = vi->numFrames;
else if (outVi->numFrames != vi->numFrames) {
if(outVi->numFrames < vi->numFrames)
outVi->numFrames = vi->numFrames;
mismatch = MismatchCauses::DIFFERENT_LENGTHS;
}
}
Expand Down
110 changes: 55 additions & 55 deletions RemapFrames.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,15 @@ static const VSFrameRef *VS_CC remapGetFrame(int n, int activationReason, void *
RemapData *d{ static_cast<RemapData*>(*instanceData) };

if (activationReason == arInitial) {
//We check whether node2 is a null pointer. If it is, we use baseclip (node1).
//Else, sourceclip (node2) is used.
vsapi->requestFrameFilter(d->frameMap[n], (d->node2 ? d->node2 : d->node1), frameCtx);
if (d->frameMap[n] == UINT_MAX)
vsapi->requestFrameFilter(n, d->node1, frameCtx);
else
vsapi->requestFrameFilter(d->frameMap[n], d->node2, frameCtx);
}
else if (activationReason == arAllFramesReady) {
return vsapi->getFrameFilter(d->frameMap[n], (d->node2 ? d->node2 : d->node1), frameCtx);
if (d->frameMap[n] == UINT_MAX)
return vsapi->getFrameFilter(n, d->node1, frameCtx);
return vsapi->getFrameFilter(d->frameMap[n], d->node2, frameCtx);
}

return nullptr;
Expand All @@ -30,7 +33,7 @@ static const VSFrameRef *VS_CC remapGetFrame(int n, int activationReason, void *
static void VS_CC remapFree(void *instanceData, VSCore *core, const VSAPI *vsapi) {
RemapData *d{ static_cast<RemapData*>(instanceData) };
vsapi->freeNode(d->node1);
if (d->node2)
if (d->node1 != d->node2)
vsapi->freeNode(d->node2);
delete d;
}
Expand Down Expand Up @@ -78,7 +81,7 @@ static void matchRangeToRange(const std::string &str, int &col, std::vector<unsi
//
//If it isn't able to parse the string as any of the above three patterns, it throws a runtime error (Parse Error).
//Runtime errors (Index out of Bounds, Overflow, or Parse errors) can also be thrown from inside getInt and fillRange.
static void parse(std::string name, std::vector<unsigned int> &frameMap, void *stream, bool file, int maxFrames) {
static void parse(std::string name, std::vector<unsigned int> &frameMap, void *stream, bool file, int maxFrames, const VSAPI *vsapi) {

int line{ 0 }; //Current line. This is simply for throwing detailed errors and has no other use.
int col{ 0 }; //Current column. This is used to track the current column position in the string we are at.
Expand All @@ -93,42 +96,40 @@ static void parse(std::string name, std::vector<unsigned int> &frameMap, void *s
std::string temp;
while (file ? std::getline(*static_cast<std::ifstream*>(stream), temp) : std::getline(*static_cast<std::stringstream*>(stream), temp)) {
col = 0;
skipWhitespace(temp, col);
char ch{ getChar(temp, col) };
if (ch != 0) {
if (ch == '#')
continue;
else if (std::isdigit(ch) || ch == '-')
matchIntToInt(temp, col, frameMap, line, file, maxFrames);
else if (ch == '[') {
++col;
Range rangeIn;
fillRange(temp, col, rangeIn, line, file, maxFrames, Filter::REMAP_FRAMES);
if (rangeIn.start > rangeIn.end) {
while (col < temp.size()) {
skipWhitespace(temp, col);
char ch{ getChar(temp, col) };
if (ch != 0) {
if (ch == '#')
continue;
else if (std::isdigit(ch) || ch == '-')
matchIntToInt(temp, col, frameMap, line, file, maxFrames);
else if (ch == '[') {
++col;
Range rangeIn;
fillRange(temp, col, rangeIn, line, file, maxFrames, Filter::REMAP_FRAMES);
if (rangeIn.start > rangeIn.end) {
std::string location{ file ? " text file " : " mappings " };
std::string error{ "RemapFrames: Index out of bounds in" + location + "at line " + std::to_string(line + 1) + ", column " + std::to_string(col + 1) };
throw std::runtime_error(error);
}
skipWhitespace(temp, col);
ch = getChar(temp, col);
if (ch != 0) {
if (std::isdigit(ch) || ch == '-') {
matchRangeToInt(temp, col, frameMap, rangeIn, line, file, maxFrames);
}
else if (ch == '[') {
++col;
matchRangeToRange(temp, col, frameMap, rangeIn, line, file, maxFrames);
}
}
}
else {
std::string location{ file ? " text file " : " mappings " };
std::string error{ "RemapFrames: Index out of bounds in" + location + "at line " + std::to_string(line + 1) + ", column " + std::to_string(col + 1) };
std::string error{ "RemapFrames: Parse Error in" + location + "at line " + std::to_string(line + 1) + ", column " + std::to_string(col + 1) };
throw std::runtime_error(error);
}
skipWhitespace(temp, col);
ch = getChar(temp, col);
if (ch != 0) {
if (std::isdigit(ch) || ch == '-')
matchRangeToInt(temp, col, frameMap, rangeIn, line, file, maxFrames);
else if (ch == '[')
++col;
matchRangeToRange(temp, col, frameMap, rangeIn, line, file, maxFrames);
}
}
else {
std::string location{ file ? " text file " : " mappings " };
std::string error{ "RemapFrames: Parse Error in" + location + "at line " + std::to_string(line + 1) + ", column " + std::to_string(col + 1) };
throw std::runtime_error(error);
}
skipWhitespace(temp, col);
if (col != temp.size()) {
std::string location{ file ? " text file " : " mappings " };
std::string error{ "RemapFrames: Parse Error in" + location + "at line " + std::to_string(line + 1) + ", column " + std::to_string(col + 1) };
throw std::runtime_error(error);
}
}
line++;
Expand All @@ -148,18 +149,18 @@ void VS_CC remapCreate(const VSMap *in, VSMap *out, void *userData, VSCore *core
filename = "";
else
filename = fn;

std::string mappings;
const char* mp{ vsapi->propGetData(in, "mappings", 0, &err) };
if (err)
mappings = "";
else
mappings = mp;

//If sourceclip is not provided, we set node2 to a null pointer.
//If sourceclip is not provided, we set sourceclip equal to baseclip.
d.node2 = vsapi->propGetNode(in, "sourceclip", 0, &err);
if (err)
d.node2 = nullptr;
d.node2 = d.node1;

bool mismatch{ !!vsapi->propGetInt(in, "mismatch", 0, &err) };
if (err)
Expand All @@ -169,9 +170,12 @@ void VS_CC remapCreate(const VSMap *in, VSMap *out, void *userData, VSCore *core
MismatchCauses mismatchCause = findCommonVi(&d.vi, d.node2, vsapi);
if (mismatchCause == MismatchCauses::DIFFERENT_LENGTHS) {
vsapi->setError(out, "RemapFrames: Clip lengths don't match");
//Free baseclip.
vsapi->freeNode(d.node1);
if (d.node2)
vsapi->freeNode(d.node2); //We check whether node2 is a null pointer. If it isn't, we free the node.
//If sourceclip and baseclip aren't the same, then free sourceclip.
//freeNode(node) doesn't change the value of node so the comparison is safe.
if (d.node1 != d.node2)
vsapi->freeNode(d.node2);
return;
}

Expand All @@ -183,19 +187,15 @@ void VS_CC remapCreate(const VSMap *in, VSMap *out, void *userData, VSCore *core
else if (mismatchCause == MismatchCauses::DIFFERENT_FRAMERATES)
vsapi->setError(out, "RemapFrames: Clip frame rates don't match");
vsapi->freeNode(d.node1);
if (d.node2)
if (d.node1 != d.node2)
vsapi->freeNode(d.node2);
return;
}

//We use a vector to store frame mappings. Each index represents a frame number,
//and each value at that index represents which frame it going to be replaced with.
d.frameMap.resize(d.vi.numFrames);

//All frames map to themselves by default.
for (int i = 0; i < d.frameMap.size(); i++) {
d.frameMap[i] = i;
}
//A value of UINT_MAX indicates that the frame doesn't need to be replaced.
d.frameMap.assign(d.vi.numFrames, UINT_MAX);

//Enclosed in a try catch block to catch any runtime errors.
//Frame mappings in the mappings string have higher precedence than
Expand All @@ -207,21 +207,21 @@ void VS_CC remapCreate(const VSMap *in, VSMap *out, void *userData, VSCore *core
if (!file) {
vsapi->setError(out, "RemapFrames: Failed to open the timecodes file.");
vsapi->freeNode(d.node1);
if (d.node2)
if (d.node1 != d.node2)
vsapi->freeNode(d.node2);
return;
}
parse(filename, d.frameMap, &file, true, d.vi.numFrames);
parse(filename, d.frameMap, &file, true, d.vi.numFrames, vsapi);
}
if (!mappings.empty()) {
std::stringstream stream(mappings);
parse(mappings, d.frameMap, &stream, false, d.vi.numFrames);
parse(mappings, d.frameMap, &stream, false, d.vi.numFrames, vsapi);
}
}
catch (const std::exception &ex) {
vsapi->setError(out, ex.what());
vsapi->freeNode(d.node1);
if (d.node2)
if (d.node1 != d.node2)
vsapi->freeNode(d.node2);
return;
}
Expand Down
2 changes: 1 addition & 1 deletion RemapFramesSimple.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ void VS_CC remapSimpleCreate(const VSMap *in, VSMap *out, void *userData, VSCore
if (!filename.empty()) {
std::ifstream file(filename);
if (!file) {
vsapi->setError(out, "RemapFrames: Failed to open the timecodes file.");
vsapi->setError(out, "RemapFramesSimple: Failed to open the timecodes file.");
vsapi->freeNode(d.node);
return;
}
Expand Down
17 changes: 7 additions & 10 deletions ReplaceFramesSimple.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,37 +101,34 @@ void VS_CC replaceCreate(const VSMap *in, VSMap *out, void *userData, VSCore *co

MismatchCauses mismatchCause = findCommonVi(&d.vi, d.node2, vsapi);
if (mismatchCause == MismatchCauses::DIFFERENT_LENGTHS) {
vsapi->setError(out, "RemapFrames: Clip lengths don't match");
vsapi->setError(out, "ReplaceFramesSimple: Clip lengths don't match");
vsapi->freeNode(d.node1);
vsapi->freeNode(d.node2);
return;
}

if (static_cast<bool>(mismatchCause) && (!mismatch)) {
if (mismatchCause == MismatchCauses::DIFFERENT_DIMENSIONS)
vsapi->setError(out, "RemapFrames: Clip dimensions don't match");
vsapi->setError(out, "ReplaceFramesSimple: Clip dimensions don't match");
else if (mismatchCause == MismatchCauses::DIFFERENT_FORMATS)
vsapi->setError(out, "RemapFrames: Clip formats don't match");
vsapi->setError(out, "ReplaceFramesSimple: Clip formats don't match");
else if (mismatchCause == MismatchCauses::DIFFERENT_FRAMERATES)
vsapi->setError(out, "RemapFrames: Clip frame rates don't match");
vsapi->setError(out, "ReplaceFramesSimple: Clip frame rates don't match");
vsapi->freeNode(d.node1);
vsapi->freeNode(d.node2);
return;
}

d.frameMap.resize(d.vi.numFrames);

//All frames map to baseclip by default
//0 = baseclip
//1 = sourceclip
for (int i = 0; i < d.frameMap.size(); i++) {
d.frameMap[i] = 0;
}
d.frameMap.assign(d.vi.numFrames, 0);

try {
if (!filename.empty()) {
std::ifstream file(filename);
if (!file) {
vsapi->setError(out, "RemapFrames: Failed to open the timecodes file.");
vsapi->setError(out, "ReplaceFramesSimple: Failed to open the timecodes file.");
vsapi->freeNode(d.node1);
vsapi->freeNode(d.node2);
return;
Expand Down

0 comments on commit 4676f0d

Please sign in to comment.