Adjust segment time getter with time offset

ngx_http_vod_hls.c

@@ -295,7 +295,7 @@ ngx_http_vod_hls_get_default_id3_data(ngx_http_vod_submodule_context_t* submodul
 		data_size = sizeof(ID3_TEXT_JSON_FORMAT) + VOD_INT64_LEN;
 	}
 
-	timestamp = media_set_get_segment_time_millis(media_set);
+	timestamp = media_set_get_segment_time_millis(&submodule_context->request_context, media_set);
 
 	p = ngx_pnalloc(submodule_context->request_context.pool, data_size);
 	if (p == NULL)

ngx_http_vod_module.c

@@ -653,7 +653,7 @@ ngx_http_vod_set_segment_time_var(ngx_http_request_t *r, ngx_http_variable_value
 		return NGX_ERROR;
 	}
 
-	value = media_set_get_segment_time_millis(media_set);
+	value = media_set_get_segment_time_millis(&ctx->submodule_context.request_context, media_set);
 
 	v->data = p;
 	v->len = ngx_sprintf(p, "%L", value) - p;

vod/media_set.c

@@ -1,9 +1,12 @@
 #include "media_set.h"
 
 int64_t
-media_set_get_segment_time_millis(media_set_t* media_set)
+media_set_get_segment_time_millis(request_context_t* request_context , media_set_t* media_set)
 {
 	media_track_t* cur_track;
+	int64_t time_offset;
+
+	time_offset = request_context->time_offset * 1000;
 
 	// try to find a track that has frames, if no track is found, fallback to the first track
 	for (cur_track = media_set->filtered_tracks; ; cur_track += media_set->total_track_count)
@@ -20,6 +23,6 @@ media_set_get_segment_time_millis(media_set_t* media_set)
 		}
 	}
 
-	return cur_track->original_clip_time +
+	return cur_track->original_clip_time - time_offset +
 		rescale_time(cur_track->first_frame_time_offset, cur_track->media_info.timescale, 1000);
 }

vod/media_set.h

@@ -187,7 +187,6 @@ typedef struct {
 	uint32_t height;
 } request_params_t;
 
-
-int64_t media_set_get_segment_time_millis(media_set_t* media_set);
+int64_t media_set_get_segment_time_millis(request_context_t* request_context , media_set_t* media_set);
 
 #endif //__MEDIA_SET_H__