headers: simplify usage of Range

client.go

@@ -1656,7 +1656,7 @@ func (c *Client) doPlay(ra *headers.Range, isSwitchingProtocol bool) (*base.Resp
 	if ra == nil {
 		ra = &headers.Range{
 			Value: &headers.RangeNPT{
-				Start: headers.RangeNPTTime(0),
+				Start: 0,
 			},
 		}
 	}

client_read_test.go

@@ -2374,7 +2374,7 @@ func TestClientReadSeek(t *testing.T) {
 		require.NoError(t, err)
 		require.Equal(t, headers.Range{
 			Value: &headers.RangeNPT{
-				Start: headers.RangeNPTTime(5500 * time.Millisecond),
+				Start: 5500 * time.Millisecond,
 			},
 		}, ra)
 
@@ -2400,7 +2400,7 @@ func TestClientReadSeek(t *testing.T) {
 		require.NoError(t, err)
 		require.Equal(t, headers.Range{
 			Value: &headers.RangeNPT{
-				Start: headers.RangeNPTTime(6400 * time.Millisecond),
+				Start: 6400 * time.Millisecond,
 			},
 		}, ra)
 
@@ -2443,14 +2443,14 @@ func TestClientReadSeek(t *testing.T) {
 
 	_, err = c.Play(&headers.Range{
 		Value: &headers.RangeNPT{
-			Start: headers.RangeNPTTime(5500 * time.Millisecond),
+			Start: 5500 * time.Millisecond,
 		},
 	})
 	require.NoError(t, err)
 
 	_, err = c.Seek(&headers.Range{
 		Value: &headers.RangeNPT{
-			Start: headers.RangeNPTTime(6400 * time.Millisecond),
+			Start: 6400 * time.Millisecond,
 		},
 	})
 	require.NoError(t, err)

pkg/headers/range.go

@@ -129,10 +129,7 @@ func (r RangeSMPTE) marshal() string {
 	return ret
 }
 
-// RangeNPTTime is a time expressed in NPT unit.
+func unmarshalRangeNPTTime(d *time.Duration, s string) error {
-type RangeNPTTime time.Duration
-
-func (t *RangeNPTTime) unmarshal(s string) error {
 	parts := strings.Split(s, ":")
 	if len(parts) > 3 {
 		return fmt.Errorf("invalid NPT time (%v)", s)
@@ -164,31 +161,31 @@ func (t *RangeNPTTime) unmarshal(s string) error {
 	}
 	seconds := tmp
 
-	*t = RangeNPTTime(time.Duration(seconds*float64(time.Second)) +
+	*d = time.Duration(seconds*float64(time.Second)) +
-		time.Duration(mins*60+hours*3600)*time.Second)
+		time.Duration(mins*60+hours*3600)*time.Second
 
 	return nil
 }
 
-func (t RangeNPTTime) marshal() string {
+func marshalRangeNPTTime(d time.Duration) string {
-	return strconv.FormatFloat(time.Duration(t).Seconds(), 'f', -1, 64)
+	return strconv.FormatFloat(d.Seconds(), 'f', -1, 64)
 }
 
-// RangeNPT is a range expressed in NPT unit.
+// RangeNPT is a range expressed in NPT units.
 type RangeNPT struct {
-	Start RangeNPTTime
+	Start time.Duration
-	End   *RangeNPTTime
+	End   *time.Duration
 }
 
 func (r *RangeNPT) unmarshal(start string, end string) error {
-	err := r.Start.unmarshal(start)
+	err := unmarshalRangeNPTTime(&r.Start, start)
 	if err != nil {
 		return err
 	}
 
 	if end != "" {
-		var v RangeNPTTime
+		var v time.Duration
-		err := v.unmarshal(end)
+		err := unmarshalRangeNPTTime(&v, end)
 		if err != nil {
 			return err
 		}
@@ -199,45 +196,41 @@ func (r *RangeNPT) unmarshal(start string, end string) error {
 }
 
 func (r RangeNPT) marshal() string {
-	ret := "npt=" + r.Start.marshal() + "-"
+	ret := "npt=" + marshalRangeNPTTime(r.Start) + "-"
 	if r.End != nil {
-		ret += r.End.marshal()
+		ret += marshalRangeNPTTime(*r.End)
 	}
 	return ret
 }
 
-// RangeUTCTime is a time expressed in UTC unit.
+func unmarshalRangeUTCTime(t *time.Time, s string) error {
-type RangeUTCTime time.Time
-
-func (t *RangeUTCTime) unmarshal(s string) error {
 	tmp, err := time.Parse("20060102T150405Z", s)
 	if err != nil {
 		return err
 	}
-
+	*t = tmp
-	*t = RangeUTCTime(tmp)
 	return nil
 }
 
-func (t RangeUTCTime) marshal() string {
+func marshalRangeUTCTime(t time.Time) string {
-	return time.Time(t).Format("20060102T150405Z")
+	return t.Format("20060102T150405Z")
 }
 
-// RangeUTC is a range expressed in UTC unit.
+// RangeUTC is a range expressed in UTC units.
 type RangeUTC struct {
-	Start RangeUTCTime
+	Start time.Time
-	End   *RangeUTCTime
+	End   *time.Time
 }
 
 func (r *RangeUTC) unmarshal(start string, end string) error {
-	err := r.Start.unmarshal(start)
+	err := unmarshalRangeUTCTime(&r.Start, start)
 	if err != nil {
 		return err
 	}
 
 	if end != "" {
-		var v RangeUTCTime
+		var v time.Time
-		err := v.unmarshal(end)
+		err := unmarshalRangeUTCTime(&v, end)
 		if err != nil {
 			return err
 		}
@@ -248,9 +241,9 @@ func (r *RangeUTC) unmarshal(start string, end string) error {
 }
 
 func (r RangeUTC) marshal() string {
-	ret := "clock=" + r.Start.marshal() + "-"
+	ret := "clock=" + marshalRangeUTCTime(r.Start) + "-"
 	if r.End != nil {
-		ret += r.End.marshal()
+		ret += marshalRangeUTCTime(*r.End)
 	}
 	return ret
 }
@@ -279,7 +272,7 @@ type Range struct {
 	Value RangeValue
 
 	// time at which the operation is to be made effective.
-	Time *RangeUTCTime
+	Time *time.Time
 }
 
 // Unmarshal decodes a Range header.
@@ -334,13 +327,13 @@ func (h *Range) Unmarshal(v base.HeaderValue) error {
 			h.Value = s
 
 		case "time":
-			t := &RangeUTCTime{}
+			var t time.Time
-			err := t.unmarshal(v)
+			err := unmarshalRangeUTCTime(&t, v)
 			if err != nil {
 				return err
 			}
 
-			h.Time = t
+			h.Time = &t
 		}
 	}
 
@@ -355,7 +348,7 @@ func (h *Range) Unmarshal(v base.HeaderValue) error {
 func (h Range) Marshal() base.HeaderValue {
 	v := h.Value.marshal()
 	if h.Time != nil {
-		v += ";time=" + h.Time.marshal()
+		v += ";time=" + marshalRangeUTCTime(*h.Time)
 	}
 	return base.HeaderValue{v}
 }

pkg/headers/range_test.go

@@ -63,9 +63,9 @@ var casesRange = []struct {
 		base.HeaderValue{`npt=123.45-125`},
 		Range{
 			Value: &RangeNPT{
-				Start: RangeNPTTime(123.45 * float64(time.Second)),
+				Start: time.Duration(123.45 * float64(time.Second)),
-				End: func() *RangeNPTTime {
+				End: func() *time.Duration {
-					v := RangeNPTTime(125 * time.Second)
+					v := 125 * time.Second
 					return &v
 				}(),
 			},
@@ -77,7 +77,7 @@ var casesRange = []struct {
 		base.HeaderValue{`npt=43535.3-`},
 		Range{
 			Value: &RangeNPT{
-				Start: RangeNPTTime(float64(12*3600+5*60+35.3) * float64(time.Second)),
+				Start: time.Duration(float64(12*3600+5*60+35.3) * float64(time.Second)),
 			},
 		},
 	},
@@ -87,9 +87,9 @@ var casesRange = []struct {
 		base.HeaderValue{`clock=19961108T142300Z-19961108T143520Z`},
 		Range{
 			Value: &RangeUTC{
-				Start: RangeUTCTime(time.Date(1996, 11, 8, 14, 23, 0, 0, time.UTC)),
+				Start: time.Date(1996, 11, 8, 14, 23, 0, 0, time.UTC),
-				End: func() *RangeUTCTime {
+				End: func() *time.Time {
-					v := RangeUTCTime(time.Date(1996, 11, 8, 14, 35, 20, 0, time.UTC))
+					v := time.Date(1996, 11, 8, 14, 35, 20, 0, time.UTC)
 					return &v
 				}(),
 			},
@@ -101,7 +101,7 @@ var casesRange = []struct {
 		base.HeaderValue{`clock=19960213T143205Z-`},
 		Range{
 			Value: &RangeUTC{
-				Start: RangeUTCTime(time.Date(1996, 2, 13, 14, 32, 5, 0, time.UTC)),
+				Start: time.Date(1996, 2, 13, 14, 32, 5, 0, time.UTC),
 			},
 		},
 	},
@@ -111,10 +111,10 @@ var casesRange = []struct {
 		base.HeaderValue{`clock=19960213T143205Z-;time=19970123T143720Z`},
 		Range{
 			Value: &RangeUTC{
-				Start: RangeUTCTime(time.Date(1996, 2, 13, 14, 32, 5, 0, time.UTC)),
+				Start: time.Date(1996, 2, 13, 14, 32, 5, 0, time.UTC),
 			},
-			Time: func() *RangeUTCTime {
+			Time: func() *time.Time {
-				v := RangeUTCTime(time.Date(1997, 1, 23, 14, 37, 20, 0, time.UTC))
+				v := time.Date(1997, 1, 23, 14, 37, 20, 0, time.UTC)
 				return &v
 			}(),
 		},