← Back to branch summary

~ubuntu-branches/ubuntu/raring/gst-plugins-good0.10/raring-proposed

« back to all changes in this revision

Viewing changes to ext/flac/gstflacenc.c

  • Committer: Package Import Robot
  • Author(s): Timo Aaltonen
  • Date: 2012-02-09 16:44:53 UTC
  • mfrom: (40.2.38 experimental)
  • Revision ID: package-import@ubuntu.com-20120209164453-6hjokwrvdn42zopb
Tags: 0.10.30.3-1ubuntu1
* Merge from Debian experimental, remaining changes:
  - 04_move_farsight_plugins_to_good.patch
    Import autoconvert, dtmf, liveadder, rptmux from -plugins-bad
  - 05_move_shm_to_good.patch
    Import shm from -plugins-bad.
  - 07_move-camerabin.patch
    Import camerabin, camerabin2, jpegformat and basecamerabinsrc
    from -plugins-bad.
  - control*:
    * Drop dependency from gstreamer0.10-plugins-good on
      gstreamer0.10-gconf. It pulls gconf and gtk3 onto the Kubuntu cd.
    * Use Breaks instead of Conflicts.
    * Add a 'Pre-Depends: ${misc:Pre-Depends}' to the plugin package,
      since we're shipping shared libraries in the package that Debian
      isn't.
* Update the patches by pulling new version of the code from
  -plugins-bad 0.10.22.3.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ext/flac/gstflacenc.c
883
883
    FLAC__uint64 absolute_byte_offset, void *client_data)
884
884
{
885
885
  GstFlacEnc *flacenc;
886
 
  GstEvent *event;
887
886
  GstPad *peerpad;
888
887
 
889
888
  flacenc = GST_FLAC_ENC (client_data);
891
890
  if (flacenc->stopped)
892
891
    return FLAC__STREAM_ENCODER_SEEK_STATUS_OK;
893
892
 
894
 
  event = gst_event_new_new_segment (TRUE, 1.0, GST_FORMAT_BYTES,
895
 
      absolute_byte_offset, GST_BUFFER_OFFSET_NONE, 0);
896
 
 
897
893
  if ((peerpad = gst_pad_get_peer (GST_AUDIO_ENCODER_SRC_PAD (flacenc)))) {
 
894
    GstEvent *event = gst_event_new_new_segment (TRUE, 1.0, GST_FORMAT_BYTES,
 
895
        absolute_byte_offset, GST_BUFFER_OFFSET_NONE, 0);
898
896
    gboolean ret = gst_pad_send_event (peerpad, event);
899
897
 
900
898
    gst_object_unref (peerpad);
1072
1070
      ret = gst_flac_enc_process_stream_headers (flacenc);
1073
1071
      flacenc->got_headers = TRUE;
1074
1072
    }
1075
 
  } else if (flacenc->got_headers && samples == 0) {
 
1073
  }
 
1074
 
 
1075
  if (flacenc->got_headers && samples == 0) {
1076
1076
    /* header fixup, push downstream directly */
1077
1077
    GST_DEBUG_OBJECT (flacenc, "Fixing up headers at pos=%" G_GUINT64_FORMAT
1078
1078
        ", size=%u", flacenc->offset, (guint) bytes);