Skip to content

Commit

Permalink
ngx-cc: log the args of the cmds in debug
Browse files Browse the repository at this point in the history
  • Loading branch information
@erankor
erankor committed Dec 1, 2024
1 parent b30ff82 commit 4e97eda
Show file tree
Hide file tree
Showing 2 changed files with 81 additions and 6 deletions.
77 changes: 71 additions & 6 deletions nginx-kmp-cc-module/src/media/cea708.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -834,6 +834,54 @@ static void CEA708_Window_Write(cea708_window_t *p_w, cea708_text_char_t c)
return CEA708_STATUS_STARVING
#define REQUIRE_ARGS_AND_POP_COMMAND(n) REQUIRE_ARGS(n); else POP_COMMAND()

#define cea708_log_command0(h, cmd) \
cc_log_debug2((h)->log, "CEA708-%uD: [%s]", \
(h)->id, \
(cmd))

#define cea708_log_command1(h, cmd) \
cc_log_debug3((h)->log, "CEA708-%uD: [%s 0x%02uxD]", \
(h)->id, \
(cmd), \
(uint32_t) cea708_input_buffer_peek(ib, 0))

#define cea708_log_command2(h, cmd) \
cc_log_debug4((h)->log, "CEA708-%uD: [%s 0x%02uxD 0x%02uxD]", \
(h)->id, \
(cmd), \
(uint32_t) cea708_input_buffer_peek(ib, 0), \
(uint32_t) cea708_input_buffer_peek(ib, 1))

#define cea708_log_command3(h, cmd) \
cc_log_debug5((h)->log, "CEA708-%uD: [%s 0x%02uxD 0x%02uxD 0x%02uxD]", \
(h)->id, \
(cmd), \
(uint32_t) cea708_input_buffer_peek(ib, 0), \
(uint32_t) cea708_input_buffer_peek(ib, 1), \
(uint32_t) cea708_input_buffer_peek(ib, 2))

#define cea708_log_command4(h, cmd) \
cc_log_debug6((h)->log, "CEA708-%uD: " \
"[%s 0x%02uxD 0x%02uxD 0x%02uxD 0x%02uxD]", \
(h)->id, \
(cmd), \
(uint32_t) cea708_input_buffer_peek(ib, 0), \
(uint32_t) cea708_input_buffer_peek(ib, 1), \
(uint32_t) cea708_input_buffer_peek(ib, 2), \
(uint32_t) cea708_input_buffer_peek(ib, 3))

#define cea708_log_command6(h, cmd) \
cc_log_debug8((h)->log, "CEA708-%uD: " \
"[%s 0x%02uxD 0x%02uxD 0x%02uxD 0x%02uxD 0x%02uxD 0x%02uxD]", \
(h)->id, \
(cmd), \
(uint32_t) cea708_input_buffer_peek(ib, 0), \
(uint32_t) cea708_input_buffer_peek(ib, 1), \
(uint32_t) cea708_input_buffer_peek(ib, 2), \
(uint32_t) cea708_input_buffer_peek(ib, 3), \
(uint32_t) cea708_input_buffer_peek(ib, 4), \
(uint32_t) cea708_input_buffer_peek(ib, 5))


