mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-17 11:45:25 +00:00
Code Issues 1 Projects Releases Wiki Activity

applemedia: atdec: 1st round of fixes

Browse source
This commit is contained in:
Alessandro Decina 2013-07-24 09:11:59 +02:00
parent 06717150bf
commit d71aaec486
2 changed files with 33 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
sys/applemedia/atdec.c
View file

@ -66,17 +66,16 @@ static GstStaticPadTemplate gst_atdec_src_template =
GST_STATIC_PAD_TEMPLATE ("src", GST_STATIC_PAD_TEMPLATE ("src",
GST_PAD_SRC, GST_PAD_SRC,
GST_PAD_ALWAYS, GST_PAD_ALWAYS,
GST_STATIC_CAPS (GST_AUDIO_CAPS_MAKE ("S16LE") ";" GST_STATIC_CAPS (GST_AUDIO_CAPS_MAKE ("S16LE") ", layout=interleaved;"
GST_AUDIO_CAPS_MAKE ("F32LE") GST_AUDIO_CAPS_MAKE ("F32LE") ", layout=interleaved")
)
); );
static GstStaticPadTemplate gst_atdec_sink_template = static GstStaticPadTemplate gst_atdec_sink_template =
GST_STATIC_PAD_TEMPLATE ("sink", GST_STATIC_PAD_TEMPLATE ("sink",
GST_PAD_SINK, GST_PAD_SINK,
GST_PAD_ALWAYS, GST_PAD_ALWAYS,
GST_STATIC_CAPS ("audio/mpeg, mpegversion=4, framed=true," GST_STATIC_CAPS ("audio/mpeg, mpegversion=4, framed=true, channels=[1,max];"
"channels=[1,max]") "audio/mpeg, mpegversion=1, layer=3")
); );
G_DEFINE_TYPE_WITH_CODE (GstATDec, gst_atdec, GST_TYPE_AUDIO_DECODER, G_DEFINE_TYPE_WITH_CODE (GstATDec, gst_atdec, GST_TYPE_AUDIO_DECODER,
@ -279,12 +278,14 @@ gst_atdec_set_format (GstAudioDecoder * decoder, GstCaps * caps)
// negotiate output caps // negotiate output caps
output_caps = gst_pad_get_allowed_caps (GST_AUDIO_DECODER_SRC_PAD (atdec)); output_caps = gst_pad_get_allowed_caps (GST_AUDIO_DECODER_SRC_PAD (atdec));
output_caps = gst_caps_fixate (output_caps);
if (!output_caps) if (!output_caps)
goto negotiation_error; output_caps =
gst_pad_get_pad_template_caps (GST_AUDIO_DECODER_SRC_PAD (atdec));
output_caps = gst_caps_fixate (output_caps);
gst_caps_set_simple (output_caps, gst_caps_set_simple (output_caps,
"rate", G_TYPE_INT, (int) input_format.mSampleRate, NULL); "rate", G_TYPE_INT, (int) input_format.mSampleRate,
"channels", G_TYPE_INT, input_format.mChannelsPerFrame, NULL);
// configure output_format from caps // configure output_format from caps
gst_caps_to_at_format (output_caps, &output_format); gst_caps_to_at_format (output_caps, &output_format);
@ -320,11 +321,6 @@ gst_atdec_set_format (GstAudioDecoder * decoder, GstCaps * caps)
return TRUE; return TRUE;
negotiation_error:
GST_ELEMENT_ERROR (atdec, STREAM, FORMAT, (NULL),
("no compatible downstream caps"));
return FALSE;
create_queue_error: create_queue_error:
GST_ELEMENT_ERROR (atdec, STREAM, FORMAT, (NULL), GST_ELEMENT_ERROR (atdec, STREAM, FORMAT, (NULL),
("AudioQueueNewOutput returned error: %d", status)); ("AudioQueueNewOutput returned error: %d", status));
@ -358,8 +354,14 @@ gst_atdec_handle_frame (GstAudioDecoder * decoder, GstBuffer * buffer)
GstMapInfo info; GstMapInfo info;
GstAudioInfo *audio_info; GstAudioInfo *audio_info;
int size, out_frames; int size, out_frames;
GstFlowReturn flow_ret = GST_FLOW_OK;
GstATDec *atdec = GST_ATDEC (decoder); GstATDec *atdec = GST_ATDEC (decoder);
if (buffer == NULL)
return GST_FLOW_OK;
audio_info = gst_audio_decoder_get_audio_info (decoder);
// copy the input buffer into an AudioQueueBuffer // copy the input buffer into an AudioQueueBuffer
size = gst_buffer_get_size (buffer); size = gst_buffer_get_size (buffer);
AudioQueueAllocateBuffer (atdec->queue, size, &input_buffer); AudioQueueAllocateBuffer (atdec->queue, size, &input_buffer);
@ -376,24 +378,29 @@ gst_atdec_handle_frame (GstAudioDecoder * decoder, GstBuffer * buffer)
AudioQueueEnqueueBuffer (atdec->queue, input_buffer, 1, &packet); AudioQueueEnqueueBuffer (atdec->queue, input_buffer, 1, &packet);
// figure out how many frames we need to pull out of the queue // figure out how many frames we need to pull out of the queue
audio_info = gst_audio_decoder_get_audio_info (decoder); out_frames = GST_CLOCK_TIME_TO_FRAMES (GST_BUFFER_DURATION (buffer),
out_frames = audio_info->rate);
GST_CLOCK_TIME_TO_FRAMES (GST_BUFFER_DURATION (buffer), audio_info->rate);
size = out_frames * audio_info->bpf; size = out_frames * audio_info->bpf;
AudioQueueAllocateBuffer (atdec->queue, size, &output_buffer); AudioQueueAllocateBuffer (atdec->queue, size, &output_buffer);
// pull the frames // pull the frames
AudioQueueOfflineRender (atdec->queue, &timestamp, output_buffer, out_frames); AudioQueueOfflineRender (atdec->queue, &timestamp, output_buffer, out_frames);
out = if (output_buffer->mAudioDataByteSize) {
gst_audio_decoder_allocate_output_buffer (decoder, out =
output_buffer->mAudioDataByteSize); gst_audio_decoder_allocate_output_buffer (decoder,
gst_buffer_map (out, &info, GST_MAP_WRITE); output_buffer->mAudioDataByteSize);
memcpy (info.data, output_buffer->mAudioData,
output_buffer->mAudioDataByteSize); gst_buffer_map (out, &info, GST_MAP_WRITE);
gst_buffer_unmap (out, &info); memcpy (info.data, output_buffer->mAudioData,
output_buffer->mAudioDataByteSize);
gst_buffer_unmap (out, &info);
flow_ret = gst_audio_decoder_finish_frame (decoder, out, 1);
}
AudioQueueFreeBuffer (atdec->queue, output_buffer); AudioQueueFreeBuffer (atdec->queue, output_buffer);
return gst_audio_decoder_finish_frame (decoder, out, 1); return flow_ret;
} }
static void static void

2
sys/applemedia/atdec.h
View file

@ -1,5 +1,5 @@
/* GStreamer /* GStreamer
* Copyright (C) 2013 FIXME <alessandro.d@gmail.com> * Copyright (C) 2013 Alessandro Decina <alessandro.d@gmail.com>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public