mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-05 15:08:53 +00:00
Code Issues 1 Projects Releases Wiki Activity

a52dec: adapt to work also with new liba52

Browse source 
Fixes https://bugzilla.gnome.org/show_bug.cgi?id=674091
This commit is contained in:
Руслан Ижбулатов 2012-04-15 23:39:48 +04:00 committed by Mark Nauwelaerts
parent 4d97760993
commit b199334a6b
2 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
ext/a52dec/gsta52dec.c
View file

@ -45,7 +45,9 @@
#include <gst/gst.h> #include <gst/gst.h>
#include <a52dec/a52.h> #include <a52dec/a52.h>
#include <a52dec/mm_accel.h> #if !defined(A52_ACCEL_DETECT)
# include <a52dec/mm_accel.h>
#endif
#include "gsta52dec.h" #include "gsta52dec.h"
#if HAVE_ORC #if HAVE_ORC
@ -136,7 +138,7 @@ gst_a52dec_class_init (GstA52DecClass * klass)
GObjectClass *gobject_class; GObjectClass *gobject_class;
GstElementClass *gstelement_class; GstElementClass *gstelement_class;
GstAudioDecoderClass *gstbase_class; GstAudioDecoderClass *gstbase_class;
guint cpuflags; guint cpuflags = 0;
gobject_class = (GObjectClass *) klass; gobject_class = (GObjectClass *) klass;
gstelement_class = (GstElementClass *) klass; gstelement_class = (GstElementClass *) klass;
@ -199,24 +201,23 @@ gst_a52dec_class_init (GstA52DecClass * klass)
* generic software djbfft based one when available in the used liba52 */ * generic software djbfft based one when available in the used liba52 */
#ifdef MM_ACCEL_DJBFFT #ifdef MM_ACCEL_DJBFFT
klass->a52_cpuflags = MM_ACCEL_DJBFFT; klass->a52_cpuflags = MM_ACCEL_DJBFFT;
#elif defined(A52_ACCEL_DETECT)
klass->a52_cpuflags = A52_ACCEL_DETECT;
#else #else
klass->a52_cpuflags = 0; klass->a52_cpuflags = 0;
#endif #endif
#if HAVE_ORC #if HAVE_ORC && !defined(A52_ACCEL_DETECT)
cpuflags = orc_target_get_default_flags (orc_target_get_by_name ("mmx")); cpuflags = orc_target_get_default_flags (orc_target_get_by_name ("mmx"));
if (cpuflags & ORC_TARGET_MMX_MMX) if (cpuflags & ORC_TARGET_MMX_MMX)
klass->a52_cpuflags |= MM_ACCEL_X86_MMX; klass->a52_cpuflags |= MM_ACCEL_X86_MMX;
if (cpuflags & ORC_TARGET_MMX_3DNOW) if (cpuflags & ORC_TARGET_MMX_3DNOW)
klass->a52_cpuflags |= MM_ACCEL_X86_3DNOW; klass->a52_cpuflags |= MM_ACCEL_X86_3DNOW;
if (cpuflags & ORC_TARGET_MMX_MMXEXT) if (cpuflags & ORC_TARGET_MMX_MMXEXT)
klass->a52_cpuflags |= MM_ACCEL_X86_MMXEXT; klass->a52_cpuflags |= MM_ACCEL_X86_MMXEXT;
#else
cpuflags = 0;
#endif #endif
GST_LOG ("CPU flags: a52=%08x, liboil=%08x", klass->a52_cpuflags, cpuflags); GST_LOG ("CPU flags: a52=%08x, orc=%08x", klass->a52_cpuflags, cpuflags);
} }
static void static void
@ -245,7 +246,13 @@ gst_a52dec_start (GstAudioDecoder * dec)
GST_DEBUG_OBJECT (dec, "start"); GST_DEBUG_OBJECT (dec, "start");
klass = GST_A52DEC_CLASS (G_OBJECT_GET_CLASS (a52dec)); klass = GST_A52DEC_CLASS (G_OBJECT_GET_CLASS (a52dec));
#if defined(A52_ACCEL_DETECT)
a52dec->state = a52_init ();
/* This line is just to avoid being accused of not using klass */
a52_accel (klass->a52_cpuflags & A52_ACCEL_DETECT);
#else
a52dec->state = a52_init (klass->a52_cpuflags); a52dec->state = a52_init (klass->a52_cpuflags);
#endif
if (!a52dec->state) { if (!a52dec->state) {
GST_ELEMENT_ERROR (GST_ELEMENT (a52dec), LIBRARY, INIT, (NULL), GST_ELEMENT_ERROR (GST_ELEMENT (a52dec), LIBRARY, INIT, (NULL),

8
m4/a52.m4
View file

@ -79,14 +79,18 @@ int
main () main ()
{ {
a52_state_t *state; a52_state_t *state;
#if defined(A52_ACCEL_DETECT)
state = a52_init ();
#else
state = a52_init (0); state = a52_init (0);
#endif
a52_free (state); a52_free (state);
return 0; return 0;
} }
],, HAVE_A52DEC=no, [echo $ac_n "cross compiling; assumed OK... $ac_c"]) ],, HAVE_A52DEC=no, [echo $ac_n "cross compiling; assumed OK... $ac_c"])
if test HAVE_A52DEC = "no"; then if test HAVE_A52DEC = "no"; then
echo "*** Your a52dec is borked somehow. Please update to 0.7.4." echo "*** Your a52dec is borked somehow. Please update to 0.7.4 or newer."
else else
AC_TRY_RUN([ AC_TRY_RUN([
#include <inttypes.h> #include <inttypes.h>
@ -102,7 +106,7 @@ main ()
], HAVE_A52DEC=no,, [echo $ac_n "cross compiling; assumed OK... $ac_c"]) ], HAVE_A52DEC=no,, [echo $ac_n "cross compiling; assumed OK... $ac_c"])
if test HAVE_A52DEC = "no"; then if test HAVE_A52DEC = "no"; then
echo "*** Your a52dec is too old. Please update to 0.7.4." echo "*** Your a52dec is too old. Please update to 0.7.4 or newer."
fi fi
fi fi
CFLAGS="$ac_save_CFLAGS" CFLAGS="$ac_save_CFLAGS"