#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
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));
+ DEFAULT_PADDING,
+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS));
/**
* GstFlacEnc: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));
+ DEFAULT_SEEKPOINTS,
+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS));
gstelement_class->change_state = gst_flac_enc_change_state;
}
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;
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_new0 (FLAC__StreamMetadata *, 3);
+ 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);
+ 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[1] =
+ 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[1], flacenc->seekpoints, total_samples);
+ (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[1], samples, total_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[1] = NULL;
+ flacenc->meta[entries] = NULL;
} else {
entries++;
}
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;
&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;
projects / platform / upstream / gst-plugins-good.git / blobdiff