Packman Build Service PMBS

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 62

nordlicht.spec Changed

_service:download_files:v0.3.4.tar.gz/Vagrantfile Deleted

@@ -1,24 +0,0 @@
-Vagrant.configure("2") do |config|
-    config.vm.define "ubuntu" do |c|
-        c.vm.box = "ubuntu"
-        c.vm.box_url = "http://files.vagrantup.com/precise64.box"
-        c.vm.provision :shell, :path => "utils/bootstrap-debian.sh"
-        c.vm.synced_folder ".", "/home/vagrant/nordlicht"
-        c.ssh.forward_agent = true
-    end
-    config.vm.define "debian" do |c|
-        c.vm.box = "debian"
-        c.vm.box_url = "https://dl.dropboxusercontent.com/u/197673519/debian-7.2.0.box"
-        c.vm.provision :shell, :path => "utils/bootstrap-debian.sh"
-        c.vm.synced_folder ".", "/home/vagrant/nordlicht"
-        c.ssh.forward_agent = true
-    end
-    config.vm.define "gentoo" do |c|
-        c.vm.box = "gentoo"
-        c.vm.box_url = "https://dl.dropboxusercontent.com/s/0e23qmbo97wb5x2/gentoo-20131029-i686-minimal.box"
-    end
-    config.vm.define "suse" do |c|
-        c.vm.box = "suse"
-        c.vm.box_url = "http://sourceforge.net/projects/opensusevagrant/files/12.2/opensuse-12.2-64.box/download"
-    end
-end

_service:download_files:v0.3.4.tar.gz/examples Deleted

_service:download_files:v0.3.4.tar.gz/examples/elephants-dream-vertical.png Deleted

_service:download_files:v0.3.4.tar.gz/examples/mpv-integration.png Deleted

_service:download_files:v0.3.4.tar.gz/examples/nordlicht-logo.png Deleted

_service:download_files:v0.3.4.tar.gz/examples/tears-of-steel.png Deleted

_service:download_files:v0.3.4.tar.gz/src Deleted

_service:download_files:v0.3.4.tar.gz/src/common.c Deleted

_service:download_files:v0.3.4.tar.gz/src/common.h Deleted

_service:download_files:v0.3.4.tar.gz/src/graphics.c Deleted

@@ -1,92 +0,0 @@
-#include "graphics.h"
-#include "common.h"
-
-column* column_scale(column *c, int length) {
-    column *c2;
-    c2 = malloc(sizeof(column));
-    c2->data = malloc(length*3);
-    c2->length = length;
-
-    float factor = 1.0*c->length/length;
-
-    int i;
-    for(i=0; i<length; i++) {
-        int lower = factor*i+0.5;
-        int upper = factor*(i+1)-0.5;
-
-        if (lower > upper) {
-            // this can happen when upscaling. pick nearest-neighbour entry:
-            lower = upper = factor*(i+0.5);
-        }
-
-        int rsum = 0;
-        int gsum = 0;
-        int bsum = 0;
-        int j;
-        for(j=lower; j<=upper; j++) {
-            rsum += c->data[j*3+0];
-            gsum += c->data[j*3+1];
-            bsum += c->data[j*3+2];
-        }
-        c2->data[i*3+0] = rsum/(upper-lower+1);
-        c2->data[i*3+1] = gsum/(upper-lower+1);
-        c2->data[i*3+2] = bsum/(upper-lower+1);
-    }
-
-    return c2;
-}
-
-void column_free(column *c) {
-    free(c->data);
-    free(c);
-}
-
-column* compress_to_column(image *i) {
-    column *c;
-    c = malloc(sizeof(column));
-    c->data = malloc(i->height*3);
-    c->length = i->height;
-
-    int x, y;
-    int step = i->width/20;
-    for (y=0; y<i->height; y++) {
-        long rsum = 0;
-        long gsum = 0;
-        long bsum = 0;
-        for (x=0; x<i->width; x+=step) {
-            rsum += i->data[y*i->width*3+3*x+0];
-            gsum += i->data[y*i->width*3+3*x+1];
-            bsum += i->data[y*i->width*3+3*x+2];
-        }
-        c->data[3*y+0] = rsum/(i->width/step+1);
-        c->data[3*y+1] = gsum/(i->width/step+1);
-        c->data[3*y+2] = bsum/(i->width/step+1);
-    }
-
-    return c;
-}
-
-column* compress_to_row(image *i) {
-    column *c;
-    c = malloc(sizeof(column));
-    c->data = malloc(i->width*3);
-    c->length = i->width;
-
-    int x, y;
-    int step = 1;
-    for (x=0; x<i->width; x++) {
-        long rsum = 0;
-        long gsum = 0;
-        long bsum = 0;
-        for (y=0; y<i->height; y+=step) {
-            rsum += i->data[y*i->width*3+3*x+0];
-            gsum += i->data[y*i->width*3+3*x+1];
-            bsum += i->data[y*i->width*3+3*x+2];
-        }
-        c->data[3*(i->width-x-1)+0] = rsum/(i->height/step);
-        c->data[3*(i->width-x-1)+1] = gsum/(i->height/step);
-        c->data[3*(i->width-x-1)+2] = bsum/(i->height/step);
-    }
-
-    return c;
-}

_service:download_files:v0.3.4.tar.gz/src/graphics.h Deleted

_service:download_files:v0.3.4.tar.gz/src/main.c Deleted

