mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-29 11:40:38 +00:00
Merge branch 'master' into 0.11
This commit is contained in:
commit
7ef7157986
4 changed files with 10 additions and 3 deletions
gst
|
@ -122,7 +122,8 @@ gst_audio_echo_class_init (GstAudioEchoClass * klass)
|
|||
"Maximum delay of the echo in nanoseconds"
|
||||
" (can't be changed in PLAYING or PAUSED state)",
|
||||
1, G_MAXUINT64, 1,
|
||||
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | GST_PARAM_CONTROLLABLE));
|
||||
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS |
|
||||
GST_PARAM_MUTABLE_READY));
|
||||
|
||||
g_object_class_install_property (gobject_class, PROP_INTENSITY,
|
||||
g_param_spec_float ("intensity", "Intensity",
|
||||
|
|
|
@ -206,7 +206,7 @@ gst_ac3_parse_reset (GstAc3Parse * ac3parse)
|
|||
static void
|
||||
gst_ac3_parse_init (GstAc3Parse * ac3parse)
|
||||
{
|
||||
gst_base_parse_set_min_frame_size (GST_BASE_PARSE (ac3parse), 64 * 2);
|
||||
gst_base_parse_set_min_frame_size (GST_BASE_PARSE (ac3parse), 6);
|
||||
gst_ac3_parse_reset (ac3parse);
|
||||
}
|
||||
|
||||
|
|
|
@ -68,6 +68,8 @@ GST_DEBUG_CATEGORY_STATIC (mpeg_audio_parse_debug);
|
|||
#define XING_TOC_FLAG 0x0004
|
||||
#define XING_VBR_SCALE_FLAG 0x0008
|
||||
|
||||
#define MIN_FRAME_SIZE 6
|
||||
|
||||
static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src",
|
||||
GST_PAD_SRC,
|
||||
GST_PAD_ALWAYS,
|
||||
|
@ -231,7 +233,7 @@ gst_mpeg_audio_parse_start (GstBaseParse * parse)
|
|||
{
|
||||
GstMpegAudioParse *mp3parse = GST_MPEG_AUDIO_PARSE (parse);
|
||||
|
||||
gst_base_parse_set_min_frame_size (GST_BASE_PARSE (mp3parse), 1024);
|
||||
gst_base_parse_set_min_frame_size (GST_BASE_PARSE (mp3parse), MIN_FRAME_SIZE);
|
||||
GST_DEBUG_OBJECT (parse, "starting");
|
||||
|
||||
gst_mpeg_audio_parse_reset (mp3parse);
|
||||
|
@ -558,6 +560,9 @@ gst_mpeg_audio_parse_check_valid_frame (GstBaseParse * parse,
|
|||
goto cleanup;
|
||||
}
|
||||
|
||||
/* restore default minimum */
|
||||
gst_base_parse_set_min_frame_size (parse, MIN_FRAME_SIZE);
|
||||
|
||||
*framesize = bpf;
|
||||
res = TRUE;
|
||||
|
||||
|
|
|
@ -26,6 +26,7 @@
|
|||
#include "config.h"
|
||||
#endif
|
||||
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
||||
#ifdef HAVE_ZLIB
|
||||
|
|
Loading…
Reference in a new issue