ardour/livetrax
13
0
Fork 0
Code

Merge branch 'cairocanvas' of git.ardour.org:ardour/ardour into cairocanvas

Browse Source
This commit is contained in:
Paul Davis 2013-04-16 20:38:17 -04:00
commit 6b78532dd5
8 changed files with 107 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk2_ardour/editor.h
View File

@ -893,9 +893,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
Gtk::Label cd_mark_label;
/* videtimline related actions */
ArdourCanvas::Rectangle* videotl_bar;
Gtk::Label videotl_label;
ArdourCanvas::Group* videotl_bar_group;
ArdourCanvas::Group* videotl_group;
Glib::RefPtr<Gtk::ToggleAction> ruler_video_action;
Glib::RefPtr<Gtk::ToggleAction> xjadeo_proc_action;

10
gtk2_ardour/editor_canvas.cc
View File

@ -145,10 +145,7 @@ Editor::initialize_canvas ()
cd_marker_group = new ArdourCanvas::Group (_time_markers_group, ArdourCanvas::Duple (0.0, 0.0));
videotl_group = new ArdourCanvas::Group (_time_markers_group, ArdourCanvas::Duple(0.0, 0.0));
videotl_bar_group = new ArdourCanvas::Group (_time_bars_canvas->root ());
videotl_bar = new ArdourCanvas::Rectangle (videotl_bar_group, ArdourCanvas::Rect (0.0, 0.0, 100,(timebar_height * videotl_bar_height)));
ARDOUR_UI::instance()->video_timeline = new VideoTimeLine(this, videotl_bar_group, (timebar_height * videotl_bar_height));
ARDOUR_UI::instance()->video_timeline = new VideoTimeLine(this, videotl_group, (timebar_height * videotl_bar_height));
cd_marker_bar_drag_rect = new ArdourCanvas::Rectangle (cd_marker_group, ArdourCanvas::Rect (0.0, 0.0, 100, timebar_height));
cd_marker_bar_drag_rect->set_outline (false);
@ -193,7 +190,7 @@ Editor::initialize_canvas ()
meter_bar->Event.connect (sigc::bind (sigc::mem_fun (*this, &Editor::canvas_meter_bar_event), meter_bar));
marker_bar->Event.connect (sigc::bind (sigc::mem_fun (*this, &Editor::canvas_marker_bar_event), marker_bar));
cd_marker_bar->Event.connect (sigc::bind (sigc::mem_fun (*this, &Editor::canvas_cd_marker_bar_event), cd_marker_bar));
videotl_bar_group->Event.connect (sigc::bind (sigc::mem_fun (*this, &Editor::canvas_videotl_bar_event), videotl_bar));
videotl_group->Event.connect (sigc::bind (sigc::mem_fun (*this, &Editor::canvas_videotl_bar_event), videotl_group));
range_marker_bar->Event.connect (sigc::bind (sigc::mem_fun (*this, &Editor::canvas_range_marker_bar_event), range_marker_bar));
transport_marker_bar->Event.connect (sigc::bind (sigc::mem_fun (*this, &Editor::canvas_transport_marker_bar_event), transport_marker_bar));
@ -774,9 +771,6 @@ Editor::color_handler()
cd_marker_bar->set_fill_color (ARDOUR_UI::config()->canvasvar_CDMarkerBar.get());
cd_marker_bar->set_outline_color (ARDOUR_UI::config()->canvasvar_MarkerBarSeparator.get());
videotl_bar->set_fill_color (ARDOUR_UI::config()->canvasvar_VideoBar.get());
videotl_bar->set_outline_color (ARDOUR_UI::config()->canvasvar_MarkerBarSeparator.get());
range_marker_bar->set_fill_color (ARDOUR_UI::config()->canvasvar_RangeMarkerBar.get());
range_marker_bar->set_outline_color (ARDOUR_UI::config()->canvasvar_MarkerBarSeparator.get());

8
gtk2_ardour/editor_rulers.cc
View File