@@ -1,171 +0,0 @@
-#include <pthread.h>
-#include <unistd.h>
-#include <sys/file.h>
-#include <sys/mman.h>
-#include <popt.h>
-#include "nordlicht.h"
-#include "common.h"
-
-const char *gnu_basename(const char *path) {
-    char *base = strrchr(path, '/');
-    return base ? base+1 : path;
-}
-
-void print_help(poptContext popt, int ret) {
-    poptPrintHelp(popt, ret == 0 ? stdout : stderr, 0);
-    exit(ret);
-}
-
-void interesting_stuff(char *filename, char *output_file, int width, int height, nordlicht_style style, int live) {
-    nordlicht *n = nordlicht_init(filename, width, height, live);
-    unsigned char *data = NULL;
-
-    if (n == NULL) {
-        exit(1);
-    }
-
-    nordlicht_set_style(n, style);
-
-    if (live) {
-        int fd = open(output_file, O_CREAT | O_TRUNC | O_RDWR, 0666);
-        if (fd == -1) {
-            error("Could not open '%s'.", output_file);
-            exit(1);
-        }
-        ftruncate(fd, nordlicht_buffer_size(n));
-        data = mmap(NULL, nordlicht_buffer_size(n), PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
-        nordlicht_set_buffer(n, data);
-    } else {
-        // Try to write the empty buffer to fail early if this does not work
-        if (nordlicht_write(n, output_file) != 0) {
-            exit(1);
-        }
-    }
-
-    pthread_t thread;
-    pthread_create(&thread, NULL, (void*(*)(void*))nordlicht_generate, n);
-
-    float progress = 0;
-    while (progress < 1) {
-        progress = nordlicht_progress(n);
-        printf("\rnordlicht: %02.0f%%", progress*100);
-        fflush(stdout);
-        usleep(100000);
-    }
-    pthread_join(thread, NULL);
-
-    if (!live) {
-        nordlicht_write(n, output_file);
-    }
-
-    nordlicht_free(n);
-    munmap(data, nordlicht_buffer_size(n));
-    // close
-
-    printf(" -> '%s'\n", output_file);
-}
-
-int main(int argc, const char **argv) {
-    int width = -1;
-    int height = -1;
-    char *output_file = NULL;
-    char *style_string = NULL;
-    nordlicht_style style;
-    int free_output_file = 0;
-
-    int help = 0;
-    int version = 0;
-    int live = 0;
-
-    struct poptOption optionsTable[] = {
-        {"width", 'w', POPT_ARG_INT, &width, 0, "set the barcode's width; by default it's \"height*10\", or 1000 pixels, if both are undefined", NULL},
-        {"height", 'h', POPT_ARG_INT, &height, 0, "set the barcode's height; by default it's \"width/10\"", NULL},
-        {"output", 'o', POPT_ARG_STRING, &output_file, 0, "set filename of output PNG; the default is $(basename VIDEOFILE).png", "FILENAME"},
-        {"style", 's', POPT_ARG_STRING, &style_string, 0, "default is 'horizontal'; can also be 'vertical', which compresses the frames \"down\" to rows, rotates them counterclockwise by 90 degrees and then appends them", "STYLE"},
-        {"live", '\0', 0, &live, 0, "generate a raw BGRA file instead of an PNG; you can display this file, it will update itself", NULL},
-        {"help", '\0', 0, &help, 0, "display this help and exit", NULL},
-        {"version", '\0', 0, &version, 0, "output version information and exit", NULL},
-        POPT_TABLEEND
-    };
-
-    poptContext popt = poptGetContext(NULL, argc, argv, optionsTable, 0);
-    poptSetOtherOptionHelp(popt, "[OPTION]... VIDEOFILE\n");
-
-    char c;
-
-    // The next line leaks 3 bytes, blame popt!
-    while ((c = poptGetNextOpt(popt)) >= 0) { }
-
-    if (c < -1) {
-        fprintf(stderr, "nordlicht: %s: %s\n", poptBadOption(popt, POPT_BADOPTION_NOALIAS), poptStrerror(c));
-        return 1;
-    }
-
-    if (version) {
-      printf("nordlicht %s\n", NORDLICHT_VERSION);
-      return 0;
-    }
-
-    if (help) {
-        print_help(popt, 0);
-    }
-
-    char *filename = (char*)poptGetArg(popt);
-
-    if (filename == NULL) {
-        error("Please specify an input file.");
-        print_help(popt, 1);
-    }
-
-    if (poptGetArg(popt) != NULL) {
-        error("Please specify only one input file.");
-        print_help(popt, 1);
-    }
-
-    if (output_file == NULL) {
-        if (live) {
-            output_file = malloc(snprintf(NULL, 0, "%s.bgra", gnu_basename(filename)) + 1);
-            sprintf(output_file, "%s.bgra", gnu_basename(filename));
-        } else {
-            output_file = malloc(snprintf(NULL, 0, "%s.png", gnu_basename(filename)) + 1);
-            sprintf(output_file, "%s.png", gnu_basename(filename));
-        }
-        free_output_file = 1;
-    }
-
-    if (width == -1 && height != -1) {
-        width = height*10;
-    }
-    if (height == -1 && width != -1) {
-        height = width/10;
-        if (height < 1) {
-            height = 1;
-        }
-    }
-    if (height == -1 && width == -1) {
-        width = 1000;
-        height = 100;
-    }
-
-    if (style_string == NULL) {
-        style = NORDLICHT_STYLE_HORIZONTAL;
-    } else {
-        if (strcmp(style_string, "horizontal") == 0) {
-            style = NORDLICHT_STYLE_HORIZONTAL;
-        } else if (strcmp(style_string, "vertical") == 0) {
-            style = NORDLICHT_STYLE_VERTICAL;
-        } else {
-            error("Unknown style '%s'.", style_string);
-            print_help(popt, 1);
-        }
-    }
-
-    interesting_stuff(filename, output_file, width, height, style, live);
-
-    if (free_output_file) {
-        free(output_file);
-    }
-
-    poptFreeContext(popt);
-    return 0;
-}

_service:download_files:v0.3.4.tar.gz/src/nordlicht.c Deleted

@@ -1,200 +0,0 @@
-#include "nordlicht.h"
-#include <png.h>
-#include "common.h"
-#include "video.h"
-
-struct nordlicht {
-    int width, height;
-    char *filename;
-    unsigned char *data;
-    int live;
-    nordlicht_style style;
-    int modifiable;
-    int owns_data;
-    float progress;
-    video *source;
-};
-
-size_t nordlicht_buffer_size(nordlicht *n) {
-    return n->width*n->height*4;
-}
-
-nordlicht* nordlicht_init(char *filename, int width, int height, int live) {
-    if (width < 1 || height < 1) {
-        error("Dimensions must be positive (got %dx%d)", width, height);
-        return NULL;
-    }
-    nordlicht *n;
-    n = malloc(sizeof(nordlicht));
-
-    n->width = width;
-    n->height = height;
-    n->filename = filename;
-
-    n->data = calloc(nordlicht_buffer_size(n), 1);
-    n->owns_data = 1;
-
-    n->live = !!live;
-
-    n->style = NORDLICHT_STYLE_HORIZONTAL;
-    n->modifiable = 1;
-    n->progress = 0;
-    n->source = video_init(filename, width);
-
-    if (n->source == NULL) {
-        error("Could not open video file '%s'", filename);
-        free(n);
-        return NULL;
-    }
-
-    return n;
-}
-
-void nordlicht_free(nordlicht *n) {
-    if (n->owns_data) {
-        free(n->data);
-    }
-    video_free(n->source);
-    free(n);
-}
-
-void nordlicht_set_style(nordlicht *n, nordlicht_style s) {
-    if (n->modifiable) {
-        n->style = s;
-    }
-}
-
-unsigned char* get_column(nordlicht *n, int i) {
-    column *c = video_get_column(n->source, 1.0*(i+0.5-COLUMN_PRECISION/2.0)/n->width, 1.0*(i+0.5+COLUMN_PRECISION/2.0)/n->width, n->style);
-
-    if (c == NULL) {
-        return NULL;
-    }
-
-    column *c2 = column_scale(c, n->height);
-    unsigned char *data = c2->data;
-    free(c2);
-    return data;
-}
-
-int nordlicht_generate(nordlicht *n) {
-    video_build_keyframe_index(n->source, n->width);
-    int x, exact;
-
-    int do_a_fast_pass = n->live || !video_exact(n->source);
-    int do_an_exact_pass = video_exact(n->source);
-
-    for(exact=(!do_a_fast_pass); exact<=do_an_exact_pass; exact++) {
-        video_set_exact(n->source, exact);
-        for (x=0; x<n->width; x++) {
-            unsigned char *column = get_column(n, x); // TODO: Fill memory directly, no need to memcpy
-            if (column) {
-                int y;
-                for (y=0; y<n->height; y++) {
-                    memcpy(n->data+n->width*4*y+4*x, column+3*y, 3);
-                    memset(n->data+n->width*4*y+4*x+3, 255, 1);
-                }
-                free(column);
-            } else {
-                memset(n->data+n->height*3*x, 0, n->height*3);
-            }
-            n->progress = 1.0*x/n->width;
-        }
-    }
-
-    n->progress = 1.0;
-    return 0;
-}
-
-int nordlicht_write(nordlicht *n, char *filename) {
-    int code = 0;
-
-    if (strcmp(filename, "") == 0) {
-        error("Output filename must not be empty");
-        return -1;
-    }
-
-    char *realpath_output = realpath(filename, NULL);
-    if (realpath_output != NULL) {
-        // output file exists
-        char *realpath_input = realpath(n->filename, NULL);
-        if (strcmp(realpath_input, realpath_output) == 0) {
-            error("Will not overwrite input file");
-            code = -1;
-        }
-
-        free(realpath_input);
-        free(realpath_output);
-
-        if (code != 0) {
-            return code;
-        }
-    }
-
-    FILE *fp;
-    png_structp png = NULL;
-    png_infop png_info = NULL;
-
-    fp = fopen(filename, "wb");
-    if (fp == NULL) {
-        error("Could not open '%s' for writing", filename);
-        code = -1;
-        goto finalize;
-    }
-
-    png = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
-    if (png == NULL) {
-        error("Error writing PNG");
-        code = -1;
-        goto finalize;
-    }
-
-    png_info = png_create_info_struct(png);
-    if (png_info == NULL) {
-        error("Error writing PNG");
-        code = -1;
-        goto finalize;
-    }
-
-    if (setjmp(png_jmpbuf(png))) {
-        error("Error writing PNG");
-        code = -1;
-        goto finalize;
-    }
-    png_init_io(png, fp);
-    png_set_IHDR(png, png_info, n->width, n->height, 8, PNG_COLOR_TYPE_RGB_ALPHA,
-            PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
-
-    png_write_info(png, png_info);
-
-    int y;
-    for (y = 0; y < n->height; y++) {
-        png_write_row(png, n->data+4*y*n->width);
-    }
-
-    png_write_end(png, NULL);
-
-finalize:
-    if (fp != NULL) fclose(fp);
-    if (png_info != NULL) png_free_data(png, png_info, PNG_FREE_ALL, -1);
-    if (png != NULL) png_destroy_write_struct(&png, (png_infopp)NULL);
-
-    return code;
-}
-
-float nordlicht_progress(nordlicht *n) {
-    return n->progress;
-}
-
-const unsigned char* nordlicht_buffer(nordlicht *n) {
-    return n->data;
-}
-
-int nordlicht_set_buffer(nordlicht *n, unsigned char *data) {
-    if (n->owns_data) {
-        free(n->data);
-    }
-    n->owns_data = 0;
-    n->data = data;
-    return 0;

_service:download_files:v0.3.4.tar.gz/src/nordlicht.h Deleted

@@ -1,45 +0,0 @@
-#ifndef INCLUDE_nordlicht_h__
-#define INCLUDE_nordlicht_h__
-#include <stdlib.h> // for size_t
-
-typedef struct nordlicht nordlicht;
-
-typedef enum nordlicht_style {
-    NORDLICHT_STYLE_HORIZONTAL, // compress frames to columns, "move to the right"
-    NORDLICHT_STYLE_VERTICAL, // compress frames to rows, "move downwards"
-} nordlicht_style;
-
-// Allocate a new nordlicht of specific width and height, for a given video
-// file. When `live` is true, give a fast approximation before starting the
-// slow, exact generation. Use `nordlicht_free` to free the nordlicht again.
-// Returns NULL on errors.
-nordlicht* nordlicht_init(char *filename, int width, int height, int live);
-
-// Free a nordlicht.
-void nordlicht_free(nordlicht *n);
-
-// Set the output style of the nordlicht. Default is NORDLICHT_STYLE_HORIZONTAL.
-void nordlicht_set_style(nordlicht *n, nordlicht_style s);
-
-// Returns a pointer to the nordlicht's internal buffer. You can use it to draw
-// the barcode while it is generated.
-const unsigned char* nordlicht_buffer(nordlicht *n);
-
-// Replace the internal nordlicht's internal buffer. The data pointer is owned
-// by the caller and must be freed after `nordlicht_free`. Returns 0 on success.
-int nordlicht_set_buffer(nordlicht *n, unsigned char *data);
-
-// Returns the size of this nordlicht's buffer in bytes.
-size_t nordlicht_buffer_size(nordlicht *n);
-
-// Generate the nordlicht. Calling this will freeze the nordlicht:
-// "set" functions will be without effect. Returns 0 on success.
-int nordlicht_generate(nordlicht *n);
-
-// Returns a value between 0 and 1 indicating how much of the nordlicht is done.
-float nordlicht_progress(nordlicht *n);
-
-// Write the nordlicht to a PNG file. Returns 0 on success.
-int nordlicht_write(nordlicht *n, char *filename);
-
-#endif

_service:download_files:v0.3.4.tar.gz/src/video.c Deleted

@@ -1,306 +0,0 @@
-#include "video.h"
-#include <libavcodec/avcodec.h>
-#include <libavformat/avformat.h>
-#include <libswscale/swscale.h>
-
-#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 28, 0)
-#define avcodec_free_frame av_freep
-#endif
-
-#define HEURISTIC_NUMBER_OF_FRAMES 1800 // how many frames will the heuristic look at?
-#define HEURISTIC_KEYFRAME_FACTOR 1 // lower bound for the actual/required keyframe ratio
-
-struct video {
-    int exact;
-
-    AVFormatContext *format_context;
-    AVCodecContext *decoder_context;
-    int video_stream;
-    AVFrame *frame;
-
-    uint8_t *buffer;
-    AVFrame *scaleframe;
-    struct SwsContext *sws_context;
-
-    long current_frame;
-    int *keyframes;
-    int number_of_keyframes;
-    int has_index;
-
-    column *last_column;
-};
-
-double fps(video *v) {
-    return av_q2d(v->format_context->streams[v->video_stream]->r_frame_rate);
-}
-
-long packet_pts(video *v, AVPacket *packet) {
-    long pts = packet->pts != 0 ? packet->pts : packet->dts;
-    double sec = (double)(pts - v->format_context->streams[v->video_stream]->start_time) *
-        av_q2d(v->format_context->streams[v->video_stream]->time_base);
-    return (int64_t)(fps(v) * sec + 0.5);
-}
-
-int grab_next_frame(video *v) {
-    int valid = 0;
-    int got_frame = 0;
-
-    AVPacket packet;
-    av_init_packet(&packet);
-
-    double pts;
-
-    while (!valid) {
-        if (av_read_frame(v->format_context, &packet) >= 0) {
-            if(packet.stream_index == v->video_stream) {
-                avcodec_decode_video2(v->decoder_context, v->frame, &got_frame, &packet);
-                if (got_frame) {
-                    pts = packet_pts(v, &packet);
-                    valid = 1;
-                }
-                av_free_packet(&packet);
-            } else {
-                av_free_packet(&packet);
-            }
-        } else {
-            error("av_read_frame failed.");
-            v->current_frame = -1;
-            return 1;
-        }
-    }
-
-    v->current_frame = pts;
-    return 0;
-}
-
-void seek_keyframe(video *v, long frame) {
-    double time_base = av_q2d(v->format_context->streams[v->video_stream]->time_base);
-    av_seek_frame(v->format_context, v->video_stream, frame/fps(v)/time_base, AVSEEK_FLAG_BACKWARD);
-    avcodec_flush_buffers(v->decoder_context);
-    grab_next_frame(v);
-}
-
-int total_number_of_frames(video *v) {
-    double duration_sec = 1.0*v->format_context->duration/AV_TIME_BASE;
-    return fps(v)*duration_sec;
-}
-
-void video_build_keyframe_index(video *v, int width) {
-    v->keyframes = malloc(sizeof(long)*60*60*3); // TODO: dynamic datastructure!
-    v->number_of_keyframes = 0;
-
-    AVPacket packet;
-    av_init_packet(&packet);
-    int frame = 0;
-
-    v->has_index = 0;
-    v->exact = 1;
-    seek_keyframe(v, 0);
-
-    while (av_read_frame(v->format_context, &packet) >= 0) {
-        if (packet.stream_index == v->video_stream) {
-            if (!!(packet.flags & AV_PKT_FLAG_KEY)) {
-                v->number_of_keyframes++;
-
-                long pts = packet_pts(v, &packet);
-                if (pts < 1 && v->number_of_keyframes > 0) {
-                    pts = frame;
-                }
-
-                v->keyframes[v->number_of_keyframes] = pts;
-            }
-            if (frame == HEURISTIC_NUMBER_OF_FRAMES) {
-                float density = 1.0*v->number_of_keyframes/HEURISTIC_NUMBER_OF_FRAMES;
-                float required_density = 1.0*HEURISTIC_KEYFRAME_FACTOR/COLUMN_PRECISION*width/total_number_of_frames(v);
-                if (density > required_density) {
-                    // The keyframe density in the first `HEURISTIC_NUMBER_OF_FRAMES`
-                    // frames is HEURISTIC_KEYFRAME_FACTOR times higher than
-                    // the density we need overall.
-                    printf("\rBuilding index: Enough keyframes (%.2f times enough), aborting.\n", density/required_density);
-                    v->exact = 0;
-                    return;
-                } else {
-                    printf("\rBuilding index: Keyframe ratio is %.2f, keep going.\n", density/required_density);
-                }
-            }
-            frame++;
-        }
-        av_free_packet(&packet);
-
-        printf("\rBuilding index: %02.0f%%", 1.0*frame/total_number_of_frames(v)*100);
-        fflush(stdout);
-    }
-    printf("\rBuilding index: %d keyframes.\n", v->number_of_keyframes);
-    v->has_index = 1;
-}
-
-video* video_init(char *filename, int width) {
-    av_log_set_level(AV_LOG_FATAL);
-    av_register_all();
-
-    video *v;
-    v = malloc(sizeof(video));
-    v->exact = 1;
-    v->format_context = NULL;
-
-    if (avformat_open_input(&v->format_context, filename, NULL, NULL) != 0) {
-        free(v);
-        return NULL;
-    }
-    if (avformat_find_stream_info(v->format_context, NULL) < 0) {
-        avformat_close_input(&v->format_context);
-        return NULL;
-    }
-    v->video_stream = av_find_best_stream(v->format_context, AVMEDIA_TYPE_VIDEO, -1, -1, NULL, 0);
-    if (v->video_stream == -1) {
-        avformat_close_input(&v->format_context);
-        return NULL;
-    }
-    v->decoder_context = v->format_context->streams[v->video_stream]->codec;
-    AVCodec *codec = NULL;
-    codec = avcodec_find_decoder(v->decoder_context->codec_id);
-    if (codec == NULL) {
-        error("Unsupported codec!");
-        avformat_close_input(&v->format_context);
-        return NULL;
-    }
-    AVDictionary *optionsDict = NULL;
-    if (avcodec_open2(v->decoder_context, codec, &optionsDict) < 0) {
-        avformat_close_input(&v->format_context);
-        return NULL;
-    }
-
-    v->frame = avcodec_alloc_frame();
-    v->current_frame = -1;
-    v->last_column = NULL;
-    v->has_index = 0;
-
-    if (grab_next_frame(v) != 0) {
-        return NULL;
-    }
-
-    v->scaleframe = avcodec_alloc_frame();
-    v->scaleframe->width = v->frame->width;
-    v->scaleframe->height = v->frame->height;
-    v->scaleframe->format = PIX_FMT_RGB24;
-
-    v->buffer = (uint8_t *)av_malloc(sizeof(uint8_t)*avpicture_get_size(PIX_FMT_RGB24, v->scaleframe->width, v->scaleframe->height));
-    avpicture_fill((AVPicture *)v->scaleframe, v->buffer, PIX_FMT_RGB24, v->frame->width, v->frame->height);
-
-    v->sws_context = sws_getContext(v->frame->width, v->frame->height, v->frame->format,
-            v->scaleframe->width, v->scaleframe->height, PIX_FMT_RGB24, SWS_AREA, NULL, NULL, NULL);
-
-    return v;
-}
-
-long preceding_keyframe(video *v, long frame_nr) {
-    int i;
-    long best_keyframe = -1;
-    for (i=0; i < v->number_of_keyframes; i++) {

_service:download_files:v0.3.4.tar.gz/src/video.h Deleted

_service:download_files:v0.3.4.tar.gz/test Deleted

_service:download_files:v0.3.4.tar.gz/test/test-bin.sh Deleted

@@ -1,91 +0,0 @@
-#!/bin/bash
-
-pass() {
-    echo "Running '$@'"
-    $@ &> "$LOG"
-    exit_code=$?
-
-    if test $exit_code != 0; then
-        cat "$LOG"
-        echo "command failed: $*"
-        exit 1
-    fi
-    return 0
-}
-
-fail() {
-    echo "Running '$@'"
-    $@ &> "$LOG"
-    exit_code=$?
-
-    if test $exit_code = 0; then
-        cat "$LOG"
-        echo "command succeded: $*"
-        exit 1
-    elif test $exit_code -gt 129 -a $exit_code -le 192; then
-        echo "died by signal: $*"
-        exit 1
-    elif test $exit_code = 127; then
-        echo "command not found: $*"
-        exit 1
-    elif test $exit_code = 126; then
-        echo "valgrind error: $*"
-        exit 1
-    fi
-    return 0
-}
-
-VIDEO='video.mp4'
-LOG='test.log'
-TMP="tests-tmp_$$/"
-
-mkdir "$TMP" &&
-ln -s ../nordlicht "$TMP" &&
-ln -s ../"$VIDEO" "$TMP" &&
-pushd "$TMP" || exit 1
-
-# test environment
-pass true
-fail false
-pass test -f "$VIDEO"
-
-# argument parsing
-pass ./nordlicht --help
-fail ./nordlicht
-fail ./nordlicht --fubar
-fail ./nordlicht "$VIDEO" somethingelse
-
-# input file
-fail ./nordlicht nonexistantvideo.foo
-
-# size
-pass ./nordlicht "$VIDEO" -w 1 -h 1
-pass ./nordlicht "$VIDEO" -w 1 -h 10000
-fail ./nordlicht "$VIDEO" -w huuuge
-fail ./nordlicht "$VIDEO" -w 0
-fail ./nordlicht "$VIDEO" -h 0
-fail ./nordlicht "$VIDEO" -w ''
-fail ./nordlicht "$VIDEO" -h ''
-fail ./nordlicht "$VIDEO" -w -100
-fail ./nordlicht "$VIDEO" -h -100
-fail ./nordlicht "$VIDEO" -w 1.1
-fail ./nordlicht "$VIDEO" -h 1.1
-fail ./nordlicht "$VIDEO" -w 1,1
-fail ./nordlicht "$VIDEO" -h 1,1
-
-# output file
-pass ./nordlicht "$VIDEO" -w 1 -o ünîç⌀də.png
-pass test -f ünîç⌀də.png
-fail ./nordlicht "$VIDEO" -o ../"$TMP"
-fail ./nordlicht "$VIDEO" -o "$VIDEO"
-fail ./nordlicht "$VIDEO" -o ''
-
-# style
-pass ./nordlicht "$VIDEO" -w 1 -s vertical
-pass ./nordlicht "$VIDEO" -w 1 -s horizontal
-fail ./nordlicht "$VIDEO" -s nope
-fail ./nordlicht "$VIDEO" -s ''
-
-popd && rm -rv "$TMP" || exit 1
-
-echo "All assertions passed. Yay!"

_service:download_files:v0.3.4.tar.gz/utils/bootstrap-debian.sh Deleted

_service:download_files:v0.3.4.tar.gz/.gitignore -> _service:download_files:v0.4.0.tar.gz/.gitignore Changed

_service:download_files:v0.4.0.tar.gz/.travis.yml Added

_service:download_files:v0.3.4.tar.gz/CMakeLists.txt -> _service:download_files:v0.4.0.tar.gz/CMakeLists.txt Changed

@@ -1,7 +1,7 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 2.6)
 
 project(nordlicht C)
-set(NORDLICHT_VERSION 0.3.4)
+set(NORDLICHT_VERSION 0.3.5)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/")
 set(LIB_SUFFIX "" CACHE STRING "Suffix of library directory name (for example '32' or '64')")
@@ -9,28 +9,39 @@
 
 find_package(Threads REQUIRED)
 find_package(FFmpeg COMPONENTS AVUTIL AVFORMAT AVCODEC SWSCALE REQUIRED)
-find_package(PNG REQUIRED)
 find_package(Popt REQUIRED)
 
-include_directories(${CMAKE_BINARY_DIR}/src ${FFMPEG_INCLUDE_DIRS} ${PNG_INCLUDE_DIRS} ${POPT_INCLUDES})
+find_program(HELP2MAN help2man)
+if (NOT HELP2MAN)
+    message(FATAL_ERROR "help2man not found, aborting.")
+endif()
 
-add_library(nordlicht SHARED src/common.c src/graphics.c src/nordlicht.c src/video.c)
-set_target_properties(nordlicht PROPERTIES SOVERSION 0)
-target_link_libraries(nordlicht ${FFMPEG_LIBRARIES} ${PNG_LIBRARIES} ${POPT_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
+include_directories(${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ${FFMPEG_INCLUDE_DIRS} ${POPT_INCLUDES})
 
-add_executable(nordlicht-bin src/main.c)
-set_target_properties(nordlicht-bin PROPERTIES OUTPUT_NAME nordlicht)
-target_link_libraries(nordlicht-bin nordlicht)
+add_library(libnordlicht SHARED error.c image.c nordlicht.c source.c)
+set_target_properties(libnordlicht PROPERTIES OUTPUT_NAME nordlicht)
+set_target_properties(libnordlicht PROPERTIES SOVERSION 0)
+target_link_libraries(libnordlicht ${FFMPEG_LIBRARIES})
 
-configure_file(cmake/nordlicht.pc.in cmake/nordlicht.pc @ONLY)
-configure_file(src/version.h.in src/version.h @ONLY)
-add_custom_command(TARGET nordlicht-bin POST_BUILD
+add_executable(nordlicht main.c)
+target_link_libraries(nordlicht libnordlicht ${POPT_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
+
+add_executable(testsuite testsuite.c)
+target_link_libraries(testsuite libnordlicht)
+
+configure_file(cmake/nordlicht.pc.in nordlicht.pc @ONLY)
+configure_file(version.h.in version.h @ONLY)
+add_custom_command(TARGET nordlicht POST_BUILD
     COMMAND help2man ${CMAKE_BINARY_DIR}/nordlicht -N -n "creates colorful barcodes from video files"
     -o ${CMAKE_BINARY_DIR}/nordlicht.1
 )
 
-install(TARGETS nordlicht DESTINATION ${LIB_INSTALL_DIR})
-install(TARGETS nordlicht-bin DESTINATION bin)
-install(FILES src/nordlicht.h DESTINATION include)
-install(FILES ${CMAKE_BINARY_DIR}/cmake/nordlicht.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
+install(TARGETS libnordlicht DESTINATION ${LIB_INSTALL_DIR})
+install(TARGETS nordlicht DESTINATION bin)
+install(FILES nordlicht.h DESTINATION include)
+install(FILES ${CMAKE_BINARY_DIR}/nordlicht.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 install(FILES ${CMAKE_BINARY_DIR}/nordlicht.1 DESTINATION share/man/man1)
+
+add_custom_target(check testsuite)
+add_custom_target(download_testfile ${CMAKE_COMMAND} -P ${CMAKE_SOURCE_DIR}/cmake/download_testfile.cmake)
+add_dependencies(check libnordlicht nordlicht download_testfile)

_service:download_files:v0.3.4.tar.gz/README.md -> _service:download_files:v0.4.0.tar.gz/README.md Changed

@@ -1,48 +1,21 @@
-![](examples/nordlicht-logo.png)
+# nordlicht
 
-**nordlicht** is a C library for converting video files into colorful barcodes. It is inspired by the [Moviebarcode Tumblr](http://moviebarcode.tumblr.com/), but aims at the next logical step: Integrating these barcodes into video players to make navigation faster and more precise.
+**nordlicht** is a C library that creates moodbars from video files. For a general introduction, installation and usage instructions, please visit <http://nordlicht.github.io/>.
 
-*nordlicht* provides a command line tool, which you can use to generate your own barcodes easily.
+## Contributing
 
-## Examples
+Development of *nordlicht* happens on GitHub. Please report any bugs or ideas to the [issue tracker](https://github.com/blinry/nordlicht/issues). To contribute code, fork the repository and submit a pull request.
 
-Here's the barcode for [Tears of Steel](http://tearsofsteel.org/). It was created by taking the movie's frames at regular intervals, scaling them to 1 pixel width, and appending them. You can differentiate inside and outside scenes, the credits, and the "secret" scene at the end:
+You can also help by packaging the software for your favorite operating system, or writing an integration for your favorite video player. Even rough prototypes are highly appreciated!
 
-![](examples/tears-of-steel.png)
-
-This barcode of [Elephants Dream](http://www.elephantsdream.org/) uses the *vertical* style, which compresses video's frames to columns and rotates them counterclockwise. This style emphasizes the movement of characters:
-
-![](examples/elephants-dream-vertical.png)
-
-## Installation
-
-- Arch Linux: Install the [`nordlicht`](https://aur.archlinux.org/packages/nordlicht/) package from the [AUR](https://wiki.archlinux.org/index.php/Arch_User_Repository)
-- Gentoo: Install the `media-video/nordlicht` package from the [multimedia overlay](https://gitorious.org/gentoo-multimedia/gentoo-multimedia), [here's how](https://www.gentoo.org/proj/en/overlays/userguide.xml)
-- On other distributions, get CMake, FFmpeg, libpng, [popt](http://freecode.com/projects/popt), and [help2man](https://www.gnu.org/software/help2man/), and issue: `mkdir build && cd build && cmake .. && make && make install`
-
-## Usage
-
-### Command line tool
-
-Basic usage: `nordlicht video.mkv -w 1000 -h 150 -o barcode.png` converts *video.mkv* to a barcode of 1000 x 150 pixels size and writes it to *barcode.png*. Run `nordlicht --help` to learn more.
-
-### Library
-
-- API documentation: see [src/nordlicht.h](src/nordlicht.h)
-- Simple usage example: see [src/main.c](src/main.c)
-
-## Integrations
-
-### mpv
-
-For very recent versions of [mpv](http://mpv.io/), there is an experimental [lua plugin](/utils/mpv-nordlicht.lua). Simply put it in `~/.mpv/lua/` (or symlink it there!) and mpv should display a live-updating barcode of the current video file. You can turn it on and off by pressing `n`. You'll need a version of mpv after commit `d706f81` (>= v0.3.6) and ImageMagick! This is how it looks like (for [Decay](http://www.decayfilm.com/)):
-
-![](/examples/mpv-integration.png)
-
-For versions >= 0.2.0, there is an older script called [mpv-nordlicht](/utils/mpv-nordlicht). Put it in your `PATH` and use it instead of `mpv`. It doesn't support multiple files, and you cannot hide the barcode. 
+*nordlicht* uses [semantic versioning](http://semver.org/).
 
 ## License: GPLv2+
 
+Copyright (C) 2014, Sebastian Morr and contributors.
+
 *nordlicht* is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
 
-The header image shows an Aurora Borealis, which is called "Nordlicht" (nord-/lɪ[ç](https://en.wikipedia.org/wiki/Voiceless_palatal_fricative)t/) in German. The picture was taken in Greenland during the [Shelios 2012 expedition](http://shelios.com/sh2012) and is available under the [Creative Commons Attribution-NonCommercial License](https://creativecommons.org/licenses/by-nc/2.0/).
+*nordlicht* is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+You can get a copy of the GNU General Public License at <http://www.gnu.org/licenses/>.

_service:download_files:v0.4.0.tar.gz/cheat.h Added

@@ -0,0 +1,3247 @@
+/*
+Copyright (c) 2012, Guillermo "Tordek" Freschi
+Copyright (c) 2013, Sampsa "Tuplanolla" Kiiskinen
+All rights reserved.
+
+The full license can be found in the LICENSE file.
+*/
+
+/*
+Identifiers starting with CHEAT_ and cheat_ are reserved for internal use and
+ identifiers starting with cheat_test_, cheat_wrapped_ or cheat_unwrapped_ for
+ external use.
+*/
+
+#ifndef CHEAT_H
+#define CHEAT_H
+
+#ifndef __BASE_FILE__ /* This is indented so that older compilers ignore it. */
+	#error "the __BASE_FILE__ preprocessor directive is not defined"
+#endif
+
+#ifndef __STDC_VERSION__
+#define __STDC_VERSION__ 198912L /* This refers to ANSI X3.159-1989. */
+#endif
+
+#if __STDC_VERSION__ >= 199901L
+#define CHEAT_MODERN
+#endif
+
+#ifdef _WIN32
+#define CHEAT_WINDOWED
+#endif
+
+#if _POSIX_C_SOURCE >= 198809L
+#define CHEAT_POSIXLY
+#else
+#ifdef __linux__
+#define CHEAT_POSIXLY
+#else
+#ifdef __unix__
+#define CHEAT_POSIXLY
+#endif
+#endif
+#endif
+
+#if _POSIX_C_SOURCE >= 200112L
+#define CHEAT_VERY_POSIXLY
+#endif
+
+#ifdef __cplusplus
+#define CHEAT_POSTMODERN
+#endif
+
+#if __GNUC__ >= 4
+#define CHEAT_GNUTIFUL
+#endif
+
+#ifdef CHEAT_POSTMODERN
+extern "C" {
+#endif
+
+/*
+These headers are also
+ available externally even though
+ they do not need to be.
+*/
+
+#include <ctype.h>
+#include <errno.h> /* errno */
+#include <limits.h> /* INT_MAX */
+#include <setjmp.h> /* jmp_buf */
+#include <signal.h> /* SIGABRT, SIGFPE, SIGILL, SIGSEGV, SIGTERM */
+#include <stdarg.h> /* va_list */
+#include <stddef.h> /* NULL, size_t */
+#include <stdio.h> /* BUFSIZ, FILE, stderr, stdout */
+#include <stdlib.h> /* EXIT_FAILURE, EXIT_SUCCESS */
+#include <string.h>
+
+#ifdef CHEAT_MODERN
+#include <stdbool.h> /* bool, false, true */
+#else
+#ifndef CHEAT_POSTMODERN
+typedef int bool;
+#define false (0)
+#define true (!false)
+#endif
+#endif
+
+#ifdef CHEAT_MODERN
+#include <stdint.h> /* SIZE_MAX */
+#else
+#ifndef SIZE_MAX
+#define SIZE_MAX ((size_t )-1)
+#endif
+#endif
+
+/*
+All nested conditions use
+  #else
+  #if
+ instead of
+  #elif
+ since some compilers choke on the shorter form.
+*/
+#ifdef CHEAT_POSIXLY
+#include <sys/types.h> /* pid_t, ssize_t */
+#include <sys/wait.h>
+#include <unistd.h> /* STDERR_FILENO, STDOUT_FILENO */
+#ifdef CHEAT_VERY_POSIXLY
+#include <sys/select.h> /* fd_set */
+#else
+#include <sys/time.h> /* fd_set */
+#endif
+#else
+#ifdef CHEAT_WINDOWED
+#include <windows.h> /* spaghetti */
+#endif
+#endif
+
+/*
+This is used to truncate too long string literals.
+*/
+#ifndef CHEAT_LIMIT
+#ifdef CHEAT_POSTMODERN
+#define CHEAT_LIMIT ((size_t )65535)
+#else
+#ifdef CHEAT_MODERN
+#define CHEAT_LIMIT ((size_t )4095)
+#else
+#ifdef CHEAT_WINDOWED
+#define CHEAT_LIMIT ((size_t )2047)
+#else
+#define CHEAT_LIMIT ((size_t )509)
+#endif
+#endif
+#endif
+#endif
+
+/*
+This is needed to be able to cast a void pointer to any other pointer type.
+*/
+#ifdef CHEAT_POSTMODERN
+#define CHEAT_CAST(type, expression) \
+	((type )expression)
+#else
+#define CHEAT_CAST(type, expression) \
+	(expression)
+#endif
+
+/*
+This disables GNU extensions for compilers that do not support them.
+*/
+#ifdef CHEAT_GNUTIFUL
+#define __io__ __cold__ /* This is informational. */
+#else
+#define __attribute__(_)
+#endif
+
+/*
+This makes comma placement automatic.
+*/
+#ifdef CHEAT_MODERN
+#define CHEAT_VARIADIC
+#else
+#ifdef CHEAT_WINDOWED
+#define CHEAT_VARIADIC
+#endif
+#endif
+
+/*
+These are needed to print size and pointer difference types correctly.
+*/
+#ifdef CHEAT_MODERN
+#define CHEAT_SIZE_FORMAT "%zu"
+#define CHEAT_SIZE_TYPE size_t
+#define CHEAT_POINTER_FORMAT "%td"
+#define CHEAT_POINTER_TYPE ptrdiff_t
+#else
+#define CHEAT_SIZE_FORMAT "%lu"
+#define CHEAT_SIZE_TYPE long unsigned int
+#define CHEAT_POINTER_FORMAT "%ld"
+#define CHEAT_POINTER_TYPE long int
+#endif
+
+/*
+These are ISO/IEC 6429 escape sequences for
+ communicating text attributes to terminal emulators.
+*/
+#define CHEAT_RESET "\033[0m" /* Some compilers do not understand '\x1b'. */
+#define CHEAT_BOLD "\033[1m"
+#define CHEAT_FOREGROUND_GRAY "\033[30;1m"
+#define CHEAT_FOREGROUND_RED "\033[31;1m"
+#define CHEAT_FOREGROUND_GREEN "\033[32;1m"
+#define CHEAT_FOREGROUND_YELLOW "\033[33;1m"
+#define CHEAT_FOREGROUND_BLUE "\033[34;1m"
+#define CHEAT_FOREGROUND_MAGENTA "\033[35;1m"
+#define CHEAT_FOREGROUND_CYAN "\033[36;1m"
+#define CHEAT_FOREGROUND_WHITE "\033[37;1m"
+#define CHEAT_BACKGROUND_BLACK "\033[40;1m"

_service:download_files:v0.4.0.tar.gz/cmake/download_testfile.cmake Added

_service:download_files:v0.4.0.tar.gz/error.c Added

_service:download_files:v0.4.0.tar.gz/error.h Added

_service:download_files:v0.4.0.tar.gz/image.c Added

@@ -0,0 +1,286 @@
+#include "image.h"
+#include "error.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <libswscale/swscale.h>
+
+#if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(52, 8, 0)
+#define av_frame_alloc  avcodec_alloc_frame
+#define av_frame_free av_freep
+void av_frame_get_buffer(AVFrame *frame, int magic) { avpicture_alloc((AVPicture *)frame, frame->format, frame->width, frame->height); }
+void av_frame_copy(AVFrame *dst, AVFrame *src) { memcpy(dst->data[0], src->data[0], sizeof(uint8_t)*avpicture_get_size(PIX_FMT_RGB24, dst->width, dst->height)); }
+#endif
+
+#define MAX_FILTER_SIZE 256
+
+struct image {
+    AVFrame *frame;
+};
+
+image *image_init(const int width, const int height) {
+    image *i;
+    i = (image *) malloc(sizeof(image));
+
+    i->frame = (AVFrame *) av_frame_alloc();
+    i->frame->width = width;
+    i->frame->height = height;
+    i->frame->format = PIX_FMT_RGB24; // best choice?
+    av_frame_get_buffer(i->frame, 16); // magic number?
+    return i;
+}
+
+int image_width(const image *i) {
+    return i->frame->width;
+}
+
+int image_height(const image *i) {
+    return i->frame->height;
+}
+
+void image_set(const image *i, const int x, const int y, const unsigned char r, const unsigned char g, const unsigned char b) {
+    *(i->frame->data[0]+y*i->frame->linesize[0]+x*3+0) = r;
+    *(i->frame->data[0]+y*i->frame->linesize[0]+x*3+1) = g;
+    *(i->frame->data[0]+y*i->frame->linesize[0]+x*3+2) = b;
+}
+
+unsigned char image_get_r(const image *i, const int x, const int y) {
+    return *(i->frame->data[0]+y*i->frame->linesize[0]+x*3+0);
+}
+
+unsigned char image_get_g(const image *i, const int x, const int y) {
+    return *(i->frame->data[0]+y*i->frame->linesize[0]+x*3+1);
+}
+
+unsigned char image_get_b(const image *i, const int x, const int y) {
+    return *(i->frame->data[0]+y*i->frame->linesize[0]+x*3+2);
+}
+
+void image_to_bgra(unsigned char *target, const int width, const int height, const image *i, const int offset_x, const int offset_y) {
+    int x, y;
+    for (y = 0; y < image_height(i) && offset_y+y < height ; y++) {
+        for (x = 0; x < image_width(i) && offset_x+x < width; x++) {
+            *(target+width*4*(offset_y+y)+4*(offset_x+x)+0) = image_get_b(i, x, y);
+            *(target+width*4*(offset_y+y)+4*(offset_x+x)+1) = image_get_g(i, x, y);
+            *(target+width*4*(offset_y+y)+4*(offset_x+x)+2) = image_get_r(i, x, y);
+            *(target+width*4*(offset_y+y)+4*(offset_x+x)+3) = 255;
+        }
+    }
+}
+
+image *image_from_bgra(const unsigned char *source, const int width, const int height) {
+    image *i = image_init(width, height);
+    int x, y;
+    for (y = 0; y < image_height(i); y++) {
+        for (x = 0; x < image_width(i); x++) {
+            image_set(i, x, y, *(source+width*4*y+4*x+2), *(source+width*4*y+4*x+1), *(source+width*4*y+4*x+0));
+        }
+    }
+    return i;
+}
+
+image* image_clone(const image *i) {
+    image *i2 = image_init(image_width(i), image_height(i));
+    av_frame_copy(i2->frame, i->frame);
+    return i2;
+}
+
+void image_copy_avframe(const image *i, AVFrame *frame) {
+    av_frame_copy(i->frame, frame);
+}
+
+image* image_dumb_scale(const image *i, const int width, const int height) {
+    image *i2 = image_init(width, height);
+
+    float x_factor = 1.0*image_width(i)/width;
+    float y_factor = 1.0*image_height(i)/height;
+
+    int x, y;
+    for (x = 0; x < width; x++) {
+        int x_lower = x_factor*x + 0.5;
+        int x_upper = x_factor*(x+1) - 0.5;
+
+        if (x_lower > x_upper) {
+            // this can happen when upscaling. pick nearest-neighbour entry
+            x_lower = x_upper = x_factor*(x+0.5);
+        }
+
+        for (y = 0; y < height; y++) {
+            int y_lower = y_factor*y + 0.5;
+            int y_upper = y_factor*(y+1) - 0.5;
+
+            if (y_lower > y_upper) {
+                // this can happen when upscaling. pick nearest-neighbour entry
+                y_lower = y_upper = y_factor*(y+0.5);
+            }
+
+            int rsum = 0;
+            int gsum = 0;
+            int bsum = 0;
+            int xx, yy;
+            for (xx = x_lower; xx <= x_upper; xx++) {
+                for (yy = y_lower; yy <= y_upper; yy++) {
+                    rsum += image_get_r(i, xx, yy);
+                    gsum += image_get_g(i, xx, yy);
+                    bsum += image_get_b(i, xx, yy);
+                }
+            }
+            int n = (x_upper-x_lower+1)*(y_upper-y_lower+1);
+            image_set(i2, x, y, rsum/n, gsum/n, bsum/n);
+        }
+    }
+
+    return i2;
+}
+
+image* image_scale(const image *i, int width, int height) {
+    int target_width = width;
+    int target_height = height;
+
+    if (width == image_width(i) && height == image_height(i)) {
+        return image_clone(i);
+    }
+
+    image *i2 = NULL;
+    image *tmp = (image *) i;
+    do {
+        width = target_width;
+        height = target_height;
+
+#if LIBSWSCALE_VERSION_MICRO < 100 || LIBSWSCALE_VERSION_INT < AV_VERSION_INT(2, 1, 103)
+        if (width < 8) {
+            // libav and old FFmpeg versions don't allow scaling to a width of less than 8
+            if (image_width(tmp) > 8) {
+                // but we can use it to go down to 8
+                width = 8;
+            } else {
+                // all hope ist lost
+                image *i3 = image_dumb_scale(tmp, width, height);
+                if (tmp != i) {
+                    image_free(tmp);
+                }
+                return i3;
+            }
+        }
+
+        if (height < 2) {
+            // This doesn't seem to work on libav...
+            if (image_height(tmp) > 2) {
+                height = 2;
+            } else {
+                image *i3 = image_dumb_scale(tmp, width, height);
+                if (tmp != i) {
+                    image_free(tmp);
+                }
+                return i3;
+            }
+        }
+#endif
+
+        // When scaling from a high width directly to 1, FFmpeg sometimes (?)
+        // introduces noise. So we avoid this situation.
+        if (width == 1 && image_width(tmp) > 2) {
+            width = 2;
+        }
+
+        if (image_width(tmp)/width > MAX_FILTER_SIZE) {
+            width = image_width(tmp)/MAX_FILTER_SIZE+1;
+        }
+        if (image_height(tmp)/height > MAX_FILTER_SIZE) {
+            height = image_height(tmp)/MAX_FILTER_SIZE+1;
+        }
+
+
+        i2 = image_init(width, height);
+
+        struct SwsContext *sws_context = sws_getContext(image_width(tmp), image_height(tmp), tmp->frame->format,
+                                                        image_width(i2), image_height(i2), i2->frame->format,
+                                                        SWS_AREA, NULL, NULL, NULL);
+        sws_scale(sws_context, (uint8_t const * const *)tmp->frame->data,

_service:download_files:v0.4.0.tar.gz/image.h Added

_service:download_files:v0.4.0.tar.gz/main.c Added

@@ -0,0 +1,283 @@
+#include <pthread.h>
+#include <sys/file.h>
+#include <sys/mman.h>
+#include <stdarg.h>
+#include <unistd.h>
+#include <string.h>
+#include <popt.h>
+#include "nordlicht.h"
+#include "version.h"
+
+typedef struct {
+    const char *name;
+    const char *description;
+    nordlicht_style style;
+} style;
+
+const style style_table[] = {
+    {"horizontal", "compress frames to vertical lines and append them", NORDLICHT_STYLE_HORIZONTAL},
+    {"vertical", "compress frames to horizontal lines and rotate them counterclockwise by 90 degrees", NORDLICHT_STYLE_VERTICAL},
+    {"slitscan", "take single columns while constantly moving to the right (and wrapping back to the left)", NORDLICHT_STYLE_SLITSCAN},
+    {"middlecolumn", "take the middlemost column of each frame", NORDLICHT_STYLE_MIDDLECOLUMN},
+    {"thumbnails", "display small thumbnails at regular intervals", NORDLICHT_STYLE_THUMBNAILS},
+    {"spectrogram", "calculate a spectrogram of the first audio track", NORDLICHT_STYLE_SPECTROGRAM},
+    {NULL, NULL, NORDLICHT_STYLE_LAST}
+};
+
+void print_error(const char *message, ...) {
+    fprintf(stderr, "nordlicht: ");
+    va_list arglist;
+    va_start(arglist, message);
+    vfprintf(stderr, message, arglist);
+    va_end(arglist);
+    fprintf(stderr, "\n");
+}
+
+const char *gnu_basename(const char *path) {
+    const char *base = strrchr(path, '/');
+    return base ? base+1 : path;
+}
+
+const char *filename_ext(const char *path) {
+    const char *dot = strrchr(path, '.');
+    if (!dot || dot == path) return "";
+    return dot+1;
+}
+
+void print_help(const poptContext popt, const int ret) {
+    poptPrintHelp(popt, ret == 0 ? stdout : stderr, 0);
+
+    printf("\nStyles:\n");
+    int i;
+    for (i = 0; style_table[i].name; i++) {
+        printf("  %-14s %s\n", style_table[i].name, style_table[i].description);
+    }
+
+    printf("\n\
+Examples:\n\
+  nordlicht video.mp4                                   generate video.mp4.png of 1000 x 100 pixels size\n\
+  nordlicht video.mp4 --style=vertical                  compress individual frames to columns\n\
+  nordlicht video.mp4 -w 1920 -h 200 -o barcode.png     override size and name of the output file\n");
+
+    exit(ret);
+}
+
+int main(const int argc, const char **argv) {
+    int width = -1;
+    int height = -1;
+    float start = 0.0;
+    float end = 1.0;
+    char *output_file = NULL;
+    char *styles_string = NULL;
+    nordlicht_strategy strategy;
+    int free_output_file = 0;
+
+    int quiet = 0;
+    int help = 0;
+    int version = 0;
+
+    const struct poptOption optionsTable[] = {
+        {"width", 'w', POPT_ARG_INT, &width, 0, "set the barcode's width; by default it's \"height*10\", or 1000 pixels, if both are undefined", NULL},
+        {"height", 'h', POPT_ARG_INT, &height, 0, "set the barcode's height; by default it's \"width/10\"", NULL},
+        {"output", 'o', POPT_ARG_STRING, &output_file, 0, "set output filename, the default is $(basename VIDEOFILE).png; when you specify an *.bgra file, you'll get a raw 32-bit BGRA file that is updated as the barcode is generated", "FILENAME"},
+        {"style", 's', POPT_ARG_STRING, &styles_string, 0, "default is 'horizontal', see \"Styles\" section below. You can specify more than one style, separated by '+', to get multiple tracks", "STYLE"},
+        {"start", '\0', POPT_ARG_FLOAT, &start, 0, "specify where to start the barcode (in percent between 0 and 1)", NULL},
+        {"end", '\0', POPT_ARG_FLOAT, &end, 0, "specify where to end the barcode (in percent between 0 and 1)", NULL},
+        {"quiet", 'q', 0, &quiet, 0, "don't show progress indicator", NULL},
+        {"help", '\0', 0, &help, 0, "display this help and exit", NULL},
+        {"version", '\0', 0, &version, 0, "output version information and exit", NULL},
+        POPT_TABLEEND
+    };
+
+    const poptContext popt = poptGetContext(NULL, argc, argv, optionsTable, 0);
+    poptSetOtherOptionHelp(popt, "[OPTION]... VIDEOFILE\n\nOptions:");
+
+    char c;
+
+    // The next line leaks 3 bytes, blame popt!
+    while ((c = poptGetNextOpt(popt)) >= 0) { }
+
+    if (c < -1) {
+        fprintf(stderr, "nordlicht: %s: %s\n", poptBadOption(popt, POPT_BADOPTION_NOALIAS), poptStrerror(c));
+        return 1;
+    }
+
+    if (version) {
+      printf("nordlicht %s\n\nWritten by Sebastian Morr and contributors.\n", NORDLICHT_VERSION);
+      return 0;
+    }
+
+    if (help) {
+        print_help(popt, 0);
+    }
+
+    const char *filename = (char*)poptGetArg(popt);
+
+    if (filename == NULL) {
+        print_error("Please specify an input file.");
+        exit(1);
+    }
+
+    if (poptGetArg(popt) != NULL) {
+        print_error("Please specify only one input file.");
+        exit(1);
+    }
+
+    if (output_file == NULL) {
+        output_file = (char *) malloc(snprintf(NULL, 0, "%s.png", gnu_basename(filename)) + 1);
+        sprintf(output_file, "%s.png", gnu_basename(filename));
+        free_output_file = 1;
+    }
+
+    if (width == -1 && height != -1) {
+        width = height*10;
+    }
+    if (height == -1 && width != -1) {
+        height = width/10;
+        if (height < 1) {
+            height = 1;
+        }
+    }
+    if (height == -1 && width == -1) {
+        width = 1000;
+        height = 100;
+    }
+
+    if (styles_string == NULL) {
+        styles_string = "horizontal";
+    }
+
+    // count the occurrences of "+" in the styles_string
+    const char *s = styles_string;
+    int num_tracks;
+    for (num_tracks=0; s[num_tracks]; s[num_tracks]=='+' ? num_tracks++ : *s++);
+    num_tracks++;
+
+    nordlicht_style *styles;
+    styles = (nordlicht_style *) malloc(num_tracks * sizeof(nordlicht_style));
+
+    const char *style_string;
+    num_tracks = 0;
+    while ((style_string = strsep(&styles_string, "+"))) {
+        int i;
+        for (i = 0; style_table[i].name; i++) {
+            if (strcmp(style_string, style_table[i].name) == 0) {
+                styles[num_tracks] = style_table[i].style;
+                break;
+            }
+        }
+
+        if (!style_table[i].name) {
+            print_error("Unknown style '%s'. Use '--help' to display available styles.", style_string);
+            exit(1);
+        }
+        num_tracks++;
+    }
+
+    const char *ext = filename_ext(output_file);
+    if (strcmp(ext, "png") == 0) {
+        strategy = NORDLICHT_STRATEGY_FAST;
+    } else if (strcmp(ext, "bgra") == 0) {
+        strategy = NORDLICHT_STRATEGY_LIVE;
+    } else {
+        print_error("Unsupported file extension '%s'.", ext);
+        exit(1);
+    }
+
+    // Interesting stuff begins here!
+
+    nordlicht *n = nordlicht_init(filename, width, height);
+    unsigned char *data = NULL;
+
+    if (n == NULL) {
+        print_error(nordlicht_error());
+        exit(1);
+    }
+
+    nordlicht_set_start(n, start);
+    nordlicht_set_end(n, end);
+    nordlicht_set_style(n, styles, num_tracks);

_service:download_files:v0.4.0.tar.gz/nordlicht.c Added

@@ -0,0 +1,322 @@
+#include "nordlicht.h"
+#include <string.h>
+#include "error.h"
+#include "source.h"
+
+#ifdef _WIN32
+#define realpath(N,R) _fullpath((R),(N),_MAX_PATH)
+#endif
+
+typedef struct {
+    nordlicht_style style;
+    int height;
+} track;
+
+struct nordlicht {
+    int width, height;
+    const char *filename;
+    track *tracks;
+    int num_tracks;
+    unsigned char *data;
+
+    int owns_data;
+    int modifiable;
+    nordlicht_strategy strategy;
+    float progress;
+    source *source;
+};
+
+size_t nordlicht_buffer_size(const nordlicht *n) {
+    return n->width * n->height * 4;
+}
+
+nordlicht* nordlicht_init(const char *filename, const int width, const int height) {
+    if (width < 1 || height < 1) {
+        error("Dimensions must be positive (got %dx%d)", width, height);
+        return NULL;
+    }
+    nordlicht *n;
+    n = (nordlicht *) malloc(sizeof(nordlicht));
+
+    n->width = width;
+    n->height = height;
+    n->filename = filename;
+
+    n->data = (unsigned char *) calloc(nordlicht_buffer_size(n), 1);
+    if (n->data == 0) {
+        error("Not enough memory to allocate %d bytes", nordlicht_buffer_size(n));
+        return NULL;
+    }
+
+    n->owns_data = 1;
+
+    n->num_tracks = 1;
+    n->tracks = (track *) malloc(sizeof(track));
+    n->tracks[0].style = NORDLICHT_STYLE_HORIZONTAL;
+    n->tracks[0].height = n->height;
+
+    n->strategy = NORDLICHT_STRATEGY_FAST;
+    n->modifiable = 1;
+    n->progress = 0;
+    n->source = source_init(filename);
+
+    if (n->source == NULL) {
+        error("Could not open video file '%s'", filename);
+        free(n);
+        return NULL;
+    }
+
+    return n;
+}
+
+void nordlicht_free(nordlicht *n) {
+    if (n->owns_data) {
+        free(n->data);
+    }
+    free(n->tracks);
+    source_free(n->source);
+    free(n);
+}
+
+const char *nordlicht_error() {
+    return get_error();
+}
+
+int nordlicht_set_start(nordlicht *n, const float start) {
+    if (! n->modifiable) {
+        return -1;
+    }
+
+    if (start < 0) {
+        error("'start' has to be >= 0.");
+        return -1;
+    }
+
+    if (start >= source_end(n->source)) {
+        error("'start' has to be smaller than 'end'.");
+        return -1;
+    }
+
+    source_set_start(n->source, start);
+    return 0;
+}
+
+int nordlicht_set_end(nordlicht *n, const float end) {
+    if (! n->modifiable) {
+        return -1;
+    }
+
+    if (end > 1) {
+        error("'end' has to be <= 1.");
+        return -1;
+    }
+
+    if (source_start(n->source) >= end) {
+        error("'start' has to be smaller than 'end'.");
+        return -1;
+    }
+
+    source_set_end(n->source, end);
+    return 0;
+}
+
+int nordlicht_set_style(nordlicht *n, const nordlicht_style *styles, const int num_tracks) {
+    if (! n->modifiable) {
+        return -1;
+    }
+
+    n->num_tracks = num_tracks;
+
+    if (n->num_tracks > n->height) {
+        error("Height of %d px is too low for %d styles", n->height, n->num_tracks);
+        return -1;
+    }
+
+    free(n->tracks);
+    n->tracks = (track *) malloc(n->num_tracks*sizeof(track));
+
+    int height_of_each_track = n->height/n->num_tracks;
+    int i;
+    for (i=0; i<num_tracks; i++) {
+        nordlicht_style s = styles[i];
+        if (s > NORDLICHT_STYLE_LAST-1) {
+            return -1;
+        }
+
+        n->tracks[i].style = s;
+        n->tracks[i].height = height_of_each_track;
+    }
+    n->tracks[0].height = n->height - (n->num_tracks-1)*height_of_each_track;
+
+    return 0;
+}
+
+int nordlicht_set_strategy(nordlicht *n, const nordlicht_strategy s) {
+    if (! n->modifiable) {
+        return -1;
+    }
+    if (s > NORDLICHT_STRATEGY_LIVE) {
+        return -1;
+    }
+    n->strategy = s;
+    return 0;
+}
+
+int nordlicht_generate(nordlicht *n) {
+    n->modifiable = 0;
+
+    source_build_keyframe_index(n->source, n->width);
+
+    int x, exact;
+
+    const int do_a_fast_pass = (n->strategy == NORDLICHT_STRATEGY_LIVE) || !source_exact(n->source);
+    const int do_an_exact_pass = source_exact(n->source);
+
+    for (exact = (!do_a_fast_pass); exact <= do_an_exact_pass; exact++) {
+        int i;
+        int y_offset = 0;
+        for(i = 0; i < n->num_tracks; i++) {
+            // call this for each track, to seek to the beginning
+            source_set_exact(n->source, exact);
+
+            for (x = 0; x < n->width; x++) {
+                image *frame;
+
+                if (n->tracks[i].style == NORDLICHT_STYLE_SPECTROGRAM) {
+                    if (!source_has_audio(n->source)) {
+                        error("File contains no audio, please select an appropriate style");
+                        n->progress = 1;
+                        return -1;
+                    }
+                    frame = source_get_audio_frame(n->source, 1.0*(x+0.5-COLUMN_PRECISION/2.0)/n->width,
+                            1.0*(x+0.5+COLUMN_PRECISION/2.0)/n->width);
+                } else {
+                    if (!source_has_video(n->source)) {
+                        error("File contains no video, please select an appropriate style");
+                        n->progress = 1;
+                        return -1;
+                    }
+                    frame = source_get_video_frame(n->source, 1.0*(x+0.5-COLUMN_PRECISION/2.0)/n->width,

_service:download_files:v0.4.0.tar.gz/nordlicht.h Added

@@ -0,0 +1,69 @@
+#ifndef INCLUDE_nordlicht_h__
+#define INCLUDE_nordlicht_h__
+#include <stdlib.h> // for size_t
+
+typedef struct nordlicht nordlicht;
+
+typedef enum nordlicht_style {
+    NORDLICHT_STYLE_THUMBNAILS,
+    NORDLICHT_STYLE_HORIZONTAL, // compress frames to columns, "move to the right"
+    NORDLICHT_STYLE_VERTICAL, // compress frames to rows, "move downwards"
+    NORDLICHT_STYLE_SLITSCAN, // take single columns, while moving to the right (and wrapping to the left)
+    NORDLICHT_STYLE_MIDDLECOLUMN, // take the frames' middlemost column
+    NORDLICHT_STYLE_SPECTROGRAM,
+    NORDLICHT_STYLE_LAST
+} nordlicht_style;
+
+typedef enum nordlicht_strategy {
+    NORDLICHT_STRATEGY_FAST, // generate barcode in a single pass as fast as possible
+    NORDLICHT_STRATEGY_LIVE, // generate a fast approximation first, good for live display
+} nordlicht_strategy;
+
+// Returns a description of the last error, or NULL if the was no error.
+const char *nordlicht_error();
+
+// Allocate a new nordlicht of specific width and height, for a given video
+// file. When `live` is true, give a fast approximation before starting the
+// slow, exact generation. Use `nordlicht_free` to free the nordlicht again.
+// Returns NULL on errors.
+nordlicht* nordlicht_init(const char *filename, const int width, const int height);
+
+// Free a nordlicht.
+void nordlicht_free(nordlicht *n);
+
+// Specify where to start the nordlicht, in percent between 0 and 1.
+int nordlicht_set_start(nordlicht *n, const float start);
+
+// Specify where to end the nordlicht, in percent between 0 and 1.
+int nordlicht_set_end(nordlicht *n, const float end);
+
+// Set the output style of the nordlicht. Default is NORDLICHT_STYLE_HORIZONTAL.
+// Returns 0 on success.
+int nordlicht_set_style(nordlicht *n, const nordlicht_style *s, const int num_styles);
+
+// Set the generation strategy of the nordlicht. Default is NORDLICHT_STRATEGY_FAST.
+// Returns 0 on success. This function will be removed in the future.
+int nordlicht_set_strategy(nordlicht *n, const nordlicht_strategy s);
+
+// Returns a pointer to the nordlicht's internal buffer. You can use it to draw
+// the barcode while it is generated. The pixel format is 32-bit BGRA.
+const unsigned char* nordlicht_buffer(const nordlicht *n);
+
+// Replace the internal nordlicht's internal buffer. The data pointer is owned
+// by the caller and must be freed after `nordlicht_free`. Returns 0 on success.
+int nordlicht_set_buffer(nordlicht *n, unsigned char *data);
+
+// Returns the size of this nordlicht's buffer in bytes.
+size_t nordlicht_buffer_size(const nordlicht *n);
+
+// Generate the nordlicht. Calling this will freeze the nordlicht:
+// "set" functions will fail. Returns 0 on success.
+int nordlicht_generate(nordlicht *n);
+
+// Returns a value between 0 and 1 indicating how much of the nordlicht is done.
+float nordlicht_progress(const nordlicht *n);
+
+// Write the nordlicht to a PNG file. Returns 0 on success.
+int nordlicht_write(const nordlicht *n, const char *filename);
+
+#endif

_service:download_files:v0.4.0.tar.gz/source.c Added

@@ -0,0 +1,459 @@
+#include "source.h"
+#include "error.h"
+#include <libavcodec/avcodec.h>
+#include <libavcodec/avfft.h>
+#include <libavformat/avformat.h>
+#include <libavutil/avutil.h>
+#include <libswscale/swscale.h>
+
+#if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(52, 8, 0)
+#define av_frame_alloc  avcodec_alloc_frame
+#define av_frame_free av_freep
+#endif
+
+#define HEURISTIC_NUMBER_OF_FRAMES 1800 // how many frames will the heuristic look at?
+#define HEURISTIC_KEYFRAME_FACTOR 1 // lower bound for the actual/required keyframe ratio
+
+#define SAMPLES_PER_FRAME 1024
+
+typedef struct {
+    int stream;
+    AVCodecContext *codec;
+    image *last_frame;
+
+    double time_base;
+    double fps;
+    AVFrame *frame;
+    long current_frame;
+} stream;
+
+struct source {
+    int exact;
+    float start, end;
+
+    AVFormatContext *format;
+    stream *video;
+    stream *audio;
+
+    uint8_t *buffer;
+    AVFrame *scaleframe;
+    struct SwsContext *sws_context;
+    AVPacket packet;
+
+    // audio specific
+    RDFTContext *rdft;
+
+    int *keyframes;
+    int number_of_keyframes;
+    int has_index;
+};
+
+long packet_pts(stream *st, const AVPacket *packet) {
+    long pts = packet->pts != 0 ? packet->pts : packet->dts;
+    double sec = st->time_base*pts;
+    return (int64_t)(st->fps*sec + 0.5);
+}
+
+int grab_next_frame(source *s, stream *st) {
+    int valid = 0;
+    int got_frame = 0;
+
+    long pts;
+
+    while (!valid) {
+        if (av_read_frame(s->format, &s->packet) >= 0) {
+            if (s->packet.stream_index == st->stream) {
+                switch (st->codec->codec_type) {
+                    case AVMEDIA_TYPE_VIDEO:
+                        avcodec_decode_video2(st->codec, st->frame, &got_frame, &s->packet);
+                        break;
+                    case AVMEDIA_TYPE_AUDIO:
+                        avcodec_decode_audio4(st->codec, st->frame, &got_frame, &s->packet);
+                        break;
+                    default:
+                        error("Stream has unknown media type.");
+                        return 1;
+                }
+
+                if (got_frame) {
+                    pts = packet_pts(st, &s->packet);
+                    valid = 1;
+                }
+            }
+            av_free_packet(&s->packet);
+        } else {
+            av_free_packet(&s->packet);
+            st->current_frame = -1;
+            return 1;
+        }
+    }
+
+    av_free_packet(&s->packet);
+    st->current_frame = pts;
+    return 0;
+}
+
+void seek_keyframe(source *s, stream *st, const long frame) {
+    av_seek_frame(s->format, st->stream, frame/st->fps/st->time_base, AVSEEK_FLAG_BACKWARD);
+    avcodec_flush_buffers(st->codec);
+    grab_next_frame(s, st);
+}
+
+int total_number_of_frames(const source *s, stream *st) {
+    double duration_sec = 1.0*s->format->duration/AV_TIME_BASE;
+    return st->fps*duration_sec;
+}
+
+void source_build_keyframe_index(source *s, const int width) {
+    if (! s->video) {
+        return;
+    }
+
+    s->keyframes = (int *) malloc(sizeof(long)*60*60*3); // TODO: dynamic datastructure!
+    s->number_of_keyframes = 0;
+
+    int frame = 0;
+
+    s->has_index = 0;
+    s->exact = 1;
+    seek_keyframe(s, s->video, 0);
+
+    while (av_read_frame(s->format, &s->packet) >= 0) {
+        if (s->packet.stream_index == s->video->stream) {
+            if (!!(s->packet.flags & AV_PKT_FLAG_KEY)) {
+                s->number_of_keyframes++;
+
+                long pts = packet_pts(s->video, &s->packet);
+                if (pts < 1 && s->number_of_keyframes > 0) {
+                    pts = frame;
+                }
+
+                s->keyframes[s->number_of_keyframes] = pts;
+            }
+            if (frame == HEURISTIC_NUMBER_OF_FRAMES) {
+                const float density = 1.0*s->number_of_keyframes/HEURISTIC_NUMBER_OF_FRAMES;
+                const float required_density = 1.0*HEURISTIC_KEYFRAME_FACTOR/COLUMN_PRECISION*width/total_number_of_frames(s, s->video)/(s->end-s->start);
+                if (density > required_density) {
+                    // The keyframe density in the first `HEURISTIC_NUMBER_OF_FRAMES`
+                    // frames is HEURISTIC_KEYFRAME_FACTOR times higher than
+                    // the density we need overall.
+                    s->exact = 0;
+                    av_free_packet(&s->packet);
+                    return;
+                }
+            }
+            frame++;
+        }
+        av_free_packet(&s->packet);
+    }
+    av_free_packet(&s->packet);
+    s->has_index = 1;
+}
+
+stream* stream_init(source *s, enum AVMediaType type) {
+    stream *st;
+    st = (stream *) malloc(sizeof(stream));
+
+    st->last_frame = NULL;
+
+    st->stream = av_find_best_stream(s->format, type, -1, -1, NULL, 0);
+    if (st->stream < 0) {
+        free(st);
+        return NULL;
+    }
+    st->codec = s->format->streams[st->stream]->codec;
+    AVCodec *codec = NULL;
+    codec = avcodec_find_decoder(st->codec->codec_id);
+    if (codec == NULL) {
+        error("Unsupported codec!");
+        free(st);
+        return NULL;
+    }
+    if (avcodec_open2(st->codec, codec, NULL) < 0) {
+        free(st);
+        return NULL;
+    }
+
+    st->time_base = av_q2d(s->format->streams[st->stream]->time_base);
+
+    switch (st->codec->codec_type) {
+        case AVMEDIA_TYPE_VIDEO:
+            st->fps = av_q2d(s->format->streams[st->stream]->avg_frame_rate);
+            break;
+        case AVMEDIA_TYPE_AUDIO:
+            st->fps = st->codec->sample_rate;
+            break;
+        default:
+            error("Stream has unknown media type.");
+            free(st);
+            return NULL;
+    }
+
+    st->frame = av_frame_alloc();
+    st->current_frame = -1;
+
+    if (grab_next_frame(s, st) != 0) {
+        free(st);
+        return NULL;
+    }
+

_service:download_files:v0.4.0.tar.gz/source.h Added

_service:download_files:v0.4.0.tar.gz/testsuite.c Added

@@ -0,0 +1,181 @@
+#include "cheat.h"
+#include "nordlicht.h"
+
+#define cheat_null(x) cheat_assert(NULL == (x))
+#define cheat_not_null(x) cheat_assert(NULL != (x))
+#define cheat_fail(x) cheat_assert(0 != (x))
+#define cheat_ok(x) cheat_assert(0 == (x))
+
+CHEAT_DECLARE(
+    nordlicht *n;
+
+    int tool(char *args) {
+        char c[200];
+        snprintf(c, 200, "./nordlicht %s >/dev/null 2>/dev/null", args);
+        return system(c);
+    }
+)
+
+CHEAT_SET_UP(
+    n = NULL;
+)
+
+CHEAT_TEAR_DOWN(
+    if (n != NULL) {
+        nordlicht_free(n);
+    }
+)
+
+CHEAT_TEST(testfile_exists,
+    cheat_assert(-1 != access("video.mp4", F_OK));
+)
+
+CHEAT_TEST(invalid_input_file,
+    cheat_null(nordlicht_init(NULL, 100, 100));
+    cheat_null(nordlicht_init("", 100, 100));
+    cheat_null(nordlicht_init("\0", 100, 100));
+    cheat_null(nordlicht_init(".", 100, 100));
+    cheat_null(nordlicht_init("..", 100, 100));
+    cheat_null(nordlicht_init("nonexistant_file.123", 100, 100));
+)
+
+CHEAT_TEST(invalid_size,
+    cheat_null(nordlicht_init("video.mp4", 0, 100));
+    cheat_null(nordlicht_init("video.mp4", 100, 0));
+    cheat_null(nordlicht_init("video.mp4", 0, 0));
+    cheat_null(nordlicht_init("video.mp4", -1, 1));
+    cheat_null(nordlicht_init("video.mp4", 1, -1));
+    cheat_null(nordlicht_init("video.mp4", -100, 100));
+    cheat_null(nordlicht_init("video.mp4", 100, -100));
+    cheat_null(nordlicht_init("video.mp4", INT_MIN, INT_MIN));
+)
+
+
+CHEAT_TEST(valid_size,
+    cheat_not_null(nordlicht_init("video.mp4", 1, 1));
+    cheat_not_null(nordlicht_init("video.mp4", INT_MAX, INT_MAX));
+)
+
+CHEAT_TEST(invalid_output,
+    n = nordlicht_init("video.mp4", 1, 100);
+    cheat_not_null(n);
+    cheat_fail(nordlicht_write(n, NULL));
+    cheat_fail(nordlicht_write(n, ""));
+    cheat_fail(nordlicht_write(n, "\0"));
+    cheat_fail(nordlicht_write(n, "."));
+    cheat_fail(nordlicht_write(n, ".."));
+    cheat_fail(nordlicht_write(n, "video.mp4"));
+)
+
+CHEAT_TEST(style,
+    n = nordlicht_init("video.mp4", 1, 100);
+    cheat_not_null(n);
+    nordlicht_style styles[1] = {NORDLICHT_STYLE_HORIZONTAL};
+    cheat_ok(nordlicht_set_style(n, styles, 1));
+    styles[0] = NORDLICHT_STYLE_VERTICAL;
+    cheat_ok(nordlicht_set_style(n, styles, 1));
+    styles[0] = 10000000;
+    cheat_fail(nordlicht_set_style(n, styles, 1));
+)
+
+CHEAT_TEST(strategy,
+    n = nordlicht_init("video.mp4", 1, 100);
+    cheat_not_null(n);
+    cheat_ok(nordlicht_set_strategy(n, NORDLICHT_STRATEGY_FAST));
+    cheat_ok(nordlicht_set_strategy(n, NORDLICHT_STRATEGY_LIVE));
+    cheat_fail(nordlicht_set_strategy(n, 2));
+    cheat_fail(nordlicht_set_strategy(n, 1000000));
+    cheat_fail(nordlicht_set_strategy(n, -1));
+)
+
+CHEAT_TEST(buffer,
+    const unsigned char *buffer = NULL;
+    n = nordlicht_init("video.mp4", 2, 100);
+    cheat_not_null(n);
+    buffer = nordlicht_buffer(n);
+    cheat_not_null(buffer);
+    cheat_assert(2*100*4 == nordlicht_buffer_size(n));
+    unsigned char *buffer2 = NULL;
+    cheat_fail(nordlicht_set_buffer(n, buffer2));
+    buffer2 = malloc(nordlicht_buffer_size(n));
+    cheat_ok(nordlicht_set_buffer(n, buffer2));
+    cheat_ok(nordlicht_set_buffer(n, buffer2));
+    cheat_ok(nordlicht_set_buffer(n, buffer2));
+    buffer = nordlicht_buffer(n);
+    cheat_assert(buffer == buffer2);
+    free(buffer2);
+)
+
+CHEAT_TEST(complete_run,
+    unsigned char *buffer2 = NULL;
+    n = nordlicht_init("video.mp4", 1, 100);
+    cheat_not_null(n);
+    cheat_ok(nordlicht_progress(n));
+    cheat_ok(nordlicht_generate(n));
+    cheat_assert(1 == nordlicht_progress(n));
+    buffer2 = malloc(nordlicht_buffer_size(n));
+    cheat_fail(nordlicht_set_buffer(n, buffer2));
+    free(buffer2);
+)
+
+CHEAT_TEST(tool_argument_parsing,
+    cheat_ok(tool("--help"));
+    cheat_ok(tool("--version"));
+    cheat_fail(tool(""));
+    cheat_fail(tool("--fubar"));
+    cheat_fail(tool("one.mp4 two.mp4"));
+    cheat_fail(tool("does_not_exist.mp4"));
+)
+
+CHEAT_TEST(tool_size,
+    cheat_ok(tool("video.mp4 -w 1 -h 1"));
+    cheat_ok(tool("video.mp4 -w 1 -h 10000"));
+    cheat_fail(tool("video.mp4 -w huuuge"));
+    cheat_fail(tool("video.mp4 -w 0"));
+    cheat_fail(tool("video.mp4 -h 0"));
+    cheat_fail(tool("video.mp4 -w ''"));
+    cheat_fail(tool("video.mp4 -h ''"));
+    cheat_fail(tool("video.mp4 -w -100"));
+    cheat_fail(tool("video.mp4 -h -100"));
+    cheat_fail(tool("video.mp4 -w 1.1"));
+    cheat_fail(tool("video.mp4 -h 1.1"));
+    cheat_fail(tool("video.mp4 -w 1,1"));
+    cheat_fail(tool("video.mp4 -h 1,1"));
+)
+
+CHEAT_TEST(tool_output,
+    cheat_ok(tool("video.mp4 -w 1 -o ünîç⌀də.png"));
+    cheat_assert(-1 != access("ünîç⌀də.png", F_OK));
+    cheat_fail(tool("video.mp4 -o video.mp4"));
+    cheat_fail(tool("video.mp4 -o ''"));
+    cheat_ok(tool("video.mp4 -w 1 -o barcode.bgra"));
+    cheat_fail(tool("video.mp4 -o barcode.abc"));
+    cheat_fail(tool("video.mp4 -o barcode"));
+)
+
+CHEAT_TEST(tool_style,
+    cheat_ok(tool("video.mp4 -w 1 -s vertical"));
+    cheat_ok(tool("video.mp4 -w 1 -s horizontal"));
+    cheat_fail(tool("video.mp4 -h 1 -s horizontal+vertical"));
+    cheat_fail(tool("video.mp4 -h 2 -s horizontal+vertical+horizontal"));
+    cheat_ok(tool("video.mp4 -h 2 -s horizontal+vertical"));
+    cheat_fail(tool("video.mp4 -s horizontal+"));
+    cheat_fail(tool("video.mp4 -s +"));
+    cheat_fail(tool("video.mp4 -s horizontal++horizontal"));
+    cheat_fail(tool("video.mp4 -s nope"));
+    cheat_fail(tool("video.mp4 -s ''"));
+)
+
+CHEAT_TEST(tool_region,
+    cheat_ok(tool("video.mp4 -w 1 --start=0.5"));
+    cheat_ok(tool("video.mp4 -w 1 --end=0.5"));
+    cheat_ok(tool("video.mp4 -w 1 --start=0.1 --end=0.2"));
+    cheat_ok(tool("video.mp4 -w 1 --start=0 --end=1"));
+    cheat_fail(tool("video.mp4 -w 1 --start=-1"));
+    cheat_fail(tool("video.mp4 -w 1 --start=1"));
+    cheat_fail(tool("video.mp4 -w 1 --start=2"));
+    cheat_fail(tool("video.mp4 -w 1 --end=-1"));
+    cheat_fail(tool("video.mp4 -w 1 --end=0"));
+    cheat_fail(tool("video.mp4 -w 1 --end=2"));
+    cheat_fail(tool("video.mp4 -w 1 --start=0.2 --end=0.1"));
+)

_service:download_files:v0.3.4.tar.gz/utils/mpv-nordlicht -> _service:download_files:v0.4.0.tar.gz/utils/mpv-nordlicht Changed

_service:download_files:v0.3.4.tar.gz/utils/mpv-nordlicht.lua -> _service:download_files:v0.4.0.tar.gz/utils/mpv-nordlicht.lua Changed

@@ -1,14 +1,24 @@
--- nordlicht integration for mpv. You need a version after commit d706f81
--- (>=v0.3.6, that is) to correctly support lua scripting.
+-- nordlicht integration for mpv. You need mpv >= 0.3.6 to correctly support
+-- lua scripting.
 
 function init()
     is_on = false
+    mode = 1 -- 1: single, 2: double
+    -- size of the display:
+    screen_width = mp.get_property("osd-width")
+
     -- size of the barcode:
     width = mp.get_property("osd-width")
     height = math.floor(width/20)
+    width2 = width*5
+    height2 = math.floor(width2/50)
+
     -- size of the progress marker:
-    mw = math.floor(height/8)*2+1
-    mh = (mw+1)/2
+    mh = math.floor(height/15)*2+1
+    mw = mh*2-1
+
+    -- styles:
+    styles = os.getenv("NORDLICHT_STYLE") or "horizontal"
 
     mp.register_event("start-file", new_file)
     mp.register_event("shutdown", shutdown)
@@ -19,7 +29,8 @@
     os.execute("convert -depth 8 -size "..mw.."x"..mh.." bgra:/tmp/arrow_up.bgra -flip bgra:/tmp/arrow_down.bgra")
 
     new_file()
-    on()
+    -- wait for the convert commands to finish
+    mp.add_timeout(0.5, on)
 end
 
 function shutdown()
@@ -39,9 +50,13 @@
 
     kill()
 
+    local nordlicht_cmd = "nordlicht -s "..styles
+    local nordlicht_cmd2 = "nordlicht -s "..styles
     local path = mp.get_property("path")
-    local cmd = "nordlicht \""..path.."\" --live -o /tmp/nordlicht.bgra -w "..width.." -h "..height.." &"
+    local cmd = "nice "..nordlicht_cmd.." \""..path.."\" -o /tmp/nordlicht.bgra -w "..width.." -h "..height.." &"
     os.execute(cmd)
+    local cmd2 = "nice "..nordlicht_cmd2.." \""..path.."\" -o /tmp/nordlicht2.bgra -w "..width2.." -h "..height2.." &"
+    os.execute(cmd2)
 
     if was_on then
         -- wait for the file to be opened and truncated
@@ -50,17 +65,28 @@
 end
 
 function update()
-    mp.command("overlay_add 0 0 "..mh.." /tmp/nordlicht.bgra 0 bgra "..width.." "..height.." "..width*4)
     local pos = mp.get_property("percent-pos")
+
     if pos ~= nil then
+        mp.command("overlay_add 0 0 "..mh.." /tmp/nordlicht.bgra 0 bgra "..width.." "..height.." "..width*4)
         mp.command("overlay_add 1 "..(math.floor(pos/100*width)-(mw-1)/2).." "..(0).." /tmp/arrow_down.bgra 0 bgra "..mw.." "..mh.." "..mw*4)
         mp.command("overlay_add 2 "..(math.floor(pos/100*width)-(mw-1)/2).." "..(height+mh).." /tmp/arrow_up.bgra 0 bgra "..mw.." "..mh.." "..mw*4)
     end
+
+    if mode == 2 then
+        local offset = height+3*mh
+
+        if pos ~= nil then
+            mp.command("overlay_add 3 "..math.floor(screen_width/2-width2*pos/100).." "..(mh+offset).." /tmp/nordlicht2.bgra 0 bgra "..width2.." "..height2.." "..width2*4)
+            mp.command("overlay_add 4 "..(math.floor(screen_width/2)-(mw-1)/2).." "..(offset).." /tmp/arrow_down.bgra 0 bgra "..mw.." "..mh.." "..mw*4)
+            mp.command("overlay_add 5 "..(math.floor(screen_width/2)-(mw-1)/2).." "..(height2+mh+offset).." /tmp/arrow_up.bgra 0 bgra "..mw.." "..mh.." "..mw*4)
+        end
+    end
 end
 
 function on()
     if not is_on then
-        timer = mp.add_periodic_timer(1.0/60, update)
+        timer = mp.add_periodic_timer(1.0/30, update)
         is_on = true
     end
 end
@@ -71,6 +97,9 @@
         mp.command("overlay_remove 0")
         mp.command("overlay_remove 1")
         mp.command("overlay_remove 2")
+        mp.command("overlay_remove 3")
+        mp.command("overlay_remove 4")
+        mp.command("overlay_remove 5")
         is_on = false
     end
 end
@@ -78,11 +107,20 @@
 function toggle()
     if is_on then
         off()
+        if mode == 1 then
+            mode = 2
+            on()
+        end
     else
+        mode = 1
         on()
     end
 end
 
-mp.set_property("fullscreen", "yes")
--- wait a little until the fullscreen kicks in
-mp.add_timeout(0.5, init)
+function fullscreen()
+    mp.set_property("fullscreen", "yes")
+end
+
+-- not an optimal solution, but it seems to work:
+mp.add_timeout(0.5, fullscreen)
+mp.add_timeout(2, init)

_service:download_files:v0.4.0.tar.gz/utils/youtube-nordlicht Added

_service:download_files:v0.4.0.tar.gz/version.h.in Changed