Skip to content

Commit c5204cc

Browse files
yilun-zhangstdaede
yilun-zhangs
authored and
tdaede
committed
Update error and warning logs for verification
1 parent 5d6115c commit c5204cc

4 files changed

Lines changed: 101 additions & 25 deletions

File tree

‎code/include/vlogging_tool_sr.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
**/
1919

2020
#include <stdarg.h>
21+
#include <stdint.h>
2122

2223
#ifndef _VLOGGING_TOOL_SR_H_
2324
#define _VLOGGING_TOOL_SR_H_
@@ -34,6 +35,7 @@ int vlog_print(LOG_TYPE type, uint64_t key, const char* format, ...);
3435
int vlog_obu(uint32_t obu_type, void* obu,
3536
uint64_t num_samples_to_trim_at_start,
3637
uint64_t num_samples_to_trim_at_end);
38+
int vlog_decop(char* decop_text);
3739
int vlog_file_close();
3840
int is_vlog_file_open();
3941

‎code/src/common/IAMF_debug.h‎

Lines changed: 73 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,24 @@
2020
#ifndef IAMF_DEBUG_H
2121
#define IAMF_DEBUG_H
2222

23-
#ifdef IA_DBG
23+
#ifndef SUPPORT_VERIFIER
24+
#define SUPPORT_VERIFIER 0
25+
#endif
2426

2527
#include <stdio.h>
2628
#include <string.h>
2729

30+
#if SUPPORT_VERIFIER
31+
#include "vlogging_tool_sr.h"
32+
#endif
33+
34+
#ifndef __MODULE__
35+
#define __MODULE__ \
36+
(strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILE__)
37+
#endif
38+
39+
#ifdef IA_DBG
40+
2841
#ifndef IA_TAG
2942
#define IA_TAG "IAMF"
3043
#endif
@@ -44,34 +57,59 @@
4457
#define obu_dump(a, b, c)
4558
#endif
4659

