mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-10-04 09:42:19 +00:00
ext/celt/gstceltdec.c: Correctly take the granulepos from upstream if possible and correctly handle the granulepos in...
Original commit message from CVS: * ext/celt/gstceltdec.c: (celt_dec_chain_parse_data): Correctly take the granulepos from upstream if possible and correctly handle the granulepos in various calculations: the granulepos is the sample number of the _last_ sample in a frame, not the first. * ext/celt/gstceltenc.c: (gst_celt_enc_sinkevent), (gst_celt_enc_encode), (gst_celt_enc_chain), (gst_celt_enc_change_state): * ext/celt/gstceltenc.h: Handle non-zero start timestamps in the encoder and detect/handle stream discontinuities. Fixes bug #547075.
This commit is contained in:
parent
315cb1ab96
commit
16e70c80ae
4 changed files with 186 additions and 66 deletions
15
ChangeLog
15
ChangeLog
|
@ -1,3 +1,18 @@
|
||||||
|
2008-08-31 Sebastian Dröge <sebastian.droege@collabora.co.uk>
|
||||||
|
|
||||||
|
* ext/celt/gstceltdec.c: (celt_dec_chain_parse_data):
|
||||||
|
Correctly take the granulepos from upstream if possible and
|
||||||
|
correctly handle the granulepos in various calculations: the
|
||||||
|
granulepos is the sample number of the _last_ sample in a frame, not
|
||||||
|
the first.
|
||||||
|
|
||||||
|
* ext/celt/gstceltenc.c: (gst_celt_enc_sinkevent),
|
||||||
|
(gst_celt_enc_encode), (gst_celt_enc_chain),
|
||||||
|
(gst_celt_enc_change_state):
|
||||||
|
* ext/celt/gstceltenc.h:
|
||||||
|
Handle non-zero start timestamps in the encoder and detect/handle
|
||||||
|
stream discontinuities. Fixes bug #547075.
|
||||||
|
|
||||||
2008-08-31 Sebastian Dröge <sebastian.droege@collabora.co.uk>
|
2008-08-31 Sebastian Dröge <sebastian.droege@collabora.co.uk>
|
||||||
|
|
||||||
Patch by: Rov Juvano <rovjuvano at users dot sourceforge dot net>
|
Patch by: Rov Juvano <rovjuvano at users dot sourceforge dot net>
|
||||||
|
|
|
@ -618,6 +618,13 @@ celt_dec_chain_parse_data (GstCeltDec * dec, GstBuffer * buf,
|
||||||
size = GST_BUFFER_SIZE (buf);
|
size = GST_BUFFER_SIZE (buf);
|
||||||
|
|
||||||
GST_DEBUG_OBJECT (dec, "received buffer of size %u", size);
|
GST_DEBUG_OBJECT (dec, "received buffer of size %u", size);
|
||||||
|
if (!GST_BUFFER_TIMESTAMP_IS_VALID (buf)
|
||||||
|
&& GST_BUFFER_OFFSET_END_IS_VALID (buf)) {
|
||||||
|
dec->granulepos = GST_BUFFER_OFFSET_END (buf);
|
||||||
|
GST_DEBUG_OBJECT (dec,
|
||||||
|
"Taking granulepos from upstream: %" G_GUINT64_FORMAT,
|
||||||
|
dec->granulepos);
|
||||||
|
}
|
||||||
|
|
||||||
/* copy timestamp */
|
/* copy timestamp */
|
||||||
} else {
|
} else {
|
||||||
|
@ -649,18 +656,19 @@ celt_dec_chain_parse_data (GstCeltDec * dec, GstBuffer * buf,
|
||||||
if (dec->granulepos == -1) {
|
if (dec->granulepos == -1) {
|
||||||
if (dec->segment.format != GST_FORMAT_TIME) {
|
if (dec->segment.format != GST_FORMAT_TIME) {
|
||||||
GST_WARNING_OBJECT (dec, "segment not initialized or not TIME format");
|
GST_WARNING_OBJECT (dec, "segment not initialized or not TIME format");
|
||||||
dec->granulepos = 0;
|
dec->granulepos = dec->frame_size;
|
||||||
} else {
|
} else {
|
||||||
dec->granulepos = gst_util_uint64_scale_int (dec->segment.last_stop,
|
dec->granulepos = gst_util_uint64_scale_int (dec->segment.last_stop,
|
||||||
dec->header.sample_rate, GST_SECOND);
|
dec->header.sample_rate, GST_SECOND) + dec->frame_size;
|
||||||
}
|
}
|
||||||
GST_DEBUG_OBJECT (dec, "granulepos=%" G_GINT64_FORMAT, dec->granulepos);
|
GST_DEBUG_OBJECT (dec, "granulepos=%" G_GINT64_FORMAT, dec->granulepos);
|
||||||
}
|
}
|
||||||
|
|
||||||
GST_BUFFER_OFFSET (outbuf) = dec->granulepos;
|
GST_BUFFER_OFFSET (outbuf) = dec->granulepos - dec->frame_size;
|
||||||
GST_BUFFER_OFFSET_END (outbuf) = dec->granulepos + dec->frame_size;
|
GST_BUFFER_OFFSET_END (outbuf) = dec->granulepos;
|
||||||
GST_BUFFER_TIMESTAMP (outbuf) = gst_util_uint64_scale_int (dec->granulepos,
|
GST_BUFFER_TIMESTAMP (outbuf) =
|
||||||
GST_SECOND, dec->header.sample_rate);
|
gst_util_uint64_scale_int (dec->granulepos - dec->frame_size, GST_SECOND,
|
||||||
|
dec->header.sample_rate);
|
||||||
GST_BUFFER_DURATION (outbuf) = dec->frame_duration;
|
GST_BUFFER_DURATION (outbuf) = dec->frame_duration;
|
||||||
|
|
||||||
dec->granulepos += dec->frame_size;
|
dec->granulepos += dec->frame_size;
|
||||||
|
|
|
@ -48,6 +48,7 @@
|
||||||
|
|
||||||
#include <gst/gsttagsetter.h>
|
#include <gst/gsttagsetter.h>
|
||||||
#include <gst/tag/tag.h>
|
#include <gst/tag/tag.h>
|
||||||
|
#include <gst/audio/audio.h>
|
||||||
#include "gstceltenc.h"
|
#include "gstceltenc.h"
|
||||||
|
|
||||||
GST_DEBUG_CATEGORY_STATIC (celtenc_debug);
|
GST_DEBUG_CATEGORY_STATIC (celtenc_debug);
|
||||||
|
@ -99,6 +100,8 @@ static void gst_celt_enc_set_property (GObject * object, guint prop_id,
|
||||||
static GstStateChangeReturn gst_celt_enc_change_state (GstElement * element,
|
static GstStateChangeReturn gst_celt_enc_change_state (GstElement * element,
|
||||||
GstStateChange transition);
|
GstStateChange transition);
|
||||||
|
|
||||||
|
static GstFlowReturn gst_celt_enc_encode (GstCeltEnc * enc, gboolean flush);
|
||||||
|
|
||||||
static void
|
static void
|
||||||
gst_celt_enc_setup_interfaces (GType celtenc_type)
|
gst_celt_enc_setup_interfaces (GType celtenc_type)
|
||||||
{
|
{
|
||||||
|
@ -676,7 +679,7 @@ gst_celt_enc_sinkevent (GstPad * pad, GstEvent * event)
|
||||||
|
|
||||||
switch (GST_EVENT_TYPE (event)) {
|
switch (GST_EVENT_TYPE (event)) {
|
||||||
case GST_EVENT_EOS:
|
case GST_EVENT_EOS:
|
||||||
enc->eos = TRUE;
|
gst_celt_enc_encode (enc, TRUE);
|
||||||
res = gst_pad_event_default (pad, event);
|
res = gst_pad_event_default (pad, event);
|
||||||
break;
|
break;
|
||||||
case GST_EVENT_TAG:
|
case GST_EVENT_TAG:
|
||||||
|
@ -701,6 +704,79 @@ gst_celt_enc_sinkevent (GstPad * pad, GstEvent * event)
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static GstFlowReturn
|
||||||
|
gst_celt_enc_encode (GstCeltEnc * enc, gboolean flush)
|
||||||
|
{
|
||||||
|
|
||||||
|
GstFlowReturn ret = GST_FLOW_OK;
|
||||||
|
gint frame_size = enc->frame_size;
|
||||||
|
gint bytes = frame_size * 2 * enc->channels;
|
||||||
|
gint bytes_per_packet =
|
||||||
|
(enc->bitrate * 1000 * enc->frame_size / enc->rate + 4) / 8;
|
||||||
|
|
||||||
|
if (flush && gst_adapter_available (enc->adapter) % bytes != 0) {
|
||||||
|
guint diff = gst_adapter_available (enc->adapter) % bytes;
|
||||||
|
GstBuffer *buf = gst_buffer_new_and_alloc (diff);
|
||||||
|
|
||||||
|
memset (GST_BUFFER_DATA (buf), 0, diff);
|
||||||
|
gst_adapter_push (enc->adapter, buf);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
while (gst_adapter_available (enc->adapter) >= bytes) {
|
||||||
|
gint16 *data;
|
||||||
|
gint outsize;
|
||||||
|
GstBuffer *outbuf;
|
||||||
|
|
||||||
|
ret = gst_pad_alloc_buffer_and_set_caps (enc->srcpad,
|
||||||
|
GST_BUFFER_OFFSET_NONE, bytes_per_packet, GST_PAD_CAPS (enc->srcpad),
|
||||||
|
&outbuf);
|
||||||
|
|
||||||
|
if (GST_FLOW_OK != ret)
|
||||||
|
goto done;
|
||||||
|
|
||||||
|
data = (gint16 *) gst_adapter_take (enc->adapter, bytes);
|
||||||
|
enc->samples_in += frame_size;
|
||||||
|
|
||||||
|
GST_DEBUG_OBJECT (enc, "encoding %d samples (%d bytes)", frame_size, bytes);
|
||||||
|
|
||||||
|
outsize =
|
||||||
|
celt_encode (enc->state, data, GST_BUFFER_DATA (outbuf),
|
||||||
|
bytes_per_packet);
|
||||||
|
|
||||||
|
g_free (data);
|
||||||
|
|
||||||
|
if (outsize < 0) {
|
||||||
|
GST_ERROR_OBJECT (enc, "Encoding failed: %d", outsize);
|
||||||
|
ret = GST_FLOW_ERROR;
|
||||||
|
goto done;
|
||||||
|
}
|
||||||
|
|
||||||
|
GST_BUFFER_TIMESTAMP (outbuf) = enc->start_ts +
|
||||||
|
gst_util_uint64_scale_int (enc->frameno_out * frame_size, GST_SECOND,
|
||||||
|
enc->rate);
|
||||||
|
GST_BUFFER_DURATION (outbuf) =
|
||||||
|
gst_util_uint64_scale_int (frame_size, GST_SECOND, enc->rate);
|
||||||
|
/* set gp time and granulepos; see gst-plugins-base/ext/ogg/README */
|
||||||
|
GST_BUFFER_OFFSET_END (outbuf) = enc->granulepos_offset +
|
||||||
|
((enc->frameno + 1) * frame_size);
|
||||||
|
GST_BUFFER_OFFSET (outbuf) =
|
||||||
|
gst_util_uint64_scale_int (GST_BUFFER_OFFSET_END (outbuf), GST_SECOND,
|
||||||
|
enc->rate);
|
||||||
|
|
||||||
|
enc->frameno++;
|
||||||
|
enc->frameno_out++;
|
||||||
|
|
||||||
|
ret = gst_celt_enc_push_buffer (enc, outbuf);
|
||||||
|
|
||||||
|
if ((GST_FLOW_OK != ret) && (GST_FLOW_NOT_LINKED != ret))
|
||||||
|
goto done;
|
||||||
|
}
|
||||||
|
|
||||||
|
done:
|
||||||
|
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
static GstFlowReturn
|
static GstFlowReturn
|
||||||
gst_celt_enc_chain (GstPad * pad, GstBuffer * buf)
|
gst_celt_enc_chain (GstPad * pad, GstBuffer * buf)
|
||||||
|
@ -763,68 +839,80 @@ gst_celt_enc_chain (GstPad * pad, GstBuffer * buf)
|
||||||
enc->header_sent = TRUE;
|
enc->header_sent = TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
{
|
GST_DEBUG_OBJECT (enc, "received buffer of %u bytes", GST_BUFFER_SIZE (buf));
|
||||||
gint frame_size = enc->frame_size;
|
|
||||||
gint bytes = frame_size * 2 * enc->channels;
|
|
||||||
gint bytes_per_packet =
|
|
||||||
(enc->bitrate * 1000 * enc->frame_size / enc->rate + 4) / 8;
|
|
||||||
|
|
||||||
GST_DEBUG_OBJECT (enc, "received buffer of %u bytes",
|
/* Save the timestamp of the first buffer. This will be later
|
||||||
GST_BUFFER_SIZE (buf));
|
* used as offset for all following buffers */
|
||||||
|
if (enc->start_ts == GST_CLOCK_TIME_NONE) {
|
||||||
|
if (GST_BUFFER_TIMESTAMP_IS_VALID (buf)) {
|
||||||
|
enc->start_ts = GST_BUFFER_TIMESTAMP (buf);
|
||||||
|
enc->granulepos_offset = gst_util_uint64_scale
|
||||||
|
(GST_BUFFER_TIMESTAMP (buf), enc->rate, GST_SECOND);
|
||||||
|
} else {
|
||||||
|
enc->start_ts = 0;
|
||||||
|
enc->granulepos_offset = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/* Check if we have a continous stream, if not drop some samples or the buffer or
|
||||||
|
* insert some silence samples */
|
||||||
|
if (enc->next_ts != GST_CLOCK_TIME_NONE &&
|
||||||
|
GST_BUFFER_TIMESTAMP (buf) < enc->next_ts) {
|
||||||
|
guint64 diff = enc->next_ts - GST_BUFFER_TIMESTAMP (buf);
|
||||||
|
guint64 diff_bytes;
|
||||||
|
|
||||||
|
GST_WARNING_OBJECT (enc, "Buffer is older than previous "
|
||||||
|
"timestamp + duration (%" GST_TIME_FORMAT "< %" GST_TIME_FORMAT
|
||||||
|
"), cannot handle. Clipping buffer.",
|
||||||
|
GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (buf)),
|
||||||
|
GST_TIME_ARGS (enc->next_ts));
|
||||||
|
|
||||||
|
diff_bytes = GST_CLOCK_TIME_TO_FRAMES (diff, enc->rate) * enc->channels * 2;
|
||||||
|
if (diff_bytes >= GST_BUFFER_SIZE (buf)) {
|
||||||
|
gst_buffer_unref (buf);
|
||||||
|
return GST_FLOW_OK;
|
||||||
|
}
|
||||||
|
buf = gst_buffer_make_metadata_writable (buf);
|
||||||
|
GST_BUFFER_DATA (buf) += diff_bytes;
|
||||||
|
GST_BUFFER_SIZE (buf) -= diff_bytes;
|
||||||
|
|
||||||
|
GST_BUFFER_TIMESTAMP (buf) += diff;
|
||||||
|
if (GST_BUFFER_DURATION_IS_VALID (buf))
|
||||||
|
GST_BUFFER_DURATION (buf) -= diff;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (enc->next_ts != GST_CLOCK_TIME_NONE
|
||||||
|
&& GST_BUFFER_TIMESTAMP_IS_VALID (buf)) {
|
||||||
|
guint64 max_diff =
|
||||||
|
gst_util_uint64_scale (enc->frame_size, GST_SECOND, enc->rate);
|
||||||
|
|
||||||
|
if (GST_BUFFER_TIMESTAMP (buf) != enc->next_ts &&
|
||||||
|
GST_BUFFER_TIMESTAMP (buf) - enc->next_ts > max_diff) {
|
||||||
|
GST_WARNING_OBJECT (enc,
|
||||||
|
"Discontinuity detected: %" G_GUINT64_FORMAT " > %" G_GUINT64_FORMAT,
|
||||||
|
GST_BUFFER_TIMESTAMP (buf) - enc->next_ts, max_diff);
|
||||||
|
|
||||||
|
gst_celt_enc_encode (enc, TRUE);
|
||||||
|
|
||||||
|
enc->frameno_out = 0;
|
||||||
|
enc->start_ts = GST_BUFFER_TIMESTAMP (buf);
|
||||||
|
enc->granulepos_offset = gst_util_uint64_scale
|
||||||
|
(GST_BUFFER_TIMESTAMP (buf), enc->rate, GST_SECOND);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (GST_BUFFER_TIMESTAMP_IS_VALID (buf)
|
||||||
|
&& GST_BUFFER_DURATION_IS_VALID (buf))
|
||||||
|
enc->next_ts = GST_BUFFER_TIMESTAMP (buf) + GST_BUFFER_DURATION (buf);
|
||||||
|
else
|
||||||
|
enc->next_ts = GST_CLOCK_TIME_NONE;
|
||||||
|
|
||||||
/* push buffer to adapter */
|
/* push buffer to adapter */
|
||||||
gst_adapter_push (enc->adapter, buf);
|
gst_adapter_push (enc->adapter, buf);
|
||||||
buf = NULL;
|
buf = NULL;
|
||||||
|
|
||||||
while (gst_adapter_available (enc->adapter) >= bytes) {
|
ret = gst_celt_enc_encode (enc, FALSE);
|
||||||
gint16 *data;
|
|
||||||
gint outsize;
|
|
||||||
GstBuffer *outbuf;
|
|
||||||
|
|
||||||
ret = gst_pad_alloc_buffer_and_set_caps (enc->srcpad,
|
|
||||||
GST_BUFFER_OFFSET_NONE, bytes_per_packet, GST_PAD_CAPS (enc->srcpad),
|
|
||||||
&outbuf);
|
|
||||||
|
|
||||||
if (GST_FLOW_OK != ret)
|
|
||||||
goto done;
|
|
||||||
|
|
||||||
data = (gint16 *) gst_adapter_take (enc->adapter, bytes);
|
|
||||||
enc->samples_in += frame_size;
|
|
||||||
|
|
||||||
GST_DEBUG_OBJECT (enc, "encoding %d samples (%d bytes)", frame_size,
|
|
||||||
bytes);
|
|
||||||
|
|
||||||
outsize =
|
|
||||||
celt_encode (enc->state, data, GST_BUFFER_DATA (outbuf),
|
|
||||||
bytes_per_packet);
|
|
||||||
|
|
||||||
g_free (data);
|
|
||||||
|
|
||||||
if (outsize < 0) {
|
|
||||||
GST_ERROR_OBJECT (enc, "Encoding failed: %d", outsize);
|
|
||||||
ret = GST_FLOW_ERROR;
|
|
||||||
goto done;
|
|
||||||
}
|
|
||||||
|
|
||||||
enc->frameno++;
|
|
||||||
|
|
||||||
GST_BUFFER_TIMESTAMP (outbuf) =
|
|
||||||
gst_util_uint64_scale_int (enc->frameno * frame_size, GST_SECOND,
|
|
||||||
enc->rate);
|
|
||||||
GST_BUFFER_DURATION (outbuf) =
|
|
||||||
gst_util_uint64_scale_int (frame_size, GST_SECOND, enc->rate);
|
|
||||||
/* set gp time and granulepos; see gst-plugins-base/ext/ogg/README */
|
|
||||||
GST_BUFFER_OFFSET_END (outbuf) = ((enc->frameno + 1) * frame_size);
|
|
||||||
GST_BUFFER_OFFSET (outbuf) =
|
|
||||||
gst_util_uint64_scale_int (GST_BUFFER_OFFSET_END (outbuf), GST_SECOND,
|
|
||||||
enc->rate);
|
|
||||||
|
|
||||||
ret = gst_celt_enc_push_buffer (enc, outbuf);
|
|
||||||
|
|
||||||
if ((GST_FLOW_OK != ret) && (GST_FLOW_NOT_LINKED != ret))
|
|
||||||
goto done;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
done:
|
done:
|
||||||
|
|
||||||
|
@ -900,6 +988,10 @@ gst_celt_enc_change_state (GstElement * element, GstStateChange transition)
|
||||||
case GST_STATE_CHANGE_READY_TO_PAUSED:
|
case GST_STATE_CHANGE_READY_TO_PAUSED:
|
||||||
enc->frameno = 0;
|
enc->frameno = 0;
|
||||||
enc->samples_in = 0;
|
enc->samples_in = 0;
|
||||||
|
enc->frameno_out = 0;
|
||||||
|
enc->start_ts = GST_CLOCK_TIME_NONE;
|
||||||
|
enc->next_ts = GST_CLOCK_TIME_NONE;
|
||||||
|
enc->granulepos_offset = 0;
|
||||||
break;
|
break;
|
||||||
case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
|
case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
|
||||||
/* fall through */
|
/* fall through */
|
||||||
|
|
|
@ -76,6 +76,11 @@ struct _GstCeltEnc {
|
||||||
GstTagList *tags;
|
GstTagList *tags;
|
||||||
|
|
||||||
guint64 frameno;
|
guint64 frameno;
|
||||||
|
guint64 frameno_out;
|
||||||
|
|
||||||
|
GstClockTime start_ts;
|
||||||
|
GstClockTime next_ts;
|
||||||
|
guint64 granulepos_offset;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct _GstCeltEncClass {
|
struct _GstCeltEncClass {
|
||||||
|
|
Loading…
Reference in a new issue