Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
gst-plugins-good
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
George Kiagiadakis
gst-plugins-good
Commits
fda72021
Commit
fda72021
authored
Feb 22, 2013
by
Akihiro Tsukada
Committed by
Sebastian Dröge
Aug 21, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pulsesink: Add support for AAC pass-through
https://bugzilla.gnome.org/show_bug.cgi?id=694445
parent
1e917822
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
1 deletion
+13
-1
ext/pulse/pulsesink.c
ext/pulse/pulsesink.c
+2
-0
ext/pulse/pulsesink.h
ext/pulse/pulsesink.h
+2
-1
ext/pulse/pulseutil.c
ext/pulse/pulseutil.c
+7
-0
ext/pulse/pulseutil.h
ext/pulse/pulseutil.h
+2
-0
No files found.
ext/pulse/pulsesink.c
View file @
fda72021
...
...
@@ -1796,6 +1796,8 @@ gst_pulsesink_payload (GstAudioBaseSink * sink, GstBuffer * buf)
case
GST_AUDIO_RING_BUFFER_FORMAT_TYPE_EAC3
:
case
GST_AUDIO_RING_BUFFER_FORMAT_TYPE_DTS
:
case
GST_AUDIO_RING_BUFFER_FORMAT_TYPE_MPEG
:
case
GST_AUDIO_RING_BUFFER_FORMAT_TYPE_MPEG2_AAC
:
case
GST_AUDIO_RING_BUFFER_FORMAT_TYPE_MPEG4_AAC
:
{
/* FIXME: alloc memory from PA if possible */
gint
framesize
=
gst_audio_iec61937_frame_size
(
&
sink
->
ringbuffer
->
spec
);
...
...
ext/pulse/pulsesink.h
View file @
fda72021
...
...
@@ -97,7 +97,8 @@ GType gst_pulsesink_get_type (void);
_PULSE_CAPS_AC3 \
_PULSE_CAPS_EAC3 \
_PULSE_CAPS_DTS \
_PULSE_CAPS_MP3
_PULSE_CAPS_MP3 \
_PULSE_CAPS_AAC
G_END_DECLS
...
...
ext/pulse/pulseutil.c
View file @
fda72021
...
...
@@ -164,6 +164,13 @@ gst_pulse_fill_format_info (GstAudioRingBufferSpec * spec, pa_format_info ** f,
format
->
encoding
=
PA_ENCODING_DTS_IEC61937
;
}
else
if
(
spec
->
type
==
GST_AUDIO_RING_BUFFER_FORMAT_TYPE_MPEG
)
{
format
->
encoding
=
PA_ENCODING_MPEG_IEC61937
;
#if PA_CHECK_VERSION(3,99,0)
}
else
if
(
spec
->
type
==
GST_AUDIO_RING_BUFFER_FORMAT_TYPE_MPEG2_AAC
)
{
format
->
encoding
=
PA_ENCODING_MPEG2_AAC_IEC61937
;
}
else
if
(
spec
->
type
==
GST_AUDIO_RING_BUFFER_FORMAT_TYPE_MPEG4_AAC
)
{
/* HACK. treat MPEG4 AAC as MPEG2 AAC for the moment */
format
->
encoding
=
PA_ENCODING_MPEG2_AAC_IEC61937
;
#endif
}
else
{
goto
fail
;
}
...
...
ext/pulse/pulseutil.h
View file @
fda72021
...
...
@@ -61,6 +61,8 @@
"block-size = (int) { 512, 1024, 2048 }; "
#define _PULSE_CAPS_MP3 "audio/mpeg, mpegversion = (int) 1, " \
"mpegaudioversion = (int) [ 1, 2 ], parsed = (boolean) true;"
#define _PULSE_CAPS_AAC "audio/mpeg, mpegversion = (int) { 2, 4 }, " \
"framed = (boolean) true, stream-format = (string) adts;"
#define _PULSE_CAPS_PCM \
_PULSE_CAPS_LINEAR \
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment