From eae3da7929d3e4a0f61ef084c5a4366a5aa1903a Mon Sep 17 00:00:00 2001 From: Lukas Hejtmanek Date: Wed, 17 Feb 2010 17:24:00 +0100 Subject: [PATCH] use AUX_* macros in hdstation instead of selfish aux interpretation --- ultragrid/src/video_capture/hdstation.c | 5 ++++- ultragrid/src/video_display/hdstation.c | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ultragrid/src/video_capture/hdstation.c b/ultragrid/src/video_capture/hdstation.c index 2aa2dedf4..ed3fa03a0 100644 --- a/ultragrid/src/video_capture/hdstation.c +++ b/ultragrid/src/video_capture/hdstation.c @@ -245,7 +245,10 @@ void *vidcap_hdstation_init(char *fmt) s->frame.width = s->mode->width; s->frame.height = s->mode->height; - s->frame.aux = s->mode->interlaced; + if(s->mode->interlaced) + s->frame.aux = AUX_INTERLACED; + else + s->frame.aux = AUX_PROGRESSIVE; aligned_x = s->frame.width; if (h_align) { diff --git a/ultragrid/src/video_display/hdstation.c b/ultragrid/src/video_display/hdstation.c index d6c5ff4d2..8c546634a 100644 --- a/ultragrid/src/video_display/hdstation.c +++ b/ultragrid/src/video_display/hdstation.c @@ -230,7 +230,10 @@ reconfigure_screen(void *state, unsigned int width, unsigned int height, s->frame.dst_bpp = get_bpp(color_spec); s->frame.fps = fps; s->frame.aux = aux; - s->interlaced = aux; + if(aux & AUX_INTERLACED) + s->interlaced = 1; + else + s->interlaced = 0; s->hd_video_mode = SV_MODE_COLOR_YUV422 | SV_MODE_ACTIVE_STREAMER;