Work around OpenImageIO bswap definition #1392
Recent OpenImageIO (on Fedora Rawhide, at least) export a bswap symbol, causing us no end of pain. Perform a massive rearrangement to deal with this annoyance, splitting oiio.c into C++ and C contents. Closes #1392.pull/1394/head
Nick Black
3 years ago
parent
6c1e3565ac
commit
cde75505ea
@ -0,0 +1,107 @@
|
||||
#include "builddef.h"
|
||||
#ifdef USE_OIIO
|
||||
#include "visual-details.h"
|
||||
#include "internal.h"
|
||||
#include "oiio.h"
|
||||
|
||||
int oiio_blit_dispatch(struct ncplane* nc, const struct blitset* bset,
|
||||
int placey, int placex, int linesize,
|
||||
const void* data, int begy, int begx,
|
||||
int leny, int lenx, bool blendcolors){
|
||||
if(rgba_blit_dispatch(nc, bset, placey, placex, linesize, data, begy, begx,
|
||||
leny, lenx, blendcolors) < 0){
|
||||
return -1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
int oiio_stream(struct notcurses* nc, ncvisual* ncv, float timescale,
|
||||
streamcb streamer, const struct ncvisual_options* vopts,
|
||||
void* curry){
|
||||
(void)timescale; // FIXME
|
||||
int frame = 1;
|
||||
struct timespec begin; // time we started
|
||||
clock_gettime(CLOCK_MONOTONIC, &begin);
|
||||
ncplane* newn = NULL;
|
||||
struct ncvisual_options activevopts;
|
||||
memcpy(&activevopts, vopts, sizeof(*vopts));
|
||||
int ncerr;
|
||||
do{
|
||||
// decay the blitter explicitly, so that the callback knows the blitter it
|
||||
// was actually rendered with
|
||||
const struct blitset* bset = rgba_blitter(nc, &activevopts);
|
||||
if(bset){
|
||||
activevopts.blitter = bset->geom;
|
||||
}
|
||||
if((newn = ncvisual_render(nc, ncv, &activevopts)) == NULL){
|
||||
if(activevopts.n != vopts->n){
|
||||
ncplane_destroy(activevopts.n);
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
if(activevopts.n != newn){
|
||||
activevopts.n = newn;
|
||||
}
|
||||
// currently OIIO is so slow for videos that there's no real point in
|
||||
// any kind of delay FIXME
|
||||
struct timespec now;
|
||||
clock_gettime(CLOCK_MONOTONIC, &now);
|
||||
int r;
|
||||
if(streamer){
|
||||
r = streamer(ncv, &activevopts, &now, curry);
|
||||
}else{
|
||||
r = ncvisual_simple_streamer(ncv, &activevopts, &now, curry);
|
||||
}
|
||||
if(r){
|
||||
if(activevopts.n != vopts->n){
|
||||
ncplane_destroy(activevopts.n);
|
||||
}
|
||||
return r;
|
||||
}
|
||||
++frame;
|
||||
}while((ncerr = oiio_decode(ncv)) == 0);
|
||||
if(activevopts.n != vopts->n){
|
||||
ncplane_destroy(activevopts.n);
|
||||
}
|
||||
if(ncerr == 1){
|
||||
return 0;
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
char* oiio_subtitle(const ncvisual* ncv) { // no support in OIIO
|
||||
(void)ncv;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
void oiio_details_seed(ncvisual* ncv) {
|
||||
(void)ncv;
|
||||
// FIXME?
|
||||
}
|
||||
|
||||
int oiio_init(int loglevel __attribute__ ((unused))) {
|
||||
// FIXME set OIIO global attribute "debug" based on loglevel
|
||||
// FIXME check OIIO_VERSION_STRING components against linked openimageio_version()
|
||||
return 0; // allow success here
|
||||
}
|
||||
|
||||
static const ncvisual_implementation oiio_impl = {
|
||||
.visual_init = oiio_init,
|
||||
.visual_printbanner = oiio_printbanner,
|
||||
.visual_blit = oiio_blit,
|
||||
.visual_create = oiio_create,
|
||||
.visual_from_file = oiio_from_file,
|
||||
.visual_details_seed = oiio_details_seed,
|
||||
.visual_details_destroy = oiio_details_destroy,
|
||||
.visual_decode = oiio_decode,
|
||||
.visual_decode_loop = oiio_decode_loop,
|
||||
.visual_stream = oiio_stream,
|
||||
.visual_subtitle = oiio_subtitle,
|
||||
.visual_resize = oiio_resize,
|
||||
.canopen_images = true,
|
||||
.canopen_videos = false,
|
||||
};
|
||||
|
||||
const ncvisual_implementation* local_visual_implementation = &oiio_impl;
|
||||
|
||||
#endif
|
||||
@ -0,0 +1,29 @@
|
||||
#ifndef MEDIA_OIIO
|
||||
#define MEDIA_OIIO
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
int oiio_decode(struct ncvisual* nc);
|
||||
struct ncvisual_details* oiio_details_init(void);
|
||||
void oiio_printbanner(const struct notcurses* nc);
|
||||
int oiio_blit(struct ncvisual* ncv, int rows, int cols,
|
||||
struct ncplane* n, const struct blitset* bset,
|
||||
int placey, int placex, int begy, int begx,
|
||||
int leny, int lenx, bool blendcolors);
|
||||
ncvisual* oiio_from_file(const char* filename);
|
||||
void oiio_details_destroy(struct ncvisual_details* deets);
|
||||
int oiio_decode_loop(ncvisual* ncv);
|
||||
int oiio_resize(ncvisual* nc, int rows, int cols);
|
||||
struct ncvisual* oiio_create(void);
|
||||
int oiio_blit_dispatch(struct ncplane* nc, const struct blitset* bset,
|
||||
int placey, int placex, int linesize,
|
||||
const void* data, int begy, int begx,
|
||||
int leny, int lenx, bool blendcolors);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif
|
||||
Loading…
Reference in New Issue