mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-28 04:31:06 +00:00
9003ed34ba
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.
133 lines
3.6 KiB
C++
133 lines
3.6 KiB
C++
/* GStreamer mpeg2enc (mjpegtools) wrapper
|
|
* (c) 2003 Ronald Bultje <rbultje@ronald.bitfreak.net>
|
|
*
|
|
* gstmpeg2encpicturereader.cc: GStreamer/mpeg2enc input wrapper
|
|
*
|
|
* 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.
|
|
*/
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
#include "config.h"
|
|
#endif
|
|
|
|
#include <encoderparams.hh>
|
|
|
|
#include "gstmpeg2encpicturereader.hh"
|
|
|
|
/*
|
|
* Class init stuff.
|
|
*/
|
|
|
|
GstMpeg2EncPictureReader::GstMpeg2EncPictureReader (GstPad *in_pad,
|
|
const GstCaps *in_caps,
|
|
EncoderParams *params) :
|
|
PictureReader (*params)
|
|
{
|
|
pad = in_pad;
|
|
caps = gst_caps_copy (in_caps);
|
|
}
|
|
|
|
GstMpeg2EncPictureReader::~GstMpeg2EncPictureReader ()
|
|
{
|
|
gst_caps_free (caps);
|
|
}
|
|
|
|
/*
|
|
* Get input picture parameters (width/height etc.).
|
|
*/
|
|
|
|
void
|
|
GstMpeg2EncPictureReader::StreamPictureParams (MPEG2EncInVidParams &strm)
|
|
{
|
|
GstStructure *structure = gst_caps_get_structure (caps, 0);
|
|
gint width, height;
|
|
gdouble fps;
|
|
|
|
gst_structure_get_int (structure, "width", &width);
|
|
gst_structure_get_int (structure, "height", &height);
|
|
gst_structure_get_double (structure, "framerate", &fps);
|
|
|
|
strm.horizontal_size = width;
|
|
strm.vertical_size = height;
|
|
strm.frame_rate_code = mpeg_framerate_code (mpeg_conform_framerate (fps));
|
|
strm.interlacing_code = Y4M_ILACE_NONE;
|
|
strm.aspect_ratio_code = mpeg_guess_mpeg_aspect_code (2, y4m_sar_SQUARE,
|
|
strm.horizontal_size,
|
|
strm.vertical_size);
|
|
|
|
/* FIXME:
|
|
* strm.interlacing_code = y4m_si_get_interlace(&si);
|
|
* sar = y4m_si_get_sampleaspect(&si);
|
|
* strm.aspect_ratio_code =
|
|
* mpeg_guess_mpeg_aspect_code(2, sar,
|
|
* strm.horizontal_size,
|
|
* strm.vertical_size);
|
|
*/
|
|
}
|
|
|
|
/*
|
|
* Read a frame.
|
|
*/
|
|
|
|
bool
|
|
GstMpeg2EncPictureReader::LoadFrame ()
|
|
{
|
|
GstData *data;
|
|
GstBuffer *buf = NULL;
|
|
gint i, x, y, n;
|
|
guint8 *frame;
|
|
|
|
do {
|
|
if ((data = (GstData *) gst_pad_get_element_private (pad))) {
|
|
gst_pad_set_element_private (pad, NULL);
|
|
} else if (!(data = gst_pad_pull (pad))) {
|
|
return true;
|
|
}
|
|
if (GST_IS_EVENT (data)) {
|
|
if (GST_EVENT_TYPE (data) == GST_EVENT_EOS) {
|
|
gst_pad_event_default (pad, GST_EVENT (data));
|
|
return true;
|
|
}
|
|
gst_pad_event_default (pad, GST_EVENT (data));
|
|
} else {
|
|
buf = GST_BUFFER (data);
|
|
}
|
|
} while (!buf);
|
|
|
|
frame = GST_BUFFER_DATA (buf);
|
|
n = frames_read % input_imgs_buf_size;
|
|
x = encparams.horizontal_size;
|
|
y = encparams.vertical_size;
|
|
|
|
for (i = 0; i < y; i++) {
|
|
memcpy (input_imgs_buf[n][0]+i*encparams.phy_width, frame, x);
|
|
frame += x;
|
|
}
|
|
lum_mean[n] = LumMean (input_imgs_buf[n][0]);
|
|
x >>= 1;
|
|
y >>= 1;
|
|
for (i = 0; i < y; i++) {
|
|
memcpy (input_imgs_buf[n][1]+i*encparams.phy_chrom_width, frame, x);
|
|
frame += x;
|
|
}
|
|
for (i = 0; i < y; i++) {
|
|
memcpy (input_imgs_buf[n][2]+i*encparams.phy_chrom_width, frame, x);
|
|
frame += x;
|
|
}
|
|
gst_buffer_unref (buf);
|
|
|
|
return false;
|
|
}
|