Merge branch 'sle118:master-v4.3' into led_visu-v4.3

This commit is contained in:
wizmo2
2023-08-05 10:46:43 +01:00
committed by GitHub
24 changed files with 46 additions and 36 deletions

View File

@@ -138,7 +138,9 @@ static int get_opus_packet(void) {
size_t bytes = min(_buf_used(streambuf), _buf_cont_read(streambuf));
while (!(status = OG(&go, stream_packetout, &u->state, &u->packet)) && bytes) {
do {
// if sync_pageout (or sync_pageseek) is not called here, sync builds ups
while (!(status = OG(&go, sync_pageout, &u->sync, &u->page)) && bytes) {
size_t consumed = min(bytes, 4096);
char* buffer = OG(&gu, sync_buffer, &u->sync, consumed);
memcpy(buffer, streambuf->readp, consumed);
@@ -146,7 +148,7 @@ static int get_opus_packet(void) {
_buf_inc_readp(streambuf, consumed);
bytes -= consumed;
} while (!(status = OG(&gu, sync_pageseek, &u->sync, &u->page)) && bytes);
}
// if we have a new page, put it in
if (status) OG(&go, stream_pagein, &u->state, &u->page);
@@ -184,7 +186,7 @@ static int read_opus_header(void) {
switch (u->status) {
case OGG_SYNC:
u->status = OGG_ID_HEADER;
OG(&gu, stream_reset_serialno, &u->state, OG(&gu, page_serialno, &u->page));
OG(&gu, stream_init, &u->state, OG(&gu, page_serialno, &u->page));
fetch = false;
break;
case OGG_ID_HEADER:
@@ -208,7 +210,7 @@ static int read_opus_header(void) {
fetch = true;
break;
case OGG_COMMENT_HEADER:
// skip pakets to consume VorbisComment. With opus, header packets align on pages
// skip packets to consume VorbisComment. With opus, header packets align on pages
status = OG(&gu, page_packets, &u->page);
break;
default:

View File

@@ -138,7 +138,9 @@ static int get_ogg_packet(void) {
size_t bytes = min(_buf_used(streambuf), _buf_cont_read(streambuf));
while (!(status = OG(&go, stream_packetout, &v->state, &v->packet)) && bytes) {
do {
// if sync_pageout (or sync_pageseek) is not called first, sync buffers build ups
while (!(status = OG(&go, sync_pageout, &v->sync, &v->page)) && bytes) {
size_t consumed = min(bytes, 4096);
char* buffer = OG(&gv, sync_buffer, &v->sync, consumed);
memcpy(buffer, streambuf->readp, consumed);
@@ -146,7 +148,7 @@ static int get_ogg_packet(void) {
_buf_inc_readp(streambuf, consumed);
bytes -= consumed;
} while (!(status = OG(&go, sync_pageseek, &v->sync, &v->page)) && bytes);
}
// if we have a new page, put it in
if (status) OG(&go, stream_pagein, &v->state, &v->page);

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

Binary file not shown.

View File

@@ -51,6 +51,8 @@ declare function getStatus(): {};
declare function getStatus(): {};
declare function getStatus(): {};
declare function getStatus(): {};
declare function getStatus(): {};
declare function getStatus(): {};
declare function getRadioButton(entry: any): string;
declare function getRadioButton(entry: any): string;
declare function getRadioButton(entry: any): string;
@@ -104,6 +106,10 @@ declare function getRadioButton(entry: any): string;
declare function getRadioButton(entry: any): string;
declare function getRadioButton(entry: any): string;
declare function getRadioButton(entry: any): string;
declare function getRadioButton(entry: any): string;
declare function getRadioButton(entry: any): string;
declare function pushStatus(): void;
declare function pushStatus(): void;
declare function pushStatus(): void;
declare function pushStatus(): void;
declare function pushStatus(): void;

View File

@@ -1,5 +1,5 @@
target_add_binary_data( __idf_wifi-manager webapp/dist/css/index.d1b1b8d25a4e298ac90f.css.gz BINARY)
target_add_binary_data( __idf_wifi-manager webapp/dist/css/index.99c86edb045064f0ff9e.css.gz BINARY)
target_add_binary_data( __idf_wifi-manager webapp/dist/favicon-32x32.png BINARY)
target_add_binary_data( __idf_wifi-manager webapp/dist/index.html.gz BINARY)
target_add_binary_data( __idf_wifi-manager webapp/dist/js/index.380f25.bundle.js.gz BINARY)
target_add_binary_data( __idf_wifi-manager webapp/dist/js/node_vendors.380f25.bundle.js.gz BINARY)
target_add_binary_data( __idf_wifi-manager webapp/dist/js/index.f2d7ed.bundle.js.gz BINARY)
target_add_binary_data( __idf_wifi-manager webapp/dist/js/node_vendors.f2d7ed.bundle.js.gz BINARY)

View File

@@ -1,34 +1,34 @@
// Automatically generated. Do not edit manually!.
#include <inttypes.h>
extern const uint8_t _index_d1b1b8d25a4e298ac90f_css_gz_start[] asm("_binary_index_d1b1b8d25a4e298ac90f_css_gz_start");
extern const uint8_t _index_d1b1b8d25a4e298ac90f_css_gz_end[] asm("_binary_index_d1b1b8d25a4e298ac90f_css_gz_end");
extern const uint8_t _index_99c86edb045064f0ff9e_css_gz_start[] asm("_binary_index_99c86edb045064f0ff9e_css_gz_start");
extern const uint8_t _index_99c86edb045064f0ff9e_css_gz_end[] asm("_binary_index_99c86edb045064f0ff9e_css_gz_end");
extern const uint8_t _favicon_32x32_png_start[] asm("_binary_favicon_32x32_png_start");
extern const uint8_t _favicon_32x32_png_end[] asm("_binary_favicon_32x32_png_end");
extern const uint8_t _index_html_gz_start[] asm("_binary_index_html_gz_start");
extern const uint8_t _index_html_gz_end[] asm("_binary_index_html_gz_end");
extern const uint8_t _index_380f25_bundle_js_gz_start[] asm("_binary_index_380f25_bundle_js_gz_start");
extern const uint8_t _index_380f25_bundle_js_gz_end[] asm("_binary_index_380f25_bundle_js_gz_end");
extern const uint8_t _node_vendors_380f25_bundle_js_gz_start[] asm("_binary_node_vendors_380f25_bundle_js_gz_start");
extern const uint8_t _node_vendors_380f25_bundle_js_gz_end[] asm("_binary_node_vendors_380f25_bundle_js_gz_end");
extern const uint8_t _index_f2d7ed_bundle_js_gz_start[] asm("_binary_index_f2d7ed_bundle_js_gz_start");
extern const uint8_t _index_f2d7ed_bundle_js_gz_end[] asm("_binary_index_f2d7ed_bundle_js_gz_end");
extern const uint8_t _node_vendors_f2d7ed_bundle_js_gz_start[] asm("_binary_node_vendors_f2d7ed_bundle_js_gz_start");
extern const uint8_t _node_vendors_f2d7ed_bundle_js_gz_end[] asm("_binary_node_vendors_f2d7ed_bundle_js_gz_end");
const char * resource_lookups[] = {
"/css/index.d1b1b8d25a4e298ac90f.css.gz",
"/css/index.99c86edb045064f0ff9e.css.gz",
"/favicon-32x32.png",
"/index.html.gz",
"/js/index.380f25.bundle.js.gz",
"/js/node_vendors.380f25.bundle.js.gz",
"/js/index.f2d7ed.bundle.js.gz",
"/js/node_vendors.f2d7ed.bundle.js.gz",
""
};
const uint8_t * resource_map_start[] = {
_index_d1b1b8d25a4e298ac90f_css_gz_start,
_index_99c86edb045064f0ff9e_css_gz_start,
_favicon_32x32_png_start,
_index_html_gz_start,
_index_380f25_bundle_js_gz_start,
_node_vendors_380f25_bundle_js_gz_start
_index_f2d7ed_bundle_js_gz_start,
_node_vendors_f2d7ed_bundle_js_gz_start
};
const uint8_t * resource_map_end[] = {
_index_d1b1b8d25a4e298ac90f_css_gz_end,
_index_99c86edb045064f0ff9e_css_gz_end,
_favicon_32x32_png_end,
_index_html_gz_end,
_index_380f25_bundle_js_gz_end,
_node_vendors_380f25_bundle_js_gz_end
_index_f2d7ed_bundle_js_gz_end,
_node_vendors_f2d7ed_bundle_js_gz_end
};

View File

@@ -1,6 +1,6 @@
/***********************************
webpack_headers
dist/css/index.d1b1b8d25a4e298ac90f.css.gz,dist/favicon-32x32.png,dist/index.html.gz,dist/js/index.380f25.bundle.js.gz,dist/js/node_vendors.380f25.bundle.js.gz
dist/css/index.99c86edb045064f0ff9e.css.gz,dist/favicon-32x32.png,dist/index.html.gz,dist/js/index.f2d7ed.bundle.js.gz,dist/js/node_vendors.f2d7ed.bundle.js.gz
***********************************/
#pragma once
#include <inttypes.h>