enum
{
Expand Down Expand Up @@ -1433,6 +1481,9 @@ static int CEA708_Decode_C1(cea708_t *h, uint8_t code)
uint8_t b_output = 0;
uint8_t v, i;
int i_ret = CEA708_STATUS_OK;
#if (NGX_DEBUG)
char cmd[4];
#endif

switch (code)
{
Expand Down Expand Up @@ -1549,7 +1600,7 @@ static int CEA708_Decode_C1(cea708_t *h, uint8_t code)

case CEA708_C1_SPA: /* Set Pen Attributes */
REQUIRE_ARGS_AND_POP_COMMAND(2);
cc_log_debug1(h->log, "CEA708-%uD: [SPA]", h->id);
cea708_log_command2(h, "SPA");

if (!h->p_cw->b_defined)
{
Expand All @@ -1571,7 +1622,7 @@ static int CEA708_Decode_C1(cea708_t *h, uint8_t code)

case CEA708_C1_SPC: /* Set Pen Color */
REQUIRE_ARGS_AND_POP_COMMAND(3);
cc_log_debug1(h->log, "CEA708-%uD: [SPC]", h->id);
cea708_log_command3(h, "SPC");

if (!h->p_cw->b_defined)
{
Expand All @@ -1593,7 +1644,7 @@ static int CEA708_Decode_C1(cea708_t *h, uint8_t code)

case CEA708_C1_SPL: /* Set Pen Location */
REQUIRE_ARGS_AND_POP_COMMAND(2);
cc_log_debug1(h->log, "CEA708-%uD: [SPL]", h->id);
cea708_log_command2(h, "SPL");

if (!h->p_cw->b_defined)
{
Expand All @@ -1610,7 +1661,7 @@ static int CEA708_Decode_C1(cea708_t *h, uint8_t code)

case CEA708_C1_SWA: /* Set Window Attributes */
REQUIRE_ARGS_AND_POP_COMMAND(4);
cc_log_debug1(h->log, "CEA708-%uD: [SWA]", h->id);
cea708_log_command4(h, "SWA");

if (!h->p_cw->b_defined)
{
Expand Down Expand Up @@ -1645,7 +1696,14 @@ static int CEA708_Decode_C1(cea708_t *h, uint8_t code)
/* Set Current Window 0-7 */
POP_COMMAND();
code -= CEA708_C1_CW0;
cc_log_debug2(h->log, "CEA708-%uD: [CW %uD]", h->id, (uint32_t) code);

#if (NGX_DEBUG)
cmd[0] = 'C';
cmd[1] = 'W';
cmd[2] = '0' + code;
cmd[3] = '\0';
cea708_log_command0(h, cmd);
#endif

if (h->window[code].b_defined)
h->p_cw = &h->window[code];
Expand All @@ -1655,7 +1713,14 @@ static int CEA708_Decode_C1(cea708_t *h, uint8_t code)
/* Define Window 0-7 */
REQUIRE_ARGS_AND_POP_COMMAND(6);
code -= CEA708_C1_DF0;
cc_log_debug2(h->log, "CEA708-%uD: [DF %uD]", h->id, (uint32_t) code);

#if (NGX_DEBUG)
cmd[0] = 'D';
cmd[1] = 'F';
cmd[2] = '0' + code;
cmd[3] = '\0';
cea708_log_command6(h, cmd);
#endif

/* also sets current window */
h->p_cw = &h->window[code];
Expand Down
10 changes: 10 additions & 0 deletions nginx-kmp-cc-module/src/media/decoder.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,19 @@ typedef int64_t vlc_tick_t;
ngx_log_debug2(NGX_LOG_DEBUG_CORE, (log), 0, fmt, arg1, arg2)
#define cc_log_debug3(log, fmt, arg1, arg2, arg3) \
ngx_log_debug3(NGX_LOG_DEBUG_CORE, (log), 0, fmt, arg1, arg2, arg3)
#define cc_log_debug4(log, fmt, arg1, arg2, arg3, arg4) \
ngx_log_debug4(NGX_LOG_DEBUG_CORE, (log), 0, fmt, arg1, arg2, arg3, \
arg4)
#define cc_log_debug5(log, fmt, arg1, arg2, arg3, arg4, arg5) \
ngx_log_debug5(NGX_LOG_DEBUG_CORE, (log), 0, fmt, arg1, arg2, arg3, \
arg4, arg5)
#define cc_log_debug6(log, fmt, arg1, arg2, arg3, arg4, arg5, arg6) \
ngx_log_debug6(NGX_LOG_DEBUG_CORE, (log), 0, fmt, arg1, arg2, arg3, \
arg4, arg5, arg6)
#define cc_log_debug8(log, fmt, arg1, arg2, arg3, arg4, arg5, arg6, arg7, \
arg8) \
ngx_log_debug8(NGX_LOG_DEBUG_CORE, (log), 0, fmt, arg1, arg2, arg3, \
arg4, arg5, arg6, arg7, arg8)

#define cc_debug_point ngx_debug_point

Expand Down

0 comments on commit 4e97eda

Please sign in to comment.