refactor sample offsets

veejay-current/veejay-server/libsample/sampleadm.c

@@ -707,6 +707,27 @@ int sample_get_position(int s1)
     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 len;
@@ -1165,22 +1186,6 @@ int sample_get_chain_status(int s1, int position)
     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)
 {
     sample_info *sample = sample_get(s1);
@@ -1236,6 +1241,7 @@ int sample_set_resume(int s1,long position)
 
         if(sample->offset > 0) {
             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;
@@ -1277,17 +1283,6 @@ int sample_get_offset(int s1, int position)
     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)
 {
     sample_info *sample;
@@ -1515,6 +1510,7 @@ int sample_get_all_effect_arg(int s1, int position, int *args, int arg_len, int
     }
     else
     {
+#pragma omp simd
      for (i = 0; i < arg_len; 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))
     {
-        sample->effect_chain[c]->frame_trimmer = 0;
         if(s1 > 1)
             s1 = s1 - 1;
         if(!sample_exists(s1)) s1 = s1 + 1;
@@ -2456,30 +2451,31 @@ int sample_reset_offset(int s1)
     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)
 {
     sample_info *sample = sample_get(s1);
     if (!sample)
 		return -1;
-    sample->effect_chain[chain_entry]->frame_offset = 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;
+    sample->effect_chain[chain_entry]->frame_offset = sample_calc_offset( sample, chain_entry, frame_offset );
 	
     return 1;
 }
+
 int sample_set_chain_audio(int s1, int chain_entry, int val)
 {
     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]->frame_offset = 0;
-        sample->effect_chain[i]->frame_trimmer = 0;
         sample->effect_chain[i]->volume = 0;
         sample->effect_chain[i]->a_flag = 0;
         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]->frame_offset = 0;
-    sample->effect_chain[position]->frame_trimmer = 0;
     sample->effect_chain[position]->volume = 0;
     sample->effect_chain[position]->a_flag = 0;
     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 source_type = 0;
     int channel = 0;
-    int frame_trimmer = 0;
     int frame_offset = 0;
     int e_flag = 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)) {
         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 );
     }
 
-    if (!xmlStrcmp(cur->name, (const xmlChar *) XMLTAG_EFFECTTRIMMER)) {
-        frame_trimmer = get_xml_int( doc, cur );
-    }
-
     if (!xmlStrcmp(cur->name, (const xmlChar *) XMLTAG_EFFECTOFFSET)) {
         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 ) {
                 sample_set_chain_status(dst_sample, chain_index, e_flag);
                 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);
@@ -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_EFFECTCHANNEL, effect->channel );
     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_EFFECTAUDIOVOLUME, effect->volume );
     put_xml_int( node, "kf_status", effect->kf_status );

veejay-current/veejay-server/libsample/sampleadm.h

@@ -48,7 +48,6 @@
 #define XMLTAG_ARGUMENT   "argument"
 #define XMLTAG_EFFECTSOURCE "source"
 #define XMLTAG_EFFECTCHANNEL "channel"
-#define XMLTAG_EFFECTTRIMMER "trimmer"
 #define XMLTAG_EFFECTOFFSET "offset"
 #define XMLTAG_EFFECTACTIVE "active"
 #define XMLTAG_EFFECTAUDIOFLAG "use_audio"
@@ -98,7 +97,6 @@ typedef struct sample_eff_t {
     void *vje_instance;
     int arg[SAMPLE_MAX_PARAMETERS];	/* array of arguments */
     int frame_offset;
-    int frame_trimmer;		/* sub frame scratcher */
     int speed;			/* last known play speed */
     /* audio settings */
     int a_flag;			/* audio enabled/disabled */
@@ -189,6 +187,7 @@ typedef struct sample_info_t {
     int transition_shape;
     int transition_length;
     int transition_active;
+
 } sample_info;
 
 #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)*/
 extern int sample_get_effect_any(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_chain_volume(int s1, int position);
 extern void    sample_set_kf_type(int s1, int entry, int type );
 /* set volume of audio data coming to the chain */
 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 */
 extern int sample_get_chain_audio(int s1, int position);

veejay-current/veejay-server/libstream/vj-tag.c

@@ -747,6 +747,7 @@ int vj_tag_generator_set_arg(int t1, int *values)
         return 0;
     if(tag->generator) {
         int i;
+#pragma omp simd
 	for( i = 0; i < 16; i ++ ) {
             tag->genargs[i] = values[i];
         }
@@ -1242,7 +1243,6 @@ 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));
         tag->effect_chain[i]->effect_id = -1;
         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]->speed = INT_MAX;
         tag->effect_chain[i]->volume = 0;
