proper RGB to Y conversion.

This commit is contained in:
Jean-François DEL NERO 2023-02-22 22:58:23 +01:00
parent 7d63b5d16a
commit c4acbc9a86
2 changed files with 21 additions and 2 deletions

View File

@ -131,6 +131,14 @@ void init_composite(composite_state * state, int sample_rate, int x_res, int y_r
} }
} }
// RGB to Y table.
for(i=0;i<256;i++)
{
state->r_yconv[i] = (double)i * 0.299;
state->g_yconv[i] = (double)i * 0.587;
state->b_yconv[i] = (double)i * 0.114;
}
state->step_index = 0; state->step_index = 0;
state->cur_state_time = 0; state->cur_state_time = 0;
} }
@ -138,7 +146,8 @@ void init_composite(composite_state * state, int sample_rate, int x_res, int y_r
void gen_video_signal(composite_state * state, double * vid_signal, int buf_size) void gen_video_signal(composite_state * state, double * vid_signal, int buf_size)
{ {
int i,xpos; int i,xpos;
double value; double value,yvalue;
uint32_t rgb_word;
value = 0; value = 0;
i = 0; i = 0;
@ -187,7 +196,13 @@ void gen_video_signal(composite_state * state, double * vid_signal, int buf_size
xpos = ((state->cur_state_time - ( vertical_blanking[state->step_index].first_duration + ((3.5+4.7)/(double)1E6) )) / (45.6/(double)1E6)) * state->buf_x_res; xpos = ((state->cur_state_time - ( vertical_blanking[state->step_index].first_duration + ((3.5+4.7)/(double)1E6) )) / (45.6/(double)1E6)) * state->buf_x_res;
value = vertical_blanking[state->step_index].end_val; value = vertical_blanking[state->step_index].end_val;
value += ((double)((state->video_buffer[(state->cur_line_index * state->buf_x_res * 2) + ( state->buf_x_res * (((vertical_blanking[state->step_index].type>>1)^1)&1)) + xpos] & 0xFF)) * ((double)((double)100.0 - vertical_blanking[state->step_index].end_val)/(double)256));
rgb_word = state->video_buffer[(state->cur_line_index * state->buf_x_res * 2) + ( state->buf_x_res * (((vertical_blanking[state->step_index].type>>1)^1)&1)) + xpos];
// Y / Luminance
yvalue = state->r_yconv[rgb_word & 0xFF] + state->g_yconv[( rgb_word >> 8 )& 0xFF] + state->b_yconv[( rgb_word >> 16 )& 0xFF];
value += (double)( yvalue * ((double)((double)100.0 - vertical_blanking[state->step_index].end_val)/(double)256));
} }
else else
{ {

View File

@ -39,6 +39,10 @@ typedef struct composite_state_
double cur_state_time; double cur_state_time;
double r_yconv[256];
double g_yconv[256];
double b_yconv[256];
}composite_state; }composite_state;
typedef struct pulses_state_ typedef struct pulses_state_