eessppeelllloo/veejay
1
0
Fork 0
mirror of https://github.com/game-stop/veejay.git synced 2025-12-18 13:49:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor sample offsets

Browse Source
This commit is contained in:
veejay
2023-11-10 23:08:17 +01:00
parent b1057668cd
commit d6ce26c25c
4 changed files with 224 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
veejay-current/veejay-server/libsample/sampleadm.c
View File

@@ -707,6 +707,27 @@ int sample_get_position(int s1)
return si->offset; return si->offset;
} }
int sample_reset_chain_offset(int s1, int chain_entry, int s2)
{
sample_info *si1 = sample_get(s1);
sample_info *si2 = sample_get(s2);
if(!si1 || !si2)
return -1;
int has_marker = si2->marker_start >= 0 && si2->marker_end > 0;
int start_frame = ( has_marker ? si2->marker_start : si2->first_frame );
int end_frame = ( has_marker ? si2->marker_end : si2->last_frame );
int new_offset = start_frame;
if( si2->speed < 0 )
new_offset = end_frame;
si1->effect_chain[ chain_entry ]->frame_offset = new_offset;
return 1;
}
int sample_update_offset(int s1, int n_frame) int sample_update_offset(int s1, int n_frame)
{ {
int len; int len;
@@ -1165,22 +1186,6 @@ int sample_get_chain_status(int s1, int position)
return sample->effect_chain[position]->e_flag; return sample->effect_chain[position]->e_flag;
} }
int sample_get_first_mix_offset(int s1, int *parent, int look_for)
{
sample_info *sample = sample_get(s1);
if(!sample)
return 0;
int p = 0;
for( p = 0; p < SAMPLE_MAX_EFFECTS; p ++ ) {
if( sample->effect_chain[p]->source_type == 0 && look_for == sample->effect_chain[p]->channel)
{
return sample->effect_chain[p]->frame_offset;
}
}
return 0;
}
void sample_update_ascociated_samples(int s1) void sample_update_ascociated_samples(int s1)
{ {
sample_info *sample = sample_get(s1); sample_info *sample = sample_get(s1);
@@ -1236,6 +1241,7 @@ int sample_set_resume(int s1,long position)
if(sample->offset > 0) { if(sample->offset > 0) {
sample->resume_pos = sample->offset; sample->resume_pos = sample->offset;
veejay_msg(VEEJAY_MSG_WARNING, "Check me, resume position set to offset %d", sample->resume_pos );
} }
sample->loop_pp = 0; sample->loop_pp = 0;
@@ -1277,17 +1283,6 @@ int sample_get_offset(int s1, int position)
return sample->effect_chain[position]->frame_offset; return sample->effect_chain[position]->frame_offset;
} }
int sample_get_trimmer(int s1, int position)
{
sample_info *sample;
sample = sample_get(s1);
if (!sample)
return -1;
if (position < 0 || position >= SAMPLE_MAX_EFFECTS)
return -1;
return sample->effect_chain[position]->frame_trimmer;
}
int sample_get_chain_volume(int s1, int position) int sample_get_chain_volume(int s1, int position)
{ {
sample_info *sample; sample_info *sample;
@@ -1515,6 +1510,7 @@ int sample_get_all_effect_arg(int s1, int position, int *args, int arg_len, int
} }
else else
{ {
#pragma omp simd
for (i = 0; i < arg_len; i++) { for (i = 0; i < arg_len; i++) {
args[i] = sample->effect_chain[position]->arg[i]; args[i] = sample->effect_chain[position]->arg[i];
} }
@@ -2381,7 +2377,6 @@ int sample_chain_add(int s1, int c, int effect_nr)
if (vje_get_extra_frame(effect_nr)) if (vje_get_extra_frame(effect_nr))
{ {
sample->effect_chain[c]->frame_trimmer = 0;
if(s1 > 1) if(s1 > 1)
s1 = s1 - 1; s1 = s1 - 1;
if(!sample_exists(s1)) s1 = s1 + 1; if(!sample_exists(s1)) s1 = s1 + 1;
@@ -2456,30 +2451,31 @@ int sample_reset_offset(int s1)
return 1; return 1;
} }
static int sample_calc_offset( sample_info *sample,int entry, int candidate_offset )
{
int s1 = sample->effect_chain[ entry ]->channel;
for( int i = 0; i < SAMPLE_MAX_EFFECTS ; i ++ ) {
if( i > entry &&
sample->effect_chain[i]->source_type == 0 &&
sample->effect_chain[i]->channel == s1 ) {
return sample->effect_chain[ i ]->frame_offset;
}
}
return candidate_offset;
}
int sample_set_offset(int s1, int chain_entry, int frame_offset) int sample_set_offset(int s1, int chain_entry, int frame_offset)
{ {
sample_info *sample = sample_get(s1); sample_info *sample = sample_get(s1);
if (!sample) if (!sample)
return -1; return -1;
sample->effect_chain[chain_entry]->frame_offset = frame_offset; sample->effect_chain[chain_entry]->frame_offset = sample_calc_offset( sample, chain_entry, frame_offset );
return 1;
}
int sample_set_trimmer(int s1, int chain_entry, int trimmer)
{
sample_info *sample = sample_get(s1);
if (!sample)
return -1;
/* set to zero if frame_offset is greater than sample length */
if (chain_entry < 0 || chain_entry >= SAMPLE_MAX_PARAMETERS)
return -1;
if (trimmer > (sample->last_frame - sample->first_frame))
trimmer = 0;
if (trimmer < 0 ) trimmer = 0;
sample->effect_chain[chain_entry]->frame_trimmer = trimmer;
return 1; return 1;
} }
int sample_set_chain_audio(int s1, int chain_entry, int val) int sample_set_chain_audio(int s1, int chain_entry, int val)
{ {
sample_info *sample = sample_get(s1); sample_info *sample = sample_get(s1);
@@ -2529,7 +2525,6 @@ int sample_chain_clear(int s1)
sample->effect_chain[i]->effect_id = -1; sample->effect_chain[i]->effect_id = -1;
sample->effect_chain[i]->frame_offset = 0; sample->effect_chain[i]->frame_offset = 0;
sample->effect_chain[i]->frame_trimmer = 0;
sample->effect_chain[i]->volume = 0; sample->effect_chain[i]->volume = 0;
sample->effect_chain[i]->a_flag = 0; sample->effect_chain[i]->a_flag = 0;
sample->effect_chain[i]->is_rendering = 1; sample->effect_chain[i]->is_rendering = 1;
@@ -2632,7 +2627,6 @@ int sample_chain_remove(int s1, int position)
sample->effect_chain[position]->effect_id = -1; sample->effect_chain[position]->effect_id = -1;
sample->effect_chain[position]->frame_offset = 0; sample->effect_chain[position]->frame_offset = 0;
sample->effect_chain[position]->frame_trimmer = 0;
sample->effect_chain[position]->volume = 0; sample->effect_chain[position]->volume = 0;
sample->effect_chain[position]->a_flag = 0; sample->effect_chain[position]->a_flag = 0;
sample->effect_chain[position]->is_rendering = 1; sample->effect_chain[position]->is_rendering = 1;
@@ -2827,7 +2821,6 @@ void ParseEffect(xmlDocPtr doc, xmlNodePtr cur, int dst_sample, int start_at)
int i; int i;
int source_type = 0; int source_type = 0;
int channel = 0; int channel = 0;
int frame_trimmer = 0;
int frame_offset = 0; int frame_offset = 0;
int e_flag = 0; int e_flag = 0;
int volume = 0; int volume = 0;
@@ -2864,7 +2857,7 @@ void ParseEffect(xmlDocPtr doc, xmlNodePtr cur, int dst_sample, int start_at)
} }
/* add source,channel,trimmer,e_flag */ /* add source,channel,e_flag */
if (!xmlStrcmp(cur->name, (const xmlChar *) XMLTAG_EFFECTSOURCE)) { if (!xmlStrcmp(cur->name, (const xmlChar *) XMLTAG_EFFECTSOURCE)) {
source_type = get_xml_int( doc, cur ); source_type = get_xml_int( doc, cur );
} }
@@ -2873,10 +2866,6 @@ void ParseEffect(xmlDocPtr doc, xmlNodePtr cur, int dst_sample, int start_at)
channel = get_xml_int( doc, cur ); channel = get_xml_int( doc, cur );
} }
if (!xmlStrcmp(cur->name, (const xmlChar *) XMLTAG_EFFECTTRIMMER)) {
frame_trimmer = get_xml_int( doc, cur );
}
if (!xmlStrcmp(cur->name, (const xmlChar *) XMLTAG_EFFECTOFFSET)) { if (!xmlStrcmp(cur->name, (const xmlChar *) XMLTAG_EFFECTOFFSET)) {
frame_offset = get_xml_int( doc, cur ); frame_offset = get_xml_int( doc, cur );
} }
@@ -2927,7 +2916,6 @@ void ParseEffect(xmlDocPtr doc, xmlNodePtr cur, int dst_sample, int start_at)
if( effect_id != -1 ) { if( effect_id != -1 ) {
sample_set_chain_status(dst_sample, chain_index, e_flag); sample_set_chain_status(dst_sample, chain_index, e_flag);
sample_set_offset(dst_sample, chain_index, frame_offset); sample_set_offset(dst_sample, chain_index, frame_offset);
sample_set_trimmer(dst_sample, chain_index, frame_trimmer);
} }
sample_info *skel = sample_get(dst_sample); sample_info *skel = sample_get(dst_sample);
@@ -3375,7 +3363,6 @@ void CreateEffect(xmlNodePtr node, sample_eff_chain * effect, int position)
put_xml_int( node, XMLTAG_EFFECTSOURCE, effect->source_type ); put_xml_int( node, XMLTAG_EFFECTSOURCE, effect->source_type );
put_xml_int( node, XMLTAG_EFFECTCHANNEL, effect->channel ); put_xml_int( node, XMLTAG_EFFECTCHANNEL, effect->channel );
put_xml_int( node, XMLTAG_EFFECTOFFSET, effect->frame_offset ); put_xml_int( node, XMLTAG_EFFECTOFFSET, effect->frame_offset );
put_xml_int( node, XMLTAG_EFFECTTRIMMER, effect->frame_trimmer );
put_xml_int( node, XMLTAG_EFFECTAUDIOFLAG, effect->a_flag ); put_xml_int( node, XMLTAG_EFFECTAUDIOFLAG, effect->a_flag );
put_xml_int( node, XMLTAG_EFFECTAUDIOVOLUME, effect->volume ); put_xml_int( node, XMLTAG_EFFECTAUDIOVOLUME, effect->volume );
put_xml_int( node, "kf_status", effect->kf_status ); put_xml_int( node, "kf_status", effect->kf_status );

9
veejay-current/veejay-server/libsample/sampleadm.h
View File

@@ -48,7 +48,6 @@
#define XMLTAG_ARGUMENT "argument" #define XMLTAG_ARGUMENT "argument"
#define XMLTAG_EFFECTSOURCE "source" #define XMLTAG_EFFECTSOURCE "source"
#define XMLTAG_EFFECTCHANNEL "channel" #define XMLTAG_EFFECTCHANNEL "channel"
#define XMLTAG_EFFECTTRIMMER "trimmer"
#define XMLTAG_EFFECTOFFSET "offset" #define XMLTAG_EFFECTOFFSET "offset"
#define XMLTAG_EFFECTACTIVE "active" #define XMLTAG_EFFECTACTIVE "active"
#define XMLTAG_EFFECTAUDIOFLAG "use_audio" #define XMLTAG_EFFECTAUDIOFLAG "use_audio"
@@ -98,7 +97,6 @@ typedef struct sample_eff_t {
void *vje_instance; void *vje_instance;
int arg[SAMPLE_MAX_PARAMETERS]; /* array of arguments */ int arg[SAMPLE_MAX_PARAMETERS]; /* array of arguments */
int frame_offset; int frame_offset;
int frame_trimmer; /* sub frame scratcher */
int speed; /* last known play speed */ int speed; /* last known play speed */
/* audio settings */ /* audio settings */
int a_flag; /* audio enabled/disabled */ int a_flag; /* audio enabled/disabled */
@@ -189,6 +187,7 @@ typedef struct sample_info_t {
int transition_shape; int transition_shape;
int transition_length; int transition_length;
int transition_active; int transition_active;
} sample_info; } sample_info;
#define SAMPLE_YUV420_BUFSIZE 16 #define SAMPLE_YUV420_BUFSIZE 16
@@ -266,16 +265,12 @@ extern int sample_get_effect(int s1, int position);
/* get effect any, even if effect is disabled (required for informational purposes)*/ /* get effect any, even if effect is disabled (required for informational purposes)*/
extern int sample_get_effect_any(int s1, int position); extern int sample_get_effect_any(int s1, int position);
extern int sample_get_offset(int s1, int position); extern int sample_get_offset(int s1, int position);
extern int sample_get_first_mix_offset(int s1, int *parent, int look_for );
/* trimmer is usefull for underlying samples in the effect chain.
you can manual adjust the video/audio sync of the underlying sample */
extern int sample_get_trimmer(int s1, int position);
extern int sample_set_trimmer(int s1, int position, int trimmer);
extern int sample_get_short_info(int sample_id, int *, int *, int *, int *) ; extern int sample_get_short_info(int sample_id, int *, int *, int *, int *) ;
extern int sample_get_chain_volume(int s1, int position); extern int sample_get_chain_volume(int s1, int position);
extern void sample_set_kf_type(int s1, int entry, int type ); extern void sample_set_kf_type(int s1, int entry, int type );
/* set volume of audio data coming to the chain */ /* set volume of audio data coming to the chain */
extern int sample_set_chain_volume(int s1, int position, int volume); extern int sample_set_chain_volume(int s1, int position, int volume);
extern int sample_reset_chain_offset(int s1, int chain_entry, int s2);
/* whether to mix underlying sample's audio */ /* whether to mix underlying sample's audio */
extern int sample_get_chain_audio(int s1, int position); extern int sample_get_chain_audio(int s1, int position);

341
veejay-current/veejay-server/libstream/vj-tag.c
View File

@@ -747,7 +747,8 @@ int vj_tag_generator_set_arg(int t1, int *values)
return 0; return 0;
if(tag->generator) { if(tag->generator) {
int i; int i;
for( i = 0; i < 16; i ++ ) { #pragma omp simd
for( i = 0; i < 16; i ++ ) {
tag->genargs[i] = values[i]; tag->genargs[i] = values[i];
} }
return 1; return 1;
@@ -836,11 +837,11 @@ int vj_tag_generator_get_args(int t1, int *args, int *n_args, int *fx_id)
return 0; return 0;
} }
void *vj_tag_get_macro(int t1) { void *vj_tag_get_macro(int t1) {
vj_tag *tag = vj_tag_get(t1); vj_tag *tag = vj_tag_get(t1);
if(!tag) return NULL; if(!tag) return NULL;
return tag->macro; return tag->macro;
} }
int vj_tag_set_stream_color(int t1, int r, int g, int b) int vj_tag_set_stream_color(int t1, int r, int g, int b)
{ {
@@ -986,8 +987,8 @@ int vj_tag_new(int type, char *filename, int stream_nr, editlist * el, int pix_f
tag->subrender = 1; tag->subrender = 1;
tag->transition_length = 25; tag->transition_length = 25;
if(type == VJ_TAG_TYPE_AVFORMAT ) if(type == VJ_TAG_TYPE_AVFORMAT )
tag->priv = avformat_thread_allocate(_tag_info->effect_frame1); tag->priv = avformat_thread_allocate(_tag_info->effect_frame1);
palette = get_ffmpeg_pixfmt( pix_fmt ); palette = get_ffmpeg_pixfmt( pix_fmt );
@@ -1027,17 +1028,17 @@ int vj_tag_new(int type, char *filename, int stream_nr, editlist * el, int pix_f
return -1; return -1;
} }
break; break;
case VJ_TAG_TYPE_AVFORMAT: case VJ_TAG_TYPE_AVFORMAT:
snprintf(tag->source_name,SOURCE_NAME_LEN, "%s", filename ); snprintf(tag->source_name,SOURCE_NAME_LEN, "%s", filename );
if(!avformat_thread_start(tag, _tag_info->effect_frame1)) { if(!avformat_thread_start(tag, _tag_info->effect_frame1)) {
veejay_msg(VEEJAY_MSG_ERROR, "Unable to start thread"); veejay_msg(VEEJAY_MSG_ERROR, "Unable to start thread");
free(tag->source_name); free(tag->source_name);
if(tag->method_filename) if(tag->method_filename)
free(tag->method_filename); free(tag->method_filename);
free(tag); free(tag);
return -1; return -1;
} }
break; break;
case VJ_TAG_TYPE_DV1394: case VJ_TAG_TYPE_DV1394:
#ifdef SUPPORT_READ_DV2 #ifdef SUPPORT_READ_DV2
snprintf(tag->source_name, SOURCE_NAME_LEN,"dv1394 %d", channel); snprintf(tag->source_name, SOURCE_NAME_LEN,"dv1394 %d", channel);
@@ -1242,9 +1243,8 @@ int vj_tag_new(int type, char *filename, int stream_nr, editlist * el, int pix_f
(sample_eff_chain *) vj_calloc(sizeof(sample_eff_chain)); (sample_eff_chain *) vj_calloc(sizeof(sample_eff_chain));
tag->effect_chain[i]->effect_id = -1; tag->effect_chain[i]->effect_id = -1;
tag->effect_chain[i]->e_flag = 0; tag->effect_chain[i]->e_flag = 0;
tag->effect_chain[i]->frame_trimmer = 0;
tag->effect_chain[i]->frame_offset = 0; tag->effect_chain[i]->frame_offset = 0;
tag->effect_chain[i]->speed = INT_MAX; tag->effect_chain[i]->speed = INT_MAX;
tag->effect_chain[i]->volume = 0; tag->effect_chain[i]->volume = 0;
tag->effect_chain[i]->a_flag = 0; tag->effect_chain[i]->a_flag = 0;
tag->effect_chain[i]->channel = 0; tag->effect_chain[i]->channel = 0;
@@ -1397,9 +1397,9 @@ int vj_tag_del(int id)
vj_yuv_stream_stop_read(vj_tag_input->stream[tag->index]); vj_yuv_stream_stop_read(vj_tag_input->stream[tag->index]);
// vj_yuv4mpeg_free( vj_tag_input->stream[tag->index]); // vj_yuv4mpeg_free( vj_tag_input->stream[tag->index]);
break; break;
case VJ_TAG_TYPE_AVFORMAT: case VJ_TAG_TYPE_AVFORMAT:
avformat_thread_stop(tag); avformat_thread_stop(tag);
break; break;
#ifdef SUPPORT_READ_DV2 #ifdef SUPPORT_READ_DV2
case VJ_TAG_TYPE_DV1394: case VJ_TAG_TYPE_DV1394:
vj_dv1394_close( vj_tag_input->dv1394[tag->index] ); vj_dv1394_close( vj_tag_input->dv1394[tag->index] );
@@ -2314,27 +2314,6 @@ int vj_tag_set_chain_status(int t1, int position, int status)
return 1; return 1;
} }
int vj_tag_get_trimmer(int t1, int position)
{
vj_tag *tag = vj_tag_get(t1);
if (!tag)
return 0;
if (position < 0 || position >= SAMPLE_MAX_EFFECTS)
return 0;
return tag->effect_chain[position]->frame_trimmer;
}
int vj_tag_set_trimmer(int t1, int position, int trim)
{
vj_tag *tag = vj_tag_get(t1);
if (!tag)
return -1;
if (position < 0 || position >= SAMPLE_MAX_EFFECTS)
return -1;
tag->effect_chain[position]->frame_trimmer = trim;
return 1;
}
int vj_tag_get_all_effect_args(int t1, int position, int *args, int vj_tag_get_all_effect_args(int t1, int position, int *args,
int arg_len, int n_frame) int arg_len, int n_frame)
{ {
@@ -2370,6 +2349,7 @@ int vj_tag_get_all_effect_args(int t1, int position, int *args,
} }
else else
{ {
#pragma omp simd
for( i = 0; i < arg_len; i ++ ) for( i = 0; i < arg_len; i ++ )
args[i] = tag->effect_chain[position]->arg[i]; args[i] = tag->effect_chain[position]->arg[i];
} }
@@ -2450,9 +2430,9 @@ int vj_tag_disable(int t1) {
net_thread_stop( tag ); net_thread_stop( tag );
} }
if(tag->source_type == VJ_TAG_TYPE_AVFORMAT ) { if(tag->source_type == VJ_TAG_TYPE_AVFORMAT ) {
avformat_thread_set_state( tag,0 ); avformat_thread_set_state( tag,0 );
} }
if(tag->source_type == VJ_TAG_TYPE_V4L && !tag->clone ) if(tag->source_type == VJ_TAG_TYPE_V4L && !tag->clone )
{ {
@@ -2505,13 +2485,13 @@ int vj_tag_enable(int t1) {
} }
} }
if(tag->source_type == VJ_TAG_TYPE_AVFORMAT ) if(tag->source_type == VJ_TAG_TYPE_AVFORMAT )
{ {
if(!avformat_thread_set_state(tag,1)) { if(!avformat_thread_set_state(tag,1)) {
veejay_msg(VEEJAY_MSG_ERROR, "Stream is not yet ready to start playing"); veejay_msg(VEEJAY_MSG_ERROR, "Stream is not yet ready to start playing");
return -1; return -1;
} }
} }
#ifdef USE_GDK_PIXBUF #ifdef USE_GDK_PIXBUF
if( tag->source_type == VJ_TAG_TYPE_PICTURE ) if( tag->source_type == VJ_TAG_TYPE_PICTURE )
@@ -2572,7 +2552,7 @@ int vj_tag_set_active(int t1, int active)
vj_yuv_stream_stop_read( vj_tag_input->stream[tag->index]); vj_yuv_stream_stop_read( vj_tag_input->stream[tag->index]);
} }
break; break;
case VJ_TAG_TYPE_AVFORMAT: case VJ_TAG_TYPE_AVFORMAT:
case VJ_TAG_TYPE_MCAST: case VJ_TAG_TYPE_MCAST:
case VJ_TAG_TYPE_NET: case VJ_TAG_TYPE_NET:
case VJ_TAG_TYPE_PICTURE: case VJ_TAG_TYPE_PICTURE:
@@ -2766,7 +2746,7 @@ int vj_tag_chain_remove(int t1, int index)
int j; int j;
for (j = 0; j < SAMPLE_MAX_PARAMETERS; j++) { for (j = 0; j < SAMPLE_MAX_PARAMETERS; j++) {
tag->effect_chain[index]->arg[j] = 0; tag->effect_chain[index]->arg[j] = 0;
} }
if( index == tag->fade_entry ) if( index == tag->fade_entry )
tag->fade_entry = -1; tag->fade_entry = -1;
@@ -2774,67 +2754,67 @@ int vj_tag_chain_remove(int t1, int index)
return 1; return 1;
} }
void vj_tag_set_chain_paused(int t1, int paused) void vj_tag_set_chain_paused(int t1, int paused)
{ {
vj_tag *tag = vj_tag_get(t1); vj_tag *tag = vj_tag_get(t1);
if(!tag) if(!tag)
return; return;
int entry; int entry;
for( entry = 0; entry < SAMPLE_MAX_EFFECTS; entry ++ ) { for( entry = 0; entry < SAMPLE_MAX_EFFECTS; entry ++ ) {
if( tag->effect_chain[entry]->source_type != 0 || if( tag->effect_chain[entry]->source_type != 0 ||
tag->effect_chain[entry]->channel <= 0 ) tag->effect_chain[entry]->channel <= 0 )
continue; continue;
if( paused == 1 ) { if( paused == 1 ) {
int speed = sample_get_speed( tag->effect_chain[entry]->channel ); int speed = sample_get_speed( tag->effect_chain[entry]->channel );
if( speed != 0) { if( speed != 0) {
tag->effect_chain[entry]->speed = speed; tag->effect_chain[entry]->speed = speed;
sample_set_speed( tag->effect_chain[entry]->channel, 0 ); sample_set_speed( tag->effect_chain[entry]->channel, 0 );
} }
} }
else { else {
if( tag->effect_chain[entry]->speed == 0 ) { if( tag->effect_chain[entry]->speed == 0 ) {
tag->effect_chain[entry]->speed = sample_get_speed( tag->effect_chain[entry]->channel ); tag->effect_chain[entry]->speed = sample_get_speed( tag->effect_chain[entry]->channel );
if( tag->effect_chain[entry]->speed == 0 ) { if( tag->effect_chain[entry]->speed == 0 ) {
veejay_msg(VEEJAY_MSG_DEBUG, "Sample %d on mixing entry %d is paused. Please set speed manually", veejay_msg(VEEJAY_MSG_DEBUG, "Sample %d on mixing entry %d is paused. Please set speed manually",
tag->effect_chain[entry]->channel, entry); tag->effect_chain[entry]->channel, entry);
} }
} }
if( tag->effect_chain[entry]->speed != INT_MAX ) { if( tag->effect_chain[entry]->speed != INT_MAX ) {
sample_set_speed( tag->effect_chain[entry]->channel, tag->effect_chain[entry]->speed ); sample_set_speed( tag->effect_chain[entry]->channel, tag->effect_chain[entry]->speed );
veejay_msg(VEEJAY_MSG_DEBUG, "Restoring speed %d for sample %d on mixing entry %d", veejay_msg(VEEJAY_MSG_DEBUG, "Restoring speed %d for sample %d on mixing entry %d",
tag->effect_chain[entry]->speed, tag->effect_chain[entry]->channel, entry ); tag->effect_chain[entry]->speed, tag->effect_chain[entry]->channel, entry );
} }
} }
} }
} }
int vj_tag_get_loop_stat_stop(int s1) { int vj_tag_get_loop_stat_stop(int s1) {
vj_tag *tag = vj_tag_get(s1); vj_tag *tag = vj_tag_get(s1);
if (!tag) return 0; if (!tag) return 0;
return tag->loop_stat_stop; return tag->loop_stat_stop;
} }
void vj_tag_set_loop_stat_stop(int s1, int loop_stop) { void vj_tag_set_loop_stat_stop(int s1, int loop_stop) {
vj_tag *tag = vj_tag_get(s1); vj_tag *tag = vj_tag_get(s1);
if(!tag) return; if(!tag) return;
tag->loop_stat_stop = loop_stop; tag->loop_stat_stop = loop_stop;
} }
int vj_tag_get_loop_stats(int s1) { int vj_tag_get_loop_stats(int s1) {
vj_tag *tag = vj_tag_get(s1); vj_tag *tag = vj_tag_get(s1);
if (!tag) return 0; if (!tag) return 0;
return tag->loop_stat; return tag->loop_stat;
} }
void vj_tag_set_loop_stats(int s1, int loops) { void vj_tag_set_loop_stats(int s1, int loops) {
vj_tag *tag = vj_tag_get(s1); vj_tag *tag = vj_tag_get(s1);
if(!tag) return; if(!tag) return;
if( loops == -1) { if( loops == -1) {
tag->loop_stat = (tag->loop_stat_stop > 0 ? (tag->loop_stat + 1 ) % tag->loop_stat_stop : tag->loop_stat + 1); tag->loop_stat = (tag->loop_stat_stop > 0 ? (tag->loop_stat + 1 ) % tag->loop_stat_stop : tag->loop_stat + 1);
} }
else else
tag->loop_stat = loops; tag->loop_stat = loops;
} }
int vj_tag_get_loops(int t1) { int vj_tag_get_loops(int t1) {
@@ -2905,9 +2885,9 @@ void vj_tag_get_by_type(int id,int type, char *description )
case VJ_TAG_TYPE_NET: case VJ_TAG_TYPE_NET:
sprintf(description, "%s", "Unicast"); sprintf(description, "%s", "Unicast");
break; break;
case VJ_TAG_TYPE_AVFORMAT: case VJ_TAG_TYPE_AVFORMAT:
sprintf(description, "%s", "AVFormat stream reader"); sprintf(description, "%s", "AVFormat stream reader");
break; break;
#ifdef USE_GDK_PIXBUF #ifdef USE_GDK_PIXBUF
case VJ_TAG_TYPE_PICTURE: case VJ_TAG_TYPE_PICTURE:
sprintf(description, "%s", "GdkPixbuf"); sprintf(description, "%s", "GdkPixbuf");
@@ -2973,16 +2953,47 @@ int vj_tag_reset_offset(int t1)
return 1; return 1;
} }
int vj_tag_reset_chain_offset( int t1, int chain_entry, int s1 )
{
sample_info *si = sample_get(s1);
vj_tag *tag = vj_tag_get(t1);
if(!si || !tag)
return -1;
int has_marker = si->marker_start >= 0 && si->marker_end > 0;
int start_frame = ( has_marker ? si->marker_start : si->first_frame );
int end_frame = ( has_marker ? si->marker_end : si->last_frame );
int new_offset = start_frame;
if( si->speed < 0 )
new_offset = end_frame;
tag->effect_chain[ chain_entry ]->frame_offset = new_offset;
return 1;
}
static int vj_tag_calc_offset( vj_tag *tag,int entry, int candidate_offset )
{
int s1 = tag->effect_chain[ entry ]->channel;
for( int i = 0; i < SAMPLE_MAX_EFFECTS ; i ++ ) {
if( i > entry &&
tag->effect_chain[i]->source_type == 0 &&
tag->effect_chain[i]->channel == s1 ) {
return tag->effect_chain[ i ]->frame_offset;
}
}
return candidate_offset;
}
int vj_tag_set_offset(int t1, int chain_entry, int frame_offset) int vj_tag_set_offset(int t1, int chain_entry, int frame_offset)
{ {
vj_tag *tag = vj_tag_get(t1); vj_tag *tag = vj_tag_get(t1);
if (!tag) if (!tag)
return -1; return -1;
/* set to zero if frame_offset is greater than sample length */ tag->effect_chain[chain_entry]->frame_offset = vj_tag_calc_offset(tag, chain_entry, frame_offset);
if (frame_offset < 0)
frame_offset = 0;
tag->effect_chain[chain_entry]->frame_offset = frame_offset;
return 1; return 1;
} }
@@ -2996,28 +3007,28 @@ int vj_tag_get_offset(int t1, int chain_entry)
} }
void vj_tag_update_ascociated_samples(int s1) void vj_tag_update_ascociated_samples(int s1)
{ {
vj_tag *sample = vj_tag_get(s1); vj_tag *sample = vj_tag_get(s1);
if(!sample) { if(!sample) {
return; return;
} }
int p = 0; int p = 0;
for( p = 0; p < SAMPLE_MAX_EFFECTS; p ++ ) { for( p = 0; p < SAMPLE_MAX_EFFECTS; p ++ ) {
if( sample->effect_chain[p]->source_type != 0 ) if( sample->effect_chain[p]->source_type != 0 )
continue; continue;
if( !sample_exists(sample->effect_chain[p]->channel) ) if( !sample_exists(sample->effect_chain[p]->channel) )
continue; continue;
int pos = sample->effect_chain[p]->frame_offset; int pos = sample->effect_chain[p]->frame_offset;
if(pos == 0 ) if(pos == 0 )
continue; continue;
sample_set_resume( sample->effect_chain[p]->channel, pos ); sample_set_resume( sample->effect_chain[p]->channel, pos );
veejay_msg(VEEJAY_MSG_DEBUG, "Sample %d will resume playback from position %d", veejay_msg(VEEJAY_MSG_DEBUG, "Sample %d will resume playback from position %d",
sample->effect_chain[p]->channel, pos ); sample->effect_chain[p]->channel, pos );
} }
} }
@@ -3150,10 +3161,12 @@ static uint8_t *blackframe_new( int w, int h, int uv_len, uint8_t *Y, uint8_t *
if(median_radius== 0 ) { if(median_radius== 0 ) {
int i; int i;
for(i = 0; i < (w*h); i ++ ) { #pragma omp simd
for(i = 0; i < (w*h); i ++ ) {
tag->lf[i] = 0.0f; tag->lf[i] = 0.0f;
tag->bf[i] = 0.0f + (double) Y[i]; tag->bf[i] = 0.0f + (double) Y[i];
} }
#pragma omp simd
for(i = 0; i < uv_len; i ++ ) { for(i = 0; i < uv_len; i ++ ) {
tag->lfu[i] = 0.0f; tag->lfu[i] = 0.0f;
tag->lfv[i] = 0.0f; tag->lfv[i] = 0.0f;
@@ -3167,12 +3180,14 @@ static uint8_t *blackframe_new( int w, int h, int uv_len, uint8_t *Y, uint8_t *
ctmf( U, ptr + (w*h),w/2,h,w/2,w/2,median_radius,1,512*1024); ctmf( U, ptr + (w*h),w/2,h,w/2,w/2,median_radius,1,512*1024);
ctmf( V, ptr + (w*h)+uv_len,w/2,h,w/2,w/2,median_radius,1,512*1024); ctmf( V, ptr + (w*h)+uv_len,w/2,h,w/2,w/2,median_radius,1,512*1024);
int i; int i;
#pragma omp simd
for(i = 0; i < (w*h); i ++ ) { for(i = 0; i < (w*h); i ++ ) {
tag->lf[i] = 0.0f; tag->lf[i] = 0.0f;
tag->bf[i] = 0.0f + (double) ptr[i]; tag->bf[i] = 0.0f + (double) ptr[i];
} }
uint8_t *ptru = ptr + (w*h); uint8_t *ptru = ptr + (w*h);
uint8_t *ptrv = ptru + uv_len; uint8_t *ptrv = ptru + uv_len;
#pragma omp simd
for(i = 0; i < uv_len; i ++ ) { for(i = 0; i < uv_len; i ++ ) {
tag->lfu[i] = 0.0f; tag->lfu[i] = 0.0f;
tag->lfv[i] = 0.0f; tag->lfv[i] = 0.0f;
@@ -3214,10 +3229,11 @@ static void blackframe_process( uint8_t *Y, uint8_t *U, uint8_t *V, int w, int
srcU = bu; srcU = bu;
srcV = bv; srcV = bv;
} }
#pragma omp simd
for( i = 0; i < (w*h); i ++ ) { for( i = 0; i < (w*h); i ++ ) {
blackframe[i] += srcY[i]; blackframe[i] += srcY[i];
} }
#pragma omp simd
for( i =0 ; i < uv_len; i ++ ) { for( i =0 ; i < uv_len; i ++ ) {
blackframeu[i] += (double) ( srcU[i] - chroma ); blackframeu[i] += (double) ( srcU[i] - chroma );
blackframev[i] += (double) ( srcV[i] - chroma ); blackframev[i] += (double) ( srcV[i] - chroma );
@@ -3316,13 +3332,15 @@ static void whiteframe_process( uint8_t *Y, uint8_t *U, uint8_t *V, int w, int h
} else { } else {
int p; int p;
//@ should subtract dark current, TODO //@ should subtract dark current, TODO
for( i = 0; i < (w*h); i ++ ) { #pragma opm simd
for( i = 0; i < (w*h); i ++ ) {
p = Y[i] - bf[i]; p = Y[i] - bf[i];
if( p < 0 ) if( p < 0 )
p = 0; p = 0;
lightframe[i] += (double) p; lightframe[i] += (double) p;
mean_of_y += p; mean_of_y += p;
} }
#pragma omp simd
for( i =0 ; i < uv_len; i ++ ) { for( i =0 ; i < uv_len; i ++ ) {
p = ((U[i]-chroma)-(bu[i]-chroma)); p = ((U[i]-chroma)-(bu[i]-chroma));
lightframe_u[i] += (double) p; lightframe_u[i] += (double) p;
@@ -3529,13 +3547,15 @@ static void blackframe_subtract( vj_tag *tag, uint8_t *Y, uint8_t *U, uint8_t *V
} else { } else {
//@ just show result of frame - dark current //@ just show result of frame - dark current
for( i = 0; i <(w*h); i ++ ) { #pragma omp simd
for( i = 0; i <(w*h); i ++ ) {
p = ( Y[i] - bf[i] ); p = ( Y[i] - bf[i] );
if( p < 0 ) if( p < 0 )
Y[i] = 0; Y[i] = 0;
else else
Y[i] = p; Y[i] = p;
} }
#pragma omp simd
for( i = 0; i < uv_len; i ++ ) { for( i = 0; i < uv_len; i ++ ) {
p = U[i] - bu[i]; p = U[i] - bu[i];
if( p < 0 ) if( p < 0 )
@@ -3667,8 +3687,8 @@ int vj_tag_get_frame(int t1, VJFrame *dst, uint8_t * abuffer)
case VJ_TAG_TYPE_MCAST: case VJ_TAG_TYPE_MCAST:
case VJ_TAG_TYPE_NET: case VJ_TAG_TYPE_NET:
if(!net_thread_get_frame( tag,dst )) { if(!net_thread_get_frame( tag,dst )) {
return 0; //failed to get frame return 0; //failed to get frame
} }
break; break;
case VJ_TAG_TYPE_YUV4MPEG: case VJ_TAG_TYPE_YUV4MPEG:
res = vj_yuv_get_frame(vj_tag_input->stream[tag->index],buffer); res = vj_yuv_get_frame(vj_tag_input->stream[tag->index],buffer);
@@ -3691,14 +3711,14 @@ int vj_tag_get_frame(int t1, VJFrame *dst, uint8_t * abuffer)
plug_process( tag->generator, -1.0 ); plug_process( tag->generator, -1.0 );
} }
break; break;
case VJ_TAG_TYPE_AVFORMAT: case VJ_TAG_TYPE_AVFORMAT:
if(!tag->active) if(!tag->active)
return 0; // not allowed to enter get_frame return 0; // not allowed to enter get_frame
if(!avformat_thread_get_frame( tag,dst,_tag_info->real_fps )) //TODO: net and avformat seem to be the same, just like all other types. use a modular structure if(!avformat_thread_get_frame( tag,dst,_tag_info->real_fps )) //TODO: net and avformat seem to be the same, just like all other types. use a modular structure
{ {
return 0; // failed to get frame return 0; // failed to get frame
} }
break; break;
case VJ_TAG_TYPE_COLOR: case VJ_TAG_TYPE_COLOR:
dummy_rgb_apply( dst, tag->color_r,tag->color_g,tag->color_b ); dummy_rgb_apply( dst, tag->color_r,tag->color_g,tag->color_b );
break; break;
@@ -3897,7 +3917,6 @@ static void tagParseEffect(xmlDocPtr doc, xmlNodePtr cur, int dst_sample)
int arg[SAMPLE_MAX_PARAMETERS]; int arg[SAMPLE_MAX_PARAMETERS];
int source_type = 0; int source_type = 0;
int channel = 0; int channel = 0;
int frame_trimmer = 0;
int frame_offset = 0; int frame_offset = 0;
int e_flag = 0; int e_flag = 0;
int anim= 0; int anim= 0;
@@ -3929,10 +3948,6 @@ static void tagParseEffect(xmlDocPtr doc, xmlNodePtr cur, int dst_sample)
channel = get_xml_int( doc, cur ); channel = get_xml_int( doc, cur );
} }
if (!xmlStrcmp(cur->name, (const xmlChar *) XMLTAG_EFFECTTRIMMER)) {
frame_trimmer = get_xml_int( doc, cur );
}
if (!xmlStrcmp(cur->name, (const xmlChar *) XMLTAG_EFFECTOFFSET)) { if (!xmlStrcmp(cur->name, (const xmlChar *) XMLTAG_EFFECTOFFSET)) {
frame_offset = get_xml_int( doc, cur ); frame_offset = get_xml_int( doc, cur );
} }
@@ -3976,7 +3991,6 @@ static void tagParseEffect(xmlDocPtr doc, xmlNodePtr cur, int dst_sample)
vj_tag_set_chain_status(dst_sample, chain_index, e_flag); vj_tag_set_chain_status(dst_sample, chain_index, e_flag);
vj_tag_set_offset(dst_sample, chain_index, frame_offset); vj_tag_set_offset(dst_sample, chain_index, frame_offset);
vj_tag_set_trimmer(dst_sample, chain_index, frame_trimmer);
j = 0; j = 0;
vj_tag *t = vj_tag_get( dst_sample ); vj_tag *t = vj_tag_get( dst_sample );
@@ -4094,13 +4108,13 @@ void tagParseStreamFX(char *sampleFile, xmlDocPtr doc, xmlNodePtr cur, void *fon
if (!xmlStrcmp(cur->name, (const xmlChar*) "calibration" )) if (!xmlStrcmp(cur->name, (const xmlChar*) "calibration" ))
cali = cur->xmlChildrenNode; cali = cur->xmlChildrenNode;
if (!xmlStrcmp(cur->name, (const xmlChar*) XMLTAG_MACRO )) if (!xmlStrcmp(cur->name, (const xmlChar*) XMLTAG_MACRO ))
macro = cur->xmlChildrenNode; macro = cur->xmlChildrenNode;
if (!xmlStrcmp(cur->name, (const xmlChar*) "subrender" )) if (!xmlStrcmp(cur->name, (const xmlChar*) "subrender" ))
subrender = get_xml_int(doc,cur); subrender = get_xml_int(doc,cur);
if( !xmlStrcmp(cur->name, (const xmlChar*) "loop_stat_stop")) if( !xmlStrcmp(cur->name, (const xmlChar*) "loop_stat_stop"))
loop_stat_stop = get_xml_int(doc,cur); loop_stat_stop = get_xml_int(doc,cur);
if (!xmlStrcmp(cur->name, (const xmlChar *) XMLTAG_EFFECTS)) { if (!xmlStrcmp(cur->name, (const xmlChar *) XMLTAG_EFFECTS)) {
fx[k] = cur->xmlChildrenNode; fx[k] = cur->xmlChildrenNode;
@@ -4154,7 +4168,7 @@ void tagParseStreamFX(char *sampleFile, xmlDocPtr doc, xmlNodePtr cur, void *fon
tag->opacity = opacity; tag->opacity = opacity;
tag->nframes = nframes; tag->nframes = nframes;
tag->subrender = subrender; tag->subrender = subrender;
tag->loop_stat_stop = loop_stat_stop; tag->loop_stat_stop = loop_stat_stop;
switch( source_type ) switch( source_type )
{ {
@@ -4179,15 +4193,15 @@ void tagParseStreamFX(char *sampleFile, xmlDocPtr doc, xmlNodePtr cur, void *fon
tagParseCalibration( doc, cali, id, vp ); tagParseCalibration( doc, cali, id, vp );
} }
if( macro ) if( macro )
{ {
vj_macro_load( tag->macro, doc, macro ); vj_macro_load( tag->macro, doc, macro );
int lss = vj_macro_get_loop_stat_stop(tag->macro); int lss = vj_macro_get_loop_stat_stop(tag->macro);
if( lss > tag->loop_stat_stop ) { if( lss > tag->loop_stat_stop ) {
tag->loop_stat_stop = lss; tag->loop_stat_stop = lss;
} }
} }
int q; int q;
for( q = 0; q < k ; q ++ ) for( q = 0; q < k ; q ++ )
{ {
@@ -4228,7 +4242,6 @@ static void tagCreateEffect(xmlNodePtr node, sample_eff_chain * effect, int posi
put_xml_int( node, XMLTAG_EFFECTSOURCE, effect->source_type ); put_xml_int( node, XMLTAG_EFFECTSOURCE, effect->source_type );
put_xml_int( node, XMLTAG_EFFECTCHANNEL, effect->channel ); put_xml_int( node, XMLTAG_EFFECTCHANNEL, effect->channel );
put_xml_int( node, XMLTAG_EFFECTOFFSET, effect->frame_offset ); put_xml_int( node, XMLTAG_EFFECTOFFSET, effect->frame_offset );
put_xml_int( node, XMLTAG_EFFECTTRIMMER, effect->frame_trimmer );
put_xml_int( node, XMLTAG_EFFECTAUDIOFLAG, effect->a_flag ); put_xml_int( node, XMLTAG_EFFECTAUDIOFLAG, effect->a_flag );
put_xml_int( node, XMLTAG_EFFECTAUDIOVOLUME, effect->volume ); put_xml_int( node, XMLTAG_EFFECTAUDIOVOLUME, effect->volume );
put_xml_int( node, "kf_status", effect->kf_status ); put_xml_int( node, "kf_status", effect->kf_status );

8
veejay-current/veejay-server/libstream/vj-tag.h
View File

@@ -215,12 +215,6 @@ int vj_tag_get_chain_status(int t1, int position);
/* return -1 on error, otherwise set new status */ /* return -1 on error, otherwise set new status */
int vj_tag_set_chain_status(int t1, int position, int new_status); int vj_tag_set_chain_status(int t1, int position, int new_status);
/* return 0 on error, other value is trimmer (0 = no trim anyway) */
int vj_tag_get_trimmer(int t1, int poisition);
/* return -1 on error, or 1 on succes */
int vj_tag_set_trimmer(int t1, int position, int value);
//int vj_tag_get_video_palette(int t1); //int vj_tag_get_video_palette(int t1);
//int vj_tag_set_video_palette(int t1, int video_palette); //int vj_tag_set_video_palette(int t1, int video_palette);
@@ -277,6 +271,8 @@ int vj_tag_set_offset(int t1, int entry, int offset);
int vj_tag_reset_offset(int t1); int vj_tag_reset_offset(int t1);
int vj_tag_reset_chain_offset(int t1, int entry, int s1);
int vj_tag_get_frame(int t1, VJFrame *dst, uint8_t *abuf); int vj_tag_get_frame(int t1, VJFrame *dst, uint8_t *abuf);
int vj_tag_get_audio_frame(int t1, uint8_t *dst ); int vj_tag_get_audio_frame(int t1, uint8_t *dst );