Skip to content

Fix tvctl distorting ntsc image when cea608 enabed #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nutki wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix tvctl distorting ntsc image when cea608 enabed #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
711685f
Revert "get CC on lines 21 and 284"
nutki Jun 15, 2023
0c4d746
initial
nutki Jun 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions cea608.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@
#include "cea608buffer.h"

#define WIDTH (53)
#define HEIGHT (2)
#define VOFFSET (1)
#define HEIGHT (VOFFSET+2)
#define OFFSET (1)
#define FIXED (19)
#define ROW(i, n) (i+(PITCH(WIDTH)*(n))+OFFSET)
Expand All @@ -52,7 +53,7 @@ void draw(uint8_t *image, int next_resource)
{
// fill image
if(next_resource == 0) {
get_packet(ROW(image, 1)+FIXED, ROW(image, 0)+FIXED);
get_packet(ROW(image, VOFFSET)+FIXED, ROW(image, VOFFSET + 1)+FIXED);
}
}

Expand All @@ -62,7 +63,7 @@ void init(uint8_t *image)
// initialize image buffer with clock run in
int n, m, clock = 0x61555;
for (m=0; m<FIXED; m++) {
for (n=0; n<HEIGHT; n++) {
for (n=VOFFSET; n<HEIGHT; n++) {
ROW(image, n)[m] = clock&1;
}
clock = clock >> 1;
Expand Down
6 changes: 3 additions & 3 deletions tvctl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ int try_set_regs(volatile unsigned int *regs, int argc, char *argv[])
state = PAL_ON;
else if (regs[5] == 0x00100003 && regs[6] == 0x000300f0 && regs[7] == 0x00100003 && regs[8] == 0x000400f0)
state = NTSC_OFF;
else if (regs[5] == 0x000e0003 && regs[6] == 0x000500f0 && regs[7] == 0x000f0003 && regs[8] == 0x000500f0)
else if (regs[5] == 0x000e0003 && regs[6] == 0x000500f0 && regs[7] == 0x000e0003 && regs[8] == 0x000600f0)
state = NTSC_ON;
else
state = UNKNOWN;
Expand All @@ -88,8 +88,8 @@ int try_set_regs(volatile unsigned int *regs, int argc, char *argv[])
case NTSC_OFF:
regs[5] = 0x000e0003;
regs[6] = 0x000500f0;
regs[7] = 0x000f0003;
regs[8] = 0x000500f0;
regs[7] = 0x000e0003;
regs[8] = 0x000600f0;
/* fallthrough */
case NTSC_ON:
fprintf(stderr, "CEA608 output is now on.\n");
Expand Down