From: Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
Date: Mon, 4 Jul 2011 09:48:13 +0000 (+0200)
Subject: Merge branch 'master' into 0.11
X-Git-Tag: 1.19.3~509^2~7828
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d59a00aa1cc792ca1437760bb10164d1eba2eae9;p=platform%2Fupstream%2Fgstreamer.git

Merge branch 'master' into 0.11

Conflicts:
	ext/pulse/pulsesink.c
---

d59a00aa1cc792ca1437760bb10164d1eba2eae9
diff --cc ext/pulse/pulsesink.c
index 4bce57d,3464799..9be964a
--- a/ext/pulse/pulsesink.c
+++ b/ext/pulse/pulsesink.c
@@@ -1788,17 -1616,88 +1659,15 @@@ gst_pulsesink_implements_interface_ini
    klass->supported = gst_pulsesink_interface_supported;
  }
  
 -static void
 -gst_pulsesink_init_interfaces (GType type)
 -{
 -  static const GInterfaceInfo implements_iface_info = {
 -    (GInterfaceInitFunc) gst_pulsesink_implements_interface_init,
 -    NULL,
 -    NULL,
 -  };
 -  static const GInterfaceInfo probe_iface_info = {
 -    (GInterfaceInitFunc) gst_pulsesink_property_probe_interface_init,
 -    NULL,
 -    NULL,
 -  };
 -  static const GInterfaceInfo svol_iface_info = {
 -    NULL, NULL, NULL
 -  };
 -
 -  g_type_add_interface_static (type, GST_TYPE_STREAM_VOLUME, &svol_iface_info);
 -  g_type_add_interface_static (type, GST_TYPE_IMPLEMENTS_INTERFACE,
 -      &implements_iface_info);
 -  g_type_add_interface_static (type, GST_TYPE_PROPERTY_PROBE,
 -      &probe_iface_info);
 -}
 -
 -static void
 -gst_pulsesink_base_init (gpointer g_class)
 -{
 -  static GstStaticPadTemplate pad_template = GST_STATIC_PAD_TEMPLATE ("sink",
 -      GST_PAD_SINK,
 -      GST_PAD_ALWAYS,
 -      GST_STATIC_CAPS ("audio/x-raw-int, "
 -          "endianness = (int) { " ENDIANNESS " }, "
 -          "signed = (boolean) TRUE, "
 -          "width = (int) 16, "
 -          "depth = (int) 16, "
 -          "rate = (int) [ 1, MAX ], "
 -          "channels = (int) [ 1, 32 ];"
 -          "audio/x-raw-float, "
 -          "endianness = (int) { " ENDIANNESS " }, "
 -          "width = (int) 32, "
 -          "rate = (int) [ 1, MAX ], "
 -          "channels = (int) [ 1, 32 ];"
 -          "audio/x-raw-int, "
 -          "endianness = (int) { " ENDIANNESS " }, "
 -          "signed = (boolean) TRUE, "
 -          "width = (int) 32, "
 -          "depth = (int) 32, "
 -          "rate = (int) [ 1, MAX ], " "channels = (int) [ 1, 32 ];"
 -          "audio/x-raw-int, "
 -          "endianness = (int) { " ENDIANNESS " }, "
 -          "signed = (boolean) TRUE, "
 -          "width = (int) 24, "
 -          "depth = (int) 24, "
 -          "rate = (int) [ 1, MAX ], "
 -          "channels = (int) [ 1, 32 ];"
 -          "audio/x-raw-int, "
 -          "endianness = (int) { " ENDIANNESS " }, "
 -          "signed = (boolean) TRUE, "
 -          "width = (int) 32, "
 -          "depth = (int) 24, "
 -          "rate = (int) [ 1, MAX ], " "channels = (int) [ 1, 32 ];"
 -          "audio/x-raw-int, "
 -          "signed = (boolean) FALSE, "
 -          "width = (int) 8, "
 -          "depth = (int) 8, "
 -          "rate = (int) [ 1, MAX ], "
 -          "channels = (int) [ 1, 32 ];"
 -          "audio/x-alaw, "
 -          "rate = (int) [ 1, MAX], "
 -          "channels = (int) [ 1, 32 ];"
 -          "audio/x-mulaw, "
 -          "rate = (int) [ 1, MAX], " "channels = (int) [ 1, 32 ]")
 -      );
 -
 -  GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
 -
 -  gst_element_class_set_details_simple (element_class,
 -      "PulseAudio Audio Sink",
 -      "Sink/Audio", "Plays audio to a PulseAudio server", "Lennart Poettering");
 -  gst_element_class_add_pad_template (element_class,
 -      gst_static_pad_template_get (&pad_template));
 -}
 +#define gst_pulsesink_parent_class parent_class
 +G_DEFINE_TYPE_WITH_CODE (GstPulseSink, gst_pulsesink, GST_TYPE_BASE_AUDIO_SINK,
 +    gst_pulsesink_init_contexts ();
 +    G_IMPLEMENT_INTERFACE (GST_TYPE_IMPLEMENTS_INTERFACE,
 +        gst_pulsesink_implements_interface_init);
 +    G_IMPLEMENT_INTERFACE (GST_TYPE_PROPERTY_PROBE,
 +        gst_pulsesink_property_probe_interface_init);
- #ifdef HAVE_PULSE_0_9_12
 +    G_IMPLEMENT_INTERFACE (GST_TYPE_STREAM_VOLUME, NULL)
- #endif
 +    );
  
  static GstRingBuffer *
  gst_pulsesink_create_ringbuffer (GstBaseAudioSink * sink)
diff --cc gst/audioparsers/gstaacparse.c
index f84633b,5ee8466..00999a0
--- a/gst/audioparsers/gstaacparse.c
+++ b/gst/audioparsers/gstaacparse.c
@@@ -605,9 -611,9 +605,10 @@@ gst_aac_parse_check_valid_frame (GstBas
  
    } else {
      GST_DEBUG ("buffer didn't contain valid frame");
-     gst_base_parse_set_min_frame_size (GST_BASE_PARSE (aacparse), 1024);
+     gst_base_parse_set_min_frame_size (GST_BASE_PARSE (aacparse),
+         ADTS_MAX_SIZE);
    }
 +  gst_buffer_unmap (buffer, data, size);
  
    return ret;
  }