extract Format and AdaptiveFormat

kkdai · Aug 13, 2020 · 064f30b · 064f30b
1 parent 8d8aa2a
commit 064f30b
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 46 deletions.
diff --git a/response_data.go b/response_data.go
@@ -8,52 +8,9 @@ type PlayerResponseData struct {
 		ContextParams   string `json:"contextParams"`
 	} `json:"playabilityStatus"`
 	StreamingData struct {
-		ExpiresInSeconds string `json:"expiresInSeconds"`
-		Formats          []struct {
-			Stream
-			Bitrate          int    `json:"bitrate"`
-			Width            int    `json:"width"`
-			Height           int    `json:"height"`
-			LastModified     string `json:"lastModified"`
-			ContentLength    string `json:"contentLength,omitempty"`
-			QualityLabel     string `json:"qualityLabel"`
-			ProjectionType   string `json:"projectionType"`
-			AverageBitrate   int    `json:"averageBitrate,omitempty"`
-			AudioQuality     string `json:"audioQuality"`
-			ApproxDurationMs string `json:"approxDurationMs"`
-			AudioSampleRate  string `json:"audioSampleRate"`
-			AudioChannels    int    `json:"audioChannels"`
-		} `json:"formats"`
-		AdaptiveFormats []struct {
-			Stream
-			Bitrate   int `json:"bitrate"`
-			Width     int `json:"width,omitempty"`
-			Height    int `json:"height,omitempty"`
-			InitRange struct {
-				Start string `json:"start"`
-				End   string `json:"end"`
-			} `json:"initRange"`
-			IndexRange struct {
-				Start string `json:"start"`
-				End   string `json:"end"`
-			} `json:"indexRange"`
-			LastModified     string `json:"lastModified"`
-			ContentLength    string `json:"contentLength"`
-			Fps              int    `json:"fps,omitempty"`
-			QualityLabel     string `json:"qualityLabel,omitempty"`
-			ProjectionType   string `json:"projectionType"`
-			AverageBitrate   int    `json:"averageBitrate"`
-			ApproxDurationMs string `json:"approxDurationMs"`
-			ColorInfo        struct {
-				Primaries               string `json:"primaries"`
-				TransferCharacteristics string `json:"transferCharacteristics"`
-				MatrixCoefficients      string `json:"matrixCoefficients"`
-			} `json:"colorInfo,omitempty"`
-			HighReplication bool   `json:"highReplication,omitempty"`
-			AudioQuality    string `json:"audioQuality,omitempty"`
-			AudioSampleRate string `json:"audioSampleRate,omitempty"`
-			AudioChannels   int    `json:"audioChannels,omitempty"`
-		} `json:"adaptiveFormats"`
+		ExpiresInSeconds string           `json:"expiresInSeconds"`
+		Formats          []Format         `json:"formats"`
+		AdaptiveFormats  []AdaptiveFormat `json:"adaptiveFormats"`
 	} `json:"streamingData"`
 	Captions struct {
 		PlayerCaptionsRenderer struct {

diff --git a/video.go b/video.go
@@ -26,6 +26,53 @@ type Stream struct {
 	Cipher   string `json:"signatureCipher"`
 }
 
+type Format struct {
+	Stream
+	Bitrate          int    `json:"bitrate"`
+	Width            int    `json:"width"`
+	Height           int    `json:"height"`
+	LastModified     string `json:"lastModified"`
+	ContentLength    string `json:"contentLength,omitempty"`
+	QualityLabel     string `json:"qualityLabel"`
+	ProjectionType   string `json:"projectionType"`
+	AverageBitrate   int    `json:"averageBitrate,omitempty"`
+	AudioQuality     string `json:"audioQuality"`
+	ApproxDurationMs string `json:"approxDurationMs"`
+	AudioSampleRate  string `json:"audioSampleRate"`
+	AudioChannels    int    `json:"audioChannels"`
+}
+
+type AdaptiveFormat struct {
+	Stream
+	Bitrate   int `json:"bitrate"`
+	Width     int `json:"width,omitempty"`
+	Height    int `json:"height,omitempty"`
+	InitRange struct {
+		Start string `json:"start"`
+		End   string `json:"end"`
+	} `json:"initRange"`
+	IndexRange struct {
+		Start string `json:"start"`
+		End   string `json:"end"`
+	} `json:"indexRange"`
+	LastModified     string `json:"lastModified"`
+	ContentLength    string `json:"contentLength"`
+	Fps              int    `json:"fps,omitempty"`
+	QualityLabel     string `json:"qualityLabel,omitempty"`
+	ProjectionType   string `json:"projectionType"`
+	AverageBitrate   int    `json:"averageBitrate"`
+	ApproxDurationMs string `json:"approxDurationMs"`
+	ColorInfo        struct {
+		Primaries               string `json:"primaries"`
+		TransferCharacteristics string `json:"transferCharacteristics"`
+		MatrixCoefficients      string `json:"matrixCoefficients"`
+	} `json:"colorInfo,omitempty"`
+	HighReplication bool   `json:"highReplication,omitempty"`
+	AudioQuality    string `json:"audioQuality,omitempty"`
+	AudioSampleRate string `json:"audioSampleRate,omitempty"`
+	AudioChannels   int    `json:"audioChannels,omitempty"`
+}
+
 func (v *Video) FindStreamByQuality(quality string) *Stream {
 	for i := range v.Streams {
 		if v.Streams[i].Quality == quality {