projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add 2 asset list fmts, user title rework, added show edit, bt tweak
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
videodevice.C
diff --git
a/cinelerra-5.1/cinelerra/videodevice.C
b/cinelerra-5.1/cinelerra/videodevice.C
index fbad636f2b34f2bafadff09b6b881472026cd1ba..78214adacacf00fc6b8cf1aedd793861bfd3fe41 100644
(file)
--- a/
cinelerra-5.1/cinelerra/videodevice.C
+++ b/
cinelerra-5.1/cinelerra/videodevice.C
@@
-29,7
+29,9
@@
#include "edl.h"
#include "edlsession.h"
#include "file.inc"
#include "edl.h"
#include "edlsession.h"
#include "file.inc"
+#ifdef HAVE_DV
#include "libdv.h"
#include "libdv.h"
+#endif
#include "libmjpeg.h"
#include "mainmenu.h"
#include "mutex.h"
#include "libmjpeg.h"
#include "mainmenu.h"
#include "mutex.h"
@@
-190,6
+192,8
@@
int VideoDevice::initialize()
single_frame = 0;
channel_changed = 0;
picture_changed = 0;
single_frame = 0;
channel_changed = 0;
picture_changed = 0;
+ odd_field_first = 0;
+ do_cursor = 0;
return 0;
}
return 0;
}
@@
-347,11
+351,12
@@
void VideoDevice::fix_asset(Asset *asset, int driver)
// Fix asset using legacy routine
const char *vcodec = 0;
switch(driver) {
// Fix asset using legacy routine
const char *vcodec = 0;
switch(driver) {
+#ifdef HAVE_DV
case CAPTURE_IEC61883:
case CAPTURE_FIREWIRE:
vcodec = CODEC_TAG_DVSD;
break;
case CAPTURE_IEC61883:
case CAPTURE_FIREWIRE:
vcodec = CODEC_TAG_DVSD;
break;
-
+#endif
case VIDEO4LINUX2JPEG:
vcodec = CODEC_TAG_MJPEG;
break;
case VIDEO4LINUX2JPEG:
vcodec = CODEC_TAG_MJPEG;
break;
@@
-492,6
+497,21
@@
int VideoDevice::set_field_order(int odd_field_first)
return 0;
}
return 0;
}
+void VideoDevice::set_do_cursor(int do_cursor, int do_big_cursor)
+{
+ int cursor_scale = 0;
+ if(do_cursor)
+ {
+ cursor_scale = 1;
+ if(do_big_cursor)
+ {
+ cursor_scale = 2;
+ }
+ }
+
+ this->do_cursor = cursor_scale;
+}
+
int VideoDevice::set_channel(Channel *channel)
{
int result = 0;
int VideoDevice::set_channel(Channel *channel)
{
int result = 0;
@@
-697,10
+717,10
@@
void VideoDevice::goose_input()
if(input_base) input_base->goose_input();
}
if(input_base) input_base->goose_input();
}
-void VideoDevice::new_output_buffer(VFrame **output, int colormodel)
+void VideoDevice::new_output_buffer(VFrame **output, int colormodel
, EDL *edl
)
{
if(!output_base) return;
{
if(!output_base) return;
- output_base->new_output_buffer(output, colormodel);
+ output_base->new_output_buffer(output, colormodel
, edl
);
}
}