@ -781,11 +781,11 @@ Editor::update_ruler_visibility ()
if (tbpos != old_unit_pos) {
videotl_group->move (ArdourCanvas::Duple (0.0, tbpos - old_unit_pos));
}
old_unit_pos = videotl_bar_group->position().y;
old_unit_pos = videotl_group->position().y;
if (tbgpos != old_unit_pos) {
videotl_bar_group->move (ArdourCanvas::Duple (0.0, tbgpos - old_unit_pos));
videotl_group->move (ArdourCanvas::Duple (0.0, tbgpos - old_unit_pos));
}
videotl_bar_group->show();
videotl_group->show();
videotl_group->show();
videotl_label.show();
tbpos += timebar_height * videotl_bar_height;
@ -793,7 +793,7 @@ Editor::update_ruler_visibility ()
visible_timebars+=videotl_bar_height;
queue_visual_videotimeline_update();
} else {
videotl_bar_group->hide();
videotl_group->hide();
videotl_group->hide();
videotl_label.hide();
update_video_timeline(true);

2
gtk2_ardour/editor_videotimeline.cc
View File

@ -45,9 +45,7 @@ Editor::set_video_timeline_height (const int h)
if (videotl_bar_height == h) { return; }
if (h < 2 || h > 8) { return; }
videotl_bar_height = h;
const double nh = (videotl_bar_height * timebar_height - ((ARDOUR::Profile->get_sae())?1.0:0.0));
videotl_label.set_size_request (-1, (int)timebar_height * videotl_bar_height);
videotl_bar->set_y1(nh);
ARDOUR_UI::instance()->video_timeline->set_height(videotl_bar_height * timebar_height);
update_ruler_visibility();
}

192
gtk2_ardour/video_image_frame.cc
View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2010 Paul Davis
Copyright (C) 2010, 2013 Paul Davis
Author: Robin Gareus <robin@gareus.org>
This program is free software; you can redistribute it and/or modify
@ -25,7 +25,6 @@
#include "public_editor.h"
#include "utils.h"
#include "canvas/group.h"
#include "rgb_macros.h"
#include "utils_videotl.h"
#include <gtkmm2ext/utils.h>
@ -52,32 +51,22 @@ VideoImageFrame::VideoImageFrame (PublicEditor& ed, ArdourCanvas::Group& parent,
frame_position = 0;
thread_active=false;
#if 0 /* DEBUG */
printf("New VideoImageFrame (%ix%i) %s - %s\n", w, h, vsurl.c_str(), vfn.c_str());
#endif
unit_position = editor.sample_to_pixel (frame_position);
group = new ArdourCanvas::Group (_parent, ArdourCanvas::Duple(unit_position, 1.0));
img_pixbuf = new ArdourCanvas::Pixbuf(group);
Glib::RefPtr<Gdk::Pixbuf> img;
img = Gdk::Pixbuf::create(Gdk::COLORSPACE_RGB, true, 8, clip_width, clip_height);
img->fill(RGBA_TO_UINT(0,0,0,255));
img_pixbuf->set(img);
image = new ArdourCanvas::Image (_parent, Cairo::FORMAT_ARGB32, clip_width, clip_height);
img = image->get_image();
fill_frame(0, 0, 0);
draw_line();
video_draw_cross(img_pixbuf->pixbuf());
img_pixbuf->set(img_pixbuf->pixbuf());
draw_x();
image->put_image(img);
group->Event.connect (sigc::bind (sigc::mem_fun (editor, &PublicEditor::canvas_videotl_bar_event), _parent));
image->Event.connect (sigc::bind (sigc::mem_fun (editor, &PublicEditor::canvas_videotl_bar_event), _parent));
}
VideoImageFrame::~VideoImageFrame ()
{
if (thread_active) pthread_join(thread_id_tt, NULL);
delete img_pixbuf;
delete group;
delete image;
pthread_mutex_destroy(&request_lock);
pthread_mutex_destroy(&queue_lock);
}
@ -86,7 +75,7 @@ void
VideoImageFrame::set_position (framepos_t frame)
{
double new_unit_position = editor.sample_to_pixel (frame);
group->move (ArdourCanvas::Duple (new_unit_position - unit_position, 0.0));
image->move (ArdourCanvas::Duple (new_unit_position - unit_position, 0.0));
frame_position = frame;
unit_position = new_unit_position;
}
@ -98,11 +87,7 @@ VideoImageFrame::reposition ()
}
void
VideoImageFrame::exposeimg ()
{
img_pixbuf->show();
/* Note: we can not use this thread to update the window
* it needs to be done from the Editor's thread idle_update */
VideoImageFrame::exposeimg () {
ImgChanged(); /* EMIT SIGNAL */
}
@ -113,22 +98,15 @@ VideoImageFrame::set_videoframe (framepos_t videoframenumber, int re)
video_frame_number = videoframenumber;
rightend = re;
#if 0 /* dummy mode: print framenumber */
gchar buf[16];
snprintf (buf, sizeof(buf), "%li", (long int) videoframenumber);
img_pixbuf->pixbuf() = pixbuf_from_ustring(g_strdup (buf), get_font_for_style (N_("MarkerText")), 80, 60, Gdk::Color ("#C0C0C0"));
return;
#endif
#if 1 /* draw "empty frame" while we request the data */
Glib::RefPtr<Gdk::Pixbuf> img;
img = img_pixbuf->pixbuf();
img->fill(RGBA_TO_UINT(0,0,0,255));
video_draw_cross(img_pixbuf->pixbuf());
img = image->get_image();
fill_frame(0, 0, 0);
draw_x();
draw_line();
cut_rightend();
img_pixbuf->set(img);
image->put_image(img);
exposeimg();
#endif
/* request video-frame from decoder in background thread */
http_get(video_frame_number);
}
@ -136,47 +114,77 @@ VideoImageFrame::set_videoframe (framepos_t videoframenumber, int re)
void
VideoImageFrame::draw_line ()
{
Glib::RefPtr<Gdk::Pixbuf> img;
img = img_pixbuf->pixbuf();
int rowstride = img->get_rowstride();
int clip_height = img->get_height();
int n_channels = img->get_n_channels();
guchar *pixels, *p;
pixels = img->get_pixels();
const int rowstride = img->stride;
const int clip_height = img->height;
uint8_t *pixels, *p;
pixels = img->data.get();
int y;
for (y=0;y<clip_height;y++) {
for (y = 0;y < clip_height; y++) {
p = pixels + y * rowstride;
p[0] = 255; p[1] = 255; p[2] = 255;
if (n_channels>3) p[3] = 255;
p[0] = 255; p[1] = 255; p[2] = 255; p[3] = 255;
}
}
void
VideoImageFrame::fill_frame (const uint8_t r, const uint8_t g, const uint8_t b)
{
memset((void*) img->data.get(), 0, img->stride * img->height); /// fill
const int rowstride = img->stride;
const int clip_height = img->height;
const int clip_width = img->width;
uint8_t *pixels, *p;
pixels = img->data.get();
int x,y;
for (y = 0; y < clip_height; ++y) {
for (x = 0; x < clip_width; ++x) {
p = pixels + y * rowstride + x * 4;
p[0] = b; p[1] = g; p[2] = r; p[3] = 255;
}
}
}
void
VideoImageFrame::draw_x ()
{
int x,y;
const int rowstride = img->stride;
const int clip_width = img->width;
const int clip_height = img->height;
uint8_t *pixels, *p;
pixels = img->data.get();
for (x = 0;x < clip_width; x++) {
y = clip_height * x / clip_width;
p = pixels + y * rowstride + x * 4;
p[0] = 192; p[1] = 192; p[2] = 192; p[3] = 255;
p = pixels + y * rowstride + (clip_width-x-1) * 4;
p[0] = 192; p[1] = 192; p[2] = 192; p[3] = 255;
}
}
void
VideoImageFrame::cut_rightend ()
{
if (rightend < 0 ) { return; }
Glib::RefPtr<Gdk::Pixbuf> img;
img = img_pixbuf->pixbuf();
int rowstride = img->get_rowstride();
int clip_height = img->get_height();
int clip_width = img->get_width();
int n_channels = img->get_n_channels();
guchar *pixels, *p;
pixels = img->get_pixels();
if (rightend < 0 ) { return; }
const int rowstride = img->stride;
const int clip_height = img->height;
const int clip_width = img->width;
uint8_t *pixels, *p;
pixels = img->data.get();
if (rightend > clip_width) { return; }
int x,y;
for (y=0;y<clip_height;++y) {
p = pixels + y * rowstride + rightend * n_channels;
p[0] = 192; p[1] = 127; p[2] = 127;
if (n_channels>3) p[3] = 255;
for (x=rightend+1; x<clip_width; ++x) {
p = pixels + y * rowstride + x * n_channels;
p[0] = 0; p[1] = 0; p[2] = 0;
if (n_channels>3) p[3] = 0;
for (y = 0;y < clip_height; ++y) {
p = pixels + y * rowstride + rightend * 4;
p[0] = 192; p[1] = 192; p[2] = 192; p[3] = 255;
for (x=rightend+1; x < clip_width; ++x) {
p = pixels + y * rowstride + x * 4;
p[0] = 0; p[1] = 0; p[2] = 0; p[3] = 0;
}
}
}
@ -187,7 +195,7 @@ http_get_thread (void *arg) {
char url[2048];
pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);
snprintf(url, sizeof(url), "%s?frame=%li&w=%d&h=%di&file=%s&format=rgb",
snprintf(url, sizeof(url), "%s?frame=%li&w=%d&h=%di&file=%s&format=bgra",
vif->get_video_server_url().c_str(),
(long int) vif->get_req_frame(), vif->get_width(), vif->get_height(),
vif->get_video_filename().c_str()
@ -213,45 +221,35 @@ http_get_thread (void *arg) {
void
VideoImageFrame::http_download_done (char *data){
if (queued_request) {
http_get_again(want_video_frame_number);
http_maybe_get_again();
return;
}
if (!data) {
/* Image request failed (HTTP error or timeout) */
Glib::RefPtr<Gdk::Pixbuf> img;
img = img_pixbuf->pixbuf();
img->fill(RGBA_TO_UINT(128,0,0,255));
video_draw_cross(img_pixbuf->pixbuf());
img = image->get_image();
fill_frame(128, 0, 0);
draw_x();
cut_rightend();
draw_line();
cut_rightend();
img_pixbuf->set(img);
/* TODO: mark as invalid:
* video_frame_number = -1;
* TODO: but prevent live-loops when calling update again
*/
image->put_image(img);
} else {
Glib::RefPtr<Gdk::Pixbuf> tmp, img;
#if 0 // RGBA
tmp = Gdk::Pixbuf::create_from_data ((guint8*) data, Gdk::COLORSPACE_RGB, true, 8, clip_width, clip_height, clip_width*4);
#else // RGB
tmp = Gdk::Pixbuf::create_from_data ((guint8*) data, Gdk::COLORSPACE_RGB, false, 8, clip_width, clip_height, clip_width*3);
#endif
img = img_pixbuf->pixbuf();
tmp->copy_area (0, 0, clip_width, clip_height, img, 0, 0);
img = image->get_image();
/* TODO - have curl write directly to the shared memory region */
memcpy((void*) img->data.get(), data, img->stride * img->height);
free(data);
draw_line();
cut_rightend();
img_pixbuf->set(img);
image->put_image(img);
}
exposeimg();
/* don't request frames too quickly, wait after user has zoomed */
usleep(40000);
/* don't request frames rapidly, wait after user has zoomed */
usleep(20000);
if (queued_request) {
http_get_again(want_video_frame_number);
http_maybe_get_again();
}
pthread_mutex_unlock(&request_lock);
}
@ -260,24 +258,11 @@ VideoImageFrame::http_download_done (char *data){
void
VideoImageFrame::http_get(framepos_t fn) {
if (pthread_mutex_trylock(&request_lock)) {
/* remember last request and schedule after the lock has been released. */
pthread_mutex_lock(&queue_lock);
queued_request=true;
want_video_frame_number=fn;
pthread_mutex_unlock(&queue_lock);
#if 0
/* TODO: cancel request and start a new one
* but only if we're waiting for curl request.
* don't interrupt http_download_done()
*
* This should work, but requires testing:
*/
if (!pthread_cancel(thread_id_tt)) {
pthread_mutex_unlock(&request_lock);
} else return;
#else
return;
#endif
}
if (thread_active) pthread_join(thread_id_tt, NULL);
pthread_mutex_lock(&queue_lock);
@ -294,7 +279,7 @@ VideoImageFrame::http_get(framepos_t fn) {
}
void
VideoImageFrame::http_get_again(framepos_t /*fn*/) {
VideoImageFrame::http_maybe_get_again() {
pthread_mutex_lock(&queue_lock);
queued_request=false;
req_video_frame_number=want_video_frame_number;
@ -332,7 +317,6 @@ extern "C" {
struct MemoryStruct chunk;
long int httpstatus;
if (status) *status = 0;
//usleep(500000); return NULL; // TEST & DEBUG
if (strncmp("http://", u, 7)) return NULL;
chunk.data=NULL;

9
gtk2_ardour/video_image_frame.h
View File

@ -34,6 +34,7 @@
#include "canvas/group.h"
#include "canvas/pixbuf.h"
#include "canvas/image.h"
namespace ARDOUR {
class TempoSection;
@ -69,8 +70,8 @@ class VideoImageFrame : public sigc::trackable
PublicEditor& editor;
ArdourCanvas::Group *_parent;
ArdourCanvas::Group *group;
ArdourCanvas::Pixbuf *img_pixbuf;
ArdourCanvas::Image *image;
boost::shared_ptr<ArdourCanvas::Image::Data> img;
int clip_width;
int clip_height;
@ -86,12 +87,14 @@ class VideoImageFrame : public sigc::trackable
void reposition ();
void exposeimg ();
void fill_frame (const uint8_t r, const uint8_t g, const uint8_t b);
void draw_line ();
void draw_x ();
void cut_rightend ();
void http_get(framepos_t fn);
void http_get_again(framepos_t fn);
void http_maybe_get_again();
framepos_t req_video_frame_number;
framepos_t want_video_frame_number;

12
gtk2_ardour/video_timeline.cc
View File

@ -45,7 +45,7 @@ using namespace Timecode;
VideoTimeLine::VideoTimeLine (PublicEditor *ed, ArdourCanvas::Group *vbg, int initial_height)
: editor (ed)
, videotl_bar_group(vbg)
, videotl_group(vbg)
, bar_height(initial_height)
{
video_start_offset = 0L;
@ -302,7 +302,7 @@ VideoTimeLine::update_video_timeline()
if (_session->timecode_frames_per_second() == 0 ) return;
}
double frames_per_unit = editor->pixel_to_sample(1.0);
double frames_per_unit = editor->get_current_zoom();
framepos_t leftmost_frame = editor->leftmost_sample();
/* Outline:
@ -379,7 +379,7 @@ VideoTimeLine::update_video_timeline()
while (video_frames.size() < visible_video_frames) {
VideoImageFrame *frame;
frame = new VideoImageFrame(*editor, *videotl_bar_group, display_vframe_width, bar_height, video_server_url, translated_filename());
frame = new VideoImageFrame(*editor, *videotl_group, display_vframe_width, bar_height, video_server_url, translated_filename());
frame->ImgChanged.connect (*this, invalidator (*this), boost::bind (&PublicEditor::queue_visual_videotimeline_update, editor), gui_context());
video_frames.push_back(frame);
}
@ -412,7 +412,7 @@ VideoTimeLine::update_video_timeline()
}
VideoImageFrame * frame = get_video_frame(vframeno, cut, rightend);
if (frame) {
frame->set_position(vfpos-leftmost_frame);
frame->set_position(vfpos);
outdated_video_frames.remove(frame);
} else {
remaining.push_back(vfcount);
@ -422,7 +422,7 @@ VideoTimeLine::update_video_timeline()
for (VideoFrames::iterator i = outdated_video_frames.begin(); i != outdated_video_frames.end(); ++i ) {
VideoImageFrame *frame = (*i);
if (remaining.empty()) {
frame->set_position(-2 * vtl_dist); /* move off screen */
frame->set_position(-2 * vtl_dist + leftmost_frame); /* move off screen */
} else {
int vfcount=remaining.front();
remaining.pop_front();
@ -433,7 +433,7 @@ VideoTimeLine::update_video_timeline()
rightend = display_vframe_width * (video_start_offset + video_duration + GOFFSET - vfpos) / vtl_dist;
//printf("lf(n): %lu\n", vframeno); // XXX
}
frame->set_position(vfpos-leftmost_frame);
frame->set_position(vfpos);
frame->set_videoframe(vframeno, rightend);
}
}

2
gtk2_ardour/video_timeline.h
View File

@ -101,7 +101,7 @@ class VideoTimeLine : public sigc::trackable, public ARDOUR::SessionHandlePtr, p
protected:
PublicEditor *editor;
ArdourCanvas::Group *videotl_bar_group;
ArdourCanvas::Group *videotl_group;
int bar_height;
std::string _xjadeo_bin;