package/gortsplib
1
0
Fork 0
mirror of https://github.com/aler9/gortsplib synced 2025-10-17 20:51:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

rename MPEGVideo and MPEGAudio into MPEG2Video and MPEG2Audio

Browse Source
This commit is contained in:
aler9
2022-08-07 14:01:00 +02:00
parent a2c6a7fb97
commit 4b19822d51
7 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
pkg/mpeg4audio/aac.go → pkg/mpeg4audio/mpeg4audio.go
View File

4
track.go
View File

@@ -67,7 +67,7 @@ func newTrackFromMediaDescription(md *psdp.MediaDescription) (Track, error) {
return newTrackJPEGFromMediaDescription(control) return newTrackJPEGFromMediaDescription(control)
case md.MediaName.Formats[0] == "32": case md.MediaName.Formats[0] == "32":
return newTrackMPEGVideoFromMediaDescription(control) return newTrackMPEG2VideoFromMediaDescription(control)
case rtpmapPart1 == "H264/90000": case rtpmapPart1 == "H264/90000":
return newTrackH264FromMediaDescription(control, payloadType, md) return newTrackH264FromMediaDescription(control, payloadType, md)
@@ -91,7 +91,7 @@ func newTrackFromMediaDescription(md *psdp.MediaDescription) (Track, error) {
return newTrackPCMAFromMediaDescription(control, rtpmapPart1) return newTrackPCMAFromMediaDescription(control, rtpmapPart1)
case md.MediaName.Formats[0] == "14": case md.MediaName.Formats[0] == "14":
return newTrackMPEGAudioFromMediaDescription(control) return newTrackMPEG2AudioFromMediaDescription(control)
case strings.HasPrefix(strings.ToLower(rtpmapPart1), "mpeg4-generic/"): case strings.HasPrefix(strings.ToLower(rtpmapPart1), "mpeg4-generic/"):
return newTrackMPEG4AudioFromMediaDescription(control, payloadType, md) return newTrackMPEG4AudioFromMediaDescription(control, payloadType, md)

18
track_mpegaudio.go → track_mpeg2audio.go
View File

@@ -4,15 +4,15 @@ import (
psdp "github.com/pion/sdp/v3" psdp "github.com/pion/sdp/v3"
) )
// TrackMPEGAudio is a MPEG-1 or MPEG-2 audio track. // TrackMPEG2Audio is a MPEG-1 or MPEG-2 audio track.
type TrackMPEGAudio struct { type TrackMPEG2Audio struct {
trackBase trackBase
} }
func newTrackMPEGAudioFromMediaDescription( func newTrackMPEG2AudioFromMediaDescription(
control string) (*TrackMPEGAudio, error, control string) (*TrackMPEG2Audio, error,
) { ) {
return &TrackMPEGAudio{ return &TrackMPEG2Audio{
trackBase: trackBase{ trackBase: trackBase{
control: control, control: control,
}, },
@@ -20,18 +20,18 @@ func newTrackMPEGAudioFromMediaDescription(
} }
// ClockRate returns the track clock rate. // ClockRate returns the track clock rate.
func (t *TrackMPEGAudio) ClockRate() int { func (t *TrackMPEG2Audio) ClockRate() int {
return 90000 return 90000
} }
func (t *TrackMPEGAudio) clone() Track { func (t *TrackMPEG2Audio) clone() Track {
return &TrackMPEGAudio{ return &TrackMPEG2Audio{
trackBase: t.trackBase, trackBase: t.trackBase,
} }
} }
// MediaDescription returns the track media description in SDP format. // MediaDescription returns the track media description in SDP format.
func (t *TrackMPEGAudio) MediaDescription() *psdp.MediaDescription { func (t *TrackMPEG2Audio) MediaDescription() *psdp.MediaDescription {
return &psdp.MediaDescription{ return &psdp.MediaDescription{
MediaName: psdp.MediaName{ MediaName: psdp.MediaName{
Media: "audio", Media: "audio",

12
track_mpegaudio_test.go → track_mpeg2audio_test.go
View File

@@ -7,21 +7,21 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
) )
func TestTrackMPEGAudioNew(t *testing.T) { func TestTrackMPEG2AudioNew(t *testing.T) {
track := &TrackMPEGAudio{} track := &TrackMPEG2Audio{}
require.Equal(t, "", track.GetControl()) require.Equal(t, "", track.GetControl())
} }
func TestTrackMPEGAudioClone(t *testing.T) { func TestTrackMPEG2AudioClone(t *testing.T) {
track := &TrackMPEGAudio{} track := &TrackMPEG2Audio{}
clone := track.clone() clone := track.clone()
require.NotSame(t, track, clone) require.NotSame(t, track, clone)
require.Equal(t, track, clone) require.Equal(t, track, clone)
} }
func TestTrackMPEGAudioMediaDescription(t *testing.T) { func TestTrackMPEG2AudioMediaDescription(t *testing.T) {
track := &TrackMPEGAudio{} track := &TrackMPEG2Audio{}
require.Equal(t, &psdp.MediaDescription{ require.Equal(t, &psdp.MediaDescription{
MediaName: psdp.MediaName{ MediaName: psdp.MediaName{

18
track_mpegvideo.go → track_mpeg2video.go
View File

@@ -4,15 +4,15 @@ import (
psdp "github.com/pion/sdp/v3" psdp "github.com/pion/sdp/v3"
) )
// TrackMPEGVideo is a MPEG-1 or MPEG-2 video track. // TrackMPEG2Video is a MPEG-1 or MPEG-2 video track.
type TrackMPEGVideo struct { type TrackMPEG2Video struct {
trackBase trackBase
} }
func newTrackMPEGVideoFromMediaDescription( func newTrackMPEG2VideoFromMediaDescription(
control string) (*TrackMPEGVideo, error, control string) (*TrackMPEG2Video, error,
) { ) {
return &TrackMPEGVideo{ return &TrackMPEG2Video{
trackBase: trackBase{ trackBase: trackBase{
control: control, control: control,
}, },
@@ -20,18 +20,18 @@ func newTrackMPEGVideoFromMediaDescription(
} }
// ClockRate returns the track clock rate. // ClockRate returns the track clock rate.
func (t *TrackMPEGVideo) ClockRate() int { func (t *TrackMPEG2Video) ClockRate() int {
return 90000 return 90000
} }
func (t *TrackMPEGVideo) clone() Track { func (t *TrackMPEG2Video) clone() Track {
return &TrackMPEGVideo{ return &TrackMPEG2Video{
trackBase: t.trackBase, trackBase: t.trackBase,
} }
} }
// MediaDescription returns the track media description in SDP format. // MediaDescription returns the track media description in SDP format.
func (t *TrackMPEGVideo) MediaDescription() *psdp.MediaDescription { func (t *TrackMPEG2Video) MediaDescription() *psdp.MediaDescription {
return &psdp.MediaDescription{ return &psdp.MediaDescription{
MediaName: psdp.MediaName{ MediaName: psdp.MediaName{
Media: "video", Media: "video",

12
track_mpegvideo_test.go → track_mpeg2video_test.go
View File

@@ -7,21 +7,21 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
) )
func TestTrackMPEGVideoNew(t *testing.T) { func TestTrackMPEG2VideoNew(t *testing.T) {
track := &TrackMPEGVideo{} track := &TrackMPEG2Video{}
require.Equal(t, "", track.GetControl()) require.Equal(t, "", track.GetControl())
} }
func TestTrackMPEGVideoClone(t *testing.T) { func TestTrackMPEG2VideoClone(t *testing.T) {
track := &TrackMPEGVideo{} track := &TrackMPEG2Video{}
clone := track.clone() clone := track.clone()
require.NotSame(t, track, clone) require.NotSame(t, track, clone)
require.Equal(t, track, clone) require.Equal(t, track, clone)
} }
func TestTrackMPEGVideoMediaDescription(t *testing.T) { func TestTrackMPEG2VideoMediaDescription(t *testing.T) {
track := &TrackMPEGVideo{} track := &TrackMPEG2Video{}
require.Equal(t, &psdp.MediaDescription{ require.Equal(t, &psdp.MediaDescription{
MediaName: psdp.MediaName{ MediaName: psdp.MediaName{

4
track_test.go
View File

@@ -47,7 +47,7 @@ func TestTrackNewFromMediaDescription(t *testing.T) {
Formats: []string{"14"}, Formats: []string{"14"},
}, },
}, },
&TrackMPEGAudio{}, &TrackMPEG2Audio{},
}, },
{ {
"aac", "aac",
@@ -226,7 +226,7 @@ func TestTrackNewFromMediaDescription(t *testing.T) {
Formats: []string{"32"}, Formats: []string{"32"},
}, },
}, },
&TrackMPEGVideo{}, &TrackMPEG2Video{},
}, },
{ {
"h264", "h264",