Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Marc-André Lureau
gst-plugins-good
Commits
dc540c23
Commit
dc540c23
authored
Nov 27, 2011
by
Tim-Philipp Müller
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master' into 0.11
Conflicts: gst/equalizer/gstiirequalizer.c
parents
17240ac9
b5bf0294
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
8 deletions
+17
-8
gst/equalizer/gstiirequalizer.c
gst/equalizer/gstiirequalizer.c
+16
-8
gst/matroska/matroska-ids.c
gst/matroska/matroska-ids.c
+1
-0
No files found.
gst/equalizer/gstiirequalizer.c
View file @
dc540c23
...
...
@@ -824,13 +824,6 @@ gst_iir_equalizer_transform_ip (GstBaseTransform * btrans, GstBuffer * buf)
if
(
G_UNLIKELY
(
channels
<
1
||
equ
->
process
==
NULL
))
return
GST_FLOW_NOT_NEGOTIATED
;
BANDS_LOCK
(
equ
);
if
(
equ
->
need_new_coefficients
)
{
update_coefficients
(
equ
);
set_passthrough
(
equ
);
}
BANDS_UNLOCK
(
equ
);
if
(
gst_base_transform_is_passthrough
(
btrans
))
return
GST_FLOW_OK
;
...
...
@@ -838,8 +831,23 @@ gst_iir_equalizer_transform_ip (GstBaseTransform * btrans, GstBuffer * buf)
timestamp
=
gst_segment_to_stream_time
(
&
btrans
->
segment
,
GST_FORMAT_TIME
,
timestamp
);
if
(
GST_CLOCK_TIME_IS_VALID
(
timestamp
))
if
(
GST_CLOCK_TIME_IS_VALID
(
timestamp
))
{
GstIirEqualizerBand
**
filters
=
equ
->
bands
;
guint
f
,
nf
=
equ
->
freq_band_count
;
gst_object_sync_values
(
GST_OBJECT
(
equ
),
timestamp
);
/* sync values for bands too */
for
(
f
=
0
;
f
<
nf
;
f
++
)
{
gst_object_sync_values
(
GST_OBJECT
(
filters
[
f
]),
timestamp
);
}
}
BANDS_LOCK
(
equ
);
if
(
equ
->
need_new_coefficients
)
{
update_coefficients
(
equ
);
set_passthrough
(
equ
);
}
BANDS_UNLOCK
(
equ
);
data
=
gst_buffer_map
(
buf
,
&
size
,
NULL
,
GST_MAP_WRITE
);
equ
->
process
(
equ
,
data
,
size
,
channels
);
...
...
gst/matroska/matroska-ids.c
View file @
dc540c23
...
...
@@ -107,6 +107,7 @@ gst_matroska_track_init_subtitle_context (GstMatroskaTrackContext ** p_context)
(
*
p_context
)
->
type
=
GST_MATROSKA_TRACK_TYPE_SUBTITLE
;
subtitle_context
->
invalid_utf8
=
FALSE
;
subtitle_context
->
seen_markup_tag
=
FALSE
;
return
TRUE
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment