FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

audiodecoder: Actually allocate enough memory for 64 bits, not just 32 bits

Browse Source 
Also fix a memory leak.
This commit is contained in:
Sebastian Dröge 2014-04-15 11:53:43 +02:00
parent 2378848240
commit 16275f479f
1 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
tests/check/libs/audiodecoder.c
View File

@ -79,7 +79,7 @@ gst_audio_decoder_tester_set_format (GstAudioDecoder * dec, GstCaps * caps)
gst_caps_unref (caps); gst_caps_unref (caps);
if (!tester->setoutputformat_on_decoding) { if (!tester->setoutputformat_on_decoding) {
caps = gst_caps_new_simple ("audio/x-raw", "format", G_TYPE_STRING, "S16LE", caps = gst_caps_new_simple ("audio/x-raw", "format", G_TYPE_STRING, "S32LE",
"channels", G_TYPE_INT, 2, "rate", G_TYPE_INT, 44100, "channels", G_TYPE_INT, 2, "rate", G_TYPE_INT, 44100,
"layout", G_TYPE_STRING, "interleaved", NULL); "layout", G_TYPE_STRING, "interleaved", NULL);
gst_audio_info_from_caps (&info, caps); gst_audio_info_from_caps (&info, caps);
@ -99,7 +99,6 @@ gst_audio_decoder_tester_handle_frame (GstAudioDecoder * dec,
gint size; gint size;
GstMapInfo map; GstMapInfo map;
GstBuffer *output_buffer; GstBuffer *output_buffer;
guint64 samples;
if (buffer == NULL) if (buffer == NULL)
return GST_FLOW_OK; return GST_FLOW_OK;
@ -108,7 +107,7 @@ gst_audio_decoder_tester_handle_frame (GstAudioDecoder * dec,
GstCaps *caps; GstCaps *caps;
GstAudioInfo info; GstAudioInfo info;
caps = gst_caps_new_simple ("audio/x-raw", "format", G_TYPE_STRING, "S16LE", caps = gst_caps_new_simple ("audio/x-raw", "format", G_TYPE_STRING, "S32LE",
"channels", G_TYPE_INT, 2, "rate", G_TYPE_INT, 44100, "channels", G_TYPE_INT, 2, "rate", G_TYPE_INT, 44100,
"layout", G_TYPE_STRING, "interleaved", NULL); "layout", G_TYPE_STRING, "interleaved", NULL);
gst_audio_info_from_caps (&info, caps); gst_audio_info_from_caps (&info, caps);
@ -119,11 +118,9 @@ gst_audio_decoder_tester_handle_frame (GstAudioDecoder * dec,
gst_buffer_map (buffer, &map, GST_MAP_READ); gst_buffer_map (buffer, &map, GST_MAP_READ);
/* the output is SE16LE stereo 44100 Hz */ /* the output is SE32LE stereo 44100 Hz */
samples = size = 2 * 4;
gst_util_uint64_scale_round (44100, GST_BUFFER_DURATION (buffer), g_assert (size == sizeof (guint64));
GST_SECOND);
size = 2 * 2 * samples;
data = g_malloc0 (size); data = g_malloc0 (size);
memcpy (data, map.data, sizeof (guint64)); memcpy (data, map.data, sizeof (guint64));
@ -179,14 +176,14 @@ _mysinkpad_event (GstPad * pad, GstObject * parent, GstEvent * event)
static void static void
setup_audiodecodertester (void) setup_audiodecodertester (void)
{ {
GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink", static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink",
GST_PAD_SINK, GST_PAD_SINK,
GST_PAD_ALWAYS, GST_PAD_ALWAYS,
GST_STATIC_CAPS ("audio/x-raw, format=(string)S16LE, " GST_STATIC_CAPS ("audio/x-raw, format=(string)S32LE, "
"rate=(int)[1, 320000], channels=(int)[1, 32]," "rate=(int)[1, 320000], channels=(int)[1, 32],"
"layout=(string)interleaved") "layout=(string)interleaved")
); );
GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src", static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src",
GST_PAD_SRC, GST_PAD_SRC,
GST_PAD_ALWAYS, GST_PAD_ALWAYS,
GST_STATIC_CAPS ("audio/x-test-custom") GST_STATIC_CAPS ("audio/x-test-custom")
@ -277,11 +274,11 @@ GST_START_TEST (audiodecoder_playback)
gst_buffer_map (buffer, &map, GST_MAP_READ); gst_buffer_map (buffer, &map, GST_MAP_READ);
num = *(guint64 *) map.data; num = *(guint64 *) map.data;
fail_unless (i == num); fail_unless_equals_uint64 (i, num);
fail_unless (GST_BUFFER_PTS (buffer) == gst_util_uint64_scale_round (i, fail_unless_equals_uint64 (GST_BUFFER_PTS (buffer),
GST_SECOND, TEST_MSECS_PER_SAMPLE)); gst_util_uint64_scale_round (i, GST_SECOND, TEST_MSECS_PER_SAMPLE));
fail_unless (GST_BUFFER_DURATION (buffer) == gst_util_uint64_scale_round (1, fail_unless_equals_uint64 (GST_BUFFER_DURATION (buffer),
GST_SECOND, TEST_MSECS_PER_SAMPLE)); gst_util_uint64_scale_round (1, GST_SECOND, TEST_MSECS_PER_SAMPLE));
gst_buffer_unmap (buffer, &map); gst_buffer_unmap (buffer, &map);