Archives/notcurses
2
0
Fork 0
mirror of https://github.com/dankamongmen/notcurses.git synced 2024-11-02 09:40:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

[media] use c allocation to match ncvisual api

Browse Source
This commit is contained in:
nick black 2021-03-20 08:33:03 -04:00
parent 3ea1a79250
commit c1ee44b1b7
3 changed files with 25 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/media/ffmpeg.cpp
View File

@ -280,11 +280,13 @@ auto ffmpeg_details_init(void) -> ncvisual_details* {
} }
auto ffmpeg_create() -> ncvisual* { auto ffmpeg_create() -> ncvisual* {
auto nc = new ncvisual{}; ncvisual* nc = static_cast<ncvisual*>(malloc(sizeof(*nc)));
if(nc){
if((nc->details = ffmpeg_details_init()) == nullptr){ if((nc->details = ffmpeg_details_init()) == nullptr){
delete nc; free(nc);
return nullptr; return nullptr;
} }
}
return nc; return nc;
} }

46
src/media/none.cpp → src/media/none.c
View File

@ -4,18 +4,18 @@
#include "internal.h" #include "internal.h"
#include "visual-details.h" #include "visual-details.h"
auto none_create() -> ncvisual* { ncvisual* none_create(){
return new ncvisual{}; return malloc(sizeof(ncvisual));
} }
int none_decode(ncvisual* nc) { int none_decode(ncvisual* nc){
(void)nc; (void)nc;
return -1; return -1;
} }
ncvisual* none_from_file(const char* filename) { ncvisual* none_from_file(const char* filename){
(void)filename; (void)filename;
return nullptr; return NULL;
} }
int none_decode_loop(ncvisual* ncv){ int none_decode_loop(ncvisual* ncv){
@ -24,7 +24,7 @@ int none_decode_loop(ncvisual* ncv){
} }
// resize, converting to RGBA (if necessary) along the way // resize, converting to RGBA (if necessary) along the way
int none_resize(ncvisual* nc, int rows, int cols) { int none_resize(ncvisual* nc, int rows, int cols){
// we'd need to verify that it's RGBA as well, except that if we've got no // we'd need to verify that it's RGBA as well, except that if we've got no
// multimedia engine, we've only got memory-assembled ncvisuals, which are // multimedia engine, we've only got memory-assembled ncvisuals, which are
// RGBA-native. so we ought be good, but this is undeniably sloppy... // RGBA-native. so we ought be good, but this is undeniably sloppy...
@ -36,7 +36,7 @@ int none_resize(ncvisual* nc, int rows, int cols) {
int none_blit(struct ncvisual* ncv, int rows, int cols, int none_blit(struct ncvisual* ncv, int rows, int cols,
ncplane* n, const struct blitset* bset, ncplane* n, const struct blitset* bset,
int begy, int begx, int leny, int lenx, const blitterargs* bargs) { int begy, int begx, int leny, int lenx, const blitterargs* bargs){
(void)rows; (void)rows;
(void)cols; (void)cols;
if(rgba_blit_dispatch(n, bset, ncv->rowstride, ncv->data, if(rgba_blit_dispatch(n, bset, ncv->rowstride, ncv->data,
@ -46,8 +46,8 @@ int none_blit(struct ncvisual* ncv, int rows, int cols,
return -1; return -1;
} }
auto none_stream(notcurses* nc, ncvisual* ncv, float timescale, int none_stream(notcurses* nc, ncvisual* ncv, float timescale,
streamcb streamer, const struct ncvisual_options* vopts, void* curry) -> int { streamcb streamer, const struct ncvisual_options* vopts, void* curry){
(void)nc; (void)nc;
(void)ncv; (void)ncv;
(void)timescale; (void)timescale;
@ -57,36 +57,16 @@ auto none_stream(notcurses* nc, ncvisual* ncv, float timescale,
return -1; return -1;
} }
char* none_subtitle(const ncvisual* ncv) { // no support in none char* none_subtitle(const ncvisual* ncv){ // no support in none
(void)ncv; (void)ncv;
return nullptr; return NULL;
} }
// FIXME before we can enable this, we need build an none::APPBUFFER-style void none_details_seed(ncvisual* ncv){
// ImageBuf in ncvisual in ncvisual_from_rgba().
/*
auto ncvisual_rotate(ncvisual* ncv, double rads) -> int {
none::ROI roi(0, ncv->cols, 0, ncv->rows, 0, 1, 0, 4);
auto tmpibuf = std::move(*ncv->details->ibuf);
ncv->details->ibuf = std::make_unique<none::ImageBuf>();
none::ImageSpec sp{};
sp.set_format(none::TypeDesc(none::TypeDesc::UINT8, 4));
sp.nchannels = 4;
ncv->details->ibuf->reset();
if(!none::ImageBufAlgo::rotate(*ncv->details->ibuf, tmpibuf, rads, "", 0, true, roi)){
return NCERR_DECODE; // FIXME need we do anything further?
}
ncv->rowstride = ncv->cols * 4;
ncvisual_set_data(ncv, static_cast<uint32_t*>(ncv->details->ibuf->localpixels()), false);
return NCERR_SUCCESS;
}
*/
auto none_details_seed(ncvisual* ncv) -> void {
(void)ncv; (void)ncv;
} }
auto none_details_destroy(struct ncvisual_details* ncv) -> void { void none_details_destroy(struct ncvisual_details* ncv){
(void)ncv; (void)ncv;
} }

6
src/media/oiio.cpp
View File

@ -34,11 +34,13 @@ auto oiio_details_destroy(ncvisual_details* deets) -> void {
} }
auto oiio_create() -> ncvisual* { auto oiio_create() -> ncvisual* {
auto nc = new ncvisual{}; ncvisual* nc = static_cast<ncvisual*>(malloc(sizeof(*nc)));
if(nc){
if((nc->details = oiio_details_init()) == nullptr){ if((nc->details = oiio_details_init()) == nullptr){
delete nc; free(nc);
return nullptr; return nullptr;
} }
}
return nc; return nc;
} }