mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-10 19:31:12 +00:00
81f2585c88
Original commit message from CVS: 2005-12-08 Martin Soto <martinsoto@users.sourceforge.net> * gst/mpegstream/gstdvddemux.c (gst_dvd_demux_handle_newsegment): Properly handle non contiguous VOBUs by adding the segment accum field to the adjust value. * gst/mpegstream/gstdvddemux.c (gst_dvd_demux_class_init) (gst_dvd_demux_init, gst_dvd_demux_handle_newsegment): Extend handle_newsegment to prevent sending actual newsegment events and use tiemstamp rewriting instead. (gst_dvd_demux_handle_dvd_event): Don't send a newsegment after dvd-lang-codes. * gst/mpegstream/gstmpegparse.c (gst_mpeg_parse_handle_newsegment) (gst_mpeg_parse_event): * gst/mpegstream/gstmpegparse.h (struct _GstMPEGParseClass): Add a new parameter to handle_newsegment to allow controlling whether newsegment events are forwarded or not. * gst/mpegstream/gstdvddemux.c (gst_dvd_demux_init) (gst_dvd_demux_handle_dvd_event, gst_dvd_demux_send_subbuffer) (gst_dvd_demux_reset): last_end_ptm and discont_time aren't necessary anymore, since timestamp adjustment is now replaced by newsegment events. (gst_dvd_demux_init): Prevent MPEGParse from adjusting timestamps. * gst/mpegstream/gstdvddemux.h: * gst/mpegstream/gstdvddemux.c (gst_dvd_demux_handle_dvd_event): Don't handle dvd-nav-packet events anymore, since the are now replaced by standard newsegment events. * gst/mpegstream/gstdvddemux.c (gst_dvd_demux_init) (gst_dvd_demux_handle_dvd_event, gst_dvd_demux_send_subbuffer) (gst_dvd_demux_change_state): * gst/mpegstream/gstdvddemux.h: Get rid of the ignore_next_newmedia_discont hack. * gst/mpegstream/gstdvddemux.c (gst_dvd_demux_class_init) (gst_dvd_demux_handle_newsegment): * gst/mpegstream/gstmpegdemux.c (gst_mpeg_demux_class_init) (gst_mpeg_demux_handle_newsegment): Don't override handle_newsegment anymore. It was only necessary to handle NEWMEDIA events. * gst/mpegstream/gstdvddemux.c (gst_dvd_demux_process_event) (gst_dvd_demux_handle_dvd_event, gst_dvd_demux_set_cur_audio) (gst_dvd_demux_set_cur_subpicture): Reactivate handling of DVD events. * gst/mpegstream/gstmpegparse.c (normal_seek) (gst_mpeg_parse_handle_src_event) (gst_mpeg_parse_handle_src_query): First attempt at reenabling seek. * gst/mpegstream/gstmpegparse.h: * gst/mpegstream/gstmpegparse.c (gst_mpeg_parse_init) (gst_mpeg_parse_update_streaminfo) (gst_mpeg_parse_get_rate) (gst_mpeg_parse_convert, gst_mpeg_parse_get_src_query_types) (gst_mpeg_parse_handle_src_query): * gst/mpegstream/gstmpegdemux.c (gst_mpeg_demux_new_output_pad): Make queries work again. * gst/mpegstream/gstmpegparse.c (gst_mpeg_parse_reset) (gst_mpeg_parse_handle_newsegment) (gst_mpeg_parse_send_newsegment, gst_mpeg_parse_pad_added) (gst_mpeg_parse_chain, gst_mpeg_parse_handle_src_event): * gst/mpegstream/gstmpegparse.h (struct _GstMPEGParse): Get rid of the newsegment_pending attribute, and rely instead on proper timestamp adjustment. * gst/mpegstream/gstmpegparse.c (gst_mpeg_parse_get_src_event_masks): Erase. * gst/mpegstream/gstmpegparse.c (gst_mpeg_parse_init): Initialize fields before creating pads to prevent the pad creation callback from failing. (gst_mpeg_parse_reset): Initialize new fields, and change initialization order to match the order in the structure. (gst_mpeg_parse_handle_newsegment): Forward new segment events whenever possible, and update the current segment. (gst_mpeg_parse_send_newsegment): Update the current segment and pending_newsegment. (gst_mpeg_parse_pad_added): Use the current segment to send newsegment events to new pads. (gst_mpeg_parse_chain): Properly add adjust time to sent buffers and events. Properly update newsegment_pending. * gst/mpegstream/gstmpegparse.h (struct _GstMPEGParse): New fields do_adjust and current_segment. * gst/mpegstream/gstmpegdemux.c: * gst/mpegstream/gstdvddemux.c: * gst/mpegstream/gstmpegparse.h: Rename handle_discont virtual method to handle_newsegment. Erase some (already commented out support) for old NEW_MEDIA events. * gst/mpegstream/gstmpegparse.h (struct _GstMPEGParse): * gst/mpegstream/gstmpegparse.c (gst_mpeg_parse_init) (gst_mpeg_parse_reset, gst_mpeg_parse_handle_discont) (gst_mpeg_parse_pad_added, gst_mpeg_parse_parse_packhead) (gst_mpeg_parse_event, gst_mpeg_parse_chain): Erase the "pending_scr" field, and replace it by a slightly different handling of the current SCR. Document code blocks in parse_packhead and chain.
133 lines
4 KiB
C
133 lines
4 KiB
C
/* 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"
|
|
|
|
G_BEGIN_DECLS
|
|
|
|
#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,
|
|
GST_DVD_DEMUX_STREAM_LAST
|
|
};
|
|
|
|
/* Supported number of streams. */
|
|
#define GST_DVD_DEMUX_NUM_SUBPICTURE_STREAMS 32
|
|
#define GST_DVD_DEMUX_MAX_SUBPICTURE_DELAY 0
|
|
|
|
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,
|
|
GST_DVD_DEMUX_AUDIO_LAST
|
|
};
|
|
|
|
|
|
/* 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,
|
|
GST_DVD_DEMUX_SUBP_LAST
|
|
};
|
|
|
|
|
|
/* Extended structure to hold additional information for linear PCM
|
|
streams. */
|
|
struct _GstDVDLPCMStream {
|
|
GstMPEGStream parent;
|
|
guint32 sample_info; /* The type of linear PCM samples
|
|
associated to this stream. The
|
|
values are bit fields with the same
|
|
format of the sample_info field in
|
|
the linear PCM header. */
|
|
gint rate, channels, width,
|
|
dynamic_range;
|
|
gboolean mute, emphasis;
|
|
};
|
|
|
|
|
|
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. */
|
|
|
|
gint mpeg_version; /* Version of the MPEG video stream */
|
|
|
|
GstMPEGStream *subpicture_stream[GST_DVD_DEMUX_NUM_SUBPICTURE_STREAMS];
|
|
/* Subpicture output streams. */
|
|
|
|
GstEvent *langcodes;
|
|
};
|
|
|
|
|
|
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);
|
|
|
|
G_END_DECLS
|
|
|
|
#endif /* __DVD_DEMUX_H__ */
|