summaryrefslogtreecommitdiffstats
path: root/gst-libs/ext/mplex/audiostrm_out.cc
diff options
context:
space:
mode:
authorRonald S. Bultje <rbultje@ronald.bitfreak.net>2004-01-01 22:45:57 +0000
committerRonald S. Bultje <rbultje@ronald.bitfreak.net>2004-01-01 22:45:57 +0000
commit9003ed34ba8e694b44433597c890affac369c368 (patch)
treedca1fa1b1decb37f42397813935add00b4f13182 /gst-libs/ext/mplex/audiostrm_out.cc
parent0e3024712e2a935d1f5b216cd4d7794a0132c522 (diff)
downloadgst-plugins-bad-9003ed34ba8e694b44433597c890affac369c368.tar.gz
gst-plugins-bad-9003ed34ba8e694b44433597c890affac369c368.tar.bz2
gst-plugins-bad-9003ed34ba8e694b44433597c890affac369c368.zip
configure.ac: Fix configure check for mpeg2enc. We need 1.6.1.93 instead of 1.6.1.92, since the pkg-config file of 1....
Original commit message from CVS: 2004-01-01 Ronald Bultje <rbultje@ronald.bitfreak.net> * configure.ac: Fix configure check for mpeg2enc. We need 1.6.1.93 instead of 1.6.1.92, since the pkg-config file of 1.6.1.92 is borked and it therefore uses the wrong include paths. Too bad... Note that 1.6.1.93 is not release yet. ;). Also add a check for mplex, which is now using the lib'ified mplex from mjpegtools, too. * ext/ffmpeg/gstffmpegcodecmap.c: Add codec_tag for 3ivx/xvid. For xvid, this should fix playback issues. I don't think ffmpeg handles 3ivx correctly, so this probably won't work. But it won't hurt either. * ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_connect), (gst_ffmpegdec_chain): * ext/ffmpeg/gstffmpegenc.c: (gst_ffmpegenc_connect), (gst_ffmpegenc_chain_audio): Fix memleak in audio encoding. Close codec if open fails, this calls the cleanup routines so we can re-use the context. * ext/mpeg2enc/gstmpeg2enc.cc: Fix pad template names/types, fix memory issue with getcaps(). * ext/mpeg2enc/gstmpeg2encoder.cc: * ext/mpeg2enc/gstmpeg2encoder.hh: Fix compile issue with new caps system (const thingy). * ext/mpeg2enc/gstmpeg2encpicturereader.cc: * ext/mpeg2enc/gstmpeg2encpicturereader.hh: We read a first frame right on initing, so that we have a caps when we init the output. This caps is cached in padprivate and read as first frame. * ext/mplex/Makefile.am: * ext/mplex/gstmplex.cc: * ext/mplex/gstmplex.h: * ext/mplex/gstmplex.hh: * ext/mplex/gstmplexibitstream.cc: * ext/mplex/gstmplexibitstream.hh: * ext/mplex/gstmplexjob.cc: * ext/mplex/gstmplexjob.hh: * ext/mplex/gstmplexoutputstream.cc: * ext/mplex/gstmplexoutputstream.hh: We wrap mjpegtools mplex. So I rewrote the plugin. The old plugin had issues, didn't do capsnego, supported only a subset of the mplex features and required a mplex fork in our local CVS. Plus that it worked agaist a very old mplex version. Rewriting was faster than updating it. * gst-libs/ext/Makefile.am: * gst-libs/ext/mplex/INSTRUCT: * gst-libs/ext/mplex/Makefile.am: * gst-libs/ext/mplex/README: * gst-libs/ext/mplex/TODO: * gst-libs/ext/mplex/ac3strm_in.cc: * gst-libs/ext/mplex/audiostrm.hh: * gst-libs/ext/mplex/audiostrm_out.cc: * gst-libs/ext/mplex/aunit.hh: * gst-libs/ext/mplex/bits.cc: * gst-libs/ext/mplex/bits.hh: * gst-libs/ext/mplex/buffer.cc: * gst-libs/ext/mplex/buffer.hh: * gst-libs/ext/mplex/fastintfns.h: * gst-libs/ext/mplex/format_codes.h: * gst-libs/ext/mplex/inputstrm.cc: * gst-libs/ext/mplex/inputstrm.hh: * gst-libs/ext/mplex/lpcmstrm_in.cc: * gst-libs/ext/mplex/mjpeg_logging.cc: * gst-libs/ext/mplex/mjpeg_logging.h: * gst-libs/ext/mplex/mjpeg_types.h: * gst-libs/ext/mplex/mpastrm_in.cc: * gst-libs/ext/mplex/mpegconsts.cc: * gst-libs/ext/mplex/mpegconsts.h: * gst-libs/ext/mplex/mplexconsts.hh: * gst-libs/ext/mplex/multplex.cc: * gst-libs/ext/mplex/outputstream.hh: * gst-libs/ext/mplex/padstrm.cc: * gst-libs/ext/mplex/padstrm.hh: * gst-libs/ext/mplex/stillsstream.cc: * gst-libs/ext/mplex/stillsstream.hh: * gst-libs/ext/mplex/systems.cc: * gst-libs/ext/mplex/systems.hh: * gst-libs/ext/mplex/vector.cc: * gst-libs/ext/mplex/vector.hh: * gst-libs/ext/mplex/videostrm.hh: * gst-libs/ext/mplex/videostrm_in.cc: * gst-libs/ext/mplex/videostrm_out.cc: * gst-libs/ext/mplex/yuv4mpeg.cc: * gst-libs/ext/mplex/yuv4mpeg.h: * gst-libs/ext/mplex/yuv4mpeg_intern.h: * gst-libs/ext/mplex/yuv4mpeg_ratio.cc: We don't fork mjpegtools' mplex in our CVS anymore. * gst/avi/gstavidemux.c: (gst_avi_demux_src_getcaps), (gst_avi_demux_add_stream): * gst/avi/gstavidemux.h: Add getcaps() function for proper caps nego. This makes some parts of AVI playback/reading work. * sys/ximage/ximagesink.c: (gst_ximagesink_sinkconnect): Resize window on new capsnego. This is probably wrong, but I'm still committing it because with current capsnego, the first successfull capsnego is auto-fixated, therefore rounded down to the lowest values in the caps. this results in a 16x16 XWindow that is not reized when real capsnego finishes. Dave, I see more cases of this, do you know a proper solution? * tools/gst-launch-ext.in: Fix MPEG-4 AAC (Apple iPod/iTunes) file commandline.
Diffstat (limited to 'gst-libs/ext/mplex/audiostrm_out.cc')
-rw-r--r--gst-libs/ext/mplex/audiostrm_out.cc144
1 files changed, 0 insertions, 144 deletions
diff --git a/gst-libs/ext/mplex/audiostrm_out.cc b/gst-libs/ext/mplex/audiostrm_out.cc
deleted file mode 100644
index 5ef358af..00000000
--- a/gst-libs/ext/mplex/audiostrm_out.cc
+++ /dev/null
@@ -1,144 +0,0 @@
-
-/*
- * inptstrm.c: Members of audi stream classes related to muxing out into
- * the output stream.
- *
- * Copyright (C) 2001 Andrew Stevens <andrew.stevens@philips.com>
- *
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public License
- * as published by the Free Software Foundation.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-
-#include <config.h>
-#include <assert.h>
-#include "fastintfns.h"
-#include "audiostrm.hh"
-#include "outputstream.hh"
-
-
-
-AudioStream::AudioStream (IBitStream & ibs, OutputStream & into):
-ElementaryStream (ibs, into, ElementaryStream::audio), num_syncword (0)
-{
- FRAME_CHUNK = 24;
- for (int i = 0; i < 2; ++i)
- num_frames[i] = size_frames[i] = 0;
-}
-
-void
-AudioStream::InitAUbuffer ()
-{
- unsigned int i;
-
- for (i = 0; i < aunits.BUF_SIZE; ++i)
- aunits.init (new AAunit);
-}
-
-
-
-/*********************************
- * Signals when audio stream has completed mux run-out specified
- * in associated mux stream.
- *********************************/
-
-bool
-AudioStream::RunOutComplete ()
-{
- return (au_unsent == 0 || (muxinto.running_out && RequiredPTS () >= muxinto.runout_PTS));
-}
-
-bool
-AudioStream::AUBufferNeedsRefill ()
-{
- return
- !eoscan
- && (aunits.current () + FRAME_CHUNK > last_buffered_AU
- || bs.buffered_bytes () < muxinto.sector_size);
-}
-
-/******************************************************************
- Output_Audio
- generates Pack/Sys Header/Packet information from the
- audio stream and saves them into the sector
-******************************************************************/
-
-void
-AudioStream::OutputSector ()
-{
- clockticks PTS;
- unsigned int max_packet_data;
- unsigned int actual_payload;
- unsigned int old_au_then_new_payload;
-
- PTS = RequiredDTS ();
- old_au_then_new_payload = muxinto.PacketPayload (*this, buffers_in_header, false, false);
-
- max_packet_data = 0;
- if (muxinto.running_out && NextRequiredPTS () > muxinto.runout_PTS) {
- /* We're now in the last AU of a segment. So we don't want to
- go beyond it's end when writing sectors. Hence we limit
- packet payload size to (remaining) AU length.
- */
- max_packet_data = au_unsent;
- }
-
- /* CASE: packet starts with new access unit */
-
- if (new_au_next_sec) {
- actual_payload =
- muxinto.WritePacket (max_packet_data, *this, buffers_in_header, PTS, 0, TIMESTAMPBITS_PTS);
-
- }
-
-
- /* CASE: packet starts with old access unit, no new one */
- /* starts in this very same packet */
- else if (!(new_au_next_sec) && (au_unsent >= old_au_then_new_payload)) {
- actual_payload =
- muxinto.WritePacket (max_packet_data, *this, buffers_in_header, 0, 0, TIMESTAMPBITS_NO);
- }
-
-
- /* CASE: packet starts with old access unit, a new one */
- /* starts in this very same packet */
- else { /* !(new_au_next_sec) && (au_unsent < old_au_then_new_payload)) */
-
- /* is there another access unit anyway ? */
- if (Lookahead () != 0) {
- PTS = NextRequiredDTS ();
- actual_payload =
- muxinto.WritePacket (max_packet_data, *this, buffers_in_header, PTS, 0, TIMESTAMPBITS_PTS);
-
- } else {
- actual_payload = muxinto.WritePacket (0, *this, buffers_in_header, 0, 0, TIMESTAMPBITS_NO);
- };
-
- }
-
- ++nsec;
-
- buffers_in_header = always_buffers_in_header;
-
-}
-
-
-
-/*
- * Local variables:
- * c-file-style: "stroustrup"
- * tab-width: 4
- * indent-tabs-mode: nil
- * End:
- */