.

Code_source/Compiled/audio/play.file~/play.file~.c

@@ -228,7 +228,7 @@ static void playfile_start(t_playfile *x, t_float f, t_float ms){
     x->x_play = !err_msg;
 }
 
-static t_symbol* playfile_doopen(t_openfile *x, t_symbol *file){
+/*static t_symbol* playfile_doopen(t_playfile *x, t_symbol *file){
     char path[MAXPDSTRING], *fn;
     int fd = canvas_open(x->x_cv, file->s_name, "", path, &fn, MAXPDSTRING, 1);
     if(fd >= 0){
@@ -239,7 +239,7 @@ static t_symbol* playfile_doopen(t_openfile *x, t_symbol *file){
     }
     else
         return(file);
-}
+}*/
 
 static void playfile_find_file(t_playfile *x, t_symbol* file, char* dir_out, char* filename_out){
     const char *filename = file->s_name;
@@ -490,6 +490,20 @@ AVChannelLayout playfile_get_channel_layout_for_file(t_playfile* x, const char *
     return(l);
 }
 
+static void playfile_free(t_playfile *x){
+    av_channel_layout_uninit(&x->x_layout);
+    avcodec_free_context(&x->x_stream_ctx);
+    avformat_close_input(&x->x_ic);
+    av_packet_free(&x->x_pkt);
+    av_frame_free(&x->x_frm);
+    swr_free(&x->x_swr);
+    t_playlist *pl = &x->x_plist;
+    freebytes(pl->arr, pl->max * sizeof(t_symbol *));
+    freebytes(x->x_outs, x->x_nch * sizeof(t_sample *));
+    freebytes(x->x_out, x->x_nch * sizeof(t_sample) * FRAMES);
+    pd_unbind(&x->x_obj.ob_pd, x->x_openpanel_sym);
+}
+
 static void *playfile_new(t_symbol *s, int ac, t_atom *av){
     int loop = 0;
     for(int i = 0; i < ac; i++){
@@ -562,20 +576,6 @@ static void *playfile_new(t_symbol *s, int ac, t_atom *av){
     return(x);
 }
 
-static void playfile_free(t_playfile *x){
-    av_channel_layout_uninit(&x->x_layout);
-    avcodec_free_context(&x->x_stream_ctx);
-    avformat_close_input(&x->x_ic);
-    av_packet_free(&x->x_pkt);
-    av_frame_free(&x->x_frm);
-    swr_free(&x->x_swr);
-    t_playlist *pl = &x->x_plist;
-    freebytes(pl->arr, pl->max * sizeof(t_symbol *));
-    freebytes(x->x_outs, x->x_nch * sizeof(t_sample *));
-    freebytes(x->x_out, x->x_nch * sizeof(t_sample) * FRAMES);
-    pd_unbind(&x->x_obj.ob_pd, x->x_openpanel_sym);
-}
-
 void setup_play0x2efile_tilde(void) {
     playfile_class = class_new(gensym("play.file~"), (t_newmethod)playfile_new,
         (t_method)playfile_free, sizeof(t_playfile), 0, A_GIMME, 0);

Code_source/Compiled/audio/play.file~/sfload2.c

@@ -0,0 +1,272 @@
+// tim schoen and porres 2024
+
+#include <libavcodec/avcodec.h>
+#include <libavformat/avformat.h>
+#include <libswresample/swresample.h>
+#include <pthread.h>
+#include <m_pd.h>
+
+#define FRAMES 4096
+
+typedef struct _avstream{
+
+}t_avstream;
+
+static t_class *sfload_class;
+
+typedef struct _sfload{
+    t_object        x_obj;
+    AVCodecContext *x_stream_ctx;
+    int            x_stream_idx;
+    AVPacket       *x_pkt;
+    AVFrame        *x_frm;
+    SwrContext     *x_swr;
+    AVFormatContext *x_ic;
+    AVChannelLayout x_layout;
+    unsigned int    x_channel;
+//    unsigned int    x_nsamps;
+    t_outlet       *x_info;
+    t_sample       *x_all_out;
+    t_canvas       *x_canvas;
+    t_symbol       *x_arr_name;
+    pthread_t       x_process_thread;
+    _Atomic int     x_result_ready;
+    t_clock        *x_result_clock;
+    char            x_path[MAXPDSTRING];
+}t_sfload;
+
+void* sfload_read_audio(void *arg){ // read audio into array
+    t_sfload *x = (t_sfload*)arg;
+    x->x_ic = avformat_alloc_context();
+    x->x_ic->probesize = 128;
+    x->x_ic->max_probe_packets = 1;
+    if(avformat_open_input(&x->x_ic, x->x_path, NULL, NULL) != 0){
+        pd_error(x, "[sfload]: Could not open file '%s'\n", x->x_path);
+        return (NULL);
+    }
+    if(avformat_find_stream_info(x->x_ic, NULL) < 0){
+        pd_error(x, "[sfload]: Could not find stream information\n");
+        return (NULL);
+    }
+    int audio_stream_index = -1;
+    for(unsigned int i = 0; i < x->x_ic->nb_streams; i++){
+        if(x->x_ic->streams[i]->codecpar->codec_type == AVMEDIA_TYPE_AUDIO){
+            audio_stream_index = i;
+            break;
+        }
+    }
+    if(audio_stream_index == -1){
+        pd_error(x, "[sfload]: Could not find any audio stream in the file\n");
+        return (NULL);
+    }
+    x->x_stream_idx = audio_stream_index;
+    AVCodecParameters *codec_parameters = x->x_ic->streams[audio_stream_index]->codecpar;
+    const AVCodec *codec = avcodec_find_decoder(codec_parameters->codec_id);
+    if(!codec){
+        pd_error(x, "[sfload]: Codec not found\n");
+        return (NULL);
+    }
+    x->x_stream_ctx = avcodec_alloc_context3(codec);
+    if(!x->x_stream_ctx){
+        pd_error(x, "[sfload]: Could not allocate audio codec context\n");
+        return (NULL);
+    }
+    if(avcodec_parameters_to_context(x->x_stream_ctx, codec_parameters) < 0){
+        pd_error(x, "[sfload]: Could not copy codec parameters to context\n");
+        return (NULL);
+    }
+    if(avcodec_open2(x->x_stream_ctx, codec, NULL) < 0){
+        pd_error(x, "[sfload]: Could not open codec\n");
+        return (NULL);
+    }
+    AVChannelLayout layout;
+    if(x->x_stream_ctx->ch_layout.u.mask)
+        av_channel_layout_from_mask(&layout, x->x_stream_ctx->ch_layout.u.mask);
+    else
+        av_channel_layout_default(&layout, x->x_stream_ctx->ch_layout.nb_channels);
+    unsigned int nch = layout.nb_channels;
+    swr_alloc_set_opts2(&x->x_swr, &layout, AV_SAMPLE_FMT_FLT, x->x_stream_ctx->sample_rate,
+        &layout, x->x_stream_ctx->sample_fmt, x->x_stream_ctx->sample_rate, 0, NULL);
+    if(!x->x_swr || swr_init(x->x_swr) < 0){
+        pd_error(x, "[sfload]: Could not initialize the resampling context\n");
+        return (NULL);
+    }
+    t_sample* x_out = (t_sample*)av_mallocz(nch * FRAMES * sizeof(t_sample));
+    int output_index = 0;
+    while(av_read_frame(x->x_ic, x->x_pkt) >= 0){
+        if(x->x_pkt->stream_index == x->x_stream_idx){
+            if(avcodec_send_packet(x->x_stream_ctx, x->x_pkt) < 0
+            || avcodec_receive_frame(x->x_stream_ctx, x->x_frm) < 0)
+                continue;
+            int samples_converted = swr_convert(x->x_swr, (uint8_t **)&x_out, FRAMES,
+                (const uint8_t **)x->x_frm->extended_data, x->x_frm->nb_samples);
+            if(samples_converted < 0){
+                pd_error(x, "[sfload]: Error converting samples\n");
+                continue;
+            }
+            x->x_all_out = realloc(x->x_all_out, (output_index + (samples_converted / nch)) * sizeof(t_sample));
+            int n = 0;
+            while(n < samples_converted){
+                for(unsigned int ch = 0; ch < nch; ch++){
+                    if(ch == x->x_channel)
+                        x->x_all_out[output_index] = x_out[n];
+                    n++;
+                }
+                output_index++;
+            }
+        }
+        av_packet_unref(x->x_pkt);
+    }
+    x->x_result_ready = output_index;
+//    post("n = %i", output_index);
+//    x->x_nsamps = output_index;
+    av_free(x_out);
+    return(NULL);
+}
+
+void sfload_check_done(t_sfload* x){ // result clock
+    if(x->x_result_ready){
+        t_garray* garray = (t_garray*)pd_findbyclass(x->x_arr_name, garray_class);
+        garray_resize_long(garray, x->x_result_ready);
+        t_word* vec = ((t_word*)garray_vec(garray));
+        for(int i = 0; i < x->x_result_ready; i++)
+            vec[i].w_float = x->x_all_out[i];
+        garray_redraw(garray);
+//        post("x->x_result_ready = %i", x->x_result_ready);
+        x->x_result_ready = 0;
+        free(x->x_all_out);
+        x->x_all_out = NULL;
+    }
+    else
+        clock_delay(x->x_result_clock, 20);
+}
+
+static void sfload_find_file(t_sfload *x, t_symbol* file, char* dir_out, char* filename_out){
+    const char *filename = file->s_name;
+    const char *dirname = canvas_getdir(x->x_canvas)->s_name;
+    char* fileout;
+    open_via_path(dirname, filename, "", dir_out, &fileout, MAXPDSTRING-1, 0);
+    memcpy(filename_out, fileout, strlen(fileout) + 1);
+    strcat(dir_out, "/");
+}
+
+AVChannelLayout sfload_get_channel_layout_for_file(t_sfload* x, const char *dirname, const char *filename) {
+    char input_path[MAXPDSTRING];
+    snprintf(input_path, MAXPDSTRING, "%s/%s", dirname, filename);
+    x->x_ic = avformat_alloc_context();
+    x->x_ic->probesize = 128;
+    x->x_ic->max_probe_packets = 1;
+    if(avformat_open_input(&x->x_ic, input_path, NULL, NULL) != 0){
+        fprintf(stderr, "Could not open input file '%s'\n", input_path);
+        goto error;
+    }
+    // Retrieve stream information
+    if(avformat_find_stream_info(x->x_ic, NULL) < 0){
+        fprintf(stderr, "Could not find stream information\n");
+        goto error;
+    }
+    int audio_stream_index = -1;
+    for(unsigned int i = 0; i < x->x_ic->nb_streams; i++){
+        if(x->x_ic->streams[i]->codecpar->codec_type == AVMEDIA_TYPE_AUDIO){
+            audio_stream_index = i;
+            break;
+        }
+    }
+    if(audio_stream_index == -1){
+        fprintf(stderr, "Could not find any audio stream in the file\n");
+        goto error;
+    }
+    x->x_stream_idx = audio_stream_index;
+    AVCodecParameters *codec_parameters = x->x_ic->streams[audio_stream_index]->codecpar;
+    return(codec_parameters->ch_layout);
+error:
+    if(x->x_ic)
+        avformat_close_input(&x->x_ic);
+    AVChannelLayout l;
+    av_channel_layout_default(&l, 1);
+    return(l);
+}
+
+void sfload_load(t_sfload* x, t_symbol* s, int ac, t_atom* av){
+    if(x->x_arr_name == NULL){
+        pd_error(x, "[sfload]: No array set\n");
+        return;
+    }
+    if(!pd_findbyclass(x->x_arr_name, garray_class)){
+        pd_error(x, "[sfload]: Array not found\n");
+        return;
+    }
+    if(!ac){
+        pd_error(x, "[sfload]: no filename given\n");
+        return;
+    }
+    t_symbol* path = NULL;
+    if(ac == 1 && av[0].a_type == A_SYMBOL)
+        path = atom_getsymbol(av);
+    if(ac >= 2 && av[1].a_type == A_FLOAT)
+        x->x_channel = atom_getfloat(av + 1);
+    else
+        x->x_channel = 0;
+    if(!path){
+        pd_error(x, "[sfload]: Invalid arguments for 'load' message\n");
+        return;
+    }
+    char dir[MAXPDSTRING], file[MAXPDSTRING];
+    sfload_find_file(x, path, dir, file);
+    snprintf(x->x_path, MAXPDSTRING, "%s/%s", dir, file);
+/*    if(pthread_create(&x->x_process_thread, NULL, sfload_read_audio, x) != 0){
+        pd_error(x, "[sfload]: Error creating thread\n");
+        return;
+    }*/
+
+    sfload_read_audio();
+
+    AVChannelLayout layout;
+    layout = sfload_get_channel_layout_for_file(x, dir, file);
+    int nch = layout.nb_channels;
+
+    post("x->x_result_ready = %i", x->x_result_ready);
+    outlet_float(x->x_info, nch);
+//    outlet_float(x->x_info, x->x_nsamps);
+
+    clock_delay(x->x_result_clock, 20);
+}
+
+void sfload_set(t_sfload* x, t_symbol* s){
+    x->x_arr_name = s;
+}
+
+static void sfload_free(t_sfload *x){
+    clock_free(x->x_result_clock);
+    pthread_join(x->x_process_thread, NULL);
+    av_channel_layout_uninit(&x->x_layout);
+    avcodec_free_context(&x->x_stream_ctx);
+    avformat_close_input(&x->x_ic);
+    av_packet_free(&x->x_pkt);
+    av_frame_free(&x->x_frm);
+    swr_free(&x->x_swr);
+}
+
+static void *sfload_new(t_symbol *s, int ac, t_atom *av){
+    t_sfload *x = (t_sfload *)pd_new(sfload_class);
+    x->x_arr_name = NULL;
+    if(ac >= 1 && av[0].a_type == A_SYMBOL)
+        x->x_arr_name = atom_getsymbol(av);
+    x->x_pkt = av_packet_alloc();
+    x->x_frm = av_frame_alloc();
+    x->x_ic = NULL;
+    x->x_all_out = NULL;
+    x->x_canvas = canvas_getcurrent();
+    x->x_result_ready = 0;
+    x->x_result_clock = clock_new(x, (t_method)sfload_check_done);
+    x->x_info = outlet_new(&x->x_obj, 0);
+    return(x);
+}
+
+void sfload_setup(void){
+    sfload_class = class_new(gensym("sfload"), (t_newmethod)sfload_new,
+        (t_method)sfload_free, sizeof(t_sfload), 0, A_GIMME, 0);
+    class_addmethod(sfload_class, (t_method)sfload_load, gensym("load"), A_GIMME, 0);
+    class_addmethod(sfload_class, (t_method)sfload_set, gensym("set"), A_SYMBOL, 0);
+//    class_addmethod(sfload_class, (t_method)sfload_info, gensym("info"), 0);
+}