diff options
Diffstat (limited to 'rotord')
| -rwxr-xr-x | rotord/libavwrapper.cpp | 6 | ||||
| -rwxr-xr-x | rotord/rotor.cpp | 6 | ||||
| -rwxr-xr-x | rotord/rotor.h | 3 | ||||
| -rwxr-xr-x | rotord/rotord.cpp | 2 |
4 files changed, 9 insertions, 8 deletions
diff --git a/rotord/libavwrapper.cpp b/rotord/libavwrapper.cpp index 08d943f..d5ee9cf 100755 --- a/rotord/libavwrapper.cpp +++ b/rotord/libavwrapper.cpp @@ -224,7 +224,7 @@ bool libav::decoder::openUsingInitializedContainer(enum PixelFormat formatParam) - numFrames=container->streams[videoStream]->nb_frames-1; + numFrames=container->streams[videoStream]->nb_frames-2; if (numFrames<1){ //some codecs don't keep this info in the header @@ -311,7 +311,9 @@ bool libav::decoder::fetchFrame(int w, int h,int targetFrameIndex) reinit_buffers_and_scaler(); } - fetchFrame(targetFrameIndex); + //seems to crash out on the last frame, if it can be caught should maybe decrement number of frames + + return fetchFrame(targetFrameIndex); } bool libav::decoder::fetchFrame(int targetFrameIndex) diff --git a/rotord/rotor.cpp b/rotord/rotor.cpp index c929fae..2d33755 100755 --- a/rotord/rotor.cpp +++ b/rotord/rotor.cpp @@ -393,8 +393,10 @@ Image* Video_loader::output(const Frame_spec &frame){ return ℑ } - //confusingly, crashes with files not made with ffmpeg/ short files? - + //confusingly, crashes with files not made with short files? + //seems to be on last frame? - returns nullptr - still tries to clone? + //can't really return 1st frame instead, should get # of frames right 1st? + //think about what echo trails does on the last frame return nullptr; }; diff --git a/rotord/rotor.h b/rotord/rotor.h index 9d4f625..7430ab0 100755 --- a/rotord/rotor.h +++ b/rotord/rotor.h @@ -884,9 +884,6 @@ namespace Rotor { //it could be hugely beneficial to only do the LUT once? //although maybe the way to do the fading is to have a LUT for each frame? - //2 inputs - "This frame" and "keyed" - //hmm, that is clumsy, could it inherit from luma_levels - //or is it actually best to use alpha keying after all! public: Echo_trails(){}; diff --git a/rotord/rotord.cpp b/rotord/rotord.cpp index 15210e9..c47823d 100755 --- a/rotord/rotord.cpp +++ b/rotord/rotord.cpp @@ -168,8 +168,8 @@ HTTPRequestHandler* RotorRequestHandlerFactory::createRequestHandler(const HTTPS //just invoking sID if (request.getMethod()=="DELETE") { task->cancel(); - XML.addValue("status","1"); status=HTTPResponse::HTTP_OK; + XML.addValue("status","context deleted succesfully"); } else { XML.addValue("error","Render context invoked with no command"); |