mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-07-28 09:15:08 +00:00
ea118a8d64
Original commit message from CVS: * ext/flac/gstflacdec.c: (gst_flacdec_src_query): Only return true if we actually filled something in. Prevents player applications from showing a random length for flac files. * gst-libs/gst/riff/riff-read.c: (gst_riff_read_class_init), (gst_riff_read_use_event), (gst_riff_read_handle_event), (gst_riff_read_seek), (gst_riff_read_skip), (gst_riff_read_strh), (gst_riff_read_strf_vids_with_data), (gst_riff_read_strf_auds_with_data), (gst_riff_read_strf_iavs): OK, ok, so I implemented event handling. Apparently it's normal that we receive random events at random points without asking for it. * gst/avi/gstavidemux.c: (gst_avi_demux_reset), (gst_avi_demux_src_convert), (gst_avi_demux_handle_src_query), (gst_avi_demux_handle_src_event), (gst_avi_demux_stream_index), (gst_avi_demux_sync), (gst_avi_demux_stream_scan), (gst_avi_demux_massage_index), (gst_avi_demux_stream_header), (gst_avi_demux_handle_seek), (gst_avi_demux_process_next_entry), (gst_avi_demux_stream_data), (gst_avi_demux_loop): * gst/avi/gstavidemux.h: Implement non-lineair chunk handling and subchunk processing. The first solves playback of AVI files where the audio and video data of individual buffers that we read are not synchronized. This should not happen according to the wonderful AVI specs, but of course it does happen in reality. It is also a prerequisite for the second. Subchunk processing allows us to cut chunks in small pieces and process each of these pieces separately. This is required because I've seen several AVI files with incredibly large audio chunks, even some files with only one audio chunk for the whole file. This allows for proper playback including seeking. This patch is supposed to fix all AVI A/V sync issues. * gst/flx/gstflxdec.c: (gst_flxdec_class_init), (flx_decode_chunks), (flx_decode_color), (gst_flxdec_loop): Work. * gst/modplug/gstmodplug.cc: Proper return value setting for the query() function. * gst/playback/gstplaybasebin.c: (setup_source): Being in non-playing state (after, e.g., EOS) is not necessarily a bad thing. Allow for that. This fixes playback of short files. They don't actually playback fully now, because the clock already runs. This means that small files (<500kB) with a small length (<2sec) will still not or barely play. Other files, such as mod or flx, will work correctly, however.
131 lines
3.1 KiB
C
131 lines
3.1 KiB
C
/* GStreamer
|
|
* Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
|
|
*
|
|
* 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 __GST_AVI_DEMUX_H__
|
|
#define __GST_AVI_DEMUX_H__
|
|
|
|
#include <gst/gst.h>
|
|
|
|
#include "gst/riff/riff-ids.h"
|
|
#include "gst/riff/riff-read.h"
|
|
|
|
G_BEGIN_DECLS
|
|
|
|
#define GST_TYPE_AVI_DEMUX \
|
|
(gst_avi_demux_get_type ())
|
|
#define GST_AVI_DEMUX(obj) \
|
|
(G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_AVI_DEMUX, GstAviDemux))
|
|
#define GST_AVI_DEMUX_CLASS(klass) \
|
|
(G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_AVI_DEMUX, GstAviDemux))
|
|
#define GST_IS_AVI_DEMUX(obj) \
|
|
(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_AVI_DEMUX))
|
|
#define GST_IS_AVI_DEMUX_CLASS(obj) \
|
|
(G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_AVI_DEMUX))
|
|
|
|
#define GST_AVI_DEMUX_MAX_STREAMS 16
|
|
|
|
#define CHUNKID_TO_STREAMNR(chunkid) \
|
|
((((chunkid) & 0xff) - '0') * 10 + \
|
|
(((chunkid) >> 8) & 0xff) - '0')
|
|
|
|
typedef struct {
|
|
gint index_nr;
|
|
gint stream_nr;
|
|
guint64 ts, dur;
|
|
guint32 flags;
|
|
guint64 offset;
|
|
gint size;
|
|
guint64 bytes_before;
|
|
guint32 frames_before;
|
|
} gst_avi_index_entry;
|
|
|
|
typedef struct {
|
|
/* index of this streamcontext */
|
|
guint num;
|
|
|
|
/* pad, strh */
|
|
GstPad *pad;
|
|
GstCaps *caps;
|
|
gst_riff_strh *strh;
|
|
gint blockalign, bitrate;
|
|
|
|
/* current position (byte, frame, time) */
|
|
guint current_frame;
|
|
guint64 current_byte;
|
|
gint current_entry;
|
|
|
|
/* delay in time (init_frames) */
|
|
guint64 delay;
|
|
|
|
/* stream length */
|
|
guint64 total_bytes;
|
|
guint32 total_frames;
|
|
|
|
guint32 skip;
|
|
} avi_stream_context;
|
|
|
|
typedef enum {
|
|
GST_AVI_DEMUX_START,
|
|
GST_AVI_DEMUX_HEADER,
|
|
GST_AVI_DEMUX_MOVI,
|
|
} GstAviDemuxState;
|
|
|
|
typedef struct _GstAviDemux {
|
|
GstRiffRead parent;
|
|
|
|
/* pads */
|
|
GstPad *sinkpad;
|
|
|
|
/* AVI decoding state */
|
|
GstAviDemuxState state;
|
|
guint level_up;
|
|
|
|
/* index */
|
|
gst_avi_index_entry *index_entries;
|
|
guint index_size;
|
|
guint64 index_offset;
|
|
guint current_entry;
|
|
|
|
/* streams */
|
|
guint num_streams;
|
|
guint num_v_streams;
|
|
guint num_a_streams;
|
|
avi_stream_context stream[GST_AVI_DEMUX_MAX_STREAMS];
|
|
|
|
/* some stream info for length */
|
|
guint32 us_per_frame;
|
|
guint32 num_frames;
|
|
|
|
/* seeking */
|
|
guint64 seek_offset;
|
|
guint64 last_seek;
|
|
gint seek_entry;
|
|
gboolean seek_flush;
|
|
} GstAviDemux;
|
|
|
|
typedef struct _GstAviDemuxClass {
|
|
GstRiffReadClass parent_class;
|
|
} GstAviDemuxClass;
|
|
|
|
GType gst_avi_demux_get_type (void);
|
|
|
|
G_END_DECLS
|
|
|
|
#endif /* __GST_AVI_DEMUX_H__ */
|