sillysagiri/bad-apple
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

dual video update

Browse Source
This commit is contained in:
sillysagiri 2025-03-25 20:15:47 +07:00
parent 19e48a4d6a
commit 5252472cc0
10 changed files with 542 additions and 464 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -9,6 +9,7 @@
/nitrofs/*.bin /nitrofs/*.bin
/nitrofs/*.raw /nitrofs/*.raw
/nitrofs/*.sillyvideo
compile_commands.json compile_commands.json
*.nds *.nds

2
Makefile
View File

@ -40,7 +40,7 @@ NITROFSDIR := nitrofs
# Defines passed to all files # Defines passed to all files
# --------------------------- # ---------------------------
DEFINES := -DARM9 -DLWRB_DISABLE_ATOMIC DEFINES := -DARM9 -DNDEBUG
# Libraries # Libraries
# --------- # ---------

30
assets/convert.sh
View File

@ -1,15 +1,33 @@
#!/bin/sh #!/bin/sh
video1="catch.mp4" video1="mezmerize.mp4"
palette1="palette1.png" palette1="palette1.png"
# output1="out_badapple.mp4"
output1="out/out_%d.bmp" output1="out/out_%d.bmp"
filters="scale=256x192:flags=lanczos:force_original_aspect_ratio=decrease,pad=256:192:-1:-1:color=black,fps=24" video2="mezmerize_fix.mp4"
palette2="palette2.png"
output2="out2/out_%d.bmp"
filters="scale=256:-1:flags=lanczos,fps=30"
dither="none"
# "bayer", "heckbert", "floyd_steinberg", "sierra2", "sierra2_4a", "sierra3", "burkes", "atkinson", "none"
# video # video
# ffmpeg -i $video1 -vf "$filters,palettegen=max_colors=256:reserve_transparent=0:stats_mode=diff" -y $palette1 ffmpeg -i $video1 -vf "$filters,palettegen=max_colors=256:reserve_transparent=0:stats_mode=diff" -y $palette1
ffmpeg -i $video1 -i $palette1 -filter_complex "$filters[x];[x][1:v]paletteuse=dither=sierra3" -y $output1 ffmpeg -i $video1 -i $palette1 -filter_complex "$filters[x];[x][1:v]paletteuse=dither=$dither" -y $output1
ffmpeg -i $video2 -vf "$filters,palettegen=max_colors=256:reserve_transparent=0:stats_mode=diff" -y $palette2
ffmpeg -i $video2 -i $palette2 -filter_complex "$filters[x];[x][1:v]paletteuse=dither=$dither" -y $output2
# audio # audio
# ffmpeg -i $video1 -f s16le -vn -ac 2 -ar 22050 -y music1.raw ffmpeg -i $video1 -f s8 -vn -ac 1 -ar 16000 -y music1.raw
for file in out/*.bmp; do
echo $file
magick "$file" -background black -gravity west -extent 256x "$file"
done
for file in out2/*.bmp; do
echo $file
magick "$file" -background black -gravity west -extent 256x "$file"
done

0
assets/out/.keep
View File

11
encoder/CMakeLists.txt
View File

@ -7,18 +7,11 @@ set(PROJECT_NAME "encoder")
project(${PROJECT_NAME}) project(${PROJECT_NAME})
message(STATUS "Downloading fastlz library")
include(FetchContent)
FetchContent_Declare(fastlz URL https://github.com/ariya/FastLZ/archive/refs/heads/master.zip)
FetchContent_MakeAvailable(fastlz)
file(GLOB_RECURSE PROJECT_SOURCES CONFIGURE_DEPENDS file(GLOB_RECURSE PROJECT_SOURCES CONFIGURE_DEPENDS
"*.cpp" "*.c" "*.cpp" "*.c")
${fastlz_SOURCE_DIR}/fastlz.c)
set(PROJECT_INCLUDE set(PROJECT_INCLUDE
"encoder" "encoder")
${fastlz_SOURCE_DIR})
set(PROJECT_VENDOR set(PROJECT_VENDOR
"") "")

9
encoder/lzss.c
View File

@ -95,7 +95,14 @@ void Usage(void)
"* multiple filenames are permitted\n"); "* multiple filenames are permitted\n");
} }
void *Memory(size_t length, size_t size); void *Memory(size_t length, size_t size)
{
void *fb = calloc(length, size);
if (fb == NULL)
EXIT("\nMemory error\n");
return fb;
}
void LZS_InsertNode(int r) void LZS_InsertNode(int r)
{ {

399
encoder/main.cpp
View File

@ -1,16 +1,17 @@
#include <algorithm>
#include <cstddef> #include <cstddef>
#include <cstdint> #include <cstdint>
#include <cstdio> #include <cstdio>
#include <cstring> #include <cstring>
#include <filesystem> #include <filesystem>
#include <fstream> #include <fstream>
#include <sys/types.h>
#include <vector>
#define STB_IMAGE_IMPLEMENTATION #define STB_IMAGE_IMPLEMENTATION
#include "stb_image.h" #include "stb_image.h"
#include "fastlz.h"
extern "C" char *RLE_Code(unsigned char *raw_buffer, int raw_len, int *new_len);
extern "C" unsigned char *LZS_Fast(unsigned char *raw_buffer, size_t raw_len, size_t *new_len); extern "C" unsigned char *LZS_Fast(unsigned char *raw_buffer, size_t raw_len, size_t *new_len);
extern "C" unsigned char *LZS_Code(unsigned char *raw_buffer, size_t raw_len, size_t *new_len, size_t best); extern "C" unsigned char *LZS_Code(unsigned char *raw_buffer, size_t raw_len, size_t *new_len, size_t best);
@ -22,28 +23,84 @@ extern "C" unsigned char *LZS_Code(unsigned char *raw_buffer, size_t raw_len, si
#define ASSETS_PATH "../assets/" #define ASSETS_PATH "../assets/"
#define PALETTE_SIZE 256 #define PALETTE_SIZE 256
#define FRAME_SIZE 256*192 #define FRAME_PER_CHUNK 2
#define CHUNK_SIZE 8 #define FRAMERATE 30
void Frame_RAWtoRGB15(unsigned char *frame, unsigned char *dest, uint16_t *palette_buffer); size_t GetTotalFrame(std::string path)
{
size_t total = 0;
for (const auto& entry : std::filesystem::directory_iterator(path)) {
if (entry.is_regular_file()) {
std::string filename = entry.path().filename().string();
int extpos = filename.find(".bmp", 4);
if (extpos != std::string::npos)
{
int number = std::stoi(filename.substr(4, extpos-4));
if (number > total) total = number;
}
}
}
return total;
}
void GetFrameDimension(std::string path, int *w, int *h)
{
int n;
unsigned char *raw = stbi_load(path.c_str(), w, h, &n, 3);
stbi_image_free(raw);
}
void ConvertPalette(uint16_t *buffer_palette, std::string path)
{
int pal_w, pal_h, pal_n;
unsigned char *palette_raw = stbi_load(path.c_str(), &pal_w, &pal_h, &pal_n, 3);
for (int i=0; i<PALETTE_SIZE; i++)
{
int index = i*3;
unsigned char r = palette_raw[index];
unsigned char g = palette_raw[index + 1];
unsigned char b = palette_raw[index + 2];
buffer_palette[i] = RGBtoRGB15(r, g, b);
}
stbi_image_free(palette_raw);
}
void ConvertFrametoPalIndex(unsigned char *buffer_frame, size_t buffer_size, uint16_t *buffer_palette, unsigned char *dest)
{
for (int rgb=0; rgb<buffer_size; rgb++)
{
int index = rgb*3;
unsigned char r = buffer_frame[index];
unsigned char g = buffer_frame[index + 1];
unsigned char b = buffer_frame[index + 2];
uint16_t palette_value = RGBtoRGB15(r, g, b);
int palette_index = -1;
for (int i=0; i<PALETTE_SIZE; i++)
{
if (buffer_palette[i] == palette_value) {
palette_index = i;
break;
}
}
if (palette_index == -1) dest[rgb] = 0;
else dest[rgb] = palette_index;
}
}
int Compress(uint8_t type, uint8_t *frame_buffer, uint32_t frame_buffer_len, uint8_t *compress_buffer) int Compress(uint8_t type, uint8_t *frame_buffer, uint32_t frame_buffer_len, uint8_t *compress_buffer)
{ {
switch (type) { // if (time_list.at(chunknum) > time_avg) type = 4;
case 1: // fastlz
return fastlz_compress_level(1, frame_buffer, frame_buffer_len, compress_buffer);
break;
case 2: // rle switch (type) {
{ case 1: // lzss
int compress_len;
char *compress = RLE_Code(frame_buffer, frame_buffer_len, &compress_len);
memcpy(compress_buffer, compress, compress_len);
return compress_len;
break;
}
case 3: // lzss
{ {
size_t compress_len; size_t compress_len;
unsigned char *compress = LZS_Fast(frame_buffer, frame_buffer_len, &compress_len); unsigned char *compress = LZS_Fast(frame_buffer, frame_buffer_len, &compress_len);
@ -53,186 +110,236 @@ int Compress(uint8_t type, uint8_t *frame_buffer, uint32_t frame_buffer_len, uin
return compress_len; return compress_len;
break; break;
} }
case 2: // raw
{
memcpy(compress_buffer, frame_buffer, frame_buffer_len);
return frame_buffer_len;
break;
}
} }
return 0; return 0;
} }
void Convert(std::string frame_path, std::string palette_path, std::string output_path, std::string output_basename, uint8_t type) void Convert(
std::string path_video1,
std::string path_palette1,
std::string path_video2,
std::string path_palette2,
std::string path_output)
{ {
uint16_t palette_buffer[PALETTE_SIZE]; uint16_t metadata_width1;
uint16_t metadata_width2;
uint16_t metadata_height1;
uint16_t metadata_height2;
size_t metadata_total_frame1;
size_t metadata_total_frame2;
size_t frame_total = 0; uint16_t *buffer_palette1 = new uint16_t[PALETTE_SIZE];
uint8_t frame_buffer[FRAME_SIZE*CHUNK_SIZE]; uint16_t *buffer_palette2 = new uint16_t[PALETTE_SIZE];
uint32_t compress_size = 0; uint8_t *buffer_frame;
uint32_t compress_size_total = 0; uint8_t *buffer_compress;
size_t compress_size_biggest = 0;
uint8_t compress_buffer[162000]; size_t size_video1_frame;
size_t size_video2_frame;
size_t size_buffer_frame;
size_t size_compress = 0;
size_t size_compress_total = 0;
size_t size_compress_max = 0;
size_t size_compress_min = 99999999;
std::ofstream file_out; std::ofstream file_out;
file_out.open(path_output, std::ios::binary);
if (!file_out) {
printf("fail to open output %s\n", path_output.c_str());
return;
}
printf("Finding total frame..."); // ---
// Find total frame
for (const auto& entry : std::filesystem::directory_iterator(frame_path)) {
if (entry.is_regular_file()) {
std::string filename = entry.path().filename().string();
int extpos = filename.find(".bmp", 4);
if (extpos != std::string::npos)
{
int number = std::stoi(filename.substr(4, extpos-4));
if (number > frame_total) frame_total = number;
}
}
}
// Generate palette
printf("Generating palette map...\n");
int pal_w, pal_h, pal_n;
unsigned char *palette_raw = stbi_load(palette_path.c_str(), &pal_w, &pal_h, &pal_n, 3);
for (int i=0; i<PALETTE_SIZE; i++)
{ {
int index = i*3; printf("Finding total frame...\n");
unsigned char r = palette_raw[index]; metadata_total_frame1 = GetTotalFrame(path_video1);
unsigned char g = palette_raw[index + 1]; metadata_total_frame2 = GetTotalFrame(path_video2);
unsigned char b = palette_raw[index + 2];
palette_buffer[i] = RGBtoRGB15(r, g, b);
} }
printf("Writing palette map...\n"); // ---
file_out.open(output_path + output_basename + "_pal.bin", std::ios::binary); {
file_out.write(reinterpret_cast<const char*>(palette_buffer), sizeof(palette_buffer)); printf("Finding video dimension...\n");
file_out.close(); int w, h;
GetFrameDimension(path_video1 + "out_1.bmp", &w, &h);
metadata_width1 = w;
metadata_height1 = h;
GetFrameDimension(path_video2 + "out_1.bmp", &w, &h);
metadata_width2 = w;
metadata_height2 = h;
size_video1_frame = metadata_width1*metadata_height1;
size_video2_frame = metadata_width2*metadata_height2;
}
printf("video1 dimension: %ix%i\n", metadata_width1, metadata_height1);
printf("video2 dimension: %ix%i\n", metadata_width2, metadata_height2);
// ---
{
size_buffer_frame = size_video1_frame + size_video2_frame;
buffer_frame = new uint8_t[size_buffer_frame*FRAME_PER_CHUNK];
buffer_compress = new uint8_t[size_buffer_frame*FRAME_PER_CHUNK];
}
// ---
{
printf("Generating palette map...\n");
ConvertPalette(buffer_palette1, path_palette1);
ConvertPalette(buffer_palette2, path_palette2);
}
// ---
{
printf("Writing metadata...\n");
uint8_t framerate = FRAMERATE;
uint8_t frame_per_chunk = FRAME_PER_CHUNK;
file_out.write(reinterpret_cast<const char*>(&framerate), sizeof(uint8_t));
file_out.write(reinterpret_cast<const char*>(&frame_per_chunk), sizeof(uint8_t));
file_out.write(reinterpret_cast<const char*>(&metadata_total_frame1), sizeof(uint32_t));
file_out.write(reinterpret_cast<const char*>(&metadata_total_frame2), sizeof(uint32_t));
file_out.write(reinterpret_cast<const char*>(&metadata_width1), sizeof(uint16_t));
file_out.write(reinterpret_cast<const char*>(&metadata_height1), sizeof(uint16_t));
file_out.write(reinterpret_cast<const char*>(&metadata_width2), sizeof(uint16_t));
file_out.write(reinterpret_cast<const char*>(&metadata_height2), sizeof(uint16_t));
}
// ---
{
printf("Writing palette map...\n");
file_out.write(reinterpret_cast<const char*>(buffer_palette1), PALETTE_SIZE*sizeof(uint16_t));
file_out.write(reinterpret_cast<const char*>(buffer_palette2), PALETTE_SIZE*sizeof(uint16_t));
}
// ---
printf("Generating image map...\n"); printf("Generating image map...\n");
std::stringstream ss; std::stringstream ss;
file_out.open(output_path + output_basename + "_img.bin", std::ios::binary);
// ########## PER FRAME ENCODER ##########
// for (int i=0; i<frame_total; i++)
// {
// ss.str("");
// ss << frame_path << "out_" << i+1 << ".bmp";
// int frame_w, frame_h, frame_n;
// unsigned char *frame_raw = stbi_load(ss.str().c_str(), &frame_w, &frame_h, &frame_n, 3);
// Frame_RAWtoRGB15(frame_raw, frame_buffer, palette_buffer);
// compress_size = Compress(type, frame_buffer, FRAME_SIZE, compress_buffer);
// if ((compress_size) > compress_size_biggest) compress_size_biggest = compress_size;
// compress_size_total += compress_size;
// file_out.write(reinterpret_cast<const char*>(&compress_size), sizeof(uint32_t));
// file_out.write(reinterpret_cast<const char*>(compress_buffer), compress_size);
// printf("write %i bytes (%i/%i)\n", compress_size, i+1, frame_total);
// }
// ########################################
// Calculate the number of complete iterations needed // Calculate the number of complete iterations needed
int numIterations = frame_total / CHUNK_SIZE; int numIterations = std::max(metadata_total_frame1, metadata_total_frame2) / FRAME_PER_CHUNK;
// Calculate the number of remaining items // Calculate the number of remaining items
int remainingItems = frame_total % CHUNK_SIZE; int remainingItems = std::max(metadata_total_frame1, metadata_total_frame2) % FRAME_PER_CHUNK;
for (int i=0; i<numIterations; i++) for (int i=0; i<numIterations; i++)
{ {
for (int i_chunk=0; i_chunk<CHUNK_SIZE; i_chunk++) { memset(buffer_frame, 0, size_buffer_frame*FRAME_PER_CHUNK);
// Calculate the index of the current item within the total set
int itemIndex = i * CHUNK_SIZE + i_chunk;
ss.str(""); for (int i_chunk=0; i_chunk<FRAME_PER_CHUNK; i_chunk++) {
ss << frame_path << "out_" << itemIndex+1 << ".bmp"; int itemIndex = i * FRAME_PER_CHUNK + i_chunk + 1;
// printf("loading %s\n", ss.str().c_str());
int frame_w, frame_h, frame_n; int frame_w, frame_h, frame_n;
unsigned char *frame_raw = stbi_load(ss.str().c_str(), &frame_w, &frame_h, &frame_n, 3);
Frame_RAWtoRGB15(frame_raw, &frame_buffer[i_chunk*FRAME_SIZE], palette_buffer); if (itemIndex <= metadata_total_frame1)
{
ss.str("");
ss << path_video1 << "out_" << itemIndex << ".bmp";
unsigned char *frame_raw = stbi_load(ss.str().c_str(), &frame_w, &frame_h, &frame_n, 3);
ConvertFrametoPalIndex(frame_raw, frame_w*frame_h, buffer_palette1, &buffer_frame[i_chunk*size_buffer_frame]);
stbi_image_free(frame_raw);
}
if (itemIndex <= metadata_total_frame2)
{
ss.str("");
ss << path_video2 << "out_" << itemIndex << ".bmp";
unsigned char *frame_raw = stbi_load(ss.str().c_str(), &frame_w, &frame_h, &frame_n, 3);
ConvertFrametoPalIndex(frame_raw, frame_w*frame_h, buffer_palette2, &buffer_frame[i_chunk*size_buffer_frame+size_video1_frame]);
stbi_image_free(frame_raw);
}
} }
compress_size = Compress(type, frame_buffer, FRAME_SIZE*CHUNK_SIZE, compress_buffer); size_compress = Compress(1, buffer_frame, size_buffer_frame*FRAME_PER_CHUNK, buffer_compress);
if ((compress_size) > compress_size_biggest) compress_size_biggest = compress_size; size_compress_max = std::max(size_compress, size_compress_max);
compress_size_total += compress_size; size_compress_min = std::min(size_compress, size_compress_min);
size_compress_total += size_compress;
file_out.write(reinterpret_cast<const char*>(&compress_size), sizeof(uint32_t)); file_out.write(reinterpret_cast<const char*>(&size_compress), sizeof(uint32_t));
file_out.write(reinterpret_cast<const char*>(compress_buffer), compress_size); file_out.write(reinterpret_cast<const char*>(buffer_compress), size_compress);
// file_out.put('\0');
printf("write chunk %i bytes %i/%i\n", compress_size, i, numIterations-1); printf("write %i bytes (%i/%i)\n", size_compress, i+1, numIterations);
} }
// Handle remaining frame // Handle remaining frame
if (remainingItems > 0) { if (remainingItems > 0) {
memset(frame_buffer, 0, FRAME_SIZE*CHUNK_SIZE); memset(buffer_frame, 0, size_buffer_frame*FRAME_PER_CHUNK);
int i_chunk = 0; int i_chunk = 0;
for (int k = frame_total-remainingItems; k<frame_total; k++) { int frame_total = std::max(metadata_total_frame1, metadata_total_frame2);
ss.str(""); for (int k = frame_total-remainingItems+1; k<=frame_total; k++) {
ss << frame_path << "out_" << k+1 << ".bmp";
// printf("loading %s\n", ss.str().c_str());
int frame_w, frame_h, frame_n; int frame_w, frame_h, frame_n;
unsigned char *frame_raw = stbi_load(ss.str().c_str(), &frame_w, &frame_h, &frame_n, 3);
Frame_RAWtoRGB15(frame_raw, &frame_buffer[i_chunk*FRAME_SIZE], palette_buffer); if (k <= metadata_total_frame1)
{
ss.str("");
ss << path_video1 << "out_" << k << ".bmp";
unsigned char *frame_raw = stbi_load(ss.str().c_str(), &frame_w, &frame_h, &frame_n, 3);
ConvertFrametoPalIndex(frame_raw, frame_w*frame_h, buffer_palette1, &buffer_frame[i_chunk*size_buffer_frame]);
stbi_image_free(frame_raw);
}
if (k <= metadata_total_frame2)
{
ss.str("");
ss << path_video2 << "out_" << k << ".bmp";
unsigned char *frame_raw = stbi_load(ss.str().c_str(), &frame_w, &frame_h, &frame_n, 3);
ConvertFrametoPalIndex(frame_raw, frame_w*frame_h, buffer_palette2, &buffer_frame[i_chunk*size_buffer_frame+size_video1_frame]);
stbi_image_free(frame_raw);
}
i_chunk++; i_chunk++;
} }
compress_size = Compress(type, frame_buffer, FRAME_SIZE*CHUNK_SIZE, compress_buffer); size_compress = Compress(1, buffer_frame, size_buffer_frame*FRAME_PER_CHUNK, buffer_compress);
if ((compress_size) > compress_size_biggest) compress_size_biggest = compress_size; size_compress_max = std::max(size_compress, size_compress_max);
compress_size_total += compress_size; size_compress_min = std::min(size_compress, size_compress_min);
size_compress_total += size_compress;
file_out.write(reinterpret_cast<const char*>(&compress_size), sizeof(uint32_t)); file_out.write(reinterpret_cast<const char*>(&size_compress), sizeof(uint32_t));
file_out.write(reinterpret_cast<const char*>(compress_buffer), compress_size); file_out.write(reinterpret_cast<const char*>(buffer_compress), size_compress);
// file_out.put('\0');
printf("write remaining chunk %i bytes\n", compress_size); printf("write remaining chunk %i bytes\n", size_compress);
} }
file_out.close(); file_out.close();
// Print // Print
printf("Total Frame: %i\n", frame_total); printf("\n");
printf("Biggest : %i\n", compress_size_biggest); printf("fps: %i\n", FRAMERATE);
printf("Total Size : %1.fmb\n", static_cast<double>(compress_size_total) / (1024*1024)); printf("frame per chunk: %i\n", FRAME_PER_CHUNK);
printf("video1 total frame: %i\n", metadata_total_frame1);
printf("video2 total frame: %i\n", metadata_total_frame2);
printf("video1 dimension: %ix%i\n", metadata_width1, metadata_height1);
printf("video2 dimension: %ix%i\n", metadata_width2, metadata_height2);
printf("compress size max: %i\n", size_compress_max);
printf("compress size min: %i\n", size_compress_min);
printf("size total : %1.fmb\n", static_cast<double>(size_compress_total) / (1024*1024));
delete[] buffer_palette1;
delete[] buffer_palette2;
delete[] buffer_frame;
delete[] buffer_compress;
} }
int main() int main()
{ {
// Convert(ASSETS_PATH "out1/", ASSETS_PATH "palette1.png", "../nitrofs/", "data_fastlz", 1); Convert(
// Convert(ASSETS_PATH "out1/", ASSETS_PATH "palette1.png", "../nitrofs/", "data_rle", 2); ASSETS_PATH "out/",
Convert(ASSETS_PATH "out/", ASSETS_PATH "palette1.png", "../nitrofs/", "main", 3); ASSETS_PATH "palette1.png",
// Convert(ASSETS_PATH "out2/", ASSETS_PATH "palette2.png", "../nitrofs/", "sub"); ASSETS_PATH "out2/",
} ASSETS_PATH "palette2.png",
"../nitrofs/video.sillyvideo");
void Frame_RAWtoRGB15(unsigned char *frame, unsigned char *dest, uint16_t *palette_buffer)
{
for (int rgb=0; rgb<FRAME_SIZE; rgb++)
{
int index = rgb*3;
unsigned char r = frame[index];
unsigned char g = frame[index + 1];
unsigned char b = frame[index + 2];
uint16_t palette_value = RGBtoRGB15(r, g, b);
int palette_index = -1;
for (int i=0; i<256; i++)
{
if (palette_buffer[i] == palette_value) {
palette_index = i;
break;
}
}
if (palette_index == -1) dest[rgb] = 0;
else dest[rgb] = palette_index;
}
} }

121
encoder/rle.c
View File

@ -1,121 +0,0 @@
/*----------------------------------------------------------------------------*/
/*-- rle.c - RLE coding for Nintendo GBA/DS --*/
/*-- Copyright (C) 2011 CUE --*/
/*-- --*/
/*-- This program 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 3 of the License, or --*/
/*-- (at your option) any later version. --*/
/*-- --*/
/*-- This program 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 should have received a copy of the GNU General Public License --*/
/*-- along with this program. If not, see <http://www.gnu.org/licenses/>. --*/
/*----------------------------------------------------------------------------*/
/*----------------------------------------------------------------------------*/
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
/*----------------------------------------------------------------------------*/
#define CMD_DECODE 0x00 // decode
#define CMD_CODE_30 0x30 // RLE magic number
#define RLE_CHECK 1 // bits to check
#define RLE_MASK 0x80 // bits position:
// ((((1 << RLE_CHECK) - 1) << (8 - RLE_CHECK)
#define RLE_LENGTH 0x7F // length, (0xFF & ~RLE_MASK)
#define RLE_THRESHOLD 2 // max number of bytes to not encode
#define RLE_N 0x80 // max store, (RLE_LENGTH + 1)
#define RLE_F 0x82 // max coded, (RLE_LENGTH + RLE_THRESHOLD + 1)
#define RAW_MINIM 0x00000000 // empty file, 0 bytes
#define RAW_MAXIM 0x00FFFFFF // 3-bytes length, 16MB - 1
#define RLE_MINIM 0x00000004 // header only (empty RAW file)
#define RLE_MAXIM 0x01400000 // 0x01020003, padded to 20MB:
// * header, 4
// * length, RAW_MAXIM
// * flags, (RAW_MAXIM + RLE_N - 1) / RLE_N
// 4 + 0x00FFFFFF + 0x00020000 + padding
/*----------------------------------------------------------------------------*/
#define BREAK(text) { printf(text); return; }
#define EXIT(text) { printf(text); exit(-1); }
/*----------------------------------------------------------------------------*/
void Title(void);
void Usage(void);
char *Load(char *filename, int *length, int min, int max);
void Save(char *filename, char *buffer, int length);
char *Memory(int length, int size);
void RLE_Decode(char *filename);
void RLE_Encode(char *filename);
char *RLE_Code(unsigned char *raw_buffer, int raw_len, int *new_len);
/*----------------------------------------------------------------------------*/
char *Memory(int length, int size) {
char *fb;
fb = (char *) calloc(length, size);
if (fb == NULL) EXIT("\nMemory error\n");
return(fb);
}
/*----------------------------------------------------------------------------*/
char *RLE_Code(unsigned char *raw_buffer, int raw_len, int *new_len) {
unsigned char *pak_buffer, *pak, *raw, *raw_end, store[RLE_N];
unsigned int pak_len, len, store_len, count;
pak_len = 4 + raw_len + ((raw_len + RLE_N - 1) / RLE_N);
pak_buffer = (unsigned char *) Memory(pak_len, sizeof(char));
*(unsigned int *)pak_buffer = CMD_CODE_30 | (raw_len << 8);
pak = pak_buffer + 4;
raw = raw_buffer;
raw_end = raw_buffer + raw_len;
store_len = 0;
while (raw < raw_end) {
for (len = 1; len < RLE_F; len++) {
if (raw + len == raw_end) break;
if (*(raw + len) != *raw) break;
}
if (len <= RLE_THRESHOLD) store[store_len++] = *raw++;
if ((store_len == RLE_N) || (store_len && (len > RLE_THRESHOLD))) {
*pak++ = store_len - 1;
for (count = 0; count < store_len; count++) *pak++ = store[count];
store_len = 0;
}
if (len > RLE_THRESHOLD) {
*pak++ = RLE_MASK | (len - (RLE_THRESHOLD + 1));
*pak++ = *raw;
raw += len;
}
}
if (store_len) {
*pak++ = store_len - 1;
for (count = 0; count < store_len; count++) *pak++ = store[count];
}
*new_len = pak - pak_buffer;
return(pak_buffer);
}
/*----------------------------------------------------------------------------*/
/*-- EOF Copyright (C) 2011 CUE --*/
/*----------------------------------------------------------------------------*/

