2004-03-27 22:45:41 +00:00
|
|
|
/* GStreamer
|
|
|
|
* Copyright (C) 2004 Martin Soto <martinsoto@users.sourceforge.net>
|
|
|
|
*
|
|
|
|
* This library is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU Library General Public
|
|
|
|
* License as published by the Free Software Foundation; either
|
|
|
|
* version 2 of the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This library is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
* Library General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU Library General Public
|
|
|
|
* License along with this library; if not, write to the
|
|
|
|
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
|
|
* Boston, MA 02111-1307, USA.
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
#ifndef __DVD_DEMUX_H__
|
|
|
|
#define __DVD_DEMUX_H__
|
|
|
|
|
|
|
|
|
|
|
|
#include <gst/gst.h>
|
|
|
|
#include "gstmpegdemux.h"
|
|
|
|
|
ext/mpeg2dec/gstmpeg2dec.c: Don't send things to NULL PAD_PEERs
Original commit message from CVS:
* ext/mpeg2dec/gstmpeg2dec.c:
Don't send things to NULL PAD_PEERs
* gst/deinterlace/gstdeinterlace.c: (gst_deinterlace_chain):
Copy-on-write the incoming buffer.
* gst/mpegstream/gstdvddemux.h:
* gst/mpegstream/gstmpegclock.h:
* gst/mpegstream/gstmpegdemux.c: (gst_mpeg_demux_parse_syshead),
(normal_seek), (gst_mpeg_demux_handle_src_event):
* gst/mpegstream/gstmpegdemux.h:
* gst/mpegstream/gstmpegpacketize.h:
* gst/mpegstream/gstmpegparse.c:
(gst_mpeg_parse_update_streaminfo), (gst_mpeg_parse_reset),
(gst_mpeg_parse_handle_discont), (gst_mpeg_parse_parse_packhead),
(gst_mpeg_parse_loop), (gst_mpeg_parse_get_rate),
(gst_mpeg_parse_convert_src), (gst_mpeg_parse_handle_src_query),
(gst_mpeg_parse_handle_src_event), (gst_mpeg_parse_change_state):
* gst/mpegstream/gstmpegparse.h:
* gst/mpegstream/gstrfc2250enc.h:
Various changes to the way time is computed that make seeking and
total time estimation much better here.
Use G_BEGIN/END_DECLS instead of __cplusplus
* gst/videocrop/gstvideocrop.c: (gst_video_crop_chain):
Use gst_buffer_stamp instead of only copying the TIMESTAMP
2005-02-01 16:40:10 +00:00
|
|
|
G_BEGIN_DECLS
|
2004-03-27 22:45:41 +00:00
|
|
|
|
|
|
|
#define GST_TYPE_DVD_DEMUX \
|
|
|
|
(gst_dvd_demux_get_type())
|
|
|
|
#define GST_DVD_DEMUX(obj) \
|
|
|
|
(G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_DVD_DEMUX,GstDVDDemux))
|
|
|
|
#define GST_DVD_DEMUX_CLASS(klass) \
|
|
|
|
(G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_DVD_DEMUX,GstDVDDemuxClass))
|
|
|
|
#define GST_IS_DVD_DEMUX(obj) \
|
|
|
|
(G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_DVD_DEMUX))
|
|
|
|
#define GST_IS_DVD_DEMUX_CLASS(obj) \
|
|
|
|
(G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_DVD_DEMUX))
|
|
|
|
|
|
|
|
|
|
|
|
/* Supported kinds of streams in addition to what mpegdemux already
|
|
|
|
does. */
|
|
|
|
enum {
|
|
|
|
GST_DVD_DEMUX_STREAM_SUBPICTURE = GST_MPEG_DEMUX_STREAM_LAST,
|
2004-05-21 22:39:29 +00:00
|
|
|
GST_DVD_DEMUX_STREAM_LAST
|
2004-03-27 22:45:41 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
/* Supported number of streams. */
|
|
|
|
#define GST_DVD_DEMUX_NUM_SUBPICTURE_STREAMS 32
|
2004-07-28 13:47:59 +00:00
|
|
|
#define GST_DVD_DEMUX_MAX_SUBPICTURE_DELAY 0
|
2004-03-27 22:45:41 +00:00
|
|
|
|
|
|
|
typedef struct _GstDVDLPCMStream GstDVDLPCMStream ;
|
|
|
|
typedef struct _GstDVDDemux GstDVDDemux;
|
|
|
|
typedef struct _GstDVDDemuxClass GstDVDDemuxClass;
|
|
|
|
|
|
|
|
|
|
|
|
/* Additional recognized audio types. */
|
|
|
|
enum {
|
|
|
|
GST_DVD_DEMUX_AUDIO_LPCM = GST_MPEG_DEMUX_AUDIO_LAST,
|
|
|
|
GST_DVD_DEMUX_AUDIO_AC3,
|
|
|
|
GST_DVD_DEMUX_AUDIO_DTS,
|
2004-05-21 22:39:29 +00:00
|
|
|
GST_DVD_DEMUX_AUDIO_LAST
|
2004-03-27 22:45:41 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/* The recognized subpicture types. */
|
|
|
|
enum {
|
|
|
|
GST_DVD_DEMUX_SUBP_UNKNOWN =
|
|
|
|
GST_MPEG_DEMUX_STREAM_TYPE (GST_DVD_DEMUX_STREAM_SUBPICTURE, 1),
|
|
|
|
GST_DVD_DEMUX_SUBP_DVD,
|
2004-05-21 22:39:29 +00:00
|
|
|
GST_DVD_DEMUX_SUBP_LAST
|
2004-03-27 22:45:41 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/* Extended structure to hold additional information for linear PCM
|
|
|
|
streams. */
|
|
|
|
struct _GstDVDLPCMStream {
|
|
|
|
GstMPEGStream parent;
|
configure.ac: Add dvdlpcmdec
Original commit message from CVS:
* configure.ac:
Add dvdlpcmdec
* ext/mpeg2dec/gstmpeg2dec.c: (gst_mpeg2dec_reset),
(free_all_buffers), (gst_mpeg2dec_alloc_buffer):
Don't push buffers if the src pad isn't negotiated yet.
* gst/audioconvert/gstaudioconvert.c:
(gst_audio_convert_buffer_to_default_format),
(gst_audio_convert_buffer_from_default_format):
Add support for 24-bit width.
* gst/dvdlpcmdec/.cvsignore:
* gst/dvdlpcmdec/Makefile.am:
* gst/dvdlpcmdec/gstdvdlpcmdec.c: (gst_dvdlpcmdec_get_type),
(gst_dvdlpcmdec_base_init), (gst_dvdlpcmdec_class_init),
(gst_dvdlpcm_reset), (gst_dvdlpcmdec_init), (gst_dvdlpcmdec_link),
(gst_dvdlpcmdec_chain), (gst_dvdlpcmdec_change_state),
(plugin_init):
* gst/dvdlpcmdec/gstdvdlpcmdec.h:
New decoder for rearranging DVD LPCM into our audio/x-raw-int
format. Needs support for the channels maps if someone can find
a DVD LPCM track with > 2 channels.
* gst/mpegstream/gstdvddemux.c: (gst_dvd_demux_handle_dvd_event),
(gst_dvd_demux_send_discont), (gst_dvd_demux_handle_discont),
(gst_dvd_demux_get_audio_stream), (gst_dvd_demux_process_private):
* gst/mpegstream/gstdvddemux.h:
* gst/mpegstream/gstmpegdemux.c: (gst_mpeg_demux_send_discont),
(gst_mpeg_demux_new_output_pad), (gst_mpeg_demux_init_stream),
(gst_mpeg_demux_send_subbuffer), (gst_mpeg_demux_handle_src_query):
* gst/mpegstream/gstmpegdemux.h:
* gst/mpegstream/gstmpegparse.c: (gst_mpeg_parse_reset),
(gst_mpeg_parse_parse_packhead), (gst_mpeg_parse_loop),
(gst_mpeg_parse_get_rate), (gst_mpeg_parse_convert_src),
(gst_mpeg_parse_handle_src_query),
(gst_mpeg_parse_handle_src_event):
Use audio/x-dvd-lpcm for LPCM output.
Add DTS output.
2005-02-08 11:08:15 +00:00
|
|
|
guint32 sample_info; /* The type of linear PCM samples
|
2004-03-27 22:45:41 +00:00
|
|
|
associated to this stream. The
|
|
|
|
values are bit fields with the same
|
|
|
|
format of the sample_info field in
|
|
|
|
the linear PCM header. */
|
configure.ac: Add dvdlpcmdec
Original commit message from CVS:
* configure.ac:
Add dvdlpcmdec
* ext/mpeg2dec/gstmpeg2dec.c: (gst_mpeg2dec_reset),
(free_all_buffers), (gst_mpeg2dec_alloc_buffer):
Don't push buffers if the src pad isn't negotiated yet.
* gst/audioconvert/gstaudioconvert.c:
(gst_audio_convert_buffer_to_default_format),
(gst_audio_convert_buffer_from_default_format):
Add support for 24-bit width.
* gst/dvdlpcmdec/.cvsignore:
* gst/dvdlpcmdec/Makefile.am:
* gst/dvdlpcmdec/gstdvdlpcmdec.c: (gst_dvdlpcmdec_get_type),
(gst_dvdlpcmdec_base_init), (gst_dvdlpcmdec_class_init),
(gst_dvdlpcm_reset), (gst_dvdlpcmdec_init), (gst_dvdlpcmdec_link),
(gst_dvdlpcmdec_chain), (gst_dvdlpcmdec_change_state),
(plugin_init):
* gst/dvdlpcmdec/gstdvdlpcmdec.h:
New decoder for rearranging DVD LPCM into our audio/x-raw-int
format. Needs support for the channels maps if someone can find
a DVD LPCM track with > 2 channels.
* gst/mpegstream/gstdvddemux.c: (gst_dvd_demux_handle_dvd_event),
(gst_dvd_demux_send_discont), (gst_dvd_demux_handle_discont),
(gst_dvd_demux_get_audio_stream), (gst_dvd_demux_process_private):
* gst/mpegstream/gstdvddemux.h:
* gst/mpegstream/gstmpegdemux.c: (gst_mpeg_demux_send_discont),
(gst_mpeg_demux_new_output_pad), (gst_mpeg_demux_init_stream),
(gst_mpeg_demux_send_subbuffer), (gst_mpeg_demux_handle_src_query):
* gst/mpegstream/gstmpegdemux.h:
* gst/mpegstream/gstmpegparse.c: (gst_mpeg_parse_reset),
(gst_mpeg_parse_parse_packhead), (gst_mpeg_parse_loop),
(gst_mpeg_parse_get_rate), (gst_mpeg_parse_convert_src),
(gst_mpeg_parse_handle_src_query),
(gst_mpeg_parse_handle_src_event):
Use audio/x-dvd-lpcm for LPCM output.
Add DTS output.
2005-02-08 11:08:15 +00:00
|
|
|
gint rate, channels, width,
|
|
|
|
dynamic_range;
|
|
|
|
gboolean mute, emphasis;
|
2004-03-27 22:45:41 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
struct _GstDVDDemux {
|
|
|
|
GstMPEGDemux parent;
|
|
|
|
|
|
|
|
GstPad *cur_video; /* Current video stream pad. */
|
|
|
|
GstPad *cur_audio; /* Current audio stream pad. */
|
|
|
|
GstPad *cur_subpicture; /* Current subpicture stream pad. */
|
|
|
|
|
|
|
|
gint cur_video_nr; /* Current video stream number. */
|
|
|
|
gint cur_audio_nr; /* Current audio stream number. */
|
|
|
|
gint cur_subpicture_nr; /* Current subpicture stream number. */
|
|
|
|
|
|
|
|
GstClockTime last_end_ptm; /* End presentation time of the las nav packet
|
|
|
|
event received. */
|
|
|
|
|
|
|
|
gboolean just_flushed; /* The element just received a flush event. */
|
|
|
|
GstClockTime discont_time; /* If different from GST_CLOCK_TIME_NONE, a
|
|
|
|
discontinuous event should be sent with the
|
ext/a52dec/gsta52dec.c: Add some debug output. Check that a discont has a valid time associated.
Original commit message from CVS:
* ext/a52dec/gsta52dec.c: (gst_a52dec_push),
(gst_a52dec_handle_event), (gst_a52dec_chain):
Add some debug output. Check that a discont has a valid
time associated.
* ext/alsa/gstalsasink.c: (gst_alsa_sink_check_event),
(gst_alsa_sink_loop):
Ignore TAG events. A little extra debug for broken timestamps.
* ext/dvdnav/dvdnavsrc.c: (dvdnavsrc_init), (dvdnavsrc_loop),
(dvdnavsrc_change_state):
Ensure we send a discont to engage the link before we send any
other events.
* ext/dvdread/dvdreadsrc.c: (dvdreadsrc_init),
(dvdreadsrc_finalize), (_close), (_open), (_seek_title),
(_seek_chapter), (seek_sector), (dvdreadsrc_get),
(dvdreadsrc_uri_get_uri), (dvdreadsrc_uri_set_uri):
Handle URI of the form dvd://title[,chapter[,angle]]. Currently only
dvd://title works in totem because typefinding sends a seek that ends
up going back to chapter 1 regardless.
* ext/mpeg2dec/gstmpeg2dec.c:
* ext/mpeg2dec/gstmpeg2dec.h:
Output correct timestamps and handle disconts.
* ext/ogg/gstoggdemux.c: (get_relative):
Small guard against a null dereference.
* ext/pango/gsttextoverlay.c: (gst_textoverlay_finalize),
(gst_textoverlay_set_property):
Free memory when done. Don't call gst_event_filler_get_duration on
EOS events. Use GST_LOG and GST_WARNING instead of g_message and
g_warning.
* ext/smoothwave/gstsmoothwave.c: (gst_smoothwave_init),
(draw_line), (gst_smoothwave_dispose), (gst_sw_sinklink),
(gst_sw_srclink), (gst_smoothwave_chain):
Draw solid lines, prettier colours.
* gst/mpeg2sub/gstmpeg2subt.c: (gst_mpeg2subt_init):
Add a default palette that'll work for some movies.
* gst/mpegstream/gstdvddemux.c: (gst_dvd_demux_init),
(gst_dvd_demux_handle_dvd_event), (gst_dvd_demux_send_discont),
(gst_dvd_demux_send_subbuffer), (gst_dvd_demux_reset):
* gst/mpegstream/gstdvddemux.h:
* gst/mpegstream/gstmpegdemux.c: (gst_mpeg_demux_send_discont),
(gst_mpeg_demux_parse_syshead), (gst_mpeg_demux_parse_pes):
* gst/mpegstream/gstmpegparse.c: (gst_mpeg_parse_init),
(gst_mpeg_parse_handle_discont), (gst_mpeg_parse_parse_packhead):
* gst/mpegstream/gstmpegparse.h:
Use PTM/NAV events when for timestamp adjustment when connected to
dvdnavsrc. Don't use many discont events where one suffices.
* gst/playback/gstplaybasebin.c: (group_destroy),
(gen_preroll_element), (gst_play_base_bin_add_element):
* gst/playback/gstplaybasebin.h:
Make sure we remove subtitles from the same bin we put them in.
* gst/subparse/gstsubparse.c: (convert_encoding), (parse_subrip),
(gst_subparse_buffer_format_autodetect),
(gst_subparse_change_state):
Fix some memleaks and invalid accesses.
* gst/typefind/gsttypefindfunctions.c: (ogganx_type_find),
(oggskel_type_find), (cmml_type_find), (plugin_init):
Some typefind functions for Annodex v3.0 files
* gst/wavparse/gstwavparse.h:
GstRiffReadClass is the correct parent class.
2005-01-25 15:34:08 +00:00
|
|
|
given time, before sending the next data
|
2004-03-27 22:45:41 +00:00
|
|
|
block.. */
|
|
|
|
|
2004-07-28 13:47:59 +00:00
|
|
|
gint mpeg_version; /* Version of the MPEG video stream */
|
|
|
|
|
2004-03-27 22:45:41 +00:00
|
|
|
GstMPEGStream *subpicture_stream[GST_DVD_DEMUX_NUM_SUBPICTURE_STREAMS];
|
|
|
|
/* Subpicture output streams. */
|
2004-07-28 13:47:59 +00:00
|
|
|
GstClockTime subpicture_time[GST_DVD_DEMUX_NUM_SUBPICTURE_STREAMS];
|
|
|
|
/* Last timestamp for buffer on each stream */
|
2004-03-27 22:45:41 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
struct _GstDVDDemuxClass {
|
|
|
|
GstMPEGDemuxClass parent_class;
|
|
|
|
|
|
|
|
GstPadTemplate *cur_video_template;
|
|
|
|
GstPadTemplate *cur_audio_template;
|
|
|
|
GstPadTemplate *subpicture_template;
|
|
|
|
GstPadTemplate *cur_subpicture_template;
|
|
|
|
|
|
|
|
GstMPEGStream *
|
|
|
|
(*get_subpicture_stream)(GstMPEGDemux *mpeg_demux,
|
|
|
|
guint8 stream_nr,
|
|
|
|
gint type,
|
|
|
|
const gpointer info);
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
GType gst_dvd_demux_get_type (void);
|
|
|
|
|
|
|
|
gboolean gst_dvd_demux_plugin_init (GstPlugin *plugin);
|
|
|
|
|
ext/mpeg2dec/gstmpeg2dec.c: Don't send things to NULL PAD_PEERs
Original commit message from CVS:
* ext/mpeg2dec/gstmpeg2dec.c:
Don't send things to NULL PAD_PEERs
* gst/deinterlace/gstdeinterlace.c: (gst_deinterlace_chain):
Copy-on-write the incoming buffer.
* gst/mpegstream/gstdvddemux.h:
* gst/mpegstream/gstmpegclock.h:
* gst/mpegstream/gstmpegdemux.c: (gst_mpeg_demux_parse_syshead),
(normal_seek), (gst_mpeg_demux_handle_src_event):
* gst/mpegstream/gstmpegdemux.h:
* gst/mpegstream/gstmpegpacketize.h:
* gst/mpegstream/gstmpegparse.c:
(gst_mpeg_parse_update_streaminfo), (gst_mpeg_parse_reset),
(gst_mpeg_parse_handle_discont), (gst_mpeg_parse_parse_packhead),
(gst_mpeg_parse_loop), (gst_mpeg_parse_get_rate),
(gst_mpeg_parse_convert_src), (gst_mpeg_parse_handle_src_query),
(gst_mpeg_parse_handle_src_event), (gst_mpeg_parse_change_state):
* gst/mpegstream/gstmpegparse.h:
* gst/mpegstream/gstrfc2250enc.h:
Various changes to the way time is computed that make seeking and
total time estimation much better here.
Use G_BEGIN/END_DECLS instead of __cplusplus
* gst/videocrop/gstvideocrop.c: (gst_video_crop_chain):
Use gst_buffer_stamp instead of only copying the TIMESTAMP
2005-02-01 16:40:10 +00:00
|
|
|
G_END_DECLS
|
2004-03-27 22:45:41 +00:00
|
|
|
|
|
|
|
#endif /* __DVD_DEMUX_H__ */
|