From 6a22c33fc7f7c33d63336b9f85e0deae5c2aca66 Mon Sep 17 00:00:00 2001 From: Alessandro Ros Date: Thu, 1 Jun 2023 20:24:31 +0200 Subject: [PATCH] make format.String() return MPEG4-audio in case of MPEG-4 audio (#300) --- pkg/formats/mpeg4_audio_generic.go | 3 ++- pkg/formats/mpeg4_audio_generic_test.go | 2 +- pkg/formats/mpeg4_audio_latm.go | 3 ++- pkg/formats/mpeg4_audio_latm_test.go | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkg/formats/mpeg4_audio_generic.go b/pkg/formats/mpeg4_audio_generic.go index 74be3d23..41c0e48d 100644 --- a/pkg/formats/mpeg4_audio_generic.go +++ b/pkg/formats/mpeg4_audio_generic.go @@ -100,7 +100,8 @@ func (f *MPEG4AudioGeneric) unmarshal( // String implements Format. func (f *MPEG4AudioGeneric) String() string { - return "MPEG4-audio-gen" + // currently, String() returns the codec name, hence hide the format name. + return "MPEG4-audio" } // ClockRate implements Format. diff --git a/pkg/formats/mpeg4_audio_generic_test.go b/pkg/formats/mpeg4_audio_generic_test.go index 5737d4b9..f3685668 100644 --- a/pkg/formats/mpeg4_audio_generic_test.go +++ b/pkg/formats/mpeg4_audio_generic_test.go @@ -21,7 +21,7 @@ func TestMPEG4AudioGenericAttributes(t *testing.T) { IndexLength: 3, IndexDeltaLength: 3, } - require.Equal(t, "MPEG4-audio-gen", format.String()) + require.Equal(t, "MPEG4-audio", format.String()) require.Equal(t, 48000, format.ClockRate()) require.Equal(t, true, format.PTSEqualsDTS(&rtp.Packet{})) } diff --git a/pkg/formats/mpeg4_audio_latm.go b/pkg/formats/mpeg4_audio_latm.go index ad070ce0..742f11a8 100644 --- a/pkg/formats/mpeg4_audio_latm.go +++ b/pkg/formats/mpeg4_audio_latm.go @@ -87,7 +87,8 @@ func (f *MPEG4AudioLATM) unmarshal( // String implements Format. func (f *MPEG4AudioLATM) String() string { - return "MPEG4-audio-latm" + // currently, String() returns the codec name, hence hide the format name. + return "MPEG4-audio" } // ClockRate implements Format. diff --git a/pkg/formats/mpeg4_audio_latm_test.go b/pkg/formats/mpeg4_audio_latm_test.go index be1c4ac3..879cda95 100644 --- a/pkg/formats/mpeg4_audio_latm_test.go +++ b/pkg/formats/mpeg4_audio_latm_test.go @@ -25,7 +25,7 @@ func TestMPEG4AudioLATMAttributes(t *testing.T) { }}, }, } - require.Equal(t, "MPEG4-audio-latm", format.String()) + require.Equal(t, "MPEG4-audio", format.String()) require.Equal(t, 44100, format.ClockRate()) require.Equal(t, true, format.PTSEqualsDTS(&rtp.Packet{})) }