2
libs/RaylibDS

@ -1 +1 @@
Subproject commit a55a77fd3e960f472655ee3b9bbe9329202c8a50 Subproject commit 23311fe88c6a6009ffdd7c23badd758dd99ef950

431
src/main.cpp
View File

@ -1,17 +1,20 @@
#include "fastlz.h" #include "Panda.hpp"
#include "filesystem.h" #include "filesystem.h"
#include "mm_types.h" #include "mm_types.h"
#include "nds/arm9/background.h" #include "nds/arm9/background.h"
#include "nds/arm9/cache.h" #include "nds/arm9/cache.h"
#include "nds/arm9/console.h" #include "nds/arm9/console.h"
#include "nds/arm9/input.h" #include "nds/arm9/input.h"
#include "nds/arm9/math.h"
#include "nds/arm9/sassert.h" #include "nds/arm9/sassert.h"
#include "nds/arm9/video.h"
#include "nds/cothread.h" #include "nds/cothread.h"
#include "nds/decompress.h" #include "nds/decompress.h"
#include "nds/dma.h" #include "nds/dma.h"
#include "nds/interrupts.h" #include "nds/interrupts.h"
#include "nds/timers.h" #include "nds/timers.h"
#include "raylibds.hpp" #include "tonccpy.h"
#include <fat.h>
#include <cstddef> #include <cstddef>
#include <cstdint> #include <cstdint>
#include <cstdio> #include <cstdio>
@ -22,19 +25,9 @@
#include <sys/_types.h> #include <sys/_types.h>
#define PALETTE_SIZE 256 #define PALETTE_SIZE 256
#define FRAME_SIZE 256*192
// TODO: hardcode fix
#define CHUNK_SIZE 8
#define FRAMERATE 24
#define VIDEO_TOTALFRAME 3268
#define VIDEO_RBUF_LEN CHUNK_SIZE*8
#define VIDEO_RBUF_BUFFER FRAME_SIZE
#define VIDEO_TEMP_SIZE 204000
#define MMSTREAM_BUF_SIZE 800 #define MMSTREAM_BUF_SIZE 800
#define MUSIC_RBUF_SIZE 96000*2 #define MUSIC_RBUF_SIZE 16000
void wait_forever(const char* msg); void wait_forever(const char* msg);
bool LoadNextChunk(unsigned char *dest); bool LoadNextChunk(unsigned char *dest);
@ -48,31 +41,28 @@ mm_word on_stream_request( mm_word length, mm_addr dest, mm_stream_formats forma
volatile bool doDraw = true; volatile bool doDraw = true;
volatile bool isPause = false; volatile bool isPause = false;
volatile int noframe = 0; volatile int noframe = 0;
volatile bool time_to_exit = false;
void *sassert_malloc(size_t size)
{
void *p = malloc(size);
sassert(p != nullptr, "Memory allocation failed %i", size);
return p;
}
struct RingBuffer { struct RingBuffer {
unsigned char *buffer = nullptr; unsigned char *buffer = nullptr;
int head; int head;
int tail; int tail;
size_t buffer_size; size_t buffer_size;
size_t size_per_item;
size_t size; size_t size;
size_t count; size_t count;
RingBuffer(size_t rb_len, size_t buffer_len, unsigned char * buffer_ptr) RingBuffer(size_t count_frame, unsigned char * buffer_ptr, size_t buffer_len)
{ {
buffer = buffer_ptr; buffer = buffer_ptr;
buffer_size = buffer_len; buffer_size = buffer_len;
size = rb_len; size = count_frame;
head = 0; head = 0;
tail = 0; tail = 0;
count = 0; count = 0;
Raylib::nocashMessageFormat("per block %i", buffer_size/size); size_per_item = buffer_size/size;
} }
unsigned char* Get() unsigned char* Get()
@ -80,7 +70,7 @@ struct RingBuffer {
if (count > 0) if (count > 0)
{ {
count--; count--;
unsigned char* ptr = &buffer[head*(buffer_size/size)]; unsigned char* ptr = &buffer[head*size_per_item];
head = (head+1) % size; head = (head+1) % size;
return ptr; return ptr;
} }
@ -93,7 +83,7 @@ struct RingBuffer {
if (count < size) if (count < size)
{ {
count++; count++;
unsigned char* ptr = &buffer[tail*(buffer_size/size)]; unsigned char* ptr = &buffer[tail*size_per_item];
tail = (tail+1) % size; tail = (tail+1) % size;
return ptr; return ptr;
} }
@ -103,13 +93,13 @@ struct RingBuffer {
unsigned char* Manual_Read() unsigned char* Manual_Read()
{ {
unsigned char* ptr = &buffer[head*(buffer_size/size)]; unsigned char* ptr = &buffer[head*size_per_item];
return ptr; return ptr;
} }
unsigned char* Manual_Write() unsigned char* Manual_Write()
{ {
unsigned char* ptr = &buffer[tail*(buffer_size/size)]; unsigned char* ptr = &buffer[tail*size_per_item];
return ptr; return ptr;
} }
@ -240,6 +230,21 @@ int file_music_len;
FILE *file_videomain = nullptr; FILE *file_videomain = nullptr;
int file_videomain_len; int file_videomain_len;
uint8_t metadata_fps;
uint8_t metadata_frame_per_chunk;
uint16_t metadata_width1;
uint16_t metadata_width2;
uint16_t metadata_height1;
uint16_t metadata_height2;
uint32_t metadata_total_frame1;
uint32_t metadata_total_frame2;
uint32_t size_video1_frame;
uint32_t size_video2_frame;
uint32_t size_buffer_frame;
uint32_t counter_frame;
RingBuffer *videomain_rb; RingBuffer *videomain_rb;
unsigned char *frame_preload_temp; unsigned char *frame_preload_temp;
unsigned char *frame_read_temp; unsigned char *frame_read_temp;
@ -253,69 +258,165 @@ uint32_t next_video_size = 0;
volatile int timer_start = 0; volatile int timer_start = 0;
volatile int timer_avg = 0; volatile int timer_avg = 0;
PrintConsole console_top;
PrintConsole console_bot;
int main(void) { int main(void) {
videoSetMode(MODE_5_3D); videoSetMode(MODE_5_3D);
videoSetModeSub(MODE_5_2D); videoSetModeSub(MODE_5_2D);
vramSetBankA(VRAM_A_MAIN_BG); vramSetBankA(VRAM_A_MAIN_BG);
vramSetBankC(VRAM_C_SUB_BG); vramSetBankC(VRAM_C_SUB_BG_0x06200000);
vramSetBankF(VRAM_F_TEX_PALETTE); vramSetBankF(VRAM_F_TEX_PALETTE);
consoleDemoInit(); // consoleDemoInit();
consoleDebugInit(DebugDevice_NOCASH); consoleDebugInit(DebugDevice_NOCASH);
bool nitrofs = nitroFSInit(NULL); bool nitrofs = nitroFSInit(NULL);
sassert(nitrofs, "nitrofs init failed"); sassert(nitrofs, "nitrofs init failed");
frame_preload_temp = (unsigned char*)sassert_malloc(VIDEO_TEMP_SIZE); bool fatfs = fatInitDefault();
music_buffer_temp = (unsigned char*)sassert_malloc(MUSIC_RBUF_SIZE); sassert(fatfs, "fatfs init failed");
videomain_rb = new RingBuffer(VIDEO_RBUF_LEN, VIDEO_RBUF_LEN*VIDEO_RBUF_BUFFER, (unsigned char*)sassert_malloc(VIDEO_RBUF_LEN*VIDEO_RBUF_BUFFER)); file_videomain = fopen("nitro:/video.sillyvideo", "rb");
music_rb = new Rbuf_Music(MUSIC_RBUF_SIZE, (unsigned char*)sassert_malloc(MUSIC_RBUF_SIZE)); sassert(file_videomain != nullptr, "failed to load video.sillyvideo");
memset(music_rb->buffer, 0, MUSIC_RBUF_SIZE);
file_videomain = fopen("nitro:/main_img.bin", "rb");
sassert(file_videomain != nullptr, "failed to load image.bin");
fseek(file_videomain, 0, SEEK_END); fseek(file_videomain, 0, SEEK_END);
file_videomain_len = ftell(file_videomain); file_videomain_len = ftell(file_videomain);
fseek(file_videomain, 0, SEEK_SET); fseek(file_videomain, 0, SEEK_SET);
file_music = fopen("nitro:/music1.raw", "rb"); file_music = fopen("nitro:/music1.raw", "rb");
sassert(file_music != nullptr, "failed to load music.raw"); sassert(file_music != nullptr, "failed to load music1.raw");
fseek(file_music, 0, SEEK_END); fseek(file_music, 0, SEEK_END);
file_music_len = ftell(file_music); file_music_len = ftell(file_music);
fseek(file_music, 0, SEEK_SET); fseek(file_music, 0, SEEK_SET);
ptr_background = bgInit(3, BgType_Bmp8, BgSize_B8_256x256, 0, 0); ptr_background = bgInit(3, BgType_Bmp8, BgSize_B8_256x256, 1, 0);
// ptr_subbackground = bgInitSub(3, BgType_Bmp8, BgSize_B8_256x256, VRAM_C_SUB_BG, 0); ptr_subbackground = bgInitSub(3, BgType_Bmp8, BgSize_B8_256x256, 1, 0);
int palmain_len; consoleInit(&console_top, 1, BgType_Text4bpp, BgSize_T_256x256, 2, 0, true, true);
unsigned char* palmain = Raylib::LoadFile("nitro:/main_pal.bin", palmain_len); consoleInit(&console_bot, 1, BgType_Text4bpp, BgSize_T_256x256, 2, 0, false, true);
DC_FlushRange(palmain, palmain_len); bgSetPriority(ptr_background, 1);
dmaCopy(palmain, BG_PALETTE, palmain_len); bgSetPriority(ptr_subbackground, 1);
Raylib::UnloadFile(palmain); // consoleSetColor(&console, CONSOLE_RED);
Panda::printf_nocash("scroll %i", metadata_height1);
{ {
Raylib::nocashMessageFormat("preload video main"); Panda::printf_nocash("read metadata");
do { fread(&metadata_fps, sizeof(uint8_t), 1, file_videomain);
unsigned char *ptr = videomain_rb->Manual_Write(); fread(&metadata_frame_per_chunk, sizeof(uint8_t), 1, file_videomain);
LoadNextChunk(ptr); fread(&metadata_total_frame1, sizeof(uint32_t), 1, file_videomain);
videomain_rb->Manual_Skip(CHUNK_SIZE); fread(&metadata_total_frame2, sizeof(uint32_t), 1, file_videomain);
} while(videomain_rb->count+CHUNK_SIZE < videomain_rb->size); fread(&metadata_width1, sizeof(uint16_t), 1, file_videomain);
fread(&metadata_height1, sizeof(uint16_t), 1, file_videomain);
fread(&metadata_width2, sizeof(uint16_t), 1, file_videomain);
fread(&metadata_height2, sizeof(uint16_t), 1, file_videomain);
Raylib::nocashMessageFormat("preload done"); size_video1_frame = metadata_width1*metadata_height1;
size_video2_frame = metadata_width2*metadata_height2;
size_buffer_frame = size_video1_frame + size_video2_frame;
Panda::printf_nocash("fps: %i", metadata_fps);
Panda::printf_nocash("frame per chunk: %i", metadata_frame_per_chunk);
Panda::printf_nocash("video1 total frame: %i", metadata_total_frame1);
Panda::printf_nocash("video2 total frame: %i", metadata_total_frame2);
Panda::printf_nocash("video1 dimension: %ix%i", metadata_width1, metadata_height1);
Panda::printf_nocash("video2 dimension: %ix%i", metadata_width2, metadata_height2);
}
bgSetScale(ptr_background, 160, 160);
bgSetScale(ptr_subbackground, 160, 160);
bgSetCenter(ptr_background, 0, (SCREEN_HEIGHT-144)/2);
bgSetCenter(ptr_subbackground, 0, (SCREEN_HEIGHT-144)/2);
bgUpdate();
{
Panda::printf_nocash("read palette");
unsigned char *buffer_palette = (unsigned char*)sassert_malloc(PALETTE_SIZE);
fread(buffer_palette, sizeof(uint8_t), PALETTE_SIZE*sizeof(uint16_t), file_videomain);
DC_FlushRange(buffer_palette, PALETTE_SIZE*sizeof(uint16_t));
dmaCopy(buffer_palette, BG_PALETTE, PALETTE_SIZE*sizeof(uint16_t));
fread(buffer_palette, sizeof(uint8_t), PALETTE_SIZE*sizeof(uint16_t), file_videomain);
DC_FlushRange(buffer_palette, PALETTE_SIZE*sizeof(uint16_t));
dmaCopy(buffer_palette, BG_PALETTE_SUB, PALETTE_SIZE*sizeof(uint16_t));
free(buffer_palette);
} }
{ {
Raylib::nocashMessageFormat("preload audio"); Panda::printf_nocash("allocate buffer");
frame_preload_temp = (unsigned char*)sassert_malloc(size_buffer_frame*metadata_frame_per_chunk);
music_buffer_temp = (unsigned char*)sassert_malloc(MUSIC_RBUF_SIZE);
int rbuf_count = 3145728 / (size_buffer_frame*metadata_frame_per_chunk);
Panda::printf_nocash("rbuf %i", rbuf_count);
size_t size_rbuf_count = rbuf_count*metadata_frame_per_chunk;
size_t size_rbuf_buffer = size_rbuf_count*size_buffer_frame;
unsigned char* buffer_video = (unsigned char*)sassert_malloc(size_rbuf_buffer);
unsigned char* buffer_music = (unsigned char*)sassert_malloc(MUSIC_RBUF_SIZE);
videomain_rb = new RingBuffer(rbuf_count*metadata_frame_per_chunk, buffer_video, size_rbuf_buffer);
music_rb = new Rbuf_Music(MUSIC_RBUF_SIZE, buffer_music);
memset(music_rb->buffer, 0, MUSIC_RBUF_SIZE);
}
// {
// Raylib::nocashMessageFormat("calculate decompress time");
// unsigned char *ptr = videomain_rb->Manual_Write();
// FILE *data = fopen("fat:/numbers.txt", "w");
// if (data == NULL) {
// perror("Failed to open file");
// }
// cpuStartTiming(1);
// while (ftell(file_videomain) < file_videomain_len)
// {
// timer_start = cpuGetTiming();
// fread(&preload_video_size, sizeof(uint32_t), 1, file_videomain);
// fread(frame_preload_temp, sizeof(uint8_t), preload_video_size, file_videomain);
// decompress(frame_preload_temp, ptr, DecompressType::LZ77);
// timer_avg = timerTicks2msec(cpuGetTiming() - timer_start);
// // time[counter] = timer_avg;
// fprintf(stderr, "%i,\n", timer_avg);
// fprintf(data, "%i, ", timer_avg);
// }
// fclose(data);
// cpuEndTiming();
// Raylib::nocashMessageFormat("done calculate");
// fseek(file_videomain, 0, SEEK_SET);
// }
{
Panda::printf_nocash("preload video main");
do {
unsigned char *ptr = videomain_rb->Manual_Write();
LoadNextChunk(ptr);
videomain_rb->Manual_Skip(metadata_frame_per_chunk);
} while(videomain_rb->getFree() >= metadata_frame_per_chunk);
Panda::printf_nocash("preload done");
}
{
Panda::printf_nocash("preload audio");
int len = music_rb->GetFree(); int len = music_rb->GetFree();
int adv = fread(music_rb->GetTail(), sizeof(char), len, file_music); int adv = fread(music_rb->GetTail(), sizeof(char), len, file_music);
music_rb->Advance(adv); music_rb->Advance(adv);
Raylib::nocashMessageFormat("preload done"); Panda::printf_nocash("preload done");
} }
mm_ds_system sys; mm_ds_system sys;
@ -326,40 +427,24 @@ int main(void) {
mmInit(&sys); mmInit(&sys);
mm_stream mystream; mm_stream mystream;
mystream.sampling_rate = 22050; mystream.sampling_rate = 16000;
mystream.buffer_length = MMSTREAM_BUF_SIZE; mystream.buffer_length = MMSTREAM_BUF_SIZE;
mystream.callback = on_stream_request; mystream.callback = on_stream_request;
mystream.format = MM_STREAM_16BIT_STEREO; mystream.format = MM_STREAM_8BIT_MONO;
mystream.timer = MM_TIMER1; mystream.timer = MM_TIMER1;
mystream.manual = false; mystream.manual = false;
timerStart(0, ClockDivider_1024, TIMER_FREQ_1024(FRAMERATE), TimerCallback); timerStart(0, ClockDivider_1024, TIMER_FREQ_1024(metadata_fps), TimerCallback);
irqSet(IRQ_VBLANK, []{ irqSet(IRQ_VBLANK, VBLCallback);
printf("\033[4;2H\033[Kvideo buffer: %i frames\n", videomain_rb->count);
printf("\033[5;2H\033[Kmusic buffer: %i bytes\n", music_rb->count);
if (noframe) printf("\033[6;2H\033[Kno frame: %i\n", noframe);
// static int counter = 0; // cothread_create(ThreadMusic, NULL, 0, COTHREAD_DETACHED);
// counter++;
// if (counter % 30 == 0)
// printf("\033[6;2H\033[Kavg decode time: %ims\n", timerTicks2msec(timer_avg/30));
scanKeys();
if (keysUp() & KEY_A) isPause = !isPause;
if (keysUp() & KEY_B) FrameStep();
if (keysHeld() & KEY_Y) FrameStep();
});
cothread_create(ThreadMusic, NULL, 0, COTHREAD_DETACHED);
// cothread_create(ThreadVideo, NULL, 0, COTHREAD_DETACHED); // cothread_create(ThreadVideo, NULL, 0, COTHREAD_DETACHED);
// cpuStartTiming(1); // cpuStartTiming(1);
mmStreamOpen( &mystream ); mmStreamOpen( &mystream );
while(1) { while(!time_to_exit) {
cothread_yield();
// swiWaitForVBlank(); // swiWaitForVBlank();
// cothread_yield_irq(IRQ_VBLANK); // cothread_yield_irq(IRQ_VBLANK);
// scanKeys(); // scanKeys();
@ -372,11 +457,11 @@ int main(void) {
if (file_videomain) if (file_videomain)
{ {
unsigned char *ptr = videomain_rb->Manual_Write(); unsigned char *ptr = videomain_rb->Manual_Write();
if (videomain_rb->count+CHUNK_SIZE < videomain_rb->size) if (videomain_rb->getFree() >= metadata_frame_per_chunk)
{ {
// timer_start = cpuGetTiming(); // timer_start = cpuGetTiming();
LoadNextChunk(ptr); LoadNextChunk(ptr);
videomain_rb->Manual_Skip(CHUNK_SIZE); videomain_rb->Manual_Skip(metadata_frame_per_chunk);
// timer_avg = cpuGetTiming() - timer_start; // timer_avg = cpuGetTiming() - timer_start;
} }
} }
@ -387,6 +472,50 @@ int main(void) {
file_videomain = nullptr; file_videomain = nullptr;
// return 0; // return 0;
} }
if (file_music != nullptr && music_rb->count < music_rb->size*0.7)
{
int free = music_rb->GetFree();
int linear = music_rb->LinearWriteSize();
int adv = 0;
// memset(music_buffer_temp, 0, MUSIC_RBUF_SIZE);
// fread(music_buffer_temp, free, 1, file_music);
if (free < linear)
{
// memcpy(music_rb->GetTail(), music_buffer_temp, free);
adv += fread(music_rb->GetTail(), 1, free, file_music);
}
else
{
// memcpy(music_rb->GetTail(), music_buffer_temp, linear);
// memcpy(music_rb->buffer, music_buffer_temp, free-linear);
adv += fread(music_rb->GetTail(), 1, linear, file_music);
adv += fread(music_rb->buffer, 1, free-linear, file_music);
}
music_rb->Advance(adv);
}
if (ftell(file_music) >= file_music_len)
{
fclose(file_music);
file_music = nullptr;
Panda::printf_nocash("music close!");
}
static bool closeOnce = false;
if (!closeOnce && file_music == nullptr && music_rb->count <= 0)
{
mmStreamClose();
Panda::printf_nocash("stream close!");
closeOnce = true;
time_to_exit = true;
}
} }
} }
@ -394,86 +523,37 @@ int main(void) {
return 0; return 0;
} }
int ThreadVideo(void *arg) void VBLCallback()
{ {
// while(1) { static int counter = 0;
// if (videomain_rb->getFree() > (sizeof(uint32_t)+preload_video_size) && videomain_rb->getFree() > videomain_rb->size/2) counter++;
// {
// // Raylib::nocashMessageFormat("video thread %i %i", videomain_rb->getFree(), preload_video_size+4);
// // if (comutex_try_acquire(&mutex)) if (counter % 8 == 0) {
// // {
// bool preload;
// do {
// preload = LoadNextChunk(file_videomain);
// } while(preload);
// // comutex_release(&mutex);
// // }
// }
// if (ftell(file_videomain) == file_videomain_len) consoleSelect(&console_top);
// { // float progress = counter_frame/metadata_total_frame1;
// fclose(file_videomain); Panda::f32 f32_counter(inttof32(counter_frame));
// file_videomain = nullptr; Panda::f32 f32_total(inttof32(metadata_total_frame1));
// return 0; Panda::f32 f32_progress((f32_counter/f32_total) * Panda::f32(inttof32(100)));
// } Panda::f32 f32_bar((f32_counter/f32_total) * Panda::f32(inttof32(30)));
// cothread_yield();
// }
// // Raylib::nocashMessageFormat("video thread exit"); printf("\033[22;1H%i%% (%i/%i)\n[", f32toint(f32_progress.value), counter_frame, metadata_total_frame1);
// return 0; for(int i=0; i<f32toint(f32_bar.value); i++) printf("-");
} printf("\033[23;32H]");
int ThreadMusic(void *arg) consoleSelect(&console_bot);
{ printf("\033[21;1H\033[Kvideo buffer: %i frames", videomain_rb->count);
while(1) { printf("\033[22;1H\033[Kmusic buffer: %i bytes", music_rb->count);
cothread_yield(); if (noframe) printf("\033[23;1H\033[Kframe drop: %i", noframe);
// else printf("\033[23;1H\033[Kframe drop: %i yay \\ >.< /\n", noframe);
if (file_music != nullptr && music_rb->count < music_rb->size*0.35)
{
int free = music_rb->GetFree();
int linear = music_rb->LinearWriteSize();
int adv = 0;
// memset(music_buffer_temp, 0, MUSIC_RBUF_SIZE);
// fread(music_buffer_temp, free, 1, file_music);
if (free < linear)
{
// memcpy(music_rb->GetTail(), music_buffer_temp, free);
adv += fread(music_rb->GetTail(), 1, free, file_music);
}
else
{
// memcpy(music_rb->GetTail(), music_buffer_temp, linear);
// memcpy(music_rb->buffer, music_buffer_temp, free-linear);
adv += fread(music_rb->GetTail(), 1, linear, file_music);
adv += fread(music_rb->buffer, 1, free-linear, file_music);
}
music_rb->Advance(adv);
}
if (ftell(file_music) >= file_music_len)
{
fclose(file_music);
file_music = nullptr;
Raylib::nocashMessageFormat("music close!");
}
static bool closeOnce = false;
if (!closeOnce && file_music == nullptr && music_rb->count <= 0)
{
mmStreamClose();
Raylib::nocashMessageFormat("stream close!");
closeOnce = true;
}
} }
return 0; // printf("\033[6;2H\033[Kavg decode time: %ims\n", timerTicks2msec(timer_avg/30));
scanKeys();
if (keysUp() & KEY_A) isPause = !isPause;
if (keysUp() & KEY_B) FrameStep();
if (keysHeld() & KEY_Y) FrameStep();
} }
void FrameStep() void FrameStep()
@ -482,26 +562,14 @@ void FrameStep()
if (videomain_rb->count) if (videomain_rb->count)
{ {
// if (comutex_try_acquire(&mutex)) unsigned char *dest = videomain_rb->Get();
// { dmaCopyAsynch(dest, bgGetGfxPtr(ptr_background), size_video1_frame);
// videomain_rb->Get(); dmaCopyAsynch(dest+size_video1_frame, bgGetGfxPtr(ptr_subbackground), size_video2_frame);
// videomain_rb->read((unsigned char*)&next_video_size, sizeof(uint32_t)); counter_frame++;
unsigned char *dest = videomain_rb->Get(); } else {
// Raylib::nocashMessageFormat("frame step start %p %i", dest, videomain_rb->count); // printf("no frame!!!!!\n");
noframe++;
// videomain_rb->read(frame_read_temp, next_video_size); }
// DC_FlushRange(dest, VIDEO_RBUF_BUFFER);
// decompress(dest, bgGetGfxPtr(ptr_background), DecompressType::LZ77Vram);
dmaCopyAsynch(dest, bgGetGfxPtr(ptr_background), FRAME_SIZE);
// dmaCopyAsynch(frame_temp, bgGetGfxPtr(ptr_background), FRAME_SIZE);
// comutex_release(&mutex);
// Raylib::nocashMessageFormat("frame step end");
} else {
printf("no frame!!!!!\n");
noframe++;
}
// } // }
} }
@ -517,13 +585,18 @@ void TimerCallback()
bool LoadNextChunk(unsigned char *dest) bool LoadNextChunk(unsigned char *dest)
{ {
if (!dest) return false; if (!dest) return false;
// Raylib::nocashMessageFormat("load next start, %p", dest);
// videomain_rb->write((unsigned char*)&preload_video_size, sizeof(uint32_t));
fread(&preload_video_size, sizeof(uint32_t), 1, file_videomain); fread(&preload_video_size, sizeof(uint32_t), 1, file_videomain);
fread(frame_preload_temp, sizeof(uint8_t), preload_video_size, file_videomain); // Panda::printf_nocash("load next start, %i", preload_video_size);
decompress(frame_preload_temp, dest, DecompressType::LZ77); if (preload_video_size == size_buffer_frame*metadata_frame_per_chunk)
{
fread(dest, sizeof(uint8_t), preload_video_size, file_videomain);
}
else
{
fread(frame_preload_temp, sizeof(uint8_t), preload_video_size, file_videomain);
decompress(frame_preload_temp, dest, DecompressType::LZ77);
}
// fastlz_decompress(frame_preload_temp, preload_video_size, dest, FRAME_SIZE*CHUNK_SIZE); // fastlz_decompress(frame_preload_temp, preload_video_size, dest, FRAME_SIZE*CHUNK_SIZE);
return true; return true;
@ -565,13 +638,13 @@ mm_word on_stream_request( mm_word length, mm_addr dest, mm_stream_formats forma
if (len < linear) if (len < linear)
{ {
memcpy(dest, music_rb->GetHead(), len); tonccpy(dest, music_rb->GetHead(), len);
} }
else else
{ {
// Raylib::nocashMessageFormat("linear %i", linear); // Raylib::nocashMessageFormat("linear %i", linear);
memcpy(dest, music_rb->GetHead(), linear); tonccpy(dest, music_rb->GetHead(), linear);
memcpy((char*)dest+linear, music_rb->buffer, len-linear); tonccpy((char*)dest+linear, music_rb->buffer, len-linear);
} }
music_rb->Skip(len); music_rb->Skip(len);