diff --git a/c_src/xav/utils.c b/c_src/xav/utils.c index 424eb64..9d58f27 100644 --- a/c_src/xav/utils.c +++ b/c_src/xav/utils.c @@ -3,28 +3,6 @@ #include #include -void print_supported_pix_fmts(AVCodec *codec) { - if (codec->pix_fmts == NULL) { - fprintf(stdout, "unknown\n"); - } else { - for (int i = 0; codec->pix_fmts[i] != -1; i++) { - fprintf(stdout, "fmt: %d\n", codec->pix_fmts[i]); - } - } -} - -void convert_to_rgb(AVFrame *src_frame, uint8_t *dst_data[], int dst_linesize[]) { - struct SwsContext *sws_ctx = - sws_getContext(src_frame->width, src_frame->height, src_frame->format, src_frame->width, - src_frame->height, AV_PIX_FMT_RGB24, SWS_BILINEAR, NULL, NULL, NULL); - - av_image_alloc(dst_data, dst_linesize, src_frame->width, src_frame->height, AV_PIX_FMT_RGB24, 1); - - // is this (const uint8_t * const*) cast really correct? - sws_scale(sws_ctx, (const uint8_t *const *)src_frame->data, src_frame->linesize, 0, - src_frame->height, dst_data, dst_linesize); -} - ERL_NIF_TERM xav_nif_ok(ErlNifEnv *env, ERL_NIF_TERM data_term) { ERL_NIF_TERM ok_term = enif_make_atom(env, "ok"); return enif_make_tuple(env, 2, ok_term, data_term); diff --git a/c_src/xav/utils.h b/c_src/xav/utils.h index dc26494..9cd5891 100644 --- a/c_src/xav/utils.h +++ b/c_src/xav/utils.h @@ -3,7 +3,6 @@ #include #include #include -#include #include #include @@ -16,10 +15,6 @@ #define XAV_ALLOC(X) enif_alloc(X) #define XAV_FREE(X) enif_free(X) - -void print_supported_pix_fmts(AVCodec *codec); -void convert_to_rgb(AVFrame *src_frame, uint8_t *dst_data[], int dst_linesize[]); - ERL_NIF_TERM xav_nif_ok(ErlNifEnv *env, ERL_NIF_TERM data_term); ERL_NIF_TERM xav_nif_error(ErlNifEnv *env, char *reason); ERL_NIF_TERM xav_nif_raise(ErlNifEnv *env, char *msg); diff --git a/c_src/xav/video_converter.c b/c_src/xav/video_converter.c index f7d6936..446d5ad 100644 --- a/c_src/xav/video_converter.c +++ b/c_src/xav/video_converter.c @@ -1,5 +1,4 @@ #include "video_converter.h" -#include "utils.h" int video_converter_convert(AVFrame *src_frame, uint8_t *out_data[], int out_linesize[]) { int ret; diff --git a/c_src/xav/video_converter.h b/c_src/xav/video_converter.h index 28eec1d..4504d45 100644 --- a/c_src/xav/video_converter.h +++ b/c_src/xav/video_converter.h @@ -1,5 +1,6 @@ #include +#include #include #include #include