PROP_EXHAUSTIVE_MODEL_SEARCH,
PROP_MIN_RESIDUAL_PARTITION_ORDER,
PROP_MAX_RESIDUAL_PARTITION_ORDER,
- PROP_RICE_PARAMETER_SEARCH_DIST
+ PROP_RICE_PARAMETER_SEARCH_DIST,
+ PROP_PADDING,
+ PROP_SEEKPOINTS
};
GST_DEBUG_CATEGORY_STATIC (flacenc_debug);
NULL, \
NULL \
}; \
+ static const GInterfaceInfo preset_info = { \
+ NULL, \
+ NULL, \
+ NULL \
+ }; \
g_type_add_interface_static (type, GST_TYPE_TAG_SETTER, \
&tag_setter_info); \
+ g_type_add_interface_static (type, GST_TYPE_PRESET, \
+ &preset_info); \
}G_STMT_END
GST_BOILERPLATE_FULL (GstFlacEnc, gst_flac_enc, GstElement, GST_TYPE_ELEMENT,
static GstStateChangeReturn gst_flac_enc_change_state (GstElement * element,
GstStateChange transition);
-#ifdef LEGACY_FLAC
-static FLAC__StreamEncoderWriteStatus
-gst_flac_enc_write_callback (const FLAC__SeekableStreamEncoder * encoder,
- const FLAC__byte buffer[], unsigned bytes,
- unsigned samples, unsigned current_frame, void *client_data);
-static FLAC__SeekableStreamEncoderSeekStatus
-gst_flac_enc_seek_callback (const FLAC__SeekableStreamEncoder * encoder,
- FLAC__uint64 absolute_byte_offset, void *client_data);
-static FLAC__SeekableStreamEncoderTellStatus
-gst_flac_enc_tell_callback (const FLAC__SeekableStreamEncoder * encoder,
- FLAC__uint64 * absolute_byte_offset, void *client_data);
-#else
static FLAC__StreamEncoderWriteStatus
gst_flac_enc_write_callback (const FLAC__StreamEncoder * encoder,
const FLAC__byte buffer[], size_t bytes,
static FLAC__StreamEncoderTellStatus
gst_flac_enc_tell_callback (const FLAC__StreamEncoder * encoder,
FLAC__uint64 * absolute_byte_offset, void *client_data);
-#endif
typedef struct
{
};
#define DEFAULT_QUALITY 5
+#define DEFAULT_PADDING 0
+#define DEFAULT_SEEKPOINTS 0
#define GST_TYPE_FLAC_ENC_QUALITY (gst_flac_enc_quality_get_type ())
-GType
+static GType
gst_flac_enc_quality_get_type (void)
{
static GType qtype = 0;
"Quality",
"Speed versus compression tradeoff",
GST_TYPE_FLAC_ENC_QUALITY, DEFAULT_QUALITY,
- G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (G_OBJECT_CLASS (klass),
- PROP_STREAMABLE_SUBSET, g_param_spec_boolean ("streamable_subset",
+ PROP_STREAMABLE_SUBSET, g_param_spec_boolean ("streamable-subset",
"Streamable subset",
"true to limit encoder to generating a Subset stream, else false",
- TRUE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+ TRUE,
+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_MID_SIDE_STEREO,
- g_param_spec_boolean ("mid_side_stereo", "Do mid side stereo",
+ g_param_spec_boolean ("mid-side-stereo", "Do mid side stereo",
"Do mid side stereo (only for stereo input)",
flacenc_params[DEFAULT_QUALITY].mid_side,
- G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (G_OBJECT_CLASS (klass),
- PROP_LOOSE_MID_SIDE_STEREO, g_param_spec_boolean ("loose_mid_side_stereo",
+ PROP_LOOSE_MID_SIDE_STEREO, g_param_spec_boolean ("loose-mid-side-stereo",
"Loose mid side stereo", "Loose mid side stereo",
flacenc_params[DEFAULT_QUALITY].loose_mid_side,
- G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_BLOCKSIZE,
g_param_spec_uint ("blocksize", "Blocksize", "Blocksize in samples",
FLAC__MIN_BLOCK_SIZE, FLAC__MAX_BLOCK_SIZE,
flacenc_params[DEFAULT_QUALITY].blocksize,
- G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_MAX_LPC_ORDER,
- g_param_spec_uint ("max_lpc_order", "Max LPC order",
+ g_param_spec_uint ("max-lpc-order", "Max LPC order",
"Max LPC order; 0 => use only fixed predictors", 0,
FLAC__MAX_LPC_ORDER, flacenc_params[DEFAULT_QUALITY].max_lpc_order,
- G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (G_OBJECT_CLASS (klass),
- PROP_QLP_COEFF_PRECISION, g_param_spec_uint ("qlp_coeff_precision",
+ PROP_QLP_COEFF_PRECISION, g_param_spec_uint ("qlp-coeff-precision",
"QLP coefficients precision",
"Precision in bits of quantized linear-predictor coefficients; 0 = automatic",
0, 32, flacenc_params[DEFAULT_QUALITY].qlp_coeff_precision,
- G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (G_OBJECT_CLASS (klass),
- PROP_QLP_COEFF_PREC_SEARCH, g_param_spec_boolean ("qlp_coeff_prec_search",
+ PROP_QLP_COEFF_PREC_SEARCH, g_param_spec_boolean ("qlp-coeff-prec-search",
"Do QLP coefficients precision search",
"false = use qlp_coeff_precision, "
"true = search around qlp_coeff_precision, take best",
flacenc_params[DEFAULT_QUALITY].qlp_coeff_prec_search,
- G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_ESCAPE_CODING,
- g_param_spec_boolean ("escape_coding", "Do Escape coding",
+ g_param_spec_boolean ("escape-coding", "Do Escape coding",
"search for escape codes in the entropy coding stage "
"for slightly better compression",
flacenc_params[DEFAULT_QUALITY].escape_coding,
- G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (G_OBJECT_CLASS (klass),
PROP_EXHAUSTIVE_MODEL_SEARCH,
- g_param_spec_boolean ("exhaustive_model_search",
+ g_param_spec_boolean ("exhaustive-model-search",
"Do exhaustive model search",
"do exhaustive search of LP coefficient quantization (expensive!)",
flacenc_params[DEFAULT_QUALITY].exhaustive_model_search,
- G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (G_OBJECT_CLASS (klass),
PROP_MIN_RESIDUAL_PARTITION_ORDER,
- g_param_spec_uint ("min_residual_partition_order",
+ g_param_spec_uint ("min-residual-partition-order",
"Min residual partition order",
"Min residual partition order (above 4 doesn't usually help much)", 0,
16, flacenc_params[DEFAULT_QUALITY].min_residual_partition_order,
- G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (G_OBJECT_CLASS (klass),
PROP_MAX_RESIDUAL_PARTITION_ORDER,
- g_param_spec_uint ("max_residual_partition_order",
+ g_param_spec_uint ("max-residual-partition-order",
"Max residual partition order",
"Max residual partition order (above 4 doesn't usually help much)", 0,
16, flacenc_params[DEFAULT_QUALITY].max_residual_partition_order,
- G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (G_OBJECT_CLASS (klass),
PROP_RICE_PARAMETER_SEARCH_DIST,
- g_param_spec_uint ("rice_parameter_search_dist",
+ g_param_spec_uint ("rice-parameter-search-dist",
"rice_parameter_search_dist",
"0 = try only calc'd parameter k; else try all [k-dist..k+dist] "
"parameters, use best", 0, FLAC__MAX_RICE_PARTITION_ORDER,
flacenc_params[DEFAULT_QUALITY].rice_parameter_search_dist,
- G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS));
+
+ /**
+ * GstFlacEnc:padding
+ *
+ * Write a PADDING block with this length in bytes
+ *
+ * Since: 0.10.16
+ **/
+ g_object_class_install_property (G_OBJECT_CLASS (klass),
+ PROP_PADDING,
+ g_param_spec_uint ("padding",
+ "Padding",
+ "Write a PADDING block with this length in bytes", 0, G_MAXUINT,
+ DEFAULT_PADDING,
+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS));
+
+ /**
+ * GstFlacEnc:seekpoints
+ *
+ * Write a SEEKTABLE block with a specific number of seekpoints
+ * or with a specific interval spacing.
+ *
+ * Since: 0.10.18
+ **/
+ g_object_class_install_property (G_OBJECT_CLASS (klass),
+ PROP_SEEKPOINTS,
+ g_param_spec_int ("seekpoints",
+ "Seekpoints",
+ "Add SEEKTABLE metadata (if > 0, number of entries, if < 0, interval in sec)",
+ -G_MAXINT, G_MAXINT,
+ DEFAULT_SEEKPOINTS,
+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS));
gstelement_class->change_state = gst_flac_enc_change_state;
}
gst_pad_use_fixed_caps (flacenc->srcpad);
gst_element_add_pad (GST_ELEMENT (flacenc), flacenc->srcpad);
-#ifdef LEGACY_FLAC
- flacenc->encoder = FLAC__seekable_stream_encoder_new ();
-#else
flacenc->encoder = FLAC__stream_encoder_new ();
-#endif
flacenc->offset = 0;
flacenc->samples_written = 0;
GstFlacEnc *flacenc = GST_FLAC_ENC (object);
gst_tag_list_free (flacenc->tags);
-#ifdef LEGACY_FLAC
- FLAC__seekable_stream_encoder_delete (flacenc->encoder);
-#else
FLAC__stream_encoder_delete (flacenc->encoder);
-#endif
G_OBJECT_CLASS (parent_class)->finalize (object);
}
GList *it;
GstFlacEnc *flacenc = GST_FLAC_ENC (user_data);
+ /* IMAGE and PREVIEW_IMAGE tags are already written
+ * differently, no need to store them inside the
+ * vorbiscomments too */
+ if (strcmp (tag, GST_TAG_IMAGE) == 0
+ || strcmp (tag, GST_TAG_PREVIEW_IMAGE) == 0)
+ return;
+
comments = gst_tag_to_vorbis_comments (list, tag);
for (it = comments; it != NULL; it = it->next) {
FLAC__StreamMetadata_VorbisComment_Entry commment_entry;
}
static void
-gst_flac_enc_set_metadata (GstFlacEnc * flacenc)
+gst_flac_enc_set_metadata (GstFlacEnc * flacenc, guint64 total_samples)
{
const GstTagList *user_tags;
GstTagList *copy;
+ gint entries = 1;
+ gint n_images, n_preview_images;
g_return_if_fail (flacenc != NULL);
user_tags = gst_tag_setter_get_tag_list (GST_TAG_SETTER (flacenc));
}
copy = gst_tag_list_merge (user_tags, flacenc->tags,
gst_tag_setter_get_tag_merge_mode (GST_TAG_SETTER (flacenc)));
- flacenc->meta = g_malloc (sizeof (FLAC__StreamMetadata **));
+ n_images = gst_tag_list_get_tag_size (copy, GST_TAG_IMAGE);
+ n_preview_images = gst_tag_list_get_tag_size (copy, GST_TAG_PREVIEW_IMAGE);
+
+ flacenc->meta =
+ g_new0 (FLAC__StreamMetadata *, 3 + n_images + n_preview_images);
flacenc->meta[0] =
FLAC__metadata_object_new (FLAC__METADATA_TYPE_VORBIS_COMMENT);
gst_tag_list_foreach (copy, add_one_tag, flacenc);
-#ifdef LEGACY_FLAC
- if (FLAC__seekable_stream_encoder_set_metadata (flacenc->encoder,
- flacenc->meta, 1) != true)
-#else
+ if (n_images + n_preview_images > 0) {
+ GstBuffer *buffer;
+ GstCaps *caps;
+ GstStructure *structure;
+ GstTagImageType image_type = GST_TAG_IMAGE_TYPE_NONE;
+ gint i;
+
+ for (i = 0; i < n_images + n_preview_images; i++) {
+ if (i < n_images) {
+ if (!gst_tag_list_get_buffer_index (copy, GST_TAG_IMAGE, i, &buffer))
+ continue;
+ } else {
+ if (!gst_tag_list_get_buffer_index (copy, GST_TAG_PREVIEW_IMAGE,
+ i - n_images, &buffer))
+ continue;
+ }
+
+ flacenc->meta[entries] =
+ FLAC__metadata_object_new (FLAC__METADATA_TYPE_PICTURE);
+
+ caps = gst_buffer_get_caps (buffer);
+ structure = gst_caps_get_structure (caps, 0);
+
+ gst_structure_get (structure, "image-type", GST_TYPE_TAG_IMAGE_TYPE,
+ &image_type, NULL);
+ /* Convert to ID3v2 APIC image type */
+ if (image_type == GST_TAG_IMAGE_TYPE_NONE)
+ image_type = (i < n_images) ? 0x00 : 0x01;
+ else
+ image_type = image_type + 2;
+
+ FLAC__metadata_object_picture_set_data (flacenc->meta[entries],
+ GST_BUFFER_DATA (buffer), GST_BUFFER_SIZE (buffer), TRUE);
+ /* FIXME: There's no way to set the picture type in libFLAC */
+ flacenc->meta[entries]->data.picture.type = image_type;
+ FLAC__metadata_object_picture_set_mime_type (flacenc->meta[entries],
+ (char *) gst_structure_get_name (structure), TRUE);
+
+ gst_caps_unref (caps);
+ gst_buffer_unref (buffer);
+ entries++;
+ }
+ }
+
+ if (flacenc->seekpoints && total_samples != GST_CLOCK_TIME_NONE) {
+ gboolean res;
+ guint samples;
+
+ flacenc->meta[entries] =
+ FLAC__metadata_object_new (FLAC__METADATA_TYPE_SEEKTABLE);
+ if (flacenc->seekpoints > 0) {
+ res =
+ FLAC__metadata_object_seektable_template_append_spaced_points
+ (flacenc->meta[entries], flacenc->seekpoints, total_samples);
+ } else {
+ samples = -flacenc->seekpoints * flacenc->sample_rate;
+ res =
+ FLAC__metadata_object_seektable_template_append_spaced_points_by_samples
+ (flacenc->meta[entries], samples, total_samples);
+ }
+ if (!res) {
+ GST_DEBUG_OBJECT (flacenc, "adding seekpoint template %d failed",
+ flacenc->seekpoints);
+ FLAC__metadata_object_delete (flacenc->meta[1]);
+ flacenc->meta[entries] = NULL;
+ } else {
+ entries++;
+ }
+ } else if (flacenc->seekpoints && total_samples == GST_CLOCK_TIME_NONE) {
+ GST_WARNING_OBJECT (flacenc, "total time unknown; can not add seekpoints");
+ }
+
+ if (flacenc->padding > 0) {
+ flacenc->meta[entries] =
+ FLAC__metadata_object_new (FLAC__METADATA_TYPE_PADDING);
+ flacenc->meta[entries]->length = flacenc->padding;
+ entries++;
+ }
+
if (FLAC__stream_encoder_set_metadata (flacenc->encoder,
- flacenc->meta, 1) != true)
-#endif
+ flacenc->meta, entries) != true)
g_warning ("Dude, i'm already initialized!");
+
gst_tag_list_free (copy);
}
GstFormat fmt = GST_FORMAT_DEFAULT;
gint64 duration;
+ GST_DEBUG_OBJECT (flacenc, "querying peer for DEFAULT format duration");
if (gst_pad_query_peer_duration (pad, &fmt, &duration)
&& fmt == GST_FORMAT_DEFAULT && duration != GST_CLOCK_TIME_NONE)
goto done;
fmt = GST_FORMAT_TIME;
+ GST_DEBUG_OBJECT (flacenc, "querying peer for TIME format duration");
if (gst_pad_query_peer_duration (pad, &fmt, &duration) &&
fmt == GST_FORMAT_TIME && duration != GST_CLOCK_TIME_NONE) {
- duration = GST_FRAMES_TO_CLOCK_TIME (duration, flacenc->sample_rate);
+ GST_DEBUG_OBJECT (flacenc, "peer reported duration %" GST_TIME_FORMAT,
+ GST_TIME_ARGS (duration));
+ duration = GST_CLOCK_TIME_TO_FRAMES (duration, flacenc->sample_rate);
goto done;
}
GstFlacEnc *flacenc;
GstStructure *structure;
guint64 total_samples = GST_CLOCK_TIME_NONE;
-
-#ifdef LEGACY_FLAC
- FLAC__SeekableStreamEncoderState state;
-#else
FLAC__StreamEncoderInitStatus init_status;
-#endif
gint depth, chans, rate, width;
flacenc = GST_FLAC_ENC (gst_pad_get_parent (pad));
-#ifdef LEGACY_FLAC
- if (FLAC__seekable_stream_encoder_get_state (flacenc->encoder) !=
- FLAC__SEEKABLE_STREAM_ENCODER_UNINITIALIZED)
-#else
if (FLAC__stream_encoder_get_state (flacenc->encoder) !=
FLAC__STREAM_ENCODER_UNINITIALIZED)
-#endif
-
goto encoder_already_initialized;
structure = gst_caps_get_structure (caps, 0);
total_samples = gst_flac_enc_query_peer_total_samples (flacenc, pad);
-#ifdef LEGACY_FLAC
- FLAC__seekable_stream_encoder_set_bits_per_sample (flacenc->encoder,
- flacenc->depth);
- FLAC__seekable_stream_encoder_set_sample_rate (flacenc->encoder,
- flacenc->sample_rate);
- FLAC__seekable_stream_encoder_set_channels (flacenc->encoder,
- flacenc->channels);
-
- if (total_samples != GST_CLOCK_TIME_NONE)
- FLAC__seekable_stream_encoder_set_total_samples_estimate (flacenc->encoder,
- total_samples);
-
- FLAC__seekable_stream_encoder_set_write_callback (flacenc->encoder,
- gst_flac_enc_write_callback);
- FLAC__seekable_stream_encoder_set_seek_callback (flacenc->encoder,
- gst_flac_enc_seek_callback);
- FLAC__seekable_stream_encoder_set_tell_callback (flacenc->encoder,
- gst_flac_enc_tell_callback);
-
- FLAC__seekable_stream_encoder_set_client_data (flacenc->encoder, flacenc);
-#else
FLAC__stream_encoder_set_bits_per_sample (flacenc->encoder, flacenc->depth);
FLAC__stream_encoder_set_sample_rate (flacenc->encoder, flacenc->sample_rate);
FLAC__stream_encoder_set_channels (flacenc->encoder, flacenc->channels);
if (total_samples != GST_CLOCK_TIME_NONE)
FLAC__stream_encoder_set_total_samples_estimate (flacenc->encoder,
- total_samples);
-#endif
+ MIN (total_samples, G_GUINT64_CONSTANT (0x0FFFFFFFFF)));
- gst_flac_enc_set_metadata (flacenc);
+ gst_flac_enc_set_metadata (flacenc, total_samples);
-#ifdef LEGACY_FLAC
- state = FLAC__seekable_stream_encoder_init (flacenc->encoder);
- if (state != FLAC__STREAM_ENCODER_OK)
- goto failed_to_initialize;
-#else
init_status = FLAC__stream_encoder_init_stream (flacenc->encoder,
gst_flac_enc_write_callback, gst_flac_enc_seek_callback,
gst_flac_enc_tell_callback, NULL, flacenc);
if (init_status != FLAC__STREAM_ENCODER_INIT_STATUS_OK)
goto failed_to_initialize;
-#endif
gst_object_unref (flacenc);
{
flacenc->quality = quality;
-#ifdef LEGACY_FLAC
-#define DO_UPDATE(name, val, str) \
- G_STMT_START { \
- if (FLAC__seekable_stream_encoder_get_##name (flacenc->encoder) != \
- flacenc_params[quality].val) { \
- FLAC__seekable_stream_encoder_set_##name (flacenc->encoder, \
- flacenc_params[quality].val); \
- g_object_notify (G_OBJECT (flacenc), str); \
- } \
- } G_STMT_END
-
-#else
#define DO_UPDATE(name, val, str) \
G_STMT_START { \
if (FLAC__stream_encoder_get_##name (flacenc->encoder) != \
} \
} G_STMT_END
-#endif
-
g_object_freeze_notify (G_OBJECT (flacenc));
if (flacenc->channels == 2 || flacenc->channels == 0) {
return TRUE;
}
-#ifdef LEGACY_FLAC
-static FLAC__SeekableStreamEncoderSeekStatus
-gst_flac_enc_seek_callback (const FLAC__SeekableStreamEncoder * encoder,
- FLAC__uint64 absolute_byte_offset, void *client_data)
-#else
static FLAC__StreamEncoderSeekStatus
gst_flac_enc_seek_callback (const FLAC__StreamEncoder * encoder,
FLAC__uint64 absolute_byte_offset, void *client_data)
-#endif
{
GstFlacEnc *flacenc;
GstEvent *event;
flacenc = GST_FLAC_ENC (client_data);
if (flacenc->stopped)
-#ifdef LEGACY_FLAC
- return FLAC__SEEKABLE_STREAM_ENCODER_SEEK_STATUS_OK;
-#else
return FLAC__STREAM_ENCODER_SEEK_STATUS_OK;
-#endif
+
event = gst_event_new_new_segment (TRUE, 1.0, GST_FORMAT_BYTES,
absolute_byte_offset, GST_BUFFER_OFFSET_NONE, 0);
gst_object_unref (peerpad);
if (ret) {
- GST_DEBUG ("Seek to %" G_GUINT64_FORMAT " %s", absolute_byte_offset,
- "succeeded");
+ GST_DEBUG ("Seek to %" G_GUINT64_FORMAT " %s",
+ (guint64) absolute_byte_offset, "succeeded");
} else {
- GST_DEBUG ("Seek to %" G_GUINT64_FORMAT " %s", absolute_byte_offset,
- "failed");
-#ifdef LEGACY_FLAC
- return FLAC__SEEKABLE_STREAM_ENCODER_SEEK_STATUS_ERROR;
-#else
+ GST_DEBUG ("Seek to %" G_GUINT64_FORMAT " %s",
+ (guint64) absolute_byte_offset, "failed");
return FLAC__STREAM_ENCODER_SEEK_STATUS_UNSUPPORTED;
-#endif
-
}
} else {
GST_DEBUG ("Seek to %" G_GUINT64_FORMAT " failed (no peer pad)",
- absolute_byte_offset);
+ (guint64) absolute_byte_offset);
}
flacenc->offset = absolute_byte_offset;
-#ifdef LEGACY_FLAC
- return FLAC__SEEKABLE_STREAM_ENCODER_SEEK_STATUS_OK;
-#else
return FLAC__STREAM_ENCODER_SEEK_STATUS_OK;
-#endif
}
static void
buf = GST_BUFFER (l->data);
gst_buffer_set_caps (buf, caps);
- GST_LOG ("Pushing header buffer, size %u bytes", GST_BUFFER_SIZE (buf));
+ GST_LOG_OBJECT (enc, "Pushing header buffer, size %u bytes",
+ GST_BUFFER_SIZE (buf));
+ GST_MEMDUMP_OBJECT (enc, "header buffer", GST_BUFFER_DATA (buf),
+ GST_BUFFER_SIZE (buf));
(void) gst_pad_push (enc->srcpad, buf);
l->data = NULL;
}
gst_caps_unref (caps);
}
-#ifdef LEGACY_FLAC
-static FLAC__StreamEncoderWriteStatus
-gst_flac_enc_write_callback (const FLAC__SeekableStreamEncoder * encoder,
- const FLAC__byte buffer[], unsigned bytes,
- unsigned samples, unsigned current_frame, void *client_data)
-#else
static FLAC__StreamEncoderWriteStatus
gst_flac_enc_write_callback (const FLAC__StreamEncoder * encoder,
const FLAC__byte buffer[], size_t bytes,
unsigned samples, unsigned current_frame, void *client_data)
-#endif
{
GstFlowReturn ret = GST_FLOW_OK;
GstFlacEnc *flacenc;
flacenc->got_headers = TRUE;
}
} else if (flacenc->got_headers && samples == 0) {
- GST_WARNING_OBJECT (flacenc, "Got header packet after data packets");
+ GST_DEBUG_OBJECT (flacenc, "Fixing up headers at pos=%" G_GUINT64_FORMAT
+ ", size=%u", flacenc->offset, (guint) bytes);
+ GST_MEMDUMP_OBJECT (flacenc, "Presumed header fragment",
+ GST_BUFFER_DATA (outbuf), GST_BUFFER_SIZE (outbuf));
+ } else {
+ GST_LOG ("Pushing buffer: ts=%" GST_TIME_FORMAT ", samples=%u, size=%u, "
+ "pos=%" G_GUINT64_FORMAT, GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (outbuf)),
+ samples, (guint) bytes, flacenc->offset);
}
- GST_LOG ("Pushing buffer: ts=%" GST_TIME_FORMAT ", samples=%u, size=%u, "
- "pos=%" G_GUINT64_FORMAT, GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (outbuf)),
- samples, (guint) bytes, flacenc->offset);
-
gst_buffer_set_caps (outbuf, GST_PAD_CAPS (flacenc->srcpad));
ret = gst_pad_push (flacenc->srcpad, outbuf);
flacenc->offset += bytes;
flacenc->samples_written += samples;
- if (GST_FLOW_IS_FATAL (ret) || ret == GST_FLOW_NOT_LINKED)
+ if (ret != GST_FLOW_OK)
return FLAC__STREAM_ENCODER_WRITE_STATUS_FATAL_ERROR;
return FLAC__STREAM_ENCODER_WRITE_STATUS_OK;
}
-#ifdef LEGACY_FLAC
-static FLAC__SeekableStreamEncoderTellStatus
-gst_flac_enc_tell_callback (const FLAC__SeekableStreamEncoder * encoder,
- FLAC__uint64 * absolute_byte_offset, void *client_data)
-#else
static FLAC__StreamEncoderTellStatus
gst_flac_enc_tell_callback (const FLAC__StreamEncoder * encoder,
FLAC__uint64 * absolute_byte_offset, void *client_data)
-#endif
{
GstFlacEnc *flacenc = GST_FLAC_ENC (client_data);
*absolute_byte_offset = flacenc->offset;
-#ifdef LEGACY_FLAC
- return FLAC__SEEKABLE_STREAM_ENCODER_TELL_STATUS_OK;
-#else
return FLAC__STREAM_ENCODER_TELL_STATUS_OK;
-#endif
}
static gboolean
&stream_time);
} else {
start = -1;
+ stream_time = -1;
}
- if (start != 0) {
+
+ if (start > 0) {
if (flacenc->offset > 0)
GST_DEBUG ("Not handling mid-stream newsegment event");
else
ret = gst_pad_push_event (flacenc->srcpad, e);
}
- if (stream_time != 0) {
+
+ if (stream_time > 0) {
GST_DEBUG ("Not handling non-zero stream time");
}
+
gst_event_unref (event);
/* don't push it downstream, we'll generate our own via seek to 0 */
break;
}
case GST_EVENT_EOS:
-#ifdef LEGACY_FLAC
- FLAC__seekable_stream_encoder_finish (flacenc->encoder);
-#else
FLAC__stream_encoder_finish (flacenc->encoder);
-#endif
ret = gst_pad_event_default (pad, event);
break;
case GST_EVENT_TAG:
if (flacenc->tags) {
gst_event_parse_tag (event, &taglist);
- gst_tag_list_insert (flacenc->tags, taglist, GST_TAG_MERGE_REPLACE);
+ gst_tag_list_insert (flacenc->tags, taglist,
+ gst_tag_setter_get_tag_merge_mode (GST_TAG_SETTER (flacenc)));
} else {
g_assert_not_reached ();
}
gst_buffer_unref (buffer);
-#ifdef LEGACY_FLAC
- res = FLAC__seekable_stream_encoder_process_interleaved (flacenc->encoder,
- (const FLAC__int32 *) data, samples / flacenc->channels);
-#else
res = FLAC__stream_encoder_process_interleaved (flacenc->encoder,
(const FLAC__int32 *) data, samples / flacenc->channels);
-#endif
g_free (data);
gst_flac_enc_update_quality (this, g_value_get_enum (value));
break;
case PROP_STREAMABLE_SUBSET:
-#ifdef LEGACY_FLAC
- FLAC__seekable_stream_encoder_set_streamable_subset (this->encoder,
- g_value_get_boolean (value));
-#else
FLAC__stream_encoder_set_streamable_subset (this->encoder,
g_value_get_boolean (value));
-#endif
break;
case PROP_MID_SIDE_STEREO:
-#ifdef LEGACY_FLAC
- FLAC__seekable_stream_encoder_set_do_mid_side_stereo (this->encoder,
- g_value_get_boolean (value));
-#else
FLAC__stream_encoder_set_do_mid_side_stereo (this->encoder,
g_value_get_boolean (value));
-#endif
break;
case PROP_LOOSE_MID_SIDE_STEREO:
-#ifdef LEGACY_FLAC
- FLAC__seekable_stream_encoder_set_loose_mid_side_stereo (this->encoder,
- g_value_get_boolean (value));
-#else
FLAC__stream_encoder_set_loose_mid_side_stereo (this->encoder,
g_value_get_boolean (value));
-#endif
break;
case PROP_BLOCKSIZE:
-#ifdef LEGACY_FLAC
- FLAC__seekable_stream_encoder_set_blocksize (this->encoder,
- g_value_get_uint (value));
-#else
FLAC__stream_encoder_set_blocksize (this->encoder,
g_value_get_uint (value));
-#endif
break;
case PROP_MAX_LPC_ORDER:
-#ifdef LEGACY_FLAC
- FLAC__seekable_stream_encoder_set_max_lpc_order (this->encoder,
- g_value_get_uint (value));
-#else
FLAC__stream_encoder_set_max_lpc_order (this->encoder,
g_value_get_uint (value));
-#endif
break;
case PROP_QLP_COEFF_PRECISION:
-#ifdef LEGACY_FLAC
- FLAC__seekable_stream_encoder_set_qlp_coeff_precision (this->encoder,
- g_value_get_uint (value));
-#else
FLAC__stream_encoder_set_qlp_coeff_precision (this->encoder,
g_value_get_uint (value));
-#endif
break;
case PROP_QLP_COEFF_PREC_SEARCH:
-#ifdef LEGACY_FLAC
- FLAC__seekable_stream_encoder_set_do_qlp_coeff_prec_search (this->encoder,
- g_value_get_boolean (value));
-#else
FLAC__stream_encoder_set_do_qlp_coeff_prec_search (this->encoder,
g_value_get_boolean (value));
-#endif
break;
case PROP_ESCAPE_CODING:
-#ifdef LEGACY_FLAC
- FLAC__seekable_stream_encoder_set_do_escape_coding (this->encoder,
- g_value_get_boolean (value));
-#else
FLAC__stream_encoder_set_do_escape_coding (this->encoder,
g_value_get_boolean (value));
-#endif
break;
case PROP_EXHAUSTIVE_MODEL_SEARCH:
-#ifdef LEGACY_FLAC
- FLAC__seekable_stream_encoder_set_do_exhaustive_model_search
- (this->encoder, g_value_get_boolean (value));
-#else
FLAC__stream_encoder_set_do_exhaustive_model_search (this->encoder,
g_value_get_boolean (value));
-#endif
break;
case PROP_MIN_RESIDUAL_PARTITION_ORDER:
-#ifdef LEGACY_FLAC
- FLAC__seekable_stream_encoder_set_min_residual_partition_order
- (this->encoder, g_value_get_uint (value));
-#else
FLAC__stream_encoder_set_min_residual_partition_order (this->encoder,
g_value_get_uint (value));
-#endif
break;
case PROP_MAX_RESIDUAL_PARTITION_ORDER:
-#ifdef LEGACY_FLAC
- FLAC__seekable_stream_encoder_set_max_residual_partition_order
- (this->encoder, g_value_get_uint (value));
-#else
FLAC__stream_encoder_set_max_residual_partition_order (this->encoder,
g_value_get_uint (value));
-#endif
break;
case PROP_RICE_PARAMETER_SEARCH_DIST:
-#ifdef LEGACY_FLAC
- FLAC__seekable_stream_encoder_set_rice_parameter_search_dist
- (this->encoder, g_value_get_uint (value));
-#else
FLAC__stream_encoder_set_rice_parameter_search_dist (this->encoder,
g_value_get_uint (value));
-#endif
+ break;
+ case PROP_PADDING:
+ this->padding = g_value_get_uint (value);
+ break;
+ case PROP_SEEKPOINTS:
+ this->seekpoints = g_value_get_int (value);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
g_value_set_enum (value, this->quality);
break;
case PROP_STREAMABLE_SUBSET:
-#ifdef LEGACY_FLAC
- g_value_set_boolean (value,
- FLAC__seekable_stream_encoder_get_streamable_subset (this->encoder));
-#else
g_value_set_boolean (value,
FLAC__stream_encoder_get_streamable_subset (this->encoder));
-#endif
break;
case PROP_MID_SIDE_STEREO:
-#ifdef LEGACY_FLAC
- g_value_set_boolean (value,
- FLAC__seekable_stream_encoder_get_do_mid_side_stereo (this->encoder));
-#else
g_value_set_boolean (value,
FLAC__stream_encoder_get_do_mid_side_stereo (this->encoder));
-#endif
break;
case PROP_LOOSE_MID_SIDE_STEREO:
-#ifdef LEGACY_FLAC
- g_value_set_boolean (value,
- FLAC__seekable_stream_encoder_get_loose_mid_side_stereo
- (this->encoder));
-#else
g_value_set_boolean (value,
FLAC__stream_encoder_get_loose_mid_side_stereo (this->encoder));
-#endif
break;
case PROP_BLOCKSIZE:
-#ifdef LEGACY_FLAC
- g_value_set_uint (value,
- FLAC__seekable_stream_encoder_get_blocksize (this->encoder));
-#else
g_value_set_uint (value,
FLAC__stream_encoder_get_blocksize (this->encoder));
-#endif
break;
case PROP_MAX_LPC_ORDER:
-#ifdef LEGACY_FLAC
- g_value_set_uint (value,
- FLAC__seekable_stream_encoder_get_max_lpc_order (this->encoder));
-#else
g_value_set_uint (value,
FLAC__stream_encoder_get_max_lpc_order (this->encoder));
-#endif
break;
case PROP_QLP_COEFF_PRECISION:
-#ifdef LEGACY_FLAC
- g_value_set_uint (value,
- FLAC__seekable_stream_encoder_get_qlp_coeff_precision
- (this->encoder));
-#else
g_value_set_uint (value,
FLAC__stream_encoder_get_qlp_coeff_precision (this->encoder));
-#endif
break;
case PROP_QLP_COEFF_PREC_SEARCH:
-#ifdef LEGACY_FLAC
- g_value_set_boolean (value,
- FLAC__seekable_stream_encoder_get_do_qlp_coeff_prec_search
- (this->encoder));
-#else
g_value_set_boolean (value,
FLAC__stream_encoder_get_do_qlp_coeff_prec_search (this->encoder));
-#endif
break;
case PROP_ESCAPE_CODING:
-#ifdef LEGACY_FLAC
- g_value_set_boolean (value,
- FLAC__seekable_stream_encoder_get_do_escape_coding (this->encoder));
-#else
g_value_set_boolean (value,
FLAC__stream_encoder_get_do_escape_coding (this->encoder));
-#endif
break;
case PROP_EXHAUSTIVE_MODEL_SEARCH:
-#ifdef LEGACY_FLAC
- g_value_set_boolean (value,
- FLAC__seekable_stream_encoder_get_do_exhaustive_model_search
- (this->encoder));
-#else
g_value_set_boolean (value,
FLAC__stream_encoder_get_do_exhaustive_model_search (this->encoder));
-#endif
break;
case PROP_MIN_RESIDUAL_PARTITION_ORDER:
-#ifdef LEGACY_FLAC
- g_value_set_uint (value,
- FLAC__seekable_stream_encoder_get_min_residual_partition_order
- (this->encoder));
-#else
g_value_set_uint (value,
FLAC__stream_encoder_get_min_residual_partition_order
(this->encoder));
-#endif
break;
case PROP_MAX_RESIDUAL_PARTITION_ORDER:
-#ifdef LEGACY_FLAC
- g_value_set_uint (value,
- FLAC__seekable_stream_encoder_get_max_residual_partition_order
- (this->encoder));
-#else
g_value_set_uint (value,
FLAC__stream_encoder_get_max_residual_partition_order
(this->encoder));
-#endif
break;
case PROP_RICE_PARAMETER_SEARCH_DIST:
-#ifdef LEGACY_FLAC
- g_value_set_uint (value,
- FLAC__seekable_stream_encoder_get_rice_parameter_search_dist
- (this->encoder));
-#else
g_value_set_uint (value,
FLAC__stream_encoder_get_rice_parameter_search_dist (this->encoder));
-#endif
+ break;
+ case PROP_PADDING:
+ g_value_set_uint (value, this->padding);
+ break;
+ case PROP_SEEKPOINTS:
+ g_value_set_int (value, this->seekpoints);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
break;
case GST_STATE_CHANGE_PAUSED_TO_READY:
-#ifdef LEGACY_FLAC
- if (FLAC__seekable_stream_encoder_get_state (flacenc->encoder) !=
- FLAC__STREAM_ENCODER_UNINITIALIZED) {
- flacenc->stopped = TRUE;
- FLAC__seekable_stream_encoder_finish (flacenc->encoder);
- }
-#else
if (FLAC__stream_encoder_get_state (flacenc->encoder) !=
FLAC__STREAM_ENCODER_UNINITIALIZED) {
flacenc->stopped = TRUE;
FLAC__stream_encoder_finish (flacenc->encoder);
}
-#endif
flacenc->offset = 0;
flacenc->samples_written = 0;
flacenc->channels = 0;
flacenc->sample_rate = 0;
if (flacenc->meta) {
FLAC__metadata_object_delete (flacenc->meta[0]);
+
+ if (flacenc->meta[1])
+ FLAC__metadata_object_delete (flacenc->meta[1]);
+
+ if (flacenc->meta[2])
+ FLAC__metadata_object_delete (flacenc->meta[2]);
+
g_free (flacenc->meta);
flacenc->meta = NULL;
}
projects / platform / upstream / gst-plugins-good.git / blobdiff