6502/ossc
1
0
Fork 0
mirror of https://github.com/marqs85/ossc.git synced 2026-04-21 05:16:31 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'scanline_contrast' of https://github.com/paulb-nl/ossc into upstream

Browse Source 
# Conflicts:
#	rtl/scanconverter.v
#	software/sys_controller/ossc/av_controller.c
This commit is contained in:
borti4938
2018-03-06 09:30:22 +01:00
parent 500a22f316 990bc1563e
commit 1a405c1e2e
6 changed files with 1089 additions and 1009 deletions
Download Patch File Download Diff File Expand all files Collapse all files
software/sys_controller/mem_init/sys_onchip_memory2_0.hex
+1007 -1007
View File
File diff suppressed because it is too large Load Diff
software/sys_controller/ossc/av_controller.c
+14 -1
View File
@@ -308,7 +308,8 @@ status_t get_status(tvp_input_t input, video_format format)
(tc.v_mask != cm.cc.v_mask) ||
(tc.mask_br != cm.cc.mask_br) ||
(tc.ar_256col != cm.cc.ar_256col) ||
(tc.reverse_lpf != cm.cc.reverse_lpf))
(tc.reverse_lpf != cm.cc.reverse_lpf) ||
(tc.sl_contrast != cm.cc.sl_contrast))
status = (status < INFO_CHANGE) ? INFO_CHANGE : status;
if (tc.sampler_phase != cm.cc.sampler_phase) {
@@ -366,8 +367,13 @@ status_t get_status(tvp_input_t input, video_format format)
// v_info: [31:29] [28:27] [26] [25:20] [19:17] [16:11] [10:0]
// | V_MULTMODE[2:0] | V_SCANLINEMODE[1:0] | V_SCANLINEID | V_MASK[5:0] | V_SYNCLEN[2:0] | V_BACKPORCH[5:0] | V_ACTIVE[10:0] |
//
<<<<<<< HEAD
// extra: [31:14] [13:9] [8:5] [4] [3:0]
// | | X_REV_LPF_STR | H_MASK_BR[3:0] | H_SCANLINESTR_TYPE | H_SCANLINESTR[3:0] |
=======
// extra: [31:15] [14:13] [12:8] [7:4] [3:0]
// | | H_SL_CONTRAST | X_REV_LPF_STR | H_MASK_BR[3:0] | H_SCANLINESTR[3:0] |
>>>>>>> 990bc1563eef0a5650dabcc5633d3aeb562abc38
//
void set_videoinfo()
{
@@ -462,10 +468,17 @@ void set_videoinfo()
(video_modes[cm.id].v_synclen<<17) |
(v_backporch<<11) |
v_active);
<<<<<<< HEAD
IOWR_ALTERA_AVALON_PIO_DATA(PIO_6_BASE, (cm.cc.reverse_lpf<<9) |
(cm.cc.mask_br<<5) |
(cm.cc.sl_method << 4) |
cm.cc.sl_str);
=======
IOWR_ALTERA_AVALON_PIO_DATA(PIO_6_BASE, (cm.cc.sl_contrast<<13) |
(cm.cc.reverse_lpf<<8) |
(cm.cc.mask_br<<4) |
cm.cc.sl_str);
>>>>>>> 990bc1563eef0a5650dabcc5633d3aeb562abc38
}
// Configure TVP7002 and scan converter logic based on the video mode
software/sys_controller/ossc/avconfig.h
+1
View File
@@ -80,6 +80,7 @@ typedef struct {
alt_u8 full_tx_setup;
alt_u8 vga_ilace_fix;
alt_u8 reverse_lpf;
alt_u8 sl_contrast;
#ifdef ENABLE_AUDIO
alt_u8 audio_dw_sampl;
alt_u8 audio_swap_lr;
software/sys_controller/ossc/menu.c
+2
View File
@@ -65,6 +65,7 @@ static const char *sl_type_desc[] = { LNG("Horizontal","ﾖｺ"), LNG("Vertical"
static const char *sl_id_desc[] = { LNG("Top","ｳｴ"), LNG("Bottom","ｼﾀ") };
static const char *audio_dw_sampl_desc[] = { LNG("Off (fs = 96kHz)","ｵﾌ (fs = 96kHz)"), "2x (fs = 48kHz)" };
static const char *lt_desc[] = { "Top-left", "Center", "Bottom-right" };
static const char *sl_contrast_desc[] = { LNG("Off","ｵﾌ"), "Low", "High" };
static void sampler_phase_disp(alt_u8 v) { sniprintf(menu_row2, LCD_ROW_LEN+1, LNG("%d deg","%d ﾄﾞ"), (v*1125)/100); }
static void sync_vth_disp(alt_u8 v) { sniprintf(menu_row2, LCD_ROW_LEN+1, "%d mV", (v*1127)/100); }
@@ -143,6 +144,7 @@ MENU(menu_postproc, P99_PROTECT({ \
{ LNG("Scanline method","Scanline method"), OPT_AVCONFIG_SELECTION, { .sel = { &tc.sl_method, OPT_WRAP, SETTING_ITEM(sl_method_desc) } } },
{ LNG("Scanline type","ｽｷｬﾝﾗｲﾝﾙｲ"), OPT_AVCONFIG_SELECTION, { .sel = { &tc.sl_type, OPT_WRAP, SETTING_ITEM(sl_type_desc) } } },
{ LNG("Scanline alignm.","ｽｷｬﾝﾗｲﾝﾎﾟｼﾞｼｮﾝ"), OPT_AVCONFIG_SELECTION, { .sel = { &tc.sl_id, OPT_WRAP, SETTING_ITEM(sl_id_desc) } } },
{ "ScanlineContrast", OPT_AVCONFIG_SELECTION, { .sel = { &tc.sl_contrast, OPT_WRAP, SETTING_ITEM(sl_contrast_desc) } } },
{ LNG("Horizontal mask","ｽｲﾍｲﾏｽｸ"), OPT_AVCONFIG_NUMVALUE, { .num = { &tc.h_mask, OPT_NOWRAP, 0, HV_MASK_MAX, pixels_disp } } },
{ LNG("Vertical mask","ｽｲﾁｮｸﾏｽｸ"), OPT_AVCONFIG_NUMVALUE, { .num = { &tc.v_mask, OPT_NOWRAP, 0, HV_MASK_MAX, pixels_disp } } },
{ LNG("Mask brightness","ﾏｽｸｱｶﾙｻ"), OPT_AVCONFIG_NUMVALUE, { .num = { &tc.mask_br, OPT_NOWRAP, 0, HV_MASK_MAX_BR, value_disp } } },