47-
#ifndef __MODULE__
48-
#define __MODULE__ \
49-
(strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILE__)
50-
#endif
51-
5260
#ifdef WIN32
61+
#if SUPPORT_VERIFIER
62+
#define ia_log(level, slevel, fmt, ...) \
63+
do { \
64+
if ((IA_DBG_E & level) || (IA_DBG_W & level)) { \
65+
char text[2048]; \
66+
sprintf(text, "[%-9s:%s(%4d):%s]>" fmt, slevel, __MODULE__, __LINE__, \
67+
__FUNCTION__, ##__VA_ARGS__); \
68+
vlog_decop(text); \
69+
} \
70+
if (IA_DBG_LEVEL & level) { \
71+
fprintf(stderr, "[%-9s:%s:%s(%4d):%s]>" fmt "\n", IA_TAG, slevel, \
72+
__MODULE__, __LINE__, __FUNCTION__, ##__VA_ARGS__); \
73+
} \
74+
} while (0)
75+
#else // !SUPPORT_VERIFIER
5376
#define ia_log(level, slevel, fmt, ...) \
5477
do { \
55-
if (IA_DBG_LEVEL & level) { \
78+
if (IA_DBG_LEVEL & level) { \
5679
fprintf(stderr, "[%-9s:%s:%s(%4d):%s]>" fmt "\n", IA_TAG, slevel, \
5780
__MODULE__, __LINE__, __FUNCTION__, ##__VA_ARGS__); \
5881
} \
5982
} while (0)
60-
83+
#endif
6184
#define ia_loge(fmt, ...) ia_log(IA_DBG_E, "ERROR", fmt, __VA_ARGS__)
6285
#define ia_logw(fmt, ...) ia_log(IA_DBG_W, "WARN ", fmt, __VA_ARGS__)
6386
#define ia_logi(fmt, ...) ia_log(IA_DBG_I, "INFO ", fmt, __VA_ARGS__)
6487
#define ia_logd(fmt, ...) ia_log(IA_DBG_D, "DEBUG", fmt, __VA_ARGS__)
6588
#define ia_logt(fmt, ...) ia_log(IA_DBG_T, "TRACE", fmt, __VA_ARGS__)
6689
#else
90+
#if SUPPORT_VERIFIER
6791
#define ia_log(level, slevel, fmt, arg...) \
6892
do { \
93+
if ((IA_DBG_E & level) || (IA_DBG_W & level)) { \
94+
char text[2048]; \
95+
sprintf(text, "[%-9s:%s(%4d):%s]>" fmt "\n", slevel, __MODULE__, \
96+
__LINE__, __FUNCTION__, ##arg); \
97+
vlog_decop(text); \
98+
} \
6999
if (IA_DBG_LEVEL & level) { \
70100
fprintf(stderr, "[%-9s:%s:%s(%4d):%s]>" fmt "\n", IA_TAG, slevel, \
71101
__MODULE__, __LINE__, __FUNCTION__, ##arg); \
72102
} \
73103
} while (0)
74-
104+
#else // !SUPPORT_VERIFIER
105+
#define ia_log(level, slevel, fmt, arg...) \
106+
do { \
107+
if (IA_DBG_LEVEL & level) { \
108+
fprintf(stderr, "[%-9s:%s:%s(%4d):%s]>" fmt "\n", IA_TAG, slevel, \
109+
__MODULE__, __LINE__, __FUNCTION__, ##arg); \
110+
} \
111+
} while (0)
112+
#endif
75113
#define ia_loge(fmt, arg...) ia_log(IA_DBG_E, "ERROR", fmt, ##arg)
76114
#define ia_logw(fmt, arg...) ia_log(IA_DBG_W, "WARN ", fmt, ##arg)
77115
#define ia_logi(fmt, arg...) ia_log(IA_DBG_I, "INFO ", fmt, ##arg)
@@ -81,14 +119,37 @@
81119

82120
#else
83121
#ifdef WIN32
122+
#if SUPPORT_VERIFIER
123+
#define ia_log(level, slevel, fmt, ...) \
124+
do { \
125+
char text[2048]; \
126+
sprintf(text, "[%-9s:%s(%4d):%s]>" fmt, slevel, __MODULE__, __LINE__, \
127+
__FUNCTION__, ##__VA_ARGS__); \
128+
vlog_decop(text); \
129+
} while (0)
130+
#define ia_loge(fmt, ...) ia_log(IA_DBG_E, "ERROR", fmt, __VA_ARGS__)
131+
#define ia_logw(fmt, ...) ia_log(IA_DBG_W, "WARN ", fmt, __VA_ARGS__)
132+
#else // !SUPPORT_VERIFIER
84133
#define ia_loge(fmt, ...)
85134
#define ia_logw(fmt, ...)
135+
#endif
86136
#define ia_logi(fmt, ...)
87137
#define ia_logd(fmt, ...)
88138
#define ia_logt(fmt, ...)
89-
#else
90-
#define ia_loge(fmt, arg...)
91-
#define ia_logw(fmt, arg...)
139+
#else // !WIN32
140+
#if SUPPORT_VERIFIER
141+
#define ia_log(level, slevel, fmt, arg...) \
142+
do { \
143+
char text[2048]; \
144+
sprintf(text, "[%-9s:%s(%4d):%s]>" fmt "\n", slevel, __MODULE__, __LINE__, \
145+
__FUNCTION__, ##arg); \
146+
} while (0)
147+
#define ia_loge(fmt, arg...) ia_log(IA_DBG_E, "ERROR", fmt, ##arg)
148+
#define ia_logw(fmt, arg...) ia_log(IA_DBG_W, "WARN ", fmt, ##arg)
149+
#else // !SUPPORT_VERIFIER
150+
#define ia_loge(fmt, ...)
151+
#define ia_logw(fmt, ...)
152+
#endif
92153
#define ia_logi(fmt, arg...)
93154
#define ia_logd(fmt, arg...)
94155
#define ia_logt(fmt, arg...)

‎code/src/iamf_dec/IAMF_OBU.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,7 @@ IAMF_Element *iamf_element_new(IAMF_OBU *obu) {
449449
ia_loge("Don't support parameter type %" PRIu64
450450
" in Audio Element %" PRId64
451451
", parameter definition bytes %" PRIu64 ".",
452-
elem->element_id, type, size);
452+
type, elem->element_id, size);
453453
continue;
454454
}
455455

@@ -1020,10 +1020,10 @@ IAMF_Parameter *iamf_parameter_new(IAMF_OBU *obu,
10201020
para->id = bs_getAleb128(&b);
10211021

10221022
if (!objParam || !objParam->param_base) {
1023-
ia_loge("parameter object(%" PRIu64
1024-
"): Invalid object parameters for Parameter "
1025-
"Object.",
1026-
para->id);
1023+
// ia_loge("parameter object(%" PRIu64
1024+
// "): Invalid object parameters for Parameter "
1025+
// "Object.",
1026+
// para->id);
10271027
goto parameter_fail;
10281028
}
10291029

‎code/src/iamf_dec/vlogging_tool_sr.c‎

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ int write_prefix(LOG_TYPE type, char* buf) {
231231
len = sprintf(buf, "#1\n");
232232
break;
233233
case LOG_DECOP:
234-
len = sprintf(buf, "$0\n");
234+
len = sprintf(buf, "#2\n");
235235
break;
236236
default:
237237
break;
@@ -246,12 +246,8 @@ int write_postfix(LOG_TYPE type, char* buf) {
246246
switch (type) {
247247
case LOG_OBU:
248248
case LOG_MP4BOX:
249-
len = sprintf(buf, "##\n");
250-
break;
251249
case LOG_DECOP:
252-
len = sprintf(buf, "$$\n");
253-
break;
254-
default:
250+
len = sprintf(buf, "##\n");
255251
break;
256252
}
257253

@@ -510,6 +506,7 @@ static void write_audio_element_log(uint64_t idx, void* obu, char* log) {
510506
log += write_yaml_form(log, 1, "audio_element_params:");
511507
for (uint64_t i = 0; i < ae_obu->nb_parameters; ++i) {
512508
ParameterBase* param = ae_obu->parameters[i];
509+
if (!param) continue;
513510
log +=
514511
write_yaml_form(log, 1, "- param_definition_type: %llu", param->type);
515512

@@ -570,9 +567,9 @@ static void write_audio_element_log(uint64_t idx, void* obu, char* log) {
570567
if (ae_obu->element_type == AUDIO_ELEMENT_TYPE_CHANNEL_BASED) {
571568
log += write_yaml_form(log, 1, "scalable_channel_layout_config:");
572569
log += write_yaml_form(log, 2, "num_layers: %u",
573-
ae_obu->channels_conf->num_layers);
570+
ae_obu->channels_conf->nb_layers);
574571
log += write_yaml_form(log, 2, "channel_audio_layer_configs:");
575-
for (uint32_t i = 0; i < ae_obu->channels_conf->num_layers; ++i) {
572+
for (uint32_t i = 0; i < ae_obu->channels_conf->nb_layers; ++i) {
576573
ChannelLayerConf* layer_conf = &ae_obu->channels_conf->layer_conf_s[i];
577574
log += write_yaml_form(log, 2, "- loudspeaker_layout: %u",
578575
layer_conf->loudspeaker_layout);
@@ -983,3 +980,19 @@ int vlog_obu(uint32_t obu_type, void* obu,
983980

984981
return vlog_print(LOG_OBU, key, log);
985982
}
983+
984+
int vlog_decop(char* decop_text) {
985+
if (!is_vlog_file_open()) return -1;
986+
987+
static uint64_t decop_log_count = 0;
988+
static char log_b[LOG_BUFFER_SIZE];
989+
char* log = log_b;
990+
uint64_t key = decop_log_count++;
991+
992+
log += write_prefix(LOG_DECOP, log);
993+
log += write_yaml_form(log, 0, "DECOP_%llu:", decop_log_count);
994+
log += write_yaml_form(log, 0, "- text: %s", decop_text);
995+
write_postfix(LOG_DECOP, log);
996+
997+
return vlog_print(LOG_DECOP, key, log_b);
998+
}

0 commit comments

Comments
 (0)