[Avidemux-svn-commit] r5442 - in branches/avidemux_2.6_branch_mean/avidemux/common: ADM_editor ADM_script
mean at BerliOS
mean at mail.berlios.de
Thu Nov 5 19:24:36 CET 2009
Author: mean
Date: 2009-11-05 19:24:29 +0100 (Thu, 05 Nov 2009)
New Revision: 5442
Modified:
branches/avidemux_2.6_branch_mean/avidemux/common/ADM_editor/ADM_edit.cpp
branches/avidemux_2.6_branch_mean/avidemux/common/ADM_editor/ADM_edit.hxx
branches/avidemux_2.6_branch_mean/avidemux/common/ADM_script/ADM_JSAvidemuxVideo.cpp
branches/avidemux_2.6_branch_mean/avidemux/common/ADM_script/ADM_JSAvidemuxVideo.h
Log:
[JS] Add app.video.dumpEditing() function
Modified: branches/avidemux_2.6_branch_mean/avidemux/common/ADM_editor/ADM_edit.cpp
===================================================================
--- branches/avidemux_2.6_branch_mean/avidemux/common/ADM_editor/ADM_edit.cpp 2009-11-04 06:47:54 UTC (rev 5441)
+++ branches/avidemux_2.6_branch_mean/avidemux/common/ADM_editor/ADM_edit.cpp 2009-11-05 18:24:29 UTC (rev 5442)
@@ -575,5 +575,15 @@
{
return _segments.removeChunk(start,end);
}
+/**
+ \fn dumpEditing
+ \brief Dump segment, video & al
+*/
+bool ADM_Composer::dumpEditing(void)
+{
+ _segments.dump();
+ return true;
+}
+
//
//
Modified: branches/avidemux_2.6_branch_mean/avidemux/common/ADM_editor/ADM_edit.hxx
===================================================================
--- branches/avidemux_2.6_branch_mean/avidemux/common/ADM_editor/ADM_edit.hxx 2009-11-04 06:47:54 UTC (rev 5441)
+++ branches/avidemux_2.6_branch_mean/avidemux/common/ADM_editor/ADM_edit.hxx 2009-11-05 18:24:29 UTC (rev 5442)
@@ -101,6 +101,8 @@
ADM_PP _pp; // Postprocessing settings
ADMImage *_imageBuffer; // Temp buffer used for decoding
uint32_t _currentSegment; // Current video segment
+ uint64_t _nextFrameDts; // COPYMODE Used in copy mode to fill the missing timestamp
+ // Warning, it is actually the DTS of the NEXT frame to fetch
//****************************** Audio **********************************
// _audiooffset points to the offset / the total segment
// not the used part !
@@ -153,7 +155,7 @@
bool rewind(void);
// Used for stream copy
bool GoToIntraTime_noDecoding(uint64_t time,uint32_t *toframe=NULL);
- bool getCompressedPicture(ADMCompressedImage *img);
+ bool getCompressedPicture(ADMCompressedImage *img); //COPYMODE
public:
uint8_t updateVideoInfo(aviInfo *info);
uint32_t getSpecificMpeg4Info( void );
@@ -206,6 +208,7 @@
bool remove(uint64_t start,uint64_t end);
bool addSegment(uint32_t ref, uint64_t startRef, uint64_t duration);
bool clearSegment(void);
+ bool dumpEditing(void);
/******************************* /Editing **********************************/
/******************************* Misc ************************************/
uint8_t setEnv(_ENV_EDITOR_FLAGS newflag);
Modified: branches/avidemux_2.6_branch_mean/avidemux/common/ADM_script/ADM_JSAvidemuxVideo.cpp
===================================================================
--- branches/avidemux_2.6_branch_mean/avidemux/common/ADM_script/ADM_JSAvidemuxVideo.cpp 2009-11-04 06:47:54 UTC (rev 5441)
+++ branches/avidemux_2.6_branch_mean/avidemux/common/ADM_script/ADM_JSAvidemuxVideo.cpp 2009-11-05 18:24:29 UTC (rev 5442)
@@ -52,17 +52,20 @@
{ "saveJpeg", SaveJPEG, 1, 0, 0 }, // save the current frame as a JPEG
{ "listBlackFrames", ListBlackFrames, 1, 0, 0 }, // output a list of the black frame to a file
{ "setPostProc", PostProcess, 3, 0, 0 }, // Postprocess
- { "setFps1000", SetFps1000, 1, 0, 0 }, // Postprocess
- { "getFps1000", GetFps1000, 0, 0, 0 }, // Postprocess
- { "getNbFrames", GetNbFrames, 0, 0, 0 }, // Postprocess
- { "getWidth", GetWidth, 0, 0, 0 }, // Postprocess
- { "getHeight", GetHeight, 0, 0, 0 }, // Postprocess
- { "getFCC", GetFCC, 0, 0, 0 }, // Postprocess
- { "isVopPacked", isVopPacked, 0, 0, 0 }, // Postprocess
- { "hasQpel", hasQpel, 0, 0, 0 }, // Postprocess
- { "hasGmc", hasGmc, 0, 0, 0 }, // Postprocess
- { "frameSize", getFrameSize, 1, 0, 0 }, // FrameSize
- { "frameType", getFrameType, 1, 0, 0 }, // Postprocess
+ { "setFps1000", SetFps1000, 1, 0, 0 }, // Postprocess
+ { "getFps1000", GetFps1000, 0, 0, 0 }, // Postprocess
+ { "getNbFrames", GetNbFrames, 0, 0, 0 }, // Postprocess
+ { "getWidth", GetWidth, 0, 0, 0 }, // Postprocess
+ { "getHeight", GetHeight, 0, 0, 0 }, // Postprocess
+ { "getFCC", GetFCC, 0, 0, 0 }, // Postprocess
+ { "isVopPacked", isVopPacked, 0, 0, 0 }, // Postprocess
+ { "hasQpel", hasQpel, 0, 0, 0 }, // Postprocess
+ { "hasGmc", hasGmc, 0, 0, 0 }, // Postprocess
+ { "frameSize", getFrameSize, 1, 0, 0 }, // FrameSize
+ { "frameType", getFrameType, 1, 0, 0 }, // Postprocess
+
+
+ { "dumpEditing", dumpEditing,0,0,0},
{ 0 }
};
@@ -607,4 +610,23 @@
#endif
return JS_TRUE;
}// end PostProcess
+/**
+ \fn dumpEditing
+ \brief dump segment, video & all
+*/
+JSBool ADM_JSAvidemuxVideo::dumpEditing(JSContext *cx, JSObject *obj, uintN argc,
+ jsval *argv, jsval *rval)
+{// begin PostProcess
+uint32_t info;
+uint32_t frame;
+uint32_t sz;
+ if(argc != 0)
+ return JS_FALSE;
+
+ enterLock();
+ video_body->dumpEditing();
+ leaveLock();
+
+ return JS_TRUE;
+}// end PostProcess
/* EOF */
Modified: branches/avidemux_2.6_branch_mean/avidemux/common/ADM_script/ADM_JSAvidemuxVideo.h
===================================================================
--- branches/avidemux_2.6_branch_mean/avidemux/common/ADM_script/ADM_JSAvidemuxVideo.h 2009-11-04 06:47:54 UTC (rev 5441)
+++ branches/avidemux_2.6_branch_mean/avidemux/common/ADM_script/ADM_JSAvidemuxVideo.h 2009-11-05 18:24:29 UTC (rev 5442)
@@ -45,6 +45,7 @@
static JSBool hasQpel(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
static JSBool getFrameSize(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
static JSBool getFrameType(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
+ static JSBool dumpEditing(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
static JSPropertySpec avidemuxvideo_properties[];
More information about the Avidemux-svn-commit
mailing list