@@ -2314,27 +2314,6 @@ int vj_tag_set_chain_status(int t1, int position, int status)
     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 arg_len, int n_frame)
 {
@@ -2370,6 +2349,7 @@ int vj_tag_get_all_effect_args(int t1, int position, int *args,
     }
     else
     {
+#pragma omp simd
         for( i = 0; i < arg_len; i ++ )
             args[i] = tag->effect_chain[position]->arg[i];
     }
@@ -2973,16 +2953,47 @@ int vj_tag_reset_offset(int t1)
     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)
 {
     vj_tag *tag = vj_tag_get(t1);
     if (!tag)
     	return -1;
-    /* set to zero if frame_offset is greater than sample length */
-    if (frame_offset < 0)
-    frame_offset = 0;
-
-    tag->effect_chain[chain_entry]->frame_offset = frame_offset;
+    tag->effect_chain[chain_entry]->frame_offset = vj_tag_calc_offset(tag, chain_entry, frame_offset);
     return 1;
 }
 
@@ -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 ) {
         int i;
+#pragma omp simd
 	for(i = 0; i < (w*h); i ++ ) {
             tag->lf[i] = 0.0f;
             tag->bf[i] = 0.0f + (double) Y[i];
         }
+#pragma omp simd
         for(i = 0; i < uv_len; i ++ ) {
             tag->lfu[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( V, ptr + (w*h)+uv_len,w/2,h,w/2,w/2,median_radius,1,512*1024);
         int i;
+#pragma omp simd
         for(i = 0; i < (w*h); i ++ ) {
             tag->lf[i] = 0.0f;
             tag->bf[i] = 0.0f + (double) ptr[i];
         }
         uint8_t *ptru = ptr + (w*h);
         uint8_t *ptrv = ptru + uv_len;
+#pragma omp simd
         for(i = 0; i < uv_len; i ++ ) {
             tag->lfu[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;
         srcV = bv;
     }
-    
+#pragma omp simd
     for( i = 0; i < (w*h); i ++ ) {
         blackframe[i] += srcY[i];
     }
+#pragma omp simd
     for( i =0 ; i < uv_len; i ++ ) {
         blackframeu[i] += (double) ( srcU[i] - chroma );
         blackframev[i] += (double) ( srcV[i] - chroma );
@@ -3316,6 +3332,7 @@ static void whiteframe_process( uint8_t *Y, uint8_t *U, uint8_t *V, int w, int h
     } else {
         int p;
         //@ should subtract dark current, TODO
+#pragma opm simd
 	for( i = 0; i < (w*h); i ++ ) {
             p = Y[i] - bf[i];
             if( p < 0 )
@@ -3323,6 +3340,7 @@ static void whiteframe_process( uint8_t *Y, uint8_t *U, uint8_t *V, int w, int h
             lightframe[i] += (double) p;
             mean_of_y += p;
         }
+#pragma omp simd
         for( i =0 ; i < uv_len; i ++ ) {
             p = ((U[i]-chroma)-(bu[i]-chroma));
             lightframe_u[i] += (double) p;
@@ -3529,6 +3547,7 @@ static void blackframe_subtract( vj_tag *tag, uint8_t *Y, uint8_t *U, uint8_t *V
 
     } else {
         //@ just show result of frame - dark current
+#pragma omp simd
     	for( i = 0; i <(w*h); i ++ ) {
             p = ( Y[i] - bf[i] );
             if( p < 0 )
@@ -3536,6 +3555,7 @@ static void blackframe_subtract( vj_tag *tag, uint8_t *Y, uint8_t *U, uint8_t *V
             else
                 Y[i] = p;
         }
+#pragma omp simd
         for( i = 0; i < uv_len; i ++ ) {
             p = U[i] - bu[i];
             if( p < 0 )
@@ -3897,7 +3917,6 @@ static void tagParseEffect(xmlDocPtr doc, xmlNodePtr cur, int dst_sample)
     int arg[SAMPLE_MAX_PARAMETERS];
     int source_type = 0;
     int channel = 0;
-    int frame_trimmer = 0;
     int frame_offset = 0;
     int e_flag = 0;
     int anim= 0;
@@ -3929,10 +3948,6 @@ static void tagParseEffect(xmlDocPtr doc, xmlNodePtr cur, int dst_sample)
             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)) {
             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_offset(dst_sample, chain_index, frame_offset);
-            vj_tag_set_trimmer(dst_sample, chain_index, frame_trimmer);
     
             j = 0;
             vj_tag *t = vj_tag_get( dst_sample );
@@ -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_EFFECTCHANNEL, effect->channel );
     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_EFFECTAUDIOVOLUME, effect->volume );
     put_xml_int( node, "kf_status", effect->kf_status );

veejay-current/veejay-server/libstream/vj-tag.h

@@ -215,12 +215,6 @@ int 	vj_tag_get_chain_status(int t1, int position);
 /* return -1 on error, otherwise set 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_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_chain_offset(int t1, int entry, int s1);
+
 int 	vj_tag_get_frame(int t1, VJFrame *dst, uint8_t *abuf);
 
 int 	vj_tag_get_audio_frame(int t1, uint8_t *dst );