diff --git a/README.md b/README.md index f675eae4..c6da654b 100644 --- a/README.md +++ b/README.md @@ -45,12 +45,13 @@ Features: * Compute and provide SSRC, RTP-Info to clients * Generate RTCP sender reports * Utilities + * Parse RTSP elements * Encode/decode format-specific frames into/from RTP packets. The following formats are supported: * Video: H264, H265, M-JPEG, VP8, VP9 * Audio: G711 (PCMA, PCMU), G722, LPCM, MPEG4 Audio (AAC), Opus - * Parse RTSP elements: requests, responses, SDP - * Parse H264 elements and formats: Annex-B, AVCC, anti-competition, DTS - * Parse MPEG4 Audio (AAC) element and formats: ADTS, MPEG4 Audio configurations + * Parse codec-specific elements. The following codecs are supported: + * Video: H264, H265, M-JPEG + * Audio: MPEG4 Audio (AAC) ## Table of contents diff --git a/client_play_test.go b/client_play_test.go index b8389614..0640357f 100644 --- a/client_play_test.go +++ b/client_play_test.go @@ -17,11 +17,11 @@ import ( "github.com/aler9/gortsplib/v2/pkg/auth" "github.com/aler9/gortsplib/v2/pkg/base" + "github.com/aler9/gortsplib/v2/pkg/codecs/mpeg4audio" "github.com/aler9/gortsplib/v2/pkg/conn" "github.com/aler9/gortsplib/v2/pkg/format" "github.com/aler9/gortsplib/v2/pkg/headers" "github.com/aler9/gortsplib/v2/pkg/media" - "github.com/aler9/gortsplib/v2/pkg/mpeg4audio" "github.com/aler9/gortsplib/v2/pkg/sdp" "github.com/aler9/gortsplib/v2/pkg/url" ) diff --git a/examples/client-publish-format-mpeg4audio/main.go b/examples/client-publish-format-mpeg4audio/main.go index 9781e10b..9dc40086 100644 --- a/examples/client-publish-format-mpeg4audio/main.go +++ b/examples/client-publish-format-mpeg4audio/main.go @@ -5,9 +5,9 @@ import ( "net" "github.com/aler9/gortsplib/v2" + "github.com/aler9/gortsplib/v2/pkg/codecs/mpeg4audio" "github.com/aler9/gortsplib/v2/pkg/format" "github.com/aler9/gortsplib/v2/pkg/media" - "github.com/aler9/gortsplib/v2/pkg/mpeg4audio" "github.com/pion/rtp" ) diff --git a/pkg/mpeg4audio/adts.go b/pkg/codecs/mpeg4audio/adts.go similarity index 100% rename from pkg/mpeg4audio/adts.go rename to pkg/codecs/mpeg4audio/adts.go diff --git a/pkg/mpeg4audio/adts_test.go b/pkg/codecs/mpeg4audio/adts_test.go similarity index 100% rename from pkg/mpeg4audio/adts_test.go rename to pkg/codecs/mpeg4audio/adts_test.go diff --git a/pkg/mpeg4audio/config.go b/pkg/codecs/mpeg4audio/config.go similarity index 100% rename from pkg/mpeg4audio/config.go rename to pkg/codecs/mpeg4audio/config.go diff --git a/pkg/mpeg4audio/config_test.go b/pkg/codecs/mpeg4audio/config_test.go similarity index 100% rename from pkg/mpeg4audio/config_test.go rename to pkg/codecs/mpeg4audio/config_test.go diff --git a/pkg/mpeg4audio/mpeg4audio.go b/pkg/codecs/mpeg4audio/mpeg4audio.go similarity index 100% rename from pkg/mpeg4audio/mpeg4audio.go rename to pkg/codecs/mpeg4audio/mpeg4audio.go diff --git a/pkg/mpeg4audio/objecttype.go b/pkg/codecs/mpeg4audio/objecttype.go similarity index 100% rename from pkg/mpeg4audio/objecttype.go rename to pkg/codecs/mpeg4audio/objecttype.go diff --git a/pkg/mpeg4audio/samplerates.go b/pkg/codecs/mpeg4audio/samplerates.go similarity index 100% rename from pkg/mpeg4audio/samplerates.go rename to pkg/codecs/mpeg4audio/samplerates.go diff --git a/pkg/format/format_test.go b/pkg/format/format_test.go index b038516d..6039130b 100644 --- a/pkg/format/format_test.go +++ b/pkg/format/format_test.go @@ -6,7 +6,7 @@ import ( psdp "github.com/pion/sdp/v3" "github.com/stretchr/testify/require" - "github.com/aler9/gortsplib/v2/pkg/mpeg4audio" + "github.com/aler9/gortsplib/v2/pkg/codecs/mpeg4audio" ) func TestNewFromMediaDescription(t *testing.T) { diff --git a/pkg/format/mpeg4audio.go b/pkg/format/mpeg4audio.go index 00d89e38..a9cab25f 100644 --- a/pkg/format/mpeg4audio.go +++ b/pkg/format/mpeg4audio.go @@ -8,8 +8,8 @@ import ( "github.com/pion/rtp" + "github.com/aler9/gortsplib/v2/pkg/codecs/mpeg4audio" "github.com/aler9/gortsplib/v2/pkg/formatdecenc/rtpmpeg4audio" - "github.com/aler9/gortsplib/v2/pkg/mpeg4audio" ) // MPEG4Audio is a MPEG-4 audio format. diff --git a/pkg/format/mpeg4audio_test.go b/pkg/format/mpeg4audio_test.go index 2d02f184..99268eb5 100644 --- a/pkg/format/mpeg4audio_test.go +++ b/pkg/format/mpeg4audio_test.go @@ -6,7 +6,7 @@ import ( "github.com/pion/rtp" "github.com/stretchr/testify/require" - "github.com/aler9/gortsplib/v2/pkg/mpeg4audio" + "github.com/aler9/gortsplib/v2/pkg/codecs/mpeg4audio" ) func TestMPEG4AudioAttributes(t *testing.T) { diff --git a/pkg/formatdecenc/rtpmpeg4audio/decoder.go b/pkg/formatdecenc/rtpmpeg4audio/decoder.go index d4c87a73..825b4437 100644 --- a/pkg/formatdecenc/rtpmpeg4audio/decoder.go +++ b/pkg/formatdecenc/rtpmpeg4audio/decoder.go @@ -8,7 +8,7 @@ import ( "github.com/pion/rtp" "github.com/aler9/gortsplib/v2/pkg/bits" - "github.com/aler9/gortsplib/v2/pkg/mpeg4audio" + "github.com/aler9/gortsplib/v2/pkg/codecs/mpeg4audio" "github.com/aler9/gortsplib/v2/pkg/rtptimedec" ) diff --git a/pkg/formatdecenc/rtpmpeg4audio/decoder_test.go b/pkg/formatdecenc/rtpmpeg4audio/decoder_test.go index 6bb42a0b..a5d65c44 100644 --- a/pkg/formatdecenc/rtpmpeg4audio/decoder_test.go +++ b/pkg/formatdecenc/rtpmpeg4audio/decoder_test.go @@ -8,7 +8,7 @@ import ( "github.com/pion/rtp" "github.com/stretchr/testify/require" - "github.com/aler9/gortsplib/v2/pkg/mpeg4audio" + "github.com/aler9/gortsplib/v2/pkg/codecs/mpeg4audio" ) func mergeBytes(vals ...[]byte) []byte { diff --git a/pkg/formatdecenc/rtpmpeg4audio/encoder.go b/pkg/formatdecenc/rtpmpeg4audio/encoder.go index d12c1a22..d85fa5a9 100644 --- a/pkg/formatdecenc/rtpmpeg4audio/encoder.go +++ b/pkg/formatdecenc/rtpmpeg4audio/encoder.go @@ -7,7 +7,7 @@ import ( "github.com/pion/rtp" "github.com/aler9/gortsplib/v2/pkg/bits" - "github.com/aler9/gortsplib/v2/pkg/mpeg4audio" + "github.com/aler9/gortsplib/v2/pkg/codecs/mpeg4audio" ) const (