scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-03-22 01:40:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Displaying progressive frames.

Browse Source 
Fixed bug while probing for AJA Kona3. Ultragrid was trying to display the
video using kona module even in case that non Kona3 video output component was
detected.
This commit is contained in:
xliska
2008-09-12 08:59:26 +00:00
parent 49d2bbb585
commit 428a24fb81
1 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
ultragrid/src/video_display/kona.c
View File

@@ -139,19 +139,23 @@ display_thread_kona(void *arg)
line1 = s->buffers[s->image_display];
line2 = s->outBuffer;
if (bitdepth == 10) {
for (i = 0; i < 1080; i += 2) {
memcpy(line2, line1, 5120);
memcpy(line2+5120, line1+5120*540, 5120);
line1 += 5120;
line2 += 2*5120;
}
if (progressive == 1) {
memcpy(line2, line1, hd_size_x*hd_size_y*hd_color_bpp);
} else {
for (i = 0; i < 1080; i += 2) {
memcpy(line2, line1, hd_size_x * hd_color_bpp);
memcpy(line2 + hd_size_x * hd_color_bpp, line1 + hd_size_x * hd_color_bpp * hd_size_y / 2, hd_size_x * hd_color_bpp);
line1 += hd_size_x * hd_color_bpp;
line2 += hd_size_x * hd_color_bpp * 2;
if (bitdepth == 10) {
for (i = 0; i < 1080; i += 2) {
memcpy(line2, line1, 5120);
memcpy(line2+5120, line1+5120*540, 5120);
line1 += 5120;
line2 += 2*5120;
}
} else {
for (i = 0; i < 1080; i += 2) {
memcpy(line2, line1, hd_size_x * hd_color_bpp);
memcpy(line2 + hd_size_x * hd_color_bpp, line1 + hd_size_x * hd_color_bpp * hd_size_y / 2, hd_size_x * hd_color_bpp);
line1 += hd_size_x * hd_color_bpp;
line2 += hd_size_x * hd_color_bpp * 2;
}
}
}
@@ -245,7 +249,7 @@ display_kona_init(void)
char *cName = *componentNameHandle;
DisposeHandle(componentNameHandle);
if (strcmp(cName, "AJA")) {
if ((strstr(cName, "AJA")) != NULL) {
fprintf(stdout, "Found video output component: %s\n", cName);
s->videoDisplayComponent = c;
s->videoDisplayComponentInstance = OpenComponent(s->videoDisplayComponent);