using namespace std;
using namespace ARDOUR;
+using namespace VideoUtils;
+
+static void freedata_cb (uint8_t *d, void* /*arg*/) {
+ /* later this can be used with libharvid
+ * the buffer/videocacheline instead of freeing it
+ */
+ free (d);
+}
VideoImageFrame::VideoImageFrame (PublicEditor& ed, ArdourCanvas::Group& parent, int w, int h, std::string vsurl, std::string vfn)
: editor (ed)
queued_request=false;
video_frame_number = -1;
rightend = -1;
- frame_position = 0;
+ sample_position = 0;
thread_active=false;
- unit_position = editor.sample_to_pixel (frame_position);
- group = new ArdourCanvas::Group (_parent, ArdourCanvas::Duple(unit_position, 1.0));
- image = new ArdourCanvas::Image (group, Cairo::FORMAT_ARGB32, clip_width, clip_height);
+ unit_position = editor.sample_to_pixel (sample_position);
+ image = new ArdourCanvas::Image (_parent, Cairo::FORMAT_ARGB32, clip_width, clip_height);
img = image->get_image();
fill_frame(0, 0, 0);
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 image;
- delete group;
pthread_mutex_destroy(&request_lock);
pthread_mutex_destroy(&queue_lock);
}
void
-VideoImageFrame::set_position (framepos_t frame)
+VideoImageFrame::set_position (framepos_t sample)
{
- double new_unit_position = editor.sample_to_pixel (frame);
- group->move (ArdourCanvas::Duple (new_unit_position - unit_position, 0.0));
- frame_position = frame;
+ double new_unit_position = editor.sample_to_pixel (sample);
+ image->move (ArdourCanvas::Duple (new_unit_position - unit_position, 0.0));
+ sample_position = sample;
unit_position = new_unit_position;
}
void
VideoImageFrame::reposition ()
{
- set_position (frame_position);
+ set_position (sample_position);
}
void
const int rowstride = img->stride;
const int clip_height = img->height;
uint8_t *pixels, *p;
- pixels = img->data.get();
+ pixels = img->data;
int y;
for (y = 0;y < clip_height; y++) {
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();
+ pixels = img->data;
int x,y;
for (y = 0; y < clip_height; ++y) {
const int clip_width = img->width;
const int clip_height = img->height;
uint8_t *pixels, *p;
- pixels = img->data.get();
+ pixels = img->data;
for (x = 0;x < clip_width; x++) {
y = clip_height * x / clip_width;
const int clip_height = img->height;
const int clip_width = img->width;
uint8_t *pixels, *p;
- pixels = img->data.get();
+ pixels = img->data;
if (rightend > clip_width) { return; }
int x,y;
int timeout = 1000; // * 5ms -> 5sec
char *res = NULL;
do {
- res=curl_http_get(url, &status);
- if (status == 503) usleep(5000); // try-again
+ res=a3_curl_http_get(url, &status);
+ if (status == 503) Glib::usleep(5000); // try-again
} while (status == 503 && --timeout > 0);
if (status != 200 || !res) {
void
VideoImageFrame::http_download_done (char *data){
if (queued_request) {
- http_maybe_get_again();
+ http_get_again(want_video_frame_number);
return;
}
cut_rightend();
image->put_image(img);
} else {
- 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);
+ img = image->get_image(false);
+ img->data = (uint8_t*) data;
+ img->destroy_callback = &freedata_cb;
draw_line();
cut_rightend();
image->put_image(img);
}
exposeimg();
- /* don't request frames rapidly, wait after user has zoomed */
- usleep(20000);
+ /* don't request frames too quickly, wait after user has zoomed */
+ Glib::usleep(40000);
if (queued_request) {
- http_maybe_get_again();
+ http_get_again(want_video_frame_number);
}
pthread_mutex_unlock(&request_lock);
}
}
void
-VideoImageFrame::http_maybe_get_again() {
+VideoImageFrame::http_get_again(framepos_t /*fn*/) {
pthread_mutex_lock(&queue_lock);
queued_request=false;
req_video_frame_number=want_video_frame_number;
http_get_thread(this);
}
-
-extern "C" {
-#include <curl/curl.h>
-
- struct MemoryStruct {
- char *data;
- size_t size;
- };
-
- static size_t
- WriteMemoryCallback(void *ptr, size_t size, size_t nmemb, void *data) {
- size_t realsize = size * nmemb;
- struct MemoryStruct *mem = (struct MemoryStruct *)data;
-
- mem->data = (char *)realloc(mem->data, mem->size + realsize + 1);
- if (mem->data) {
- memcpy(&(mem->data[mem->size]), ptr, realsize);
- mem->size += realsize;
- mem->data[mem->size] = 0;
- }
- return realsize;
- }
-
- char *curl_http_get (const char *u, int *status) {
- CURL *curl;
- CURLcode res;
- struct MemoryStruct chunk;
- long int httpstatus;
- if (status) *status = 0;
- if (strncmp("http://", u, 7)) return NULL;
-
- chunk.data=NULL;
- chunk.size=0;
-
- curl = curl_easy_init();
- if(!curl) return NULL;
- curl_easy_setopt(curl, CURLOPT_URL, u);
-
- curl_easy_setopt(curl, CURLOPT_WRITEDATA, (void *)&chunk);
- curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteMemoryCallback);
- curl_easy_setopt(curl, CURLOPT_USERAGENT, ARDOUR_USER_AGENT);
- curl_easy_setopt(curl, CURLOPT_TIMEOUT, ARDOUR_CURL_TIMEOUT);
- curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1);
-#ifdef CURLERRORDEBUG
- char curlerror[CURL_ERROR_SIZE] = "";
- curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, curlerror);
-#endif
-
- res = curl_easy_perform(curl);
- curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &httpstatus);
- curl_easy_cleanup(curl);
- if (status) *status = httpstatus;
- if (res) {
-#ifdef CURLERRORDEBUG
- printf("curl_http_get() failed: %s\n", curlerror);
-#endif
- return NULL;
- }
- if (httpstatus != 200) {
- free (chunk.data);
- chunk.data = NULL;
- }
- return (chunk.data);
- }
-
-} /* end extern "C" */
projects / ardour.git / blobdiff