mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-26 02:00:33 +00:00
Code Issues 1 Projects Releases Wiki Activity

ext/flac/gstflacenc.c: Set an estimate for the total number of samples that will be encoded if possible to help decod...

Browse source 
Original commit message from CVS:
* ext/flac/gstflacenc.c: (gst_flac_enc_query_peer_total_samples),
(gst_flac_enc_sink_setcaps), (gst_flac_enc_write_callback):
Set an estimate for the total number of samples that will be encoded
if possible to help decoders if the streaminfo can't be rewritten
later (like when muxing into Ogg containers).
Add a warning if we get header packets after data packets as those
will get lost when muxing into Ogg, i.e. rewriting the headers doesn't
work.
This commit is contained in:
Sebastian Dröge 2008-08-03 12:23:49 +00:00
parent e3e4257ac9
commit df707c6664
2 changed files with 54 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ChangeLog
View file

@ -1,3 +1,15 @@
2008-08-03 Sebastian Dröge <sebastian.droege@collabora.co.uk>
* ext/flac/gstflacenc.c: (gst_flac_enc_query_peer_total_samples),
(gst_flac_enc_sink_setcaps), (gst_flac_enc_write_callback):
Set an estimate for the total number of samples that will be encoded
if possible to help decoders if the streaminfo can't be rewritten
later (like when muxing into Ogg containers).
Add a warning if we get header packets after data packets as those
will get lost when muxing into Ogg, i.e. rewriting the headers doesn't
work.
2008-08-03 Sebastian Dröge <sebastian.droege@collabora.co.uk> 2008-08-03 Sebastian Dröge <sebastian.droege@collabora.co.uk>
* ext/flac/gstflacdec.c: (gst_flac_dec_metadata_callback), * ext/flac/gstflacdec.c: (gst_flac_dec_metadata_callback),

42
ext/flac/gstflacenc.c
View file

@ -554,11 +554,41 @@ gst_flac_enc_sink_getcaps (GstPad * pad)
return ret; return ret;
} }
static guint64
gst_flac_enc_query_peer_total_samples (GstFlacEnc * flacenc, GstPad * pad)
{
GstFormat fmt = GST_FORMAT_DEFAULT;
gint64 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;
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);
goto done;
}
GST_DEBUG_OBJECT (flacenc, "Upstream reported no total samples");
return GST_CLOCK_TIME_NONE;
done:
GST_DEBUG_OBJECT (flacenc,
"Upstream reported %" G_GUINT64_FORMAT " total samples", duration);
return duration;
}
static gboolean static gboolean
gst_flac_enc_sink_setcaps (GstPad * pad, GstCaps * caps) gst_flac_enc_sink_setcaps (GstPad * pad, GstCaps * caps)
{ {
GstFlacEnc *flacenc; GstFlacEnc *flacenc;
GstStructure *structure; GstStructure *structure;
guint64 total_samples = GST_CLOCK_TIME_NONE;
#ifdef LEGACY_FLAC #ifdef LEGACY_FLAC
FLAC__SeekableStreamEncoderState state; FLAC__SeekableStreamEncoderState state;
@ -603,6 +633,8 @@ gst_flac_enc_sink_setcaps (GstPad * pad, GstCaps * caps)
gst_caps_unref (caps); gst_caps_unref (caps);
total_samples = gst_flac_enc_query_peer_total_samples (flacenc, pad);
#ifdef LEGACY_FLAC #ifdef LEGACY_FLAC
FLAC__seekable_stream_encoder_set_bits_per_sample (flacenc->encoder, FLAC__seekable_stream_encoder_set_bits_per_sample (flacenc->encoder,
flacenc->depth); flacenc->depth);
@ -611,6 +643,10 @@ gst_flac_enc_sink_setcaps (GstPad * pad, GstCaps * caps)
FLAC__seekable_stream_encoder_set_channels (flacenc->encoder, FLAC__seekable_stream_encoder_set_channels (flacenc->encoder,
flacenc->channels); 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, FLAC__seekable_stream_encoder_set_write_callback (flacenc->encoder,
gst_flac_enc_write_callback); gst_flac_enc_write_callback);
FLAC__seekable_stream_encoder_set_seek_callback (flacenc->encoder, FLAC__seekable_stream_encoder_set_seek_callback (flacenc->encoder,
@ -623,6 +659,10 @@ gst_flac_enc_sink_setcaps (GstPad * pad, GstCaps * caps)
FLAC__stream_encoder_set_bits_per_sample (flacenc->encoder, flacenc->depth); 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_sample_rate (flacenc->encoder, flacenc->sample_rate);
FLAC__stream_encoder_set_channels (flacenc->encoder, flacenc->channels); 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 #endif
gst_flac_enc_set_metadata (flacenc); gst_flac_enc_set_metadata (flacenc);
@ -952,6 +992,8 @@ gst_flac_enc_write_callback (const FLAC__StreamEncoder * encoder,
gst_flac_enc_process_stream_headers (flacenc); gst_flac_enc_process_stream_headers (flacenc);
flacenc->got_headers = TRUE; flacenc->got_headers = TRUE;
} }
} else if (flacenc->got_headers && samples == 0) {
GST_WARNING_OBJECT (flacenc, "Got header packet after data packets");
} }
GST_LOG ("Pushing buffer: ts=%" GST_TIME_FORMAT ", samples=%u, size=%u, " GST_LOG ("Pushing buffer: ts=%" GST_TIME_FORMAT ", samples=%u, size=%u, "