mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-29 13:11:06 +00:00
Code Issues 1 Projects Releases Wiki Activity

Merge branch 'master' into 0.11

Browse source 
Conflicts:
	gst/colorspace/colorspace.c
This commit is contained in:
Wim Taymans 2011-11-09 12:19:04 +01:00
commit 4e8791dafd
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ext/opus/gstopusenc.c
View file

@ -270,7 +270,7 @@ gst_opus_enc_sink_setcaps (GstPad * pad, GstCaps * caps)
gst_caps_unref (otherpadcaps); gst_caps_unref (otherpadcaps);
} }
GST_ERROR_OBJECT (pad, "channels=%d rate=%d frame-size=%d", GST_DEBUG_OBJECT (pad, "channels=%d rate=%d frame-size=%d",
enc->n_channels, enc->sample_rate, enc->frame_size); enc->n_channels, enc->sample_rate, enc->frame_size);
switch (enc->frame_size) { switch (enc->frame_size) {
case 2: case 2:
@ -296,7 +296,7 @@ gst_opus_enc_sink_setcaps (GstPad * pad, GstCaps * caps)
return FALSE; return FALSE;
break; break;
} }
GST_ERROR ("frame_samples %d", enc->frame_samples); GST_DEBUG_OBJECT (pad, "frame_samples %d", enc->frame_samples);
gst_opus_enc_setup (enc); gst_opus_enc_setup (enc);
@ -534,7 +534,7 @@ gst_opus_enc_src_query (GstPad * pad, GstQuery * query)
GstClockTime min_latency, max_latency; GstClockTime min_latency, max_latency;
gint64 latency; gint64 latency;
if ((res = gst_pad_peer_query (pad, query))) { if ((res = gst_pad_peer_query (enc->sinkpad, query))) {
gst_query_parse_latency (query, &live, &min_latency, &max_latency); gst_query_parse_latency (query, &live, &min_latency, &max_latency);
latency = gst_opus_enc_get_latency (enc); latency = gst_opus_enc_get_latency (enc);
@ -807,7 +807,7 @@ gst_opus_enc_encode (GstOpusEnc * enc, gboolean flush)
(enc->bitrate * enc->frame_samples / enc->sample_rate + 4) / 8; (enc->bitrate * enc->frame_samples / enc->sample_rate + 4) / 8;
if (flush && gst_adapter_available (enc->adapter) % bytes != 0) { if (flush && gst_adapter_available (enc->adapter) % bytes != 0) {
guint diff = gst_adapter_available (enc->adapter) % bytes; guint diff = bytes - gst_adapter_available (enc->adapter) % bytes;
GstBuffer *buf = gst_buffer_new_and_alloc (diff); GstBuffer *buf = gst_buffer_new_and_alloc (diff);
memset (GST_BUFFER_DATA (buf), 0, diff); memset (GST_BUFFER_DATA (buf), 0, diff);