* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
/*****************************************************************************
|
2004-01-25 15:34:25 +01:00
|
|
|
* transcode.c: transcoding stream output module
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
*****************************************************************************
|
2005-07-09 08:17:09 +02:00
|
|
|
* Copyright (C) 2003-2004 the VideoLAN team
|
2004-03-06 06:47:59 +01:00
|
|
|
* $Id$
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
*
|
|
|
|
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
|
2004-08-08 23:14:38 +02:00
|
|
|
* Gildas Bazin <gbazin@videolan.org>
|
2006-03-18 12:27:10 +01:00
|
|
|
* Jean-Paul Saman <jpsaman #_at_# m2x dot nl>
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
|
|
|
* 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
|
2006-01-13 00:10:04 +01:00
|
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
*****************************************************************************/
|
|
|
|
|
|
|
|
/*****************************************************************************
|
|
|
|
* Preamble
|
|
|
|
*****************************************************************************/
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
2005-03-22 14:29:30 +01:00
|
|
|
#include <math.h>
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
|
|
|
|
#include <vlc/vlc.h>
|
|
|
|
#include <vlc/input.h>
|
|
|
|
#include <vlc/sout.h>
|
2003-10-08 23:01:07 +02:00
|
|
|
#include <vlc/vout.h>
|
|
|
|
#include <vlc/decoder.h>
|
2006-08-06 15:27:58 +02:00
|
|
|
#include <vlc_filter.h>
|
|
|
|
#include <vlc_osd.h>
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
|
2005-08-05 16:46:20 +02:00
|
|
|
#define MASTER_SYNC_MAX_DRIFT 100000
|
|
|
|
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
/*****************************************************************************
|
2004-03-11 18:36:43 +01:00
|
|
|
* Module descriptor
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
*****************************************************************************/
|
2004-04-25 18:35:39 +02:00
|
|
|
#define VENC_TEXT N_("Video encoder")
|
|
|
|
#define VENC_LONGTEXT N_( \
|
2006-03-25 11:57:34 +01:00
|
|
|
"This is the video encoder module that will be used (and its associated "\
|
|
|
|
"options).")
|
2004-04-25 16:15:29 +02:00
|
|
|
#define VCODEC_TEXT N_("Destination video codec")
|
|
|
|
#define VCODEC_LONGTEXT N_( \
|
2006-03-25 11:57:34 +01:00
|
|
|
"This is the video codec that will be used.")
|
2004-04-25 16:15:29 +02:00
|
|
|
#define VB_TEXT N_("Video bitrate")
|
|
|
|
#define VB_LONGTEXT N_( \
|
2006-03-25 11:57:34 +01:00
|
|
|
"Target bitrate of the transcoded video stream." )
|
2004-04-25 16:15:29 +02:00
|
|
|
#define SCALE_TEXT N_("Video scaling")
|
|
|
|
#define SCALE_LONGTEXT N_( \
|
2006-03-25 11:57:34 +01:00
|
|
|
"Scale factor to apply to the video while transcoding (eg: 0.25)")
|
2004-08-19 17:01:54 +02:00
|
|
|
#define FPS_TEXT N_("Video frame-rate")
|
|
|
|
#define FPS_LONGTEXT N_( \
|
2006-03-25 11:57:34 +01:00
|
|
|
"Target output frame rate for the video stream." )
|
2004-04-25 16:15:29 +02:00
|
|
|
#define DEINTERLACE_TEXT N_("Deinterlace video")
|
|
|
|
#define DEINTERLACE_LONGTEXT N_( \
|
2006-03-25 11:57:34 +01:00
|
|
|
"Deinterlace the video before encoding." )
|
2005-05-20 17:02:25 +02:00
|
|
|
#define DEINTERLACE_MODULE_TEXT N_("Deinterlace module")
|
|
|
|
#define DEINTERLACE_MODULE_LONGTEXT N_( \
|
2006-03-25 11:57:34 +01:00
|
|
|
"Specify the deinterlace module to use." )
|
2004-04-25 16:15:29 +02:00
|
|
|
#define WIDTH_TEXT N_("Video width")
|
|
|
|
#define WIDTH_LONGTEXT N_( \
|
2006-03-25 11:57:34 +01:00
|
|
|
"Output video width." )
|
2004-04-25 16:15:29 +02:00
|
|
|
#define HEIGHT_TEXT N_("Video height")
|
|
|
|
#define HEIGHT_LONGTEXT N_( \
|
2006-03-25 11:57:34 +01:00
|
|
|
"Output video height." )
|
2005-08-12 17:51:18 +02:00
|
|
|
#define MAXWIDTH_TEXT N_("Maximum video width")
|
|
|
|
#define MAXWIDTH_LONGTEXT N_( \
|
2006-03-25 11:57:34 +01:00
|
|
|
"Maximum output video width." )
|
2005-08-12 17:51:18 +02:00
|
|
|
#define MAXHEIGHT_TEXT N_("Maximum video height")
|
|
|
|
#define MAXHEIGHT_LONGTEXT N_( \
|
2006-03-25 11:57:34 +01:00
|
|
|
"Maximum output video height." )
|
2005-06-03 12:11:58 +02:00
|
|
|
#define VFILTER_TEXT N_("Video filter")
|
|
|
|
#define VFILTER_LONGTEXT N_( \
|
2006-03-25 11:57:34 +01:00
|
|
|
"Video filters will be applied to the video streams (after overlays " \
|
|
|
|
"are applied). You must enter a comma-separated list of filters." )
|
2004-04-25 16:15:29 +02:00
|
|
|
|
2006-03-25 11:57:34 +01:00
|
|
|
#define CROPTOP_TEXT N_("Video crop (top)")
|
2004-04-25 16:15:29 +02:00
|
|
|
#define CROPTOP_LONGTEXT N_( \
|
2006-03-25 11:57:34 +01:00
|
|
|
"Number of pixels to crop at the top of the video." )
|
|
|
|
#define CROPLEFT_TEXT N_("Video crop (left)")
|
2004-04-25 16:15:29 +02:00
|
|
|
#define CROPLEFT_LONGTEXT N_( \
|
2006-03-25 11:57:34 +01:00
|
|
|
"Number of pixels to crop at the left of the video." )
|
|
|
|
#define CROPBOTTOM_TEXT N_("Video crop (bottom)")
|
2004-04-25 16:15:29 +02:00
|
|
|
#define CROPBOTTOM_LONGTEXT N_( \
|
2006-03-25 11:57:34 +01:00
|
|
|
"Number of pixels to crop at the bottom of the video." )
|
|
|
|
#define CROPRIGHT_TEXT N_("Video crop (right)")
|
2004-04-25 16:15:29 +02:00
|
|
|
#define CROPRIGHT_LONGTEXT N_( \
|
2006-03-25 11:57:34 +01:00
|
|
|
"Number of pixels to crop at the right of the video." )
|
2004-04-25 16:15:29 +02:00
|
|
|
|
2006-03-25 11:57:34 +01:00
|
|
|
#define PADDTOP_TEXT N_("Video padding (top)")
|
2006-03-18 12:27:10 +01:00
|
|
|
#define PADDTOP_LONGTEXT N_( \
|
2006-03-25 11:57:34 +01:00
|
|
|
"Size of the black border to add at the top of the video." )
|
|
|
|
#define PADDLEFT_TEXT N_("Video padding (left)")
|
2006-03-18 12:27:10 +01:00
|
|
|
#define PADDLEFT_LONGTEXT N_( \
|
2006-03-25 11:57:34 +01:00
|
|
|
"Size of the black border to add at the left of the video." )
|
|
|
|
#define PADDBOTTOM_TEXT N_("Video padding (bottom)")
|
2006-03-18 12:27:10 +01:00
|
|
|
#define PADDBOTTOM_LONGTEXT N_( \
|
2006-03-25 11:57:34 +01:00
|
|
|
"Size of the black border to add at the bottom of the video." )
|
|
|
|
#define PADDRIGHT_TEXT N_("Video padding (right)")
|
2006-03-18 12:27:10 +01:00
|
|
|
#define PADDRIGHT_LONGTEXT N_( \
|
2006-03-25 11:57:34 +01:00
|
|
|
"Size of the black border to add at the right of the video." )
|
2006-03-18 12:27:10 +01:00
|
|
|
|
|
|
|
#define CANVAS_WIDTH_TEXT N_("Video canvas width")
|
|
|
|
#define CANVAS_WIDTH_LONGTEXT N_( \
|
2006-03-25 11:57:34 +01:00
|
|
|
"This will automatically crod and pad the video to a specified width." )
|
2006-03-18 12:27:10 +01:00
|
|
|
#define CANVAS_HEIGHT_TEXT N_("Video canvas height")
|
|
|
|
#define CANVAS_HEIGHT_LONGTEXT N_( \
|
2006-03-25 11:57:34 +01:00
|
|
|
"This will automatically crod and pad the video to a specified height." )
|
2006-03-18 12:27:10 +01:00
|
|
|
#define CANVAS_ASPECT_TEXT N_("Video canvas aspect ratio")
|
|
|
|
#define CANVAS_ASPECT_LONGTEXT N_( \
|
2006-03-25 11:57:34 +01:00
|
|
|
"This sets aspect (like 4:3) of the video canvas and letterbox the video "\
|
|
|
|
"accordingly." )
|
2006-03-18 12:27:10 +01:00
|
|
|
|
2004-04-25 18:35:39 +02:00
|
|
|
#define AENC_TEXT N_("Audio encoder")
|
|
|
|
#define AENC_LONGTEXT N_( \
|
2006-03-25 11:57:34 +01:00
|
|
|
"This is the audio encoder module that will be used (and its associated "\
|
|
|
|
"options).")
|
2004-04-25 16:15:29 +02:00
|
|
|
#define ACODEC_TEXT N_("Destination audio codec")
|
|
|
|
#define ACODEC_LONGTEXT N_( \
|
2006-03-25 11:57:34 +01:00
|
|
|
"This is the audio codec that will be used.")
|
2004-04-25 16:15:29 +02:00
|
|
|
#define AB_TEXT N_("Audio bitrate")
|
|
|
|
#define AB_LONGTEXT N_( \
|
2006-03-25 11:57:34 +01:00
|
|
|
"Target bitrate of the transcoded audio stream." )
|
2004-04-25 16:15:29 +02:00
|
|
|
#define ARATE_TEXT N_("Audio sample rate")
|
|
|
|
#define ARATE_LONGTEXT N_( \
|
2006-03-25 11:57:34 +01:00
|
|
|
"Sample rate of the transcoded audio stream (11250, 22500, 44100 or 48000).")
|
2004-04-25 16:15:29 +02:00
|
|
|
#define ACHANS_TEXT N_("Audio channels")
|
|
|
|
#define ACHANS_LONGTEXT N_( \
|
2006-03-25 11:57:34 +01:00
|
|
|
"Number of audio channels in the transcoded streams." )
|
2006-08-06 15:27:58 +02:00
|
|
|
#define AFILTER_TEXT N_("Audio filter")
|
|
|
|
#define AFILTER_LONGTEXT N_( \
|
|
|
|
"Audio filters will be applied to the audio streams (after conversion " \
|
|
|
|
"filters are applied). You must enter a comma-separated list of filters." )
|
2004-04-25 16:15:29 +02:00
|
|
|
|
2004-08-08 23:14:38 +02:00
|
|
|
#define SENC_TEXT N_("Subtitles encoder")
|
|
|
|
#define SENC_LONGTEXT N_( \
|
2006-03-25 11:57:34 +01:00
|
|
|
"This is the subtitles encoder module that will be used (and its " \
|
|
|
|
"associated options)." )
|
2004-08-08 23:14:38 +02:00
|
|
|
#define SCODEC_TEXT N_("Destination subtitles codec")
|
|
|
|
#define SCODEC_LONGTEXT N_( \
|
2006-09-10 22:20:21 +02:00
|
|
|
"This is the subtitles codec that will be used." )
|
2006-03-25 11:57:34 +01:00
|
|
|
|
|
|
|
#define SFILTER_TEXT N_("Overlays")
|
2004-09-17 12:13:21 +02:00
|
|
|
#define SFILTER_LONGTEXT N_( \
|
2006-03-25 11:57:34 +01:00
|
|
|
"This allows you to add overlays (also known as \"subpictures\" on the "\
|
|
|
|
"transcoded video stream. The subpictures produced by the filters will "\
|
|
|
|
"be overlayed directly onto the video. You must specify a comma-separated "\
|
|
|
|
"list of subpicture modules" )
|
2004-08-08 23:14:38 +02:00
|
|
|
|
2005-08-11 22:13:01 +02:00
|
|
|
#define OSD_TEXT N_("OSD menu")
|
|
|
|
#define OSD_LONGTEXT N_(\
|
2006-03-25 11:57:34 +01:00
|
|
|
"Stream the On Screen Display menu (using the osdmenu subpicture module)." )
|
2006-03-19 02:27:21 +01:00
|
|
|
|
2004-04-25 16:15:29 +02:00
|
|
|
#define THREADS_TEXT N_("Number of threads")
|
|
|
|
#define THREADS_LONGTEXT N_( \
|
2006-03-25 11:57:34 +01:00
|
|
|
"Number of threads used for the transcoding." )
|
2005-06-03 12:11:58 +02:00
|
|
|
#define HP_TEXT N_("High priority")
|
|
|
|
#define HP_LONGTEXT N_( \
|
|
|
|
"Runs the optional encoder thread at the OUTPUT priority instead of " \
|
|
|
|
"VIDEO." )
|
2004-04-25 16:15:29 +02:00
|
|
|
|
2004-08-19 17:01:54 +02:00
|
|
|
#define ASYNC_TEXT N_("Synchronise on audio track")
|
|
|
|
#define ASYNC_LONGTEXT N_( \
|
|
|
|
"This option will drop/duplicate video frames to synchronise the video " \
|
|
|
|
"track on the audio track." )
|
|
|
|
|
2005-04-26 14:40:02 +02:00
|
|
|
#define HURRYUP_TEXT N_( "Hurry up" )
|
2006-03-25 11:57:34 +01:00
|
|
|
#define HURRYUP_LONGTEXT N_( "The transcoder will drop frames if your CPU " \
|
|
|
|
"can't keep up with the encoding rate." )
|
2005-04-26 14:40:02 +02:00
|
|
|
|
2005-06-29 01:46:33 +02:00
|
|
|
static char *ppsz_deinterlace_type[] =
|
|
|
|
{
|
|
|
|
"deinterlace", "ffmpeg-deinterlace"
|
|
|
|
};
|
|
|
|
|
2004-03-11 18:36:43 +01:00
|
|
|
static int Open ( vlc_object_t * );
|
|
|
|
static void Close( vlc_object_t * );
|
|
|
|
|
2004-04-25 16:15:29 +02:00
|
|
|
#define SOUT_CFG_PREFIX "sout-transcode-"
|
|
|
|
|
2004-03-11 18:36:43 +01:00
|
|
|
vlc_module_begin();
|
2005-03-03 07:58:04 +01:00
|
|
|
set_shortname( _("Transcode"));
|
2004-03-11 18:36:43 +01:00
|
|
|
set_description( _("Transcode stream output") );
|
|
|
|
set_capability( "sout stream", 50 );
|
|
|
|
add_shortcut( "transcode" );
|
|
|
|
set_callbacks( Open, Close );
|
2004-12-11 15:45:46 +01:00
|
|
|
set_category( CAT_SOUT );
|
|
|
|
set_subcategory( SUBCAT_SOUT_STREAM );
|
2005-03-03 07:58:04 +01:00
|
|
|
set_section( N_("Video"), NULL );
|
2004-04-25 18:35:39 +02:00
|
|
|
add_string( SOUT_CFG_PREFIX "venc", NULL, NULL, VENC_TEXT,
|
|
|
|
VENC_LONGTEXT, VLC_FALSE );
|
2004-04-25 16:15:29 +02:00
|
|
|
add_string( SOUT_CFG_PREFIX "vcodec", NULL, NULL, VCODEC_TEXT,
|
|
|
|
VCODEC_LONGTEXT, VLC_FALSE );
|
|
|
|
add_integer( SOUT_CFG_PREFIX "vb", 800 * 1000, NULL, VB_TEXT,
|
|
|
|
VB_LONGTEXT, VLC_FALSE );
|
|
|
|
add_float( SOUT_CFG_PREFIX "scale", 1, NULL, SCALE_TEXT,
|
|
|
|
SCALE_LONGTEXT, VLC_FALSE );
|
2004-08-19 17:01:54 +02:00
|
|
|
add_float( SOUT_CFG_PREFIX "fps", 0, NULL, FPS_TEXT,
|
|
|
|
FPS_LONGTEXT, VLC_FALSE );
|
2005-04-26 14:40:02 +02:00
|
|
|
add_bool( SOUT_CFG_PREFIX "hurry-up", VLC_TRUE, NULL, HURRYUP_TEXT,
|
|
|
|
HURRYUP_LONGTEXT, VLC_FALSE );
|
2004-04-25 16:15:29 +02:00
|
|
|
add_bool( SOUT_CFG_PREFIX "deinterlace", 0, NULL, DEINTERLACE_TEXT,
|
|
|
|
DEINTERLACE_LONGTEXT, VLC_FALSE );
|
2005-05-20 17:02:25 +02:00
|
|
|
add_string( SOUT_CFG_PREFIX "deinterlace-module", "deinterlace", NULL,
|
|
|
|
DEINTERLACE_MODULE_TEXT, DEINTERLACE_MODULE_LONGTEXT,
|
|
|
|
VLC_FALSE );
|
2005-06-29 01:46:33 +02:00
|
|
|
change_string_list( ppsz_deinterlace_type, 0, 0 );
|
2004-04-25 16:15:29 +02:00
|
|
|
add_integer( SOUT_CFG_PREFIX "width", 0, NULL, WIDTH_TEXT,
|
|
|
|
WIDTH_LONGTEXT, VLC_TRUE );
|
|
|
|
add_integer( SOUT_CFG_PREFIX "height", 0, NULL, HEIGHT_TEXT,
|
|
|
|
HEIGHT_LONGTEXT, VLC_TRUE );
|
2005-08-12 17:51:18 +02:00
|
|
|
add_integer( SOUT_CFG_PREFIX "maxwidth", 0, NULL, MAXWIDTH_TEXT,
|
|
|
|
MAXWIDTH_LONGTEXT, VLC_TRUE );
|
|
|
|
add_integer( SOUT_CFG_PREFIX "maxheight", 0, NULL, MAXHEIGHT_TEXT,
|
|
|
|
MAXHEIGHT_LONGTEXT, VLC_TRUE );
|
2006-09-06 23:32:39 +02:00
|
|
|
add_module_list( SOUT_CFG_PREFIX "vfilter", "video filter2",
|
2005-06-03 12:11:58 +02:00
|
|
|
NULL, NULL,
|
|
|
|
VFILTER_TEXT, VFILTER_LONGTEXT, VLC_FALSE );
|
2004-04-25 16:15:29 +02:00
|
|
|
|
|
|
|
add_integer( SOUT_CFG_PREFIX "croptop", 0, NULL, CROPTOP_TEXT,
|
|
|
|
CROPTOP_LONGTEXT, VLC_TRUE );
|
|
|
|
add_integer( SOUT_CFG_PREFIX "cropleft", 0, NULL, CROPLEFT_TEXT,
|
|
|
|
CROPLEFT_LONGTEXT, VLC_TRUE );
|
|
|
|
add_integer( SOUT_CFG_PREFIX "cropbottom", 0, NULL, CROPBOTTOM_TEXT,
|
|
|
|
CROPBOTTOM_LONGTEXT, VLC_TRUE );
|
|
|
|
add_integer( SOUT_CFG_PREFIX "cropright", 0, NULL, CROPRIGHT_TEXT,
|
|
|
|
CROPRIGHT_LONGTEXT, VLC_TRUE );
|
|
|
|
|
2006-03-18 12:27:10 +01:00
|
|
|
add_integer( SOUT_CFG_PREFIX "paddtop", 0, NULL, PADDTOP_TEXT,
|
|
|
|
PADDTOP_LONGTEXT, VLC_TRUE );
|
|
|
|
add_integer( SOUT_CFG_PREFIX "paddleft", 0, NULL, PADDLEFT_TEXT,
|
|
|
|
PADDLEFT_LONGTEXT, VLC_TRUE );
|
|
|
|
add_integer( SOUT_CFG_PREFIX "paddbottom", 0, NULL, PADDBOTTOM_TEXT,
|
|
|
|
PADDBOTTOM_LONGTEXT, VLC_TRUE );
|
|
|
|
add_integer( SOUT_CFG_PREFIX "paddright", 0, NULL, PADDRIGHT_TEXT,
|
|
|
|
PADDRIGHT_LONGTEXT, VLC_TRUE );
|
|
|
|
|
|
|
|
add_integer( SOUT_CFG_PREFIX "canvas-width", 0, NULL, CANVAS_WIDTH_TEXT,
|
|
|
|
CANVAS_WIDTH_LONGTEXT, VLC_TRUE );
|
|
|
|
add_integer( SOUT_CFG_PREFIX "canvas-height", 0, NULL, CANVAS_HEIGHT_TEXT,
|
|
|
|
CANVAS_HEIGHT_LONGTEXT, VLC_TRUE );
|
|
|
|
add_string( SOUT_CFG_PREFIX "canvas-aspect", NULL, NULL, CANVAS_ASPECT_TEXT,
|
|
|
|
CANVAS_ASPECT_LONGTEXT, VLC_FALSE );
|
|
|
|
|
2005-03-03 07:58:04 +01:00
|
|
|
set_section( N_("Audio"), NULL );
|
2004-04-25 18:35:39 +02:00
|
|
|
add_string( SOUT_CFG_PREFIX "aenc", NULL, NULL, AENC_TEXT,
|
|
|
|
AENC_LONGTEXT, VLC_FALSE );
|
2004-04-25 16:15:29 +02:00
|
|
|
add_string( SOUT_CFG_PREFIX "acodec", NULL, NULL, ACODEC_TEXT,
|
|
|
|
ACODEC_LONGTEXT, VLC_FALSE );
|
|
|
|
add_integer( SOUT_CFG_PREFIX "ab", 64000, NULL, AB_TEXT,
|
|
|
|
AB_LONGTEXT, VLC_FALSE );
|
|
|
|
add_integer( SOUT_CFG_PREFIX "channels", 0, NULL, ACHANS_TEXT,
|
|
|
|
ACHANS_LONGTEXT, VLC_FALSE );
|
|
|
|
add_integer( SOUT_CFG_PREFIX "samplerate", 0, NULL, ARATE_TEXT,
|
|
|
|
ARATE_LONGTEXT, VLC_TRUE );
|
2005-03-03 07:58:04 +01:00
|
|
|
add_bool( SOUT_CFG_PREFIX "audio-sync", 0, NULL, ASYNC_TEXT,
|
|
|
|
ASYNC_LONGTEXT, VLC_FALSE );
|
2006-08-06 15:27:58 +02:00
|
|
|
add_module_list_cat( SOUT_CFG_PREFIX "afilter", SUBCAT_AUDIO_MISC,
|
|
|
|
NULL, NULL,
|
|
|
|
AFILTER_TEXT, AFILTER_LONGTEXT, VLC_FALSE );
|
2004-04-25 16:15:29 +02:00
|
|
|
|
2005-03-03 07:58:04 +01:00
|
|
|
set_section( N_("Overlays/Subtitles"), NULL );
|
2004-08-08 23:14:38 +02:00
|
|
|
add_string( SOUT_CFG_PREFIX "senc", NULL, NULL, SENC_TEXT,
|
|
|
|
SENC_LONGTEXT, VLC_FALSE );
|
|
|
|
add_string( SOUT_CFG_PREFIX "scodec", NULL, NULL, SCODEC_TEXT,
|
|
|
|
SCODEC_LONGTEXT, VLC_FALSE );
|
|
|
|
add_bool( SOUT_CFG_PREFIX "soverlay", 0, NULL, SCODEC_TEXT,
|
|
|
|
SCODEC_LONGTEXT, VLC_FALSE );
|
2005-03-03 07:58:04 +01:00
|
|
|
add_module_list_cat( SOUT_CFG_PREFIX "sfilter", SUBCAT_VIDEO_SUBPIC,
|
|
|
|
NULL, NULL,
|
|
|
|
SFILTER_TEXT, SFILTER_LONGTEXT, VLC_FALSE );
|
2004-08-08 23:14:38 +02:00
|
|
|
|
2005-08-11 22:13:01 +02:00
|
|
|
set_section( N_("On Screen Display"), NULL );
|
|
|
|
add_bool( SOUT_CFG_PREFIX "osd", 0, NULL, OSD_TEXT,
|
|
|
|
OSD_LONGTEXT, VLC_FALSE );
|
2006-08-04 17:17:15 +02:00
|
|
|
|
2005-03-03 07:58:04 +01:00
|
|
|
set_section( N_("Miscellaneous"), NULL );
|
2004-04-25 16:15:29 +02:00
|
|
|
add_integer( SOUT_CFG_PREFIX "threads", 0, NULL, THREADS_TEXT,
|
|
|
|
THREADS_LONGTEXT, VLC_TRUE );
|
2005-06-03 12:11:58 +02:00
|
|
|
add_bool( SOUT_CFG_PREFIX "high-priority", 0, NULL, HP_TEXT, HP_LONGTEXT,
|
|
|
|
VLC_TRUE );
|
2004-08-19 17:01:54 +02:00
|
|
|
|
2004-04-25 16:15:29 +02:00
|
|
|
vlc_module_end();
|
2004-03-11 18:36:43 +01:00
|
|
|
|
2004-04-25 18:35:39 +02:00
|
|
|
static const char *ppsz_sout_options[] = {
|
|
|
|
"venc", "vcodec", "vb", "croptop", "cropbottom", "cropleft", "cropright",
|
2006-03-18 12:27:10 +01:00
|
|
|
"paddtop", "paddbottom", "paddleft", "paddright",
|
|
|
|
"canvas-width", "canvas-height", "canvas-aspect",
|
2005-06-03 12:11:58 +02:00
|
|
|
"scale", "fps", "width", "height", "vfilter", "deinterlace",
|
|
|
|
"deinterlace-module", "threads", "hurry-up", "aenc", "acodec", "ab",
|
2006-08-06 15:27:58 +02:00
|
|
|
"afilter", "samplerate", "channels", "senc", "scodec", "soverlay",
|
|
|
|
"sfilter", "osd", "audio-sync", "high-priority", "maxwidth", "maxheight",
|
|
|
|
NULL
|
2004-04-25 18:35:39 +02:00
|
|
|
};
|
|
|
|
|
2004-03-11 18:36:43 +01:00
|
|
|
/*****************************************************************************
|
|
|
|
* Exported prototypes
|
|
|
|
*****************************************************************************/
|
2003-11-21 16:32:09 +01:00
|
|
|
static sout_stream_id_t *Add ( sout_stream_t *, es_format_t * );
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
static int Del ( sout_stream_t *, sout_stream_id_t * );
|
2004-03-11 18:36:43 +01:00
|
|
|
static int Send( sout_stream_t *, sout_stream_id_t *, block_t* );
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
|
2004-08-26 23:27:06 +02:00
|
|
|
static int transcode_audio_new ( sout_stream_t *, sout_stream_id_t * );
|
|
|
|
static void transcode_audio_close ( sout_stream_t *, sout_stream_id_t * );
|
|
|
|
static int transcode_audio_process( sout_stream_t *, sout_stream_id_t *,
|
|
|
|
block_t *, block_t ** );
|
|
|
|
|
2004-08-27 15:31:23 +02:00
|
|
|
static aout_buffer_t *audio_new_buffer( decoder_t *, int );
|
|
|
|
static void audio_del_buffer( decoder_t *, aout_buffer_t * );
|
|
|
|
|
2004-08-26 23:27:06 +02:00
|
|
|
static int transcode_video_new ( sout_stream_t *, sout_stream_id_t * );
|
|
|
|
static void transcode_video_close ( sout_stream_t *, sout_stream_id_t * );
|
|
|
|
static int transcode_video_encoder_open( sout_stream_t *, sout_stream_id_t *);
|
|
|
|
static int transcode_video_process( sout_stream_t *, sout_stream_id_t *,
|
|
|
|
block_t *, block_t ** );
|
|
|
|
|
2004-09-08 14:48:57 +02:00
|
|
|
static void video_del_buffer( vlc_object_t *, picture_t * );
|
|
|
|
static picture_t *video_new_buffer_decoder( decoder_t * );
|
|
|
|
static void video_del_buffer_decoder( decoder_t *, picture_t * );
|
|
|
|
static void video_link_picture_decoder( decoder_t *, picture_t * );
|
|
|
|
static void video_unlink_picture_decoder( decoder_t *, picture_t * );
|
|
|
|
static picture_t *video_new_buffer_filter( filter_t * );
|
|
|
|
static void video_del_buffer_filter( filter_t *, picture_t * );
|
2003-08-09 16:59:24 +02:00
|
|
|
|
2004-08-08 23:14:38 +02:00
|
|
|
static int transcode_spu_new ( sout_stream_t *, sout_stream_id_t * );
|
|
|
|
static void transcode_spu_close ( sout_stream_t *, sout_stream_id_t * );
|
|
|
|
static int transcode_spu_process( sout_stream_t *, sout_stream_id_t *,
|
|
|
|
block_t *, block_t ** );
|
|
|
|
|
Forward port of branches/0.8.1-jpsaman-thedj revision 12070. The OSD menu subsystem consists of two parts a core part (src/osd, include/vlc_osd.h) and a subfilter (modules/video_filter/osdmenu.c). The OSD menu can be used locally or it can be streamed. It depends on the way the functionality is called from the vlc commandline. Currently there is only one way to make the subpictures appear on the video and that is through the rc-interface. The following commands are supported by it: "menu on" (show OSD menu), "menu off" (hide OSD menu), "menu left" (highlight button on the left), "menu right" (highlight button on the right), "menu up" (highlight button above), "menu down" (highlight button below) or "menu select" (perform hotkey action). When there is no button on the left, right, up or down then the menu-command will be ignored.
To stream use a commandline similar to this:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg --extraintf rc --sout '#transcode{sfilter=osdmenu}:std{mux=ts,access=udp,url=127.0.0.1:1234}' -vvvv
For local playback a commandline like this is needed:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg -vvvv
Have fun with the basic functionality - jpsaman.
2005-08-11 00:08:50 +02:00
|
|
|
static int transcode_osd_new ( sout_stream_t *, sout_stream_id_t * );
|
|
|
|
static void transcode_osd_close ( sout_stream_t *, sout_stream_id_t * );
|
|
|
|
static int transcode_osd_process( sout_stream_t *, sout_stream_id_t *,
|
|
|
|
block_t *, block_t ** );
|
2006-01-16 22:32:56 +01:00
|
|
|
|
* modules/codec/ffmpeg/encoder.c, modules/stream_out/transcode.c :
- new ffmpeg options available from the command-line : interleaved video,
noise reduction, rate control parameters, i_quant_factor, trellis
quantification, mpeg4 matrix, and thread count
- portable functions to use ffmpeg multithreading capabilities on all
platforms
- hurry up mode now turns off rd and trellis, and also raises the noise
reduction parameter (thus noise reduction is mandatory with hurry up)
- if threads=1, no ffmpeg thread is launched, but the ffmpeg encoding
will be done in a separate thread than the packetizer and decoder
- fixed a bug with mp3 decoding and weird ffmpeg return code
2004-02-20 19:34:28 +01:00
|
|
|
static int EncoderThread( struct sout_stream_sys_t * p_sys );
|
|
|
|
|
2003-10-27 02:04:38 +01:00
|
|
|
static int pi_channels_maps[6] =
|
|
|
|
{
|
|
|
|
0,
|
|
|
|
AOUT_CHAN_CENTER, AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT,
|
|
|
|
AOUT_CHAN_CENTER | AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT,
|
|
|
|
AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_REARLEFT
|
|
|
|
| AOUT_CHAN_REARRIGHT,
|
|
|
|
AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER
|
|
|
|
| AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT
|
|
|
|
};
|
|
|
|
|
* modules/codec/ffmpeg/encoder.c, modules/stream_out/transcode.c :
- new ffmpeg options available from the command-line : interleaved video,
noise reduction, rate control parameters, i_quant_factor, trellis
quantification, mpeg4 matrix, and thread count
- portable functions to use ffmpeg multithreading capabilities on all
platforms
- hurry up mode now turns off rd and trellis, and also raises the noise
reduction parameter (thus noise reduction is mandatory with hurry up)
- if threads=1, no ffmpeg thread is launched, but the ffmpeg encoding
will be done in a separate thread than the packetizer and decoder
- fixed a bug with mp3 decoding and weird ffmpeg return code
2004-02-20 19:34:28 +01:00
|
|
|
#define PICTURE_RING_SIZE 64
|
2004-08-08 23:14:38 +02:00
|
|
|
#define SUBPICTURE_RING_SIZE 20
|
2006-08-06 15:27:58 +02:00
|
|
|
#define TRANSCODE_FILTERS 10
|
* modules/codec/ffmpeg/encoder.c, modules/stream_out/transcode.c :
- new ffmpeg options available from the command-line : interleaved video,
noise reduction, rate control parameters, i_quant_factor, trellis
quantification, mpeg4 matrix, and thread count
- portable functions to use ffmpeg multithreading capabilities on all
platforms
- hurry up mode now turns off rd and trellis, and also raises the noise
reduction parameter (thus noise reduction is mandatory with hurry up)
- if threads=1, no ffmpeg thread is launched, but the ffmpeg encoding
will be done in a separate thread than the packetizer and decoder
- fixed a bug with mp3 decoding and weird ffmpeg return code
2004-02-20 19:34:28 +01:00
|
|
|
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
struct sout_stream_sys_t
|
|
|
|
{
|
* modules/codec/ffmpeg/encoder.c, modules/stream_out/transcode.c :
- new ffmpeg options available from the command-line : interleaved video,
noise reduction, rate control parameters, i_quant_factor, trellis
quantification, mpeg4 matrix, and thread count
- portable functions to use ffmpeg multithreading capabilities on all
platforms
- hurry up mode now turns off rd and trellis, and also raises the noise
reduction parameter (thus noise reduction is mandatory with hurry up)
- if threads=1, no ffmpeg thread is launched, but the ffmpeg encoding
will be done in a separate thread than the packetizer and decoder
- fixed a bug with mp3 decoding and weird ffmpeg return code
2004-02-20 19:34:28 +01:00
|
|
|
VLC_COMMON_MEMBERS
|
|
|
|
|
2004-08-26 23:27:06 +02:00
|
|
|
sout_stream_t *p_out;
|
|
|
|
sout_stream_id_t *id_video;
|
|
|
|
block_t *p_buffers;
|
* modules/codec/ffmpeg/encoder.c, modules/stream_out/transcode.c :
- new ffmpeg options available from the command-line : interleaved video,
noise reduction, rate control parameters, i_quant_factor, trellis
quantification, mpeg4 matrix, and thread count
- portable functions to use ffmpeg multithreading capabilities on all
platforms
- hurry up mode now turns off rd and trellis, and also raises the noise
reduction parameter (thus noise reduction is mandatory with hurry up)
- if threads=1, no ffmpeg thread is launched, but the ffmpeg encoding
will be done in a separate thread than the packetizer and decoder
- fixed a bug with mp3 decoding and weird ffmpeg return code
2004-02-20 19:34:28 +01:00
|
|
|
vlc_mutex_t lock_out;
|
|
|
|
vlc_cond_t cond;
|
|
|
|
picture_t * pp_pics[PICTURE_RING_SIZE];
|
|
|
|
int i_first_pic, i_last_pic;
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
|
2004-08-08 23:14:38 +02:00
|
|
|
/* Audio */
|
2003-04-30 00:44:08 +02:00
|
|
|
vlc_fourcc_t i_acodec; /* codec audio (0 if not transcode) */
|
2004-04-25 18:35:39 +02:00
|
|
|
char *psz_aenc;
|
2006-10-01 18:08:37 +02:00
|
|
|
config_chain_t *p_audio_cfg;
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
int i_sample_rate;
|
|
|
|
int i_channels;
|
|
|
|
int i_abitrate;
|
2006-08-06 15:27:58 +02:00
|
|
|
char *psz_afilters[TRANSCODE_FILTERS];
|
2006-10-01 18:08:37 +02:00
|
|
|
config_chain_t *p_afilters_cfg[TRANSCODE_FILTERS];
|
2006-08-06 15:27:58 +02:00
|
|
|
int i_afilters;
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
|
2004-08-08 23:14:38 +02:00
|
|
|
/* Video */
|
|
|
|
vlc_fourcc_t i_vcodec; /* codec video (0 if not transcode) */
|
2004-04-25 18:35:39 +02:00
|
|
|
char *psz_venc;
|
2006-10-01 18:08:37 +02:00
|
|
|
config_chain_t *p_video_cfg;
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
int i_vbitrate;
|
2003-12-08 14:02:40 +01:00
|
|
|
double f_scale;
|
2004-08-19 17:01:54 +02:00
|
|
|
double f_fps;
|
2005-08-12 17:51:18 +02:00
|
|
|
unsigned int i_width, i_maxwidth;
|
|
|
|
unsigned int i_height, i_maxheight;
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
vlc_bool_t b_deinterlace;
|
2005-05-20 17:02:25 +02:00
|
|
|
char *psz_deinterlace;
|
2006-10-01 18:08:37 +02:00
|
|
|
config_chain_t *p_deinterlace_cfg;
|
* modules/codec/ffmpeg/encoder.c, modules/stream_out/transcode.c :
- new ffmpeg options available from the command-line : interleaved video,
noise reduction, rate control parameters, i_quant_factor, trellis
quantification, mpeg4 matrix, and thread count
- portable functions to use ffmpeg multithreading capabilities on all
platforms
- hurry up mode now turns off rd and trellis, and also raises the noise
reduction parameter (thus noise reduction is mandatory with hurry up)
- if threads=1, no ffmpeg thread is launched, but the ffmpeg encoding
will be done in a separate thread than the packetizer and decoder
- fixed a bug with mp3 decoding and weird ffmpeg return code
2004-02-20 19:34:28 +01:00
|
|
|
int i_threads;
|
2005-06-03 12:11:58 +02:00
|
|
|
vlc_bool_t b_high_priority;
|
2005-04-26 14:40:02 +02:00
|
|
|
vlc_bool_t b_hurry_up;
|
2006-08-06 15:27:58 +02:00
|
|
|
char *psz_vfilters[TRANSCODE_FILTERS];
|
2006-10-01 18:08:37 +02:00
|
|
|
config_chain_t *p_vfilters_cfg[TRANSCODE_FILTERS];
|
2005-06-03 12:11:58 +02:00
|
|
|
int i_vfilters;
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
|
|
|
|
int i_crop_top;
|
|
|
|
int i_crop_bottom;
|
|
|
|
int i_crop_right;
|
|
|
|
int i_crop_left;
|
2003-08-09 16:59:24 +02:00
|
|
|
|
2006-03-18 12:27:10 +01:00
|
|
|
int i_padd_top;
|
|
|
|
int i_padd_bottom;
|
|
|
|
int i_padd_right;
|
|
|
|
int i_padd_left;
|
|
|
|
|
|
|
|
int i_canvas_width;
|
|
|
|
int i_canvas_height;
|
|
|
|
int i_canvas_aspect;
|
2006-08-04 17:17:15 +02:00
|
|
|
|
2006-03-18 12:27:10 +01:00
|
|
|
/* Video, calculated */
|
|
|
|
int i_src_x_offset;
|
|
|
|
int i_src_y_offset;
|
|
|
|
int i_crop_width;
|
|
|
|
int i_crop_height;
|
|
|
|
|
|
|
|
int i_dst_x_offset;
|
|
|
|
int i_dst_y_offset;
|
|
|
|
int i_nopadd_width;
|
|
|
|
int i_nopadd_height;
|
|
|
|
|
2004-08-08 23:14:38 +02:00
|
|
|
/* SPU */
|
|
|
|
vlc_fourcc_t i_scodec; /* codec spu (0 if not transcode) */
|
|
|
|
char *psz_senc;
|
|
|
|
vlc_bool_t b_soverlay;
|
2006-10-01 18:08:37 +02:00
|
|
|
config_chain_t *p_spu_cfg;
|
2004-09-15 17:50:54 +02:00
|
|
|
spu_t *p_spu;
|
2004-08-19 17:01:54 +02:00
|
|
|
|
Forward port of branches/0.8.1-jpsaman-thedj revision 12070. The OSD menu subsystem consists of two parts a core part (src/osd, include/vlc_osd.h) and a subfilter (modules/video_filter/osdmenu.c). The OSD menu can be used locally or it can be streamed. It depends on the way the functionality is called from the vlc commandline. Currently there is only one way to make the subpictures appear on the video and that is through the rc-interface. The following commands are supported by it: "menu on" (show OSD menu), "menu off" (hide OSD menu), "menu left" (highlight button on the left), "menu right" (highlight button on the right), "menu up" (highlight button above), "menu down" (highlight button below) or "menu select" (perform hotkey action). When there is no button on the left, right, up or down then the menu-command will be ignored.
To stream use a commandline similar to this:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg --extraintf rc --sout '#transcode{sfilter=osdmenu}:std{mux=ts,access=udp,url=127.0.0.1:1234}' -vvvv
For local playback a commandline like this is needed:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg -vvvv
Have fun with the basic functionality - jpsaman.
2005-08-11 00:08:50 +02:00
|
|
|
/* OSD Menu */
|
|
|
|
sout_stream_id_t *id_osd; /* extension for streaming OSD menus */
|
|
|
|
vlc_fourcc_t i_osdcodec; /* codec osd menu (0 if not transcode) */
|
|
|
|
char *psz_osdenc;
|
2006-10-01 18:08:37 +02:00
|
|
|
config_chain_t *p_osd_cfg;
|
2005-08-11 22:13:01 +02:00
|
|
|
vlc_bool_t b_es_osd; /* VLC_TRUE when osd es is registered */
|
|
|
|
vlc_bool_t b_sout_osd;
|
2006-01-16 22:32:56 +01:00
|
|
|
|
2004-08-19 17:01:54 +02:00
|
|
|
/* Sync */
|
2004-10-30 17:05:52 +02:00
|
|
|
vlc_bool_t b_master_sync;
|
2004-08-19 17:01:54 +02:00
|
|
|
mtime_t i_master_drift;
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
};
|
|
|
|
|
2004-09-08 14:48:57 +02:00
|
|
|
struct decoder_owner_sys_t
|
|
|
|
{
|
|
|
|
picture_t *pp_pics[PICTURE_RING_SIZE];
|
2005-06-07 12:28:09 +02:00
|
|
|
sout_stream_sys_t *p_sys;
|
2004-09-08 14:48:57 +02:00
|
|
|
};
|
|
|
|
struct filter_owner_sys_t
|
|
|
|
{
|
|
|
|
picture_t *pp_pics[PICTURE_RING_SIZE];
|
2005-06-07 12:28:09 +02:00
|
|
|
sout_stream_sys_t *p_sys;
|
2004-09-08 14:48:57 +02:00
|
|
|
};
|
|
|
|
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
/*****************************************************************************
|
|
|
|
* Open:
|
|
|
|
*****************************************************************************/
|
|
|
|
static int Open( vlc_object_t *p_this )
|
|
|
|
{
|
|
|
|
sout_stream_t *p_stream = (sout_stream_t*)p_this;
|
|
|
|
sout_stream_sys_t *p_sys;
|
2004-04-25 16:15:29 +02:00
|
|
|
vlc_value_t val;
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
|
* modules/codec/ffmpeg/encoder.c, modules/stream_out/transcode.c :
- new ffmpeg options available from the command-line : interleaved video,
noise reduction, rate control parameters, i_quant_factor, trellis
quantification, mpeg4 matrix, and thread count
- portable functions to use ffmpeg multithreading capabilities on all
platforms
- hurry up mode now turns off rd and trellis, and also raises the noise
reduction parameter (thus noise reduction is mandatory with hurry up)
- if threads=1, no ffmpeg thread is launched, but the ffmpeg encoding
will be done in a separate thread than the packetizer and decoder
- fixed a bug with mp3 decoding and weird ffmpeg return code
2004-02-20 19:34:28 +01:00
|
|
|
p_sys = vlc_object_create( p_this, sizeof( sout_stream_sys_t ) );
|
2004-04-25 16:15:29 +02:00
|
|
|
|
2004-07-10 19:20:59 +02:00
|
|
|
p_sys->p_out = sout_StreamNew( p_stream->p_sout, p_stream->psz_next );
|
2004-04-25 16:15:29 +02:00
|
|
|
if( !p_sys->p_out )
|
|
|
|
{
|
|
|
|
msg_Err( p_stream, "cannot create chain" );
|
2005-03-02 11:01:39 +01:00
|
|
|
vlc_object_destroy( p_sys );
|
2004-04-25 16:15:29 +02:00
|
|
|
return VLC_EGENERIC;
|
|
|
|
}
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
|
2004-08-19 17:01:54 +02:00
|
|
|
p_sys->i_master_drift = 0;
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
|
2006-10-01 18:08:37 +02:00
|
|
|
config_ChainParse( p_stream, SOUT_CFG_PREFIX, ppsz_sout_options,
|
2004-04-25 18:35:39 +02:00
|
|
|
p_stream->p_cfg );
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
|
2004-04-25 18:35:39 +02:00
|
|
|
/* Audio transcoding parameters */
|
|
|
|
var_Get( p_stream, SOUT_CFG_PREFIX "aenc", &val );
|
|
|
|
p_sys->psz_aenc = NULL;
|
|
|
|
p_sys->p_audio_cfg = NULL;
|
|
|
|
if( val.psz_string && *val.psz_string )
|
2004-04-25 16:15:29 +02:00
|
|
|
{
|
2004-04-25 18:35:39 +02:00
|
|
|
char *psz_next;
|
2006-10-01 18:08:37 +02:00
|
|
|
psz_next = config_ChainCreate( &p_sys->psz_aenc, &p_sys->p_audio_cfg,
|
|
|
|
val.psz_string );
|
2004-04-25 16:15:29 +02:00
|
|
|
if( psz_next ) free( psz_next );
|
|
|
|
}
|
2004-04-25 18:35:39 +02:00
|
|
|
if( val.psz_string ) free( val.psz_string );
|
2004-04-25 16:15:29 +02:00
|
|
|
|
|
|
|
var_Get( p_stream, SOUT_CFG_PREFIX "acodec", &val );
|
|
|
|
p_sys->i_acodec = 0;
|
|
|
|
if( val.psz_string && *val.psz_string )
|
|
|
|
{
|
|
|
|
char fcc[4] = " ";
|
|
|
|
memcpy( fcc, val.psz_string, __MIN( strlen( val.psz_string ), 4 ) );
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
p_sys->i_acodec = VLC_FOURCC( fcc[0], fcc[1], fcc[2], fcc[3] );
|
2004-04-25 16:15:29 +02:00
|
|
|
}
|
|
|
|
if( val.psz_string ) free( val.psz_string );
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
|
2004-04-25 16:15:29 +02:00
|
|
|
var_Get( p_stream, SOUT_CFG_PREFIX "ab", &val );
|
|
|
|
p_sys->i_abitrate = val.i_int;
|
|
|
|
if( p_sys->i_abitrate < 4000 ) p_sys->i_abitrate *= 1000;
|
|
|
|
|
|
|
|
var_Get( p_stream, SOUT_CFG_PREFIX "samplerate", &val );
|
|
|
|
p_sys->i_sample_rate = val.i_int;
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
|
2004-04-25 16:15:29 +02:00
|
|
|
var_Get( p_stream, SOUT_CFG_PREFIX "channels", &val );
|
|
|
|
p_sys->i_channels = val.i_int;
|
|
|
|
|
|
|
|
if( p_sys->i_acodec )
|
|
|
|
{
|
2006-08-17 22:07:13 +02:00
|
|
|
if( p_sys->i_acodec == VLC_FOURCC('m','p','3',0) &&
|
|
|
|
p_sys->i_channels > 2 )
|
Forward port of branches/0.8.1-jpsaman-thedj revision 12070. The OSD menu subsystem consists of two parts a core part (src/osd, include/vlc_osd.h) and a subfilter (modules/video_filter/osdmenu.c). The OSD menu can be used locally or it can be streamed. It depends on the way the functionality is called from the vlc commandline. Currently there is only one way to make the subpictures appear on the video and that is through the rc-interface. The following commands are supported by it: "menu on" (show OSD menu), "menu off" (hide OSD menu), "menu left" (highlight button on the left), "menu right" (highlight button on the right), "menu up" (highlight button above), "menu down" (highlight button below) or "menu select" (perform hotkey action). When there is no button on the left, right, up or down then the menu-command will be ignored.
To stream use a commandline similar to this:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg --extraintf rc --sout '#transcode{sfilter=osdmenu}:std{mux=ts,access=udp,url=127.0.0.1:1234}' -vvvv
For local playback a commandline like this is needed:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg -vvvv
Have fun with the basic functionality - jpsaman.
2005-08-11 00:08:50 +02:00
|
|
|
{
|
|
|
|
msg_Warn( p_stream, "%d channels invalid for mp3, forcing to 2",
|
|
|
|
p_sys->i_channels );
|
|
|
|
p_sys->i_channels = 2;
|
2006-03-19 02:27:21 +01:00
|
|
|
}
|
2004-04-25 16:15:29 +02:00
|
|
|
msg_Dbg( p_stream, "codec audio=%4.4s %dHz %d channels %dKb/s",
|
|
|
|
(char *)&p_sys->i_acodec, p_sys->i_sample_rate,
|
|
|
|
p_sys->i_channels, p_sys->i_abitrate / 1000 );
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
}
|
|
|
|
|
2006-08-06 15:27:58 +02:00
|
|
|
var_Get( p_stream, SOUT_CFG_PREFIX "afilter", &val );
|
|
|
|
p_sys->i_afilters = 0;
|
|
|
|
if( val.psz_string && *val.psz_string )
|
|
|
|
{
|
|
|
|
char *psz_parser = val.psz_string;
|
|
|
|
|
|
|
|
while( (psz_parser != NULL) && (*psz_parser != '\0')
|
|
|
|
&& (p_sys->i_afilters < TRANSCODE_FILTERS) )
|
|
|
|
{
|
2006-10-01 18:08:37 +02:00
|
|
|
psz_parser = config_ChainCreate(
|
2006-08-06 15:27:58 +02:00
|
|
|
&p_sys->psz_afilters[p_sys->i_afilters],
|
|
|
|
&p_sys->p_afilters_cfg[p_sys->i_afilters],
|
|
|
|
psz_parser );
|
|
|
|
p_sys->i_afilters++;
|
|
|
|
if( (psz_parser != NULL) && (*psz_parser != '\0') ) psz_parser++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if( val.psz_string ) free( val.psz_string );
|
|
|
|
if( p_sys->i_afilters < TRANSCODE_FILTERS-1 )
|
|
|
|
{
|
|
|
|
p_sys->psz_afilters[p_sys->i_afilters] = NULL;
|
|
|
|
p_sys->p_afilters_cfg[p_sys->i_afilters] = NULL;
|
|
|
|
}
|
|
|
|
|
2004-04-25 16:15:29 +02:00
|
|
|
/* Video transcoding parameters */
|
2004-04-25 18:35:39 +02:00
|
|
|
var_Get( p_stream, SOUT_CFG_PREFIX "venc", &val );
|
|
|
|
p_sys->psz_venc = NULL;
|
|
|
|
p_sys->p_video_cfg = NULL;
|
|
|
|
if( val.psz_string && *val.psz_string )
|
|
|
|
{
|
|
|
|
char *psz_next;
|
2006-10-01 18:08:37 +02:00
|
|
|
psz_next = config_ChainCreate( &p_sys->psz_venc, &p_sys->p_video_cfg,
|
2004-07-10 19:20:59 +02:00
|
|
|
val.psz_string );
|
2004-04-25 18:35:39 +02:00
|
|
|
if( psz_next ) free( psz_next );
|
|
|
|
}
|
|
|
|
if( val.psz_string ) free( val.psz_string );
|
|
|
|
|
2004-04-25 16:15:29 +02:00
|
|
|
var_Get( p_stream, SOUT_CFG_PREFIX "vcodec", &val );
|
|
|
|
p_sys->i_vcodec = 0;
|
|
|
|
if( val.psz_string && *val.psz_string )
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
{
|
|
|
|
char fcc[4] = " ";
|
2004-04-25 16:15:29 +02:00
|
|
|
memcpy( fcc, val.psz_string, __MIN( strlen( val.psz_string ), 4 ) );
|
|
|
|
p_sys->i_vcodec = VLC_FOURCC( fcc[0], fcc[1], fcc[2], fcc[3] );
|
|
|
|
}
|
|
|
|
if( val.psz_string ) free( val.psz_string );
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
|
2004-04-25 16:15:29 +02:00
|
|
|
var_Get( p_stream, SOUT_CFG_PREFIX "vb", &val );
|
|
|
|
p_sys->i_vbitrate = val.i_int;
|
|
|
|
if( p_sys->i_vbitrate < 16000 ) p_sys->i_vbitrate *= 1000;
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
|
2004-04-25 16:15:29 +02:00
|
|
|
var_Get( p_stream, SOUT_CFG_PREFIX "scale", &val );
|
|
|
|
p_sys->f_scale = val.f_float;
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
|
2004-08-19 17:01:54 +02:00
|
|
|
var_Get( p_stream, SOUT_CFG_PREFIX "fps", &val );
|
|
|
|
p_sys->f_fps = val.f_float;
|
|
|
|
|
2005-04-26 14:40:02 +02:00
|
|
|
var_Get( p_stream, SOUT_CFG_PREFIX "hurry-up", &val );
|
|
|
|
p_sys->b_hurry_up = val.b_bool;
|
|
|
|
|
2004-04-25 16:15:29 +02:00
|
|
|
var_Get( p_stream, SOUT_CFG_PREFIX "width", &val );
|
|
|
|
p_sys->i_width = val.i_int;
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
|
2004-04-25 16:15:29 +02:00
|
|
|
var_Get( p_stream, SOUT_CFG_PREFIX "height", &val );
|
|
|
|
p_sys->i_height = val.i_int;
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
|
2005-08-12 17:51:18 +02:00
|
|
|
var_Get( p_stream, SOUT_CFG_PREFIX "maxwidth", &val );
|
|
|
|
p_sys->i_maxwidth = val.i_int;
|
|
|
|
|
|
|
|
var_Get( p_stream, SOUT_CFG_PREFIX "maxheight", &val );
|
|
|
|
p_sys->i_maxheight = val.i_int;
|
|
|
|
|
2005-06-03 12:11:58 +02:00
|
|
|
var_Get( p_stream, SOUT_CFG_PREFIX "vfilter", &val );
|
|
|
|
p_sys->i_vfilters = 0;
|
|
|
|
if( val.psz_string && *val.psz_string )
|
|
|
|
{
|
|
|
|
char *psz_parser = val.psz_string;
|
|
|
|
|
2006-08-06 15:27:58 +02:00
|
|
|
while( (psz_parser != NULL) && (*psz_parser != '\0')
|
|
|
|
&& (p_sys->i_vfilters < TRANSCODE_FILTERS) )
|
2005-06-03 12:11:58 +02:00
|
|
|
{
|
2006-10-01 18:08:37 +02:00
|
|
|
psz_parser = config_ChainCreate(
|
2005-06-03 12:11:58 +02:00
|
|
|
&p_sys->psz_vfilters[p_sys->i_vfilters],
|
|
|
|
&p_sys->p_vfilters_cfg[p_sys->i_vfilters],
|
|
|
|
psz_parser );
|
|
|
|
p_sys->i_vfilters++;
|
|
|
|
if( psz_parser != NULL && *psz_parser != '\0' ) psz_parser++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if( val.psz_string ) free( val.psz_string );
|
2006-08-06 15:27:58 +02:00
|
|
|
if( p_sys->i_vfilters < TRANSCODE_FILTERS-1 )
|
|
|
|
{
|
|
|
|
p_sys->psz_vfilters[p_sys->i_vfilters] = NULL;
|
|
|
|
p_sys->p_vfilters_cfg[p_sys->i_vfilters] = NULL;
|
|
|
|
}
|
2005-06-03 12:11:58 +02:00
|
|
|
|
2004-04-25 16:15:29 +02:00
|
|
|
var_Get( p_stream, SOUT_CFG_PREFIX "deinterlace", &val );
|
|
|
|
p_sys->b_deinterlace = val.b_bool;
|
|
|
|
|
2005-05-20 17:02:25 +02:00
|
|
|
var_Get( p_stream, SOUT_CFG_PREFIX "deinterlace-module", &val );
|
|
|
|
p_sys->psz_deinterlace = NULL;
|
|
|
|
p_sys->p_deinterlace_cfg = NULL;
|
|
|
|
if( val.psz_string && *val.psz_string )
|
|
|
|
{
|
|
|
|
char *psz_next;
|
2006-10-01 18:08:37 +02:00
|
|
|
psz_next = config_ChainCreate( &p_sys->psz_deinterlace,
|
2005-05-20 17:02:25 +02:00
|
|
|
&p_sys->p_deinterlace_cfg,
|
|
|
|
val.psz_string );
|
|
|
|
if( psz_next ) free( psz_next );
|
|
|
|
}
|
|
|
|
if( val.psz_string ) free( val.psz_string );
|
|
|
|
|
2004-04-25 16:15:29 +02:00
|
|
|
var_Get( p_stream, SOUT_CFG_PREFIX "croptop", &val );
|
|
|
|
p_sys->i_crop_top = val.i_int;
|
|
|
|
var_Get( p_stream, SOUT_CFG_PREFIX "cropbottom", &val );
|
|
|
|
p_sys->i_crop_bottom = val.i_int;
|
|
|
|
var_Get( p_stream, SOUT_CFG_PREFIX "cropleft", &val );
|
|
|
|
p_sys->i_crop_left = val.i_int;
|
|
|
|
var_Get( p_stream, SOUT_CFG_PREFIX "cropright", &val );
|
|
|
|
p_sys->i_crop_right = val.i_int;
|
|
|
|
|
2006-03-18 12:27:10 +01:00
|
|
|
var_Get( p_stream, SOUT_CFG_PREFIX "paddtop", &val );
|
|
|
|
p_sys->i_padd_top = val.i_int;
|
|
|
|
var_Get( p_stream, SOUT_CFG_PREFIX "paddbottom", &val );
|
|
|
|
p_sys->i_padd_bottom = val.i_int;
|
|
|
|
var_Get( p_stream, SOUT_CFG_PREFIX "paddleft", &val );
|
|
|
|
p_sys->i_padd_left = val.i_int;
|
|
|
|
var_Get( p_stream, SOUT_CFG_PREFIX "paddright", &val );
|
|
|
|
p_sys->i_padd_right = val.i_int;
|
2006-08-04 17:17:15 +02:00
|
|
|
|
2006-03-18 12:27:10 +01:00
|
|
|
var_Get( p_stream, SOUT_CFG_PREFIX "canvas-width", &val );
|
|
|
|
p_sys->i_canvas_width = val.i_int;
|
|
|
|
var_Get( p_stream, SOUT_CFG_PREFIX "canvas-height", &val );
|
|
|
|
p_sys->i_canvas_height = val.i_int;
|
2006-08-04 17:17:15 +02:00
|
|
|
|
2006-03-18 12:27:10 +01:00
|
|
|
var_Get( p_stream, SOUT_CFG_PREFIX "canvas-aspect", &val );
|
2006-08-17 22:07:13 +02:00
|
|
|
p_sys->i_canvas_aspect = 0;
|
|
|
|
if( val.psz_string && *val.psz_string )
|
2006-03-18 12:27:10 +01:00
|
|
|
{
|
|
|
|
char *psz_parser = strchr( val.psz_string, ':' );
|
|
|
|
if( psz_parser )
|
|
|
|
{
|
|
|
|
*psz_parser++ = '\0';
|
2006-08-17 22:07:13 +02:00
|
|
|
p_sys->i_canvas_aspect = atoi( val.psz_string ) *
|
|
|
|
VOUT_ASPECT_FACTOR / atoi( psz_parser );
|
2006-03-18 12:27:10 +01:00
|
|
|
}
|
2006-08-17 22:07:13 +02:00
|
|
|
else msg_Warn( p_stream, "bad aspect ratio %s", val.psz_string );
|
2006-03-18 12:27:10 +01:00
|
|
|
|
|
|
|
}
|
2006-08-17 22:07:13 +02:00
|
|
|
if( val.psz_string ) free( val.psz_string );
|
2006-03-18 12:27:10 +01:00
|
|
|
|
2004-04-25 16:15:29 +02:00
|
|
|
var_Get( p_stream, SOUT_CFG_PREFIX "threads", &val );
|
|
|
|
p_sys->i_threads = val.i_int;
|
2005-06-03 12:11:58 +02:00
|
|
|
var_Get( p_stream, SOUT_CFG_PREFIX "high-priority", &val );
|
|
|
|
p_sys->b_high_priority = val.b_bool;
|
2004-04-25 16:15:29 +02:00
|
|
|
|
|
|
|
if( p_sys->i_vcodec )
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
{
|
2004-04-25 16:15:29 +02:00
|
|
|
msg_Dbg( p_stream, "codec video=%4.4s %dx%d scaling: %f %dkb/s",
|
|
|
|
(char *)&p_sys->i_vcodec, p_sys->i_width, p_sys->i_height,
|
|
|
|
p_sys->f_scale, p_sys->i_vbitrate / 1000 );
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
}
|
2003-12-08 14:02:40 +01:00
|
|
|
|
2004-08-08 23:14:38 +02:00
|
|
|
/* Subpictures transcoding parameters */
|
Forward port of branches/0.8.1-jpsaman-thedj revision 12070. The OSD menu subsystem consists of two parts a core part (src/osd, include/vlc_osd.h) and a subfilter (modules/video_filter/osdmenu.c). The OSD menu can be used locally or it can be streamed. It depends on the way the functionality is called from the vlc commandline. Currently there is only one way to make the subpictures appear on the video and that is through the rc-interface. The following commands are supported by it: "menu on" (show OSD menu), "menu off" (hide OSD menu), "menu left" (highlight button on the left), "menu right" (highlight button on the right), "menu up" (highlight button above), "menu down" (highlight button below) or "menu select" (perform hotkey action). When there is no button on the left, right, up or down then the menu-command will be ignored.
To stream use a commandline similar to this:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg --extraintf rc --sout '#transcode{sfilter=osdmenu}:std{mux=ts,access=udp,url=127.0.0.1:1234}' -vvvv
For local playback a commandline like this is needed:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg -vvvv
Have fun with the basic functionality - jpsaman.
2005-08-11 00:08:50 +02:00
|
|
|
p_sys->p_spu = NULL;
|
2004-08-08 23:14:38 +02:00
|
|
|
p_sys->psz_senc = NULL;
|
|
|
|
p_sys->p_spu_cfg = NULL;
|
2004-09-17 12:13:21 +02:00
|
|
|
p_sys->i_scodec = 0;
|
|
|
|
|
|
|
|
var_Get( p_stream, SOUT_CFG_PREFIX "senc", &val );
|
2004-08-08 23:14:38 +02:00
|
|
|
if( val.psz_string && *val.psz_string )
|
|
|
|
{
|
|
|
|
char *psz_next;
|
2006-10-01 18:08:37 +02:00
|
|
|
psz_next = config_ChainCreate( &p_sys->psz_senc, &p_sys->p_spu_cfg,
|
2004-08-08 23:14:38 +02:00
|
|
|
val.psz_string );
|
|
|
|
if( psz_next ) free( psz_next );
|
|
|
|
}
|
|
|
|
if( val.psz_string ) free( val.psz_string );
|
|
|
|
|
|
|
|
var_Get( p_stream, SOUT_CFG_PREFIX "scodec", &val );
|
|
|
|
if( val.psz_string && *val.psz_string )
|
|
|
|
{
|
|
|
|
char fcc[4] = " ";
|
|
|
|
memcpy( fcc, val.psz_string, __MIN( strlen( val.psz_string ), 4 ) );
|
|
|
|
p_sys->i_scodec = VLC_FOURCC( fcc[0], fcc[1], fcc[2], fcc[3] );
|
|
|
|
}
|
|
|
|
if( val.psz_string ) free( val.psz_string );
|
|
|
|
|
|
|
|
if( p_sys->i_scodec )
|
|
|
|
{
|
2005-03-11 09:18:14 +01:00
|
|
|
msg_Dbg( p_stream, "codec spu=%4.4s", (char *)&p_sys->i_scodec );
|
2004-08-08 23:14:38 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
var_Get( p_stream, SOUT_CFG_PREFIX "soverlay", &val );
|
|
|
|
p_sys->b_soverlay = val.b_bool;
|
2004-09-17 12:13:21 +02:00
|
|
|
|
|
|
|
var_Get( p_stream, SOUT_CFG_PREFIX "sfilter", &val );
|
|
|
|
if( val.psz_string && *val.psz_string )
|
|
|
|
{
|
|
|
|
p_sys->p_spu = spu_Create( p_stream );
|
|
|
|
var_Create( p_sys->p_spu, "sub-filter", VLC_VAR_STRING );
|
|
|
|
var_Set( p_sys->p_spu, "sub-filter", val );
|
|
|
|
spu_Init( p_sys->p_spu );
|
|
|
|
}
|
|
|
|
if( val.psz_string ) free( val.psz_string );
|
2004-08-08 23:14:38 +02:00
|
|
|
|
Forward port of branches/0.8.1-jpsaman-thedj revision 12070. The OSD menu subsystem consists of two parts a core part (src/osd, include/vlc_osd.h) and a subfilter (modules/video_filter/osdmenu.c). The OSD menu can be used locally or it can be streamed. It depends on the way the functionality is called from the vlc commandline. Currently there is only one way to make the subpictures appear on the video and that is through the rc-interface. The following commands are supported by it: "menu on" (show OSD menu), "menu off" (hide OSD menu), "menu left" (highlight button on the left), "menu right" (highlight button on the right), "menu up" (highlight button above), "menu down" (highlight button below) or "menu select" (perform hotkey action). When there is no button on the left, right, up or down then the menu-command will be ignored.
To stream use a commandline similar to this:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg --extraintf rc --sout '#transcode{sfilter=osdmenu}:std{mux=ts,access=udp,url=127.0.0.1:1234}' -vvvv
For local playback a commandline like this is needed:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg -vvvv
Have fun with the basic functionality - jpsaman.
2005-08-11 00:08:50 +02:00
|
|
|
/* OSD menu transcoding parameters */
|
|
|
|
p_sys->psz_osdenc = NULL;
|
|
|
|
p_sys->p_osd_cfg = NULL;
|
|
|
|
p_sys->i_osdcodec = 0;
|
2005-08-11 22:13:01 +02:00
|
|
|
p_sys->b_es_osd = VLC_FALSE;
|
|
|
|
|
|
|
|
var_Get( p_stream, SOUT_CFG_PREFIX "osd", &val );
|
|
|
|
p_sys->b_sout_osd = val.b_bool;
|
|
|
|
if( p_sys->b_sout_osd )
|
Forward port of branches/0.8.1-jpsaman-thedj revision 12070. The OSD menu subsystem consists of two parts a core part (src/osd, include/vlc_osd.h) and a subfilter (modules/video_filter/osdmenu.c). The OSD menu can be used locally or it can be streamed. It depends on the way the functionality is called from the vlc commandline. Currently there is only one way to make the subpictures appear on the video and that is through the rc-interface. The following commands are supported by it: "menu on" (show OSD menu), "menu off" (hide OSD menu), "menu left" (highlight button on the left), "menu right" (highlight button on the right), "menu up" (highlight button above), "menu down" (highlight button below) or "menu select" (perform hotkey action). When there is no button on the left, right, up or down then the menu-command will be ignored.
To stream use a commandline similar to this:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg --extraintf rc --sout '#transcode{sfilter=osdmenu}:std{mux=ts,access=udp,url=127.0.0.1:1234}' -vvvv
For local playback a commandline like this is needed:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg -vvvv
Have fun with the basic functionality - jpsaman.
2005-08-11 00:08:50 +02:00
|
|
|
{
|
2005-08-11 22:13:01 +02:00
|
|
|
vlc_value_t osd_val;
|
Forward port of branches/0.8.1-jpsaman-thedj revision 12070. The OSD menu subsystem consists of two parts a core part (src/osd, include/vlc_osd.h) and a subfilter (modules/video_filter/osdmenu.c). The OSD menu can be used locally or it can be streamed. It depends on the way the functionality is called from the vlc commandline. Currently there is only one way to make the subpictures appear on the video and that is through the rc-interface. The following commands are supported by it: "menu on" (show OSD menu), "menu off" (hide OSD menu), "menu left" (highlight button on the left), "menu right" (highlight button on the right), "menu up" (highlight button above), "menu down" (highlight button below) or "menu select" (perform hotkey action). When there is no button on the left, right, up or down then the menu-command will be ignored.
To stream use a commandline similar to this:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg --extraintf rc --sout '#transcode{sfilter=osdmenu}:std{mux=ts,access=udp,url=127.0.0.1:1234}' -vvvv
For local playback a commandline like this is needed:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg -vvvv
Have fun with the basic functionality - jpsaman.
2005-08-11 00:08:50 +02:00
|
|
|
char *psz_next;
|
2006-01-16 22:32:56 +01:00
|
|
|
|
2006-10-01 18:08:37 +02:00
|
|
|
psz_next = config_ChainCreate( &p_sys->psz_osdenc,
|
Forward port of branches/0.8.1-jpsaman-thedj revision 12070. The OSD menu subsystem consists of two parts a core part (src/osd, include/vlc_osd.h) and a subfilter (modules/video_filter/osdmenu.c). The OSD menu can be used locally or it can be streamed. It depends on the way the functionality is called from the vlc commandline. Currently there is only one way to make the subpictures appear on the video and that is through the rc-interface. The following commands are supported by it: "menu on" (show OSD menu), "menu off" (hide OSD menu), "menu left" (highlight button on the left), "menu right" (highlight button on the right), "menu up" (highlight button above), "menu down" (highlight button below) or "menu select" (perform hotkey action). When there is no button on the left, right, up or down then the menu-command will be ignored.
To stream use a commandline similar to this:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg --extraintf rc --sout '#transcode{sfilter=osdmenu}:std{mux=ts,access=udp,url=127.0.0.1:1234}' -vvvv
For local playback a commandline like this is needed:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg -vvvv
Have fun with the basic functionality - jpsaman.
2005-08-11 00:08:50 +02:00
|
|
|
&p_sys->p_osd_cfg, strdup( "dvbsub") );
|
|
|
|
if( psz_next ) free( psz_next );
|
2006-01-16 22:32:56 +01:00
|
|
|
|
|
|
|
p_sys->i_osdcodec = VLC_FOURCC('Y','U','V','P' );
|
Forward port of branches/0.8.1-jpsaman-thedj revision 12070. The OSD menu subsystem consists of two parts a core part (src/osd, include/vlc_osd.h) and a subfilter (modules/video_filter/osdmenu.c). The OSD menu can be used locally or it can be streamed. It depends on the way the functionality is called from the vlc commandline. Currently there is only one way to make the subpictures appear on the video and that is through the rc-interface. The following commands are supported by it: "menu on" (show OSD menu), "menu off" (hide OSD menu), "menu left" (highlight button on the left), "menu right" (highlight button on the right), "menu up" (highlight button above), "menu down" (highlight button below) or "menu select" (perform hotkey action). When there is no button on the left, right, up or down then the menu-command will be ignored.
To stream use a commandline similar to this:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg --extraintf rc --sout '#transcode{sfilter=osdmenu}:std{mux=ts,access=udp,url=127.0.0.1:1234}' -vvvv
For local playback a commandline like this is needed:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg -vvvv
Have fun with the basic functionality - jpsaman.
2005-08-11 00:08:50 +02:00
|
|
|
|
|
|
|
msg_Dbg( p_stream, "codec osd=%4.4s", (char *)&p_sys->i_osdcodec );
|
|
|
|
|
|
|
|
if( !p_sys->p_spu )
|
|
|
|
{
|
2005-08-11 22:13:01 +02:00
|
|
|
osd_val.psz_string = strdup("osdmenu");
|
Forward port of branches/0.8.1-jpsaman-thedj revision 12070. The OSD menu subsystem consists of two parts a core part (src/osd, include/vlc_osd.h) and a subfilter (modules/video_filter/osdmenu.c). The OSD menu can be used locally or it can be streamed. It depends on the way the functionality is called from the vlc commandline. Currently there is only one way to make the subpictures appear on the video and that is through the rc-interface. The following commands are supported by it: "menu on" (show OSD menu), "menu off" (hide OSD menu), "menu left" (highlight button on the left), "menu right" (highlight button on the right), "menu up" (highlight button above), "menu down" (highlight button below) or "menu select" (perform hotkey action). When there is no button on the left, right, up or down then the menu-command will be ignored.
To stream use a commandline similar to this:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg --extraintf rc --sout '#transcode{sfilter=osdmenu}:std{mux=ts,access=udp,url=127.0.0.1:1234}' -vvvv
For local playback a commandline like this is needed:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg -vvvv
Have fun with the basic functionality - jpsaman.
2005-08-11 00:08:50 +02:00
|
|
|
p_sys->p_spu = spu_Create( p_stream );
|
|
|
|
var_Create( p_sys->p_spu, "sub-filter", VLC_VAR_STRING );
|
2005-08-11 22:13:01 +02:00
|
|
|
var_Set( p_sys->p_spu, "sub-filter", osd_val );
|
Forward port of branches/0.8.1-jpsaman-thedj revision 12070. The OSD menu subsystem consists of two parts a core part (src/osd, include/vlc_osd.h) and a subfilter (modules/video_filter/osdmenu.c). The OSD menu can be used locally or it can be streamed. It depends on the way the functionality is called from the vlc commandline. Currently there is only one way to make the subpictures appear on the video and that is through the rc-interface. The following commands are supported by it: "menu on" (show OSD menu), "menu off" (hide OSD menu), "menu left" (highlight button on the left), "menu right" (highlight button on the right), "menu up" (highlight button above), "menu down" (highlight button below) or "menu select" (perform hotkey action). When there is no button on the left, right, up or down then the menu-command will be ignored.
To stream use a commandline similar to this:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg --extraintf rc --sout '#transcode{sfilter=osdmenu}:std{mux=ts,access=udp,url=127.0.0.1:1234}' -vvvv
For local playback a commandline like this is needed:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg -vvvv
Have fun with the basic functionality - jpsaman.
2005-08-11 00:08:50 +02:00
|
|
|
spu_Init( p_sys->p_spu );
|
2005-08-11 22:13:01 +02:00
|
|
|
if( osd_val.psz_string ) free( osd_val.psz_string );
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
osd_val.psz_string = strdup("osdmenu");
|
|
|
|
var_Set( p_sys->p_spu, "sub-filter", osd_val );
|
|
|
|
if( osd_val.psz_string ) free( osd_val.psz_string );
|
2006-01-16 22:32:56 +01:00
|
|
|
}
|
Forward port of branches/0.8.1-jpsaman-thedj revision 12070. The OSD menu subsystem consists of two parts a core part (src/osd, include/vlc_osd.h) and a subfilter (modules/video_filter/osdmenu.c). The OSD menu can be used locally or it can be streamed. It depends on the way the functionality is called from the vlc commandline. Currently there is only one way to make the subpictures appear on the video and that is through the rc-interface. The following commands are supported by it: "menu on" (show OSD menu), "menu off" (hide OSD menu), "menu left" (highlight button on the left), "menu right" (highlight button on the right), "menu up" (highlight button above), "menu down" (highlight button below) or "menu select" (perform hotkey action). When there is no button on the left, right, up or down then the menu-command will be ignored.
To stream use a commandline similar to this:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg --extraintf rc --sout '#transcode{sfilter=osdmenu}:std{mux=ts,access=udp,url=127.0.0.1:1234}' -vvvv
For local playback a commandline like this is needed:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg -vvvv
Have fun with the basic functionality - jpsaman.
2005-08-11 00:08:50 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Audio settings */
|
2004-08-19 17:01:54 +02:00
|
|
|
var_Get( p_stream, SOUT_CFG_PREFIX "audio-sync", &val );
|
2004-10-30 17:05:52 +02:00
|
|
|
p_sys->b_master_sync = val.b_bool;
|
|
|
|
if( p_sys->f_fps > 0 ) p_sys->b_master_sync = VLC_TRUE;
|
2004-08-19 17:01:54 +02:00
|
|
|
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
p_stream->pf_add = Add;
|
|
|
|
p_stream->pf_del = Del;
|
|
|
|
p_stream->pf_send = Send;
|
|
|
|
p_stream->p_sys = p_sys;
|
|
|
|
|
|
|
|
return VLC_SUCCESS;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*****************************************************************************
|
|
|
|
* Close:
|
|
|
|
*****************************************************************************/
|
|
|
|
static void Close( vlc_object_t * p_this )
|
|
|
|
{
|
|
|
|
sout_stream_t *p_stream = (sout_stream_t*)p_this;
|
|
|
|
sout_stream_sys_t *p_sys = p_stream->p_sys;
|
|
|
|
|
2004-07-10 19:20:59 +02:00
|
|
|
sout_StreamDelete( p_sys->p_out );
|
2004-04-25 16:15:29 +02:00
|
|
|
|
|
|
|
while( p_sys->p_audio_cfg != NULL )
|
|
|
|
{
|
2006-10-01 18:08:37 +02:00
|
|
|
config_chain_t *p_next = p_sys->p_audio_cfg->p_next;
|
2004-04-25 16:15:29 +02:00
|
|
|
|
|
|
|
if( p_sys->p_audio_cfg->psz_name )
|
|
|
|
free( p_sys->p_audio_cfg->psz_name );
|
|
|
|
if( p_sys->p_audio_cfg->psz_value )
|
|
|
|
free( p_sys->p_audio_cfg->psz_value );
|
|
|
|
free( p_sys->p_audio_cfg );
|
|
|
|
|
|
|
|
p_sys->p_audio_cfg = p_next;
|
|
|
|
}
|
2004-04-25 18:35:39 +02:00
|
|
|
if( p_sys->psz_aenc ) free( p_sys->psz_aenc );
|
2004-04-25 16:15:29 +02:00
|
|
|
|
|
|
|
while( p_sys->p_video_cfg != NULL )
|
|
|
|
{
|
2006-10-01 18:08:37 +02:00
|
|
|
config_chain_t *p_next = p_sys->p_video_cfg->p_next;
|
2004-04-25 16:15:29 +02:00
|
|
|
|
|
|
|
if( p_sys->p_video_cfg->psz_name )
|
|
|
|
free( p_sys->p_video_cfg->psz_name );
|
|
|
|
if( p_sys->p_video_cfg->psz_value )
|
|
|
|
free( p_sys->p_video_cfg->psz_value );
|
|
|
|
free( p_sys->p_video_cfg );
|
|
|
|
|
|
|
|
p_sys->p_video_cfg = p_next;
|
|
|
|
}
|
2004-04-25 18:35:39 +02:00
|
|
|
if( p_sys->psz_venc ) free( p_sys->psz_venc );
|
2004-04-25 16:15:29 +02:00
|
|
|
|
2005-05-20 17:02:25 +02:00
|
|
|
while( p_sys->p_deinterlace_cfg != NULL )
|
|
|
|
{
|
2006-10-01 18:08:37 +02:00
|
|
|
config_chain_t *p_next = p_sys->p_deinterlace_cfg->p_next;
|
2005-05-20 17:02:25 +02:00
|
|
|
|
|
|
|
if( p_sys->p_deinterlace_cfg->psz_name )
|
|
|
|
free( p_sys->p_deinterlace_cfg->psz_name );
|
|
|
|
if( p_sys->p_deinterlace_cfg->psz_value )
|
|
|
|
free( p_sys->p_deinterlace_cfg->psz_value );
|
|
|
|
free( p_sys->p_deinterlace_cfg );
|
|
|
|
|
|
|
|
p_sys->p_deinterlace_cfg = p_next;
|
|
|
|
}
|
|
|
|
if( p_sys->psz_deinterlace ) free( p_sys->psz_deinterlace );
|
|
|
|
|
2004-08-08 23:14:38 +02:00
|
|
|
while( p_sys->p_spu_cfg != NULL )
|
|
|
|
{
|
2006-10-01 18:08:37 +02:00
|
|
|
config_chain_t *p_next = p_sys->p_spu_cfg->p_next;
|
2004-08-08 23:14:38 +02:00
|
|
|
|
|
|
|
if( p_sys->p_spu_cfg->psz_name )
|
|
|
|
free( p_sys->p_spu_cfg->psz_name );
|
|
|
|
if( p_sys->p_spu_cfg->psz_value )
|
|
|
|
free( p_sys->p_spu_cfg->psz_value );
|
|
|
|
free( p_sys->p_spu_cfg );
|
|
|
|
|
|
|
|
p_sys->p_spu_cfg = p_next;
|
|
|
|
}
|
|
|
|
if( p_sys->psz_senc ) free( p_sys->psz_senc );
|
|
|
|
|
2004-09-15 17:50:54 +02:00
|
|
|
if( p_sys->p_spu ) spu_Destroy( p_sys->p_spu );
|
2006-01-16 22:32:56 +01:00
|
|
|
|
Forward port of branches/0.8.1-jpsaman-thedj revision 12070. The OSD menu subsystem consists of two parts a core part (src/osd, include/vlc_osd.h) and a subfilter (modules/video_filter/osdmenu.c). The OSD menu can be used locally or it can be streamed. It depends on the way the functionality is called from the vlc commandline. Currently there is only one way to make the subpictures appear on the video and that is through the rc-interface. The following commands are supported by it: "menu on" (show OSD menu), "menu off" (hide OSD menu), "menu left" (highlight button on the left), "menu right" (highlight button on the right), "menu up" (highlight button above), "menu down" (highlight button below) or "menu select" (perform hotkey action). When there is no button on the left, right, up or down then the menu-command will be ignored.
To stream use a commandline similar to this:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg --extraintf rc --sout '#transcode{sfilter=osdmenu}:std{mux=ts,access=udp,url=127.0.0.1:1234}' -vvvv
For local playback a commandline like this is needed:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg -vvvv
Have fun with the basic functionality - jpsaman.
2005-08-11 00:08:50 +02:00
|
|
|
while( p_sys->p_osd_cfg != NULL )
|
|
|
|
{
|
2006-10-01 18:08:37 +02:00
|
|
|
config_chain_t *p_next = p_sys->p_osd_cfg->p_next;
|
Forward port of branches/0.8.1-jpsaman-thedj revision 12070. The OSD menu subsystem consists of two parts a core part (src/osd, include/vlc_osd.h) and a subfilter (modules/video_filter/osdmenu.c). The OSD menu can be used locally or it can be streamed. It depends on the way the functionality is called from the vlc commandline. Currently there is only one way to make the subpictures appear on the video and that is through the rc-interface. The following commands are supported by it: "menu on" (show OSD menu), "menu off" (hide OSD menu), "menu left" (highlight button on the left), "menu right" (highlight button on the right), "menu up" (highlight button above), "menu down" (highlight button below) or "menu select" (perform hotkey action). When there is no button on the left, right, up or down then the menu-command will be ignored.
To stream use a commandline similar to this:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg --extraintf rc --sout '#transcode{sfilter=osdmenu}:std{mux=ts,access=udp,url=127.0.0.1:1234}' -vvvv
For local playback a commandline like this is needed:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg -vvvv
Have fun with the basic functionality - jpsaman.
2005-08-11 00:08:50 +02:00
|
|
|
|
|
|
|
if( p_sys->p_osd_cfg->psz_name )
|
|
|
|
free( p_sys->p_osd_cfg->psz_name );
|
|
|
|
if( p_sys->p_osd_cfg->psz_value )
|
|
|
|
free( p_sys->p_osd_cfg->psz_value );
|
|
|
|
free( p_sys->p_osd_cfg );
|
|
|
|
|
|
|
|
p_sys->p_osd_cfg = p_next;
|
|
|
|
}
|
2006-01-16 22:32:56 +01:00
|
|
|
if( p_sys->psz_osdenc ) free( p_sys->psz_osdenc );
|
2004-08-08 23:14:38 +02:00
|
|
|
|
* modules/codec/ffmpeg/encoder.c, modules/stream_out/transcode.c :
- new ffmpeg options available from the command-line : interleaved video,
noise reduction, rate control parameters, i_quant_factor, trellis
quantification, mpeg4 matrix, and thread count
- portable functions to use ffmpeg multithreading capabilities on all
platforms
- hurry up mode now turns off rd and trellis, and also raises the noise
reduction parameter (thus noise reduction is mandatory with hurry up)
- if threads=1, no ffmpeg thread is launched, but the ffmpeg encoding
will be done in a separate thread than the packetizer and decoder
- fixed a bug with mp3 decoding and weird ffmpeg return code
2004-02-20 19:34:28 +01:00
|
|
|
vlc_object_destroy( p_sys );
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
struct sout_stream_id_t
|
|
|
|
{
|
|
|
|
vlc_fourcc_t b_transcode;
|
2004-08-26 23:27:06 +02:00
|
|
|
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
/* id of the out stream */
|
|
|
|
void *id;
|
|
|
|
|
2004-08-08 23:14:38 +02:00
|
|
|
/* Decoder */
|
|
|
|
decoder_t *p_decoder;
|
|
|
|
|
2004-08-26 23:27:06 +02:00
|
|
|
/* Filters */
|
2006-08-06 15:27:58 +02:00
|
|
|
filter_t *pp_filter[TRANSCODE_FILTERS];
|
2004-08-26 23:27:06 +02:00
|
|
|
int i_filter;
|
2006-08-06 15:27:58 +02:00
|
|
|
/* User specified filters */
|
|
|
|
filter_t *pp_ufilter[TRANSCODE_FILTERS];
|
|
|
|
int i_ufilter;
|
2004-08-26 23:27:06 +02:00
|
|
|
|
2003-10-08 23:01:07 +02:00
|
|
|
/* Encoder */
|
2003-10-27 02:04:38 +01:00
|
|
|
encoder_t *p_encoder;
|
2003-10-08 23:01:07 +02:00
|
|
|
|
2004-08-19 17:01:54 +02:00
|
|
|
/* Sync */
|
|
|
|
date_t interpolated_pts;
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
};
|
|
|
|
|
2004-08-08 23:14:38 +02:00
|
|
|
static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
{
|
2004-08-08 23:14:38 +02:00
|
|
|
sout_stream_sys_t *p_sys = p_stream->p_sys;
|
|
|
|
sout_stream_id_t *id;
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
|
|
|
|
id = malloc( sizeof( sout_stream_id_t ) );
|
2004-08-19 17:01:54 +02:00
|
|
|
memset( id, 0, sizeof(sout_stream_id_t) );
|
|
|
|
|
2003-05-17 01:02:37 +02:00
|
|
|
id->id = NULL;
|
2004-08-08 23:14:38 +02:00
|
|
|
id->p_decoder = NULL;
|
2003-10-08 23:01:07 +02:00
|
|
|
id->p_encoder = NULL;
|
|
|
|
|
2004-08-26 23:27:06 +02:00
|
|
|
/* Create decoder object */
|
|
|
|
id->p_decoder = vlc_object_create( p_stream, VLC_OBJECT_DECODER );
|
|
|
|
if( !id->p_decoder )
|
|
|
|
{
|
|
|
|
msg_Err( p_stream, "out of memory" );
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
vlc_object_attach( id->p_decoder, p_stream );
|
|
|
|
id->p_decoder->p_module = NULL;
|
|
|
|
id->p_decoder->fmt_in = *p_fmt;
|
|
|
|
id->p_decoder->b_pace_control = VLC_TRUE;
|
|
|
|
|
|
|
|
/* Create encoder object */
|
|
|
|
id->p_encoder = vlc_object_create( p_stream, VLC_OBJECT_ENCODER );
|
|
|
|
if( !id->p_encoder )
|
|
|
|
{
|
|
|
|
msg_Err( p_stream, "out of memory" );
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
vlc_object_attach( id->p_encoder, p_stream );
|
|
|
|
id->p_encoder->p_module = NULL;
|
2004-08-19 17:01:54 +02:00
|
|
|
|
|
|
|
/* Create destination format */
|
2004-08-26 23:27:06 +02:00
|
|
|
es_format_Init( &id->p_encoder->fmt_out, p_fmt->i_cat, 0 );
|
|
|
|
id->p_encoder->fmt_out.i_id = p_fmt->i_id;
|
|
|
|
id->p_encoder->fmt_out.i_group = p_fmt->i_group;
|
|
|
|
if( p_fmt->psz_language )
|
|
|
|
id->p_encoder->fmt_out.psz_language = strdup( p_fmt->psz_language );
|
2004-08-19 17:01:54 +02:00
|
|
|
|
2004-04-25 19:33:37 +02:00
|
|
|
if( p_fmt->i_cat == AUDIO_ES && (p_sys->i_acodec || p_sys->psz_aenc) )
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
{
|
|
|
|
msg_Dbg( p_stream,
|
|
|
|
"creating audio transcoding from fcc=`%4.4s' to fcc=`%4.4s'",
|
2004-08-19 17:01:54 +02:00
|
|
|
(char*)&p_fmt->i_codec, (char*)&p_sys->i_acodec );
|
|
|
|
|
|
|
|
/* Complete destination format */
|
2004-08-26 23:27:06 +02:00
|
|
|
id->p_encoder->fmt_out.i_codec = p_sys->i_acodec;
|
|
|
|
id->p_encoder->fmt_out.audio.i_rate = p_sys->i_sample_rate > 0 ?
|
|
|
|
p_sys->i_sample_rate : (int)p_fmt->audio.i_rate;
|
|
|
|
id->p_encoder->fmt_out.i_bitrate = p_sys->i_abitrate;
|
|
|
|
id->p_encoder->fmt_out.audio.i_bitspersample =
|
|
|
|
p_fmt->audio.i_bitspersample;
|
2005-04-08 19:44:14 +02:00
|
|
|
id->p_encoder->fmt_out.audio.i_channels = p_sys->i_channels > 0 ?
|
|
|
|
p_sys->i_channels : p_fmt->audio.i_channels;
|
|
|
|
/* Sanity check for audio channels */
|
|
|
|
id->p_encoder->fmt_out.audio.i_channels =
|
|
|
|
__MIN( id->p_encoder->fmt_out.audio.i_channels,
|
|
|
|
id->p_decoder->fmt_in.audio.i_channels );
|
|
|
|
id->p_encoder->fmt_out.audio.i_original_channels =
|
|
|
|
id->p_decoder->fmt_in.audio.i_physical_channels;
|
|
|
|
if( id->p_decoder->fmt_in.audio.i_channels ==
|
|
|
|
id->p_encoder->fmt_out.audio.i_channels )
|
|
|
|
{
|
|
|
|
id->p_encoder->fmt_out.audio.i_physical_channels =
|
|
|
|
id->p_decoder->fmt_in.audio.i_physical_channels;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
id->p_encoder->fmt_out.audio.i_physical_channels =
|
|
|
|
pi_channels_maps[id->p_encoder->fmt_out.audio.i_channels];
|
|
|
|
}
|
2004-08-26 23:27:06 +02:00
|
|
|
|
|
|
|
/* Build decoder -> filter -> encoder chain */
|
|
|
|
if( transcode_audio_new( p_stream, id ) )
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
{
|
|
|
|
msg_Err( p_stream, "cannot create audio chain" );
|
2004-08-26 23:27:06 +02:00
|
|
|
goto error;
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
}
|
|
|
|
|
2004-08-26 23:27:06 +02:00
|
|
|
/* Open output stream */
|
|
|
|
id->id = p_sys->p_out->pf_add( p_sys->p_out, &id->p_encoder->fmt_out );
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
id->b_transcode = VLC_TRUE;
|
2003-07-07 17:50:44 +02:00
|
|
|
|
2005-08-31 22:37:23 +02:00
|
|
|
if( !id->id )
|
|
|
|
{
|
|
|
|
transcode_audio_close( p_stream, id );
|
|
|
|
goto error;
|
|
|
|
}
|
2004-08-19 17:01:54 +02:00
|
|
|
|
|
|
|
date_Init( &id->interpolated_pts, p_fmt->audio.i_rate, 1 );
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
}
|
2004-04-25 19:33:37 +02:00
|
|
|
else if( p_fmt->i_cat == VIDEO_ES &&
|
|
|
|
(p_sys->i_vcodec != 0 || p_sys->psz_venc) )
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
{
|
|
|
|
msg_Dbg( p_stream,
|
|
|
|
"creating video transcoding from fcc=`%4.4s' to fcc=`%4.4s'",
|
2004-04-25 16:15:29 +02:00
|
|
|
(char*)&p_fmt->i_codec, (char*)&p_sys->i_vcodec );
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
|
2004-08-19 17:01:54 +02:00
|
|
|
/* Complete destination format */
|
2004-08-26 23:27:06 +02:00
|
|
|
id->p_encoder->fmt_out.i_codec = p_sys->i_vcodec;
|
2006-03-18 12:27:10 +01:00
|
|
|
id->p_encoder->fmt_out.video.i_width = p_sys->i_width & ~1;
|
|
|
|
id->p_encoder->fmt_out.video.i_height = p_sys->i_height & ~1;
|
2004-08-26 23:27:06 +02:00
|
|
|
id->p_encoder->fmt_out.i_bitrate = p_sys->i_vbitrate;
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
|
2004-08-26 23:27:06 +02:00
|
|
|
/* Build decoder -> filter -> encoder chain */
|
|
|
|
if( transcode_video_new( p_stream, id ) )
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
{
|
|
|
|
msg_Err( p_stream, "cannot create video chain" );
|
2004-08-26 23:27:06 +02:00
|
|
|
goto error;
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
}
|
2004-08-26 23:27:06 +02:00
|
|
|
|
|
|
|
/* Stream will be added later on because we don't know
|
|
|
|
* all the characteristics of the decoded stream yet */
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
id->b_transcode = VLC_TRUE;
|
2004-08-19 17:01:54 +02:00
|
|
|
|
2004-08-26 23:27:06 +02:00
|
|
|
if( p_sys->f_fps > 0 )
|
2004-08-19 17:01:54 +02:00
|
|
|
{
|
2005-03-22 10:53:11 +01:00
|
|
|
id->p_encoder->fmt_out.video.i_frame_rate =
|
2005-05-20 19:58:06 +02:00
|
|
|
(p_sys->f_fps * 1001) + 0.5;
|
2005-03-22 10:53:11 +01:00
|
|
|
id->p_encoder->fmt_out.video.i_frame_rate_base = 1001;
|
2004-08-19 17:01:54 +02:00
|
|
|
}
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
}
|
2004-08-08 23:14:38 +02:00
|
|
|
else if( p_fmt->i_cat == SPU_ES && (p_sys->i_scodec || p_sys->psz_senc) )
|
|
|
|
{
|
|
|
|
msg_Dbg( p_stream, "creating subtitles transcoding from fcc=`%4.4s' "
|
|
|
|
"to fcc=`%4.4s'", (char*)&p_fmt->i_codec,
|
|
|
|
(char*)&p_sys->i_scodec );
|
|
|
|
|
2004-08-19 17:01:54 +02:00
|
|
|
/* Complete destination format */
|
2004-08-26 23:27:06 +02:00
|
|
|
id->p_encoder->fmt_out.i_codec = p_sys->i_scodec;
|
2004-08-08 23:14:38 +02:00
|
|
|
|
|
|
|
/* build decoder -> filter -> encoder */
|
|
|
|
if( transcode_spu_new( p_stream, id ) )
|
|
|
|
{
|
|
|
|
msg_Err( p_stream, "cannot create subtitles chain" );
|
2004-08-26 23:27:06 +02:00
|
|
|
goto error;
|
2004-08-08 23:14:38 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* open output stream */
|
2004-08-26 23:27:06 +02:00
|
|
|
id->id = p_sys->p_out->pf_add( p_sys->p_out, &id->p_encoder->fmt_out );
|
2004-08-08 23:14:38 +02:00
|
|
|
id->b_transcode = VLC_TRUE;
|
|
|
|
|
2005-08-31 22:37:23 +02:00
|
|
|
if( !id->id )
|
|
|
|
{
|
|
|
|
transcode_spu_close( p_stream, id );
|
|
|
|
goto error;
|
|
|
|
}
|
2004-08-08 23:14:38 +02:00
|
|
|
}
|
|
|
|
else if( p_fmt->i_cat == SPU_ES && p_sys->b_soverlay )
|
|
|
|
{
|
|
|
|
msg_Dbg( p_stream, "subtitles (fcc=`%4.4s') overlaying",
|
|
|
|
(char*)&p_fmt->i_codec );
|
|
|
|
|
|
|
|
id->b_transcode = VLC_TRUE;
|
|
|
|
|
2004-08-26 23:27:06 +02:00
|
|
|
/* Build decoder -> filter -> overlaying chain */
|
2004-08-08 23:14:38 +02:00
|
|
|
if( transcode_spu_new( p_stream, id ) )
|
|
|
|
{
|
|
|
|
msg_Err( p_stream, "cannot create subtitles chain" );
|
2004-08-26 23:27:06 +02:00
|
|
|
goto error;
|
2004-08-08 23:14:38 +02:00
|
|
|
}
|
|
|
|
}
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
else
|
|
|
|
{
|
2004-04-25 18:35:39 +02:00
|
|
|
msg_Dbg( p_stream, "not transcoding a stream (fcc=`%4.4s')",
|
|
|
|
(char*)&p_fmt->i_codec );
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
id->id = p_sys->p_out->pf_add( p_sys->p_out, p_fmt );
|
|
|
|
id->b_transcode = VLC_FALSE;
|
|
|
|
|
2004-08-26 23:27:06 +02:00
|
|
|
if( !id->id ) goto error;
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
}
|
|
|
|
|
2005-08-11 22:13:01 +02:00
|
|
|
if( p_sys->b_sout_osd )
|
Forward port of branches/0.8.1-jpsaman-thedj revision 12070. The OSD menu subsystem consists of two parts a core part (src/osd, include/vlc_osd.h) and a subfilter (modules/video_filter/osdmenu.c). The OSD menu can be used locally or it can be streamed. It depends on the way the functionality is called from the vlc commandline. Currently there is only one way to make the subpictures appear on the video and that is through the rc-interface. The following commands are supported by it: "menu on" (show OSD menu), "menu off" (hide OSD menu), "menu left" (highlight button on the left), "menu right" (highlight button on the right), "menu up" (highlight button above), "menu down" (highlight button below) or "menu select" (perform hotkey action). When there is no button on the left, right, up or down then the menu-command will be ignored.
To stream use a commandline similar to this:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg --extraintf rc --sout '#transcode{sfilter=osdmenu}:std{mux=ts,access=udp,url=127.0.0.1:1234}' -vvvv
For local playback a commandline like this is needed:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg -vvvv
Have fun with the basic functionality - jpsaman.
2005-08-11 00:08:50 +02:00
|
|
|
{
|
|
|
|
/* Create a fake OSD menu elementary stream */
|
2005-08-11 22:13:01 +02:00
|
|
|
if( !p_sys->b_es_osd && (p_sys->i_osdcodec != 0 || p_sys->psz_osdenc) )
|
Forward port of branches/0.8.1-jpsaman-thedj revision 12070. The OSD menu subsystem consists of two parts a core part (src/osd, include/vlc_osd.h) and a subfilter (modules/video_filter/osdmenu.c). The OSD menu can be used locally or it can be streamed. It depends on the way the functionality is called from the vlc commandline. Currently there is only one way to make the subpictures appear on the video and that is through the rc-interface. The following commands are supported by it: "menu on" (show OSD menu), "menu off" (hide OSD menu), "menu left" (highlight button on the left), "menu right" (highlight button on the right), "menu up" (highlight button above), "menu down" (highlight button below) or "menu select" (perform hotkey action). When there is no button on the left, right, up or down then the menu-command will be ignored.
To stream use a commandline similar to this:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg --extraintf rc --sout '#transcode{sfilter=osdmenu}:std{mux=ts,access=udp,url=127.0.0.1:1234}' -vvvv
For local playback a commandline like this is needed:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg -vvvv
Have fun with the basic functionality - jpsaman.
2005-08-11 00:08:50 +02:00
|
|
|
{
|
|
|
|
if( transcode_osd_new( p_stream, p_sys->id_osd ) )
|
|
|
|
{
|
|
|
|
msg_Err( p_stream, "cannot create osd chain" );
|
|
|
|
goto error;
|
|
|
|
}
|
2005-08-11 22:13:01 +02:00
|
|
|
p_sys->b_es_osd = VLC_TRUE;
|
Forward port of branches/0.8.1-jpsaman-thedj revision 12070. The OSD menu subsystem consists of two parts a core part (src/osd, include/vlc_osd.h) and a subfilter (modules/video_filter/osdmenu.c). The OSD menu can be used locally or it can be streamed. It depends on the way the functionality is called from the vlc commandline. Currently there is only one way to make the subpictures appear on the video and that is through the rc-interface. The following commands are supported by it: "menu on" (show OSD menu), "menu off" (hide OSD menu), "menu left" (highlight button on the left), "menu right" (highlight button on the right), "menu up" (highlight button above), "menu down" (highlight button below) or "menu select" (perform hotkey action). When there is no button on the left, right, up or down then the menu-command will be ignored.
To stream use a commandline similar to this:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg --extraintf rc --sout '#transcode{sfilter=osdmenu}:std{mux=ts,access=udp,url=127.0.0.1:1234}' -vvvv
For local playback a commandline like this is needed:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg -vvvv
Have fun with the basic functionality - jpsaman.
2005-08-11 00:08:50 +02:00
|
|
|
}
|
|
|
|
}
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
return id;
|
2004-08-26 23:27:06 +02:00
|
|
|
|
|
|
|
error:
|
|
|
|
if( id->p_decoder )
|
|
|
|
{
|
|
|
|
vlc_object_detach( id->p_decoder );
|
|
|
|
vlc_object_destroy( id->p_decoder );
|
2006-08-20 22:46:40 +02:00
|
|
|
id->p_decoder = NULL;
|
2004-08-26 23:27:06 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if( id->p_encoder )
|
|
|
|
{
|
|
|
|
vlc_object_detach( id->p_encoder );
|
2005-08-31 22:37:23 +02:00
|
|
|
es_format_Clean( &id->p_encoder->fmt_out );
|
2004-08-26 23:27:06 +02:00
|
|
|
vlc_object_destroy( id->p_encoder );
|
2006-08-20 22:46:40 +02:00
|
|
|
id->p_encoder = NULL;
|
2004-08-26 23:27:06 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
free( id );
|
|
|
|
return NULL;
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
}
|
|
|
|
|
2004-08-08 23:14:38 +02:00
|
|
|
static int Del( sout_stream_t *p_stream, sout_stream_id_t *id )
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
{
|
2004-08-26 23:27:06 +02:00
|
|
|
sout_stream_sys_t *p_sys = p_stream->p_sys;
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
|
2005-08-11 22:13:01 +02:00
|
|
|
if( p_sys->b_es_osd )
|
Forward port of branches/0.8.1-jpsaman-thedj revision 12070. The OSD menu subsystem consists of two parts a core part (src/osd, include/vlc_osd.h) and a subfilter (modules/video_filter/osdmenu.c). The OSD menu can be used locally or it can be streamed. It depends on the way the functionality is called from the vlc commandline. Currently there is only one way to make the subpictures appear on the video and that is through the rc-interface. The following commands are supported by it: "menu on" (show OSD menu), "menu off" (hide OSD menu), "menu left" (highlight button on the left), "menu right" (highlight button on the right), "menu up" (highlight button above), "menu down" (highlight button below) or "menu select" (perform hotkey action). When there is no button on the left, right, up or down then the menu-command will be ignored.
To stream use a commandline similar to this:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg --extraintf rc --sout '#transcode{sfilter=osdmenu}:std{mux=ts,access=udp,url=127.0.0.1:1234}' -vvvv
For local playback a commandline like this is needed:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg -vvvv
Have fun with the basic functionality - jpsaman.
2005-08-11 00:08:50 +02:00
|
|
|
transcode_osd_close( p_stream, p_sys->id_osd );
|
|
|
|
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
if( id->b_transcode )
|
|
|
|
{
|
2004-08-26 23:27:06 +02:00
|
|
|
switch( id->p_decoder->fmt_in.i_cat )
|
2004-08-08 23:14:38 +02:00
|
|
|
{
|
2004-08-26 23:27:06 +02:00
|
|
|
case AUDIO_ES:
|
|
|
|
transcode_audio_close( p_stream, id );
|
|
|
|
break;
|
|
|
|
case VIDEO_ES:
|
|
|
|
transcode_video_close( p_stream, id );
|
|
|
|
break;
|
|
|
|
case SPU_ES:
|
2004-08-08 23:14:38 +02:00
|
|
|
transcode_spu_close( p_stream, id );
|
2004-08-26 23:27:06 +02:00
|
|
|
break;
|
2004-08-08 23:14:38 +02:00
|
|
|
}
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
}
|
|
|
|
|
2003-05-17 01:02:37 +02:00
|
|
|
if( id->id ) p_sys->p_out->pf_del( p_sys->p_out, id->id );
|
2004-08-26 23:27:06 +02:00
|
|
|
|
|
|
|
if( id->p_decoder )
|
|
|
|
{
|
|
|
|
vlc_object_detach( id->p_decoder );
|
|
|
|
vlc_object_destroy( id->p_decoder );
|
2006-08-20 22:46:40 +02:00
|
|
|
id->p_decoder = NULL;
|
2004-08-26 23:27:06 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if( id->p_encoder )
|
|
|
|
{
|
|
|
|
vlc_object_detach( id->p_encoder );
|
2005-08-31 22:37:23 +02:00
|
|
|
es_format_Clean( &id->p_encoder->fmt_out );
|
2004-08-26 23:27:06 +02:00
|
|
|
vlc_object_destroy( id->p_encoder );
|
2006-08-20 22:46:40 +02:00
|
|
|
id->p_encoder = NULL;
|
2004-08-26 23:27:06 +02:00
|
|
|
}
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
free( id );
|
|
|
|
|
|
|
|
return VLC_SUCCESS;
|
|
|
|
}
|
|
|
|
|
2003-06-29 22:58:16 +02:00
|
|
|
static int Send( sout_stream_t *p_stream, sout_stream_id_t *id,
|
2004-03-11 18:36:43 +01:00
|
|
|
block_t *p_buffer )
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
{
|
2004-08-19 17:01:54 +02:00
|
|
|
sout_stream_sys_t *p_sys = p_stream->p_sys;
|
Forward port of branches/0.8.1-jpsaman-thedj revision 12070. The OSD menu subsystem consists of two parts a core part (src/osd, include/vlc_osd.h) and a subfilter (modules/video_filter/osdmenu.c). The OSD menu can be used locally or it can be streamed. It depends on the way the functionality is called from the vlc commandline. Currently there is only one way to make the subpictures appear on the video and that is through the rc-interface. The following commands are supported by it: "menu on" (show OSD menu), "menu off" (hide OSD menu), "menu left" (highlight button on the left), "menu right" (highlight button on the right), "menu up" (highlight button above), "menu down" (highlight button below) or "menu select" (perform hotkey action). When there is no button on the left, right, up or down then the menu-command will be ignored.
To stream use a commandline similar to this:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg --extraintf rc --sout '#transcode{sfilter=osdmenu}:std{mux=ts,access=udp,url=127.0.0.1:1234}' -vvvv
For local playback a commandline like this is needed:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg -vvvv
Have fun with the basic functionality - jpsaman.
2005-08-11 00:08:50 +02:00
|
|
|
block_t *p_out = NULL;
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
|
2004-08-26 23:27:06 +02:00
|
|
|
if( !id->b_transcode && id->id )
|
|
|
|
{
|
Forward port of branches/0.8.1-jpsaman-thedj revision 12070. The OSD menu subsystem consists of two parts a core part (src/osd, include/vlc_osd.h) and a subfilter (modules/video_filter/osdmenu.c). The OSD menu can be used locally or it can be streamed. It depends on the way the functionality is called from the vlc commandline. Currently there is only one way to make the subpictures appear on the video and that is through the rc-interface. The following commands are supported by it: "menu on" (show OSD menu), "menu off" (hide OSD menu), "menu left" (highlight button on the left), "menu right" (highlight button on the right), "menu up" (highlight button above), "menu down" (highlight button below) or "menu select" (perform hotkey action). When there is no button on the left, right, up or down then the menu-command will be ignored.
To stream use a commandline similar to this:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg --extraintf rc --sout '#transcode{sfilter=osdmenu}:std{mux=ts,access=udp,url=127.0.0.1:1234}' -vvvv
For local playback a commandline like this is needed:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg -vvvv
Have fun with the basic functionality - jpsaman.
2005-08-11 00:08:50 +02:00
|
|
|
/* Transcode OSD menu pictures. */
|
2005-08-11 22:13:01 +02:00
|
|
|
if( p_sys->b_es_osd )
|
Forward port of branches/0.8.1-jpsaman-thedj revision 12070. The OSD menu subsystem consists of two parts a core part (src/osd, include/vlc_osd.h) and a subfilter (modules/video_filter/osdmenu.c). The OSD menu can be used locally or it can be streamed. It depends on the way the functionality is called from the vlc commandline. Currently there is only one way to make the subpictures appear on the video and that is through the rc-interface. The following commands are supported by it: "menu on" (show OSD menu), "menu off" (hide OSD menu), "menu left" (highlight button on the left), "menu right" (highlight button on the right), "menu up" (highlight button above), "menu down" (highlight button below) or "menu select" (perform hotkey action). When there is no button on the left, right, up or down then the menu-command will be ignored.
To stream use a commandline similar to this:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg --extraintf rc --sout '#transcode{sfilter=osdmenu}:std{mux=ts,access=udp,url=127.0.0.1:1234}' -vvvv
For local playback a commandline like this is needed:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg -vvvv
Have fun with the basic functionality - jpsaman.
2005-08-11 00:08:50 +02:00
|
|
|
{
|
2006-03-19 02:27:21 +01:00
|
|
|
transcode_osd_process( p_stream, id, p_buffer, &p_out );
|
Forward port of branches/0.8.1-jpsaman-thedj revision 12070. The OSD menu subsystem consists of two parts a core part (src/osd, include/vlc_osd.h) and a subfilter (modules/video_filter/osdmenu.c). The OSD menu can be used locally or it can be streamed. It depends on the way the functionality is called from the vlc commandline. Currently there is only one way to make the subpictures appear on the video and that is through the rc-interface. The following commands are supported by it: "menu on" (show OSD menu), "menu off" (hide OSD menu), "menu left" (highlight button on the left), "menu right" (highlight button on the right), "menu up" (highlight button above), "menu down" (highlight button below) or "menu select" (perform hotkey action). When there is no button on the left, right, up or down then the menu-command will be ignored.
To stream use a commandline similar to this:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg --extraintf rc --sout '#transcode{sfilter=osdmenu}:std{mux=ts,access=udp,url=127.0.0.1:1234}' -vvvv
For local playback a commandline like this is needed:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg -vvvv
Have fun with the basic functionality - jpsaman.
2005-08-11 00:08:50 +02:00
|
|
|
}
|
2004-08-26 23:27:06 +02:00
|
|
|
return p_sys->p_out->pf_send( p_sys->p_out, id->id, p_buffer );
|
|
|
|
}
|
|
|
|
else if( !id->b_transcode )
|
|
|
|
{
|
|
|
|
block_Release( p_buffer );
|
|
|
|
return VLC_EGENERIC;
|
|
|
|
}
|
|
|
|
|
|
|
|
switch( id->p_decoder->fmt_in.i_cat )
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
{
|
2004-08-26 23:27:06 +02:00
|
|
|
case AUDIO_ES:
|
|
|
|
transcode_audio_process( p_stream, id, p_buffer, &p_out );
|
|
|
|
break;
|
2004-03-11 18:36:43 +01:00
|
|
|
|
2004-08-26 23:27:06 +02:00
|
|
|
case VIDEO_ES:
|
|
|
|
if( transcode_video_process( p_stream, id, p_buffer, &p_out )
|
|
|
|
!= VLC_SUCCESS )
|
2004-03-11 18:36:43 +01:00
|
|
|
{
|
|
|
|
return VLC_EGENERIC;
|
|
|
|
}
|
2004-08-26 23:27:06 +02:00
|
|
|
break;
|
2004-03-11 18:36:43 +01:00
|
|
|
|
2004-08-26 23:27:06 +02:00
|
|
|
case SPU_ES:
|
|
|
|
if( transcode_spu_process( p_stream, id, p_buffer, &p_out ) !=
|
|
|
|
VLC_SUCCESS )
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
{
|
2004-08-26 23:27:06 +02:00
|
|
|
return VLC_EGENERIC;
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
}
|
2004-08-26 23:27:06 +02:00
|
|
|
break;
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
|
2004-08-26 23:27:06 +02:00
|
|
|
default:
|
2005-07-11 10:33:01 +02:00
|
|
|
p_out = NULL;
|
2004-03-11 18:36:43 +01:00
|
|
|
block_Release( p_buffer );
|
2004-08-26 23:27:06 +02:00
|
|
|
break;
|
2003-05-02 05:41:03 +02:00
|
|
|
}
|
2004-08-26 23:27:06 +02:00
|
|
|
|
|
|
|
if( p_out ) return p_sys->p_out->pf_send( p_sys->p_out, id->id, p_out );
|
|
|
|
return VLC_SUCCESS;
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/****************************************************************************
|
2004-08-27 15:31:23 +02:00
|
|
|
* decoder reencoder part
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
****************************************************************************/
|
2004-08-27 15:31:23 +02:00
|
|
|
int audio_BitsPerSample( vlc_fourcc_t i_format )
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
{
|
2004-08-27 15:31:23 +02:00
|
|
|
switch( i_format )
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
{
|
2004-08-27 15:31:23 +02:00
|
|
|
case VLC_FOURCC('u','8',' ',' '):
|
|
|
|
case VLC_FOURCC('s','8',' ',' '):
|
2004-08-31 14:02:12 +02:00
|
|
|
return 8;
|
2004-08-27 15:31:23 +02:00
|
|
|
|
|
|
|
case VLC_FOURCC('u','1','6','l'):
|
|
|
|
case VLC_FOURCC('s','1','6','l'):
|
|
|
|
case VLC_FOURCC('u','1','6','b'):
|
|
|
|
case VLC_FOURCC('s','1','6','b'):
|
2004-08-31 14:02:12 +02:00
|
|
|
return 16;
|
|
|
|
|
|
|
|
case VLC_FOURCC('u','2','4','l'):
|
|
|
|
case VLC_FOURCC('s','2','4','l'):
|
|
|
|
case VLC_FOURCC('u','2','4','b'):
|
|
|
|
case VLC_FOURCC('s','2','4','b'):
|
|
|
|
return 24;
|
|
|
|
|
|
|
|
case VLC_FOURCC('u','3','2','l'):
|
|
|
|
case VLC_FOURCC('s','3','2','l'):
|
|
|
|
case VLC_FOURCC('u','3','2','b'):
|
|
|
|
case VLC_FOURCC('s','3','2','b'):
|
2004-08-27 15:31:23 +02:00
|
|
|
case VLC_FOURCC('f','l','3','2'):
|
|
|
|
case VLC_FOURCC('f','i','3','2'):
|
2004-08-31 14:02:12 +02:00
|
|
|
return 32;
|
|
|
|
|
|
|
|
case VLC_FOURCC('f','l','6','4'):
|
|
|
|
return 64;
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2005-03-18 00:31:38 +01:00
|
|
|
static filter_t *transcode_audio_filter_new( sout_stream_t *p_stream,
|
|
|
|
sout_stream_id_t *id,
|
|
|
|
es_format_t *p_fmt_in,
|
2006-08-06 15:27:58 +02:00
|
|
|
es_format_t *p_fmt_out,
|
|
|
|
char *psz_name )
|
2005-03-18 00:31:38 +01:00
|
|
|
{
|
2006-08-06 15:27:58 +02:00
|
|
|
sout_stream_sys_t *p_sys = p_stream->p_sys;
|
2005-03-18 00:31:38 +01:00
|
|
|
filter_t *p_filter = vlc_object_create( p_stream, VLC_OBJECT_FILTER );
|
|
|
|
|
|
|
|
vlc_object_attach( p_filter, p_stream );
|
2005-07-11 10:33:01 +02:00
|
|
|
p_filter->pf_audio_buffer_new = (block_t* (*) (filter_t*, int))__block_New;
|
2005-03-18 00:31:38 +01:00
|
|
|
|
|
|
|
p_filter->fmt_in = *p_fmt_in;
|
|
|
|
p_filter->fmt_out = *p_fmt_out;
|
2006-08-06 15:27:58 +02:00
|
|
|
if( psz_name )
|
|
|
|
p_filter->p_cfg = p_sys->p_afilters_cfg[id->i_ufilter];
|
2005-03-18 00:31:38 +01:00
|
|
|
|
2006-08-06 15:27:58 +02:00
|
|
|
p_filter->p_module = module_Need( p_filter, "audio filter2", psz_name, 0 );
|
2005-03-18 00:31:38 +01:00
|
|
|
if( p_filter->p_module )
|
|
|
|
{
|
2006-08-06 15:27:58 +02:00
|
|
|
p_filter->fmt_out.audio.i_bitspersample =
|
2005-03-18 00:31:38 +01:00
|
|
|
audio_BitsPerSample( p_filter->fmt_out.i_codec );
|
|
|
|
*p_fmt_in = p_filter->fmt_out;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
vlc_object_detach( p_filter );
|
|
|
|
vlc_object_destroy( p_filter );
|
|
|
|
p_filter = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
return p_filter;
|
|
|
|
}
|
|
|
|
|
2004-08-26 23:27:06 +02:00
|
|
|
static int transcode_audio_new( sout_stream_t *p_stream,
|
|
|
|
sout_stream_id_t *id )
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
{
|
2004-08-27 15:31:23 +02:00
|
|
|
sout_stream_sys_t *p_sys = p_stream->p_sys;
|
2005-03-17 21:39:52 +01:00
|
|
|
es_format_t fmt_last;
|
2006-08-06 15:27:58 +02:00
|
|
|
int i;
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
|
2004-08-27 15:31:23 +02:00
|
|
|
/*
|
|
|
|
* Open decoder
|
|
|
|
*/
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
|
2004-08-27 15:31:23 +02:00
|
|
|
/* Initialization of decoder structures */
|
2005-04-08 19:44:14 +02:00
|
|
|
id->p_decoder->fmt_out = id->p_decoder->fmt_in;
|
|
|
|
id->p_decoder->fmt_out.i_extra = 0;
|
|
|
|
id->p_decoder->fmt_out.p_extra = 0;
|
2004-08-27 15:31:23 +02:00
|
|
|
id->p_decoder->pf_decode_audio = 0;
|
|
|
|
id->p_decoder->pf_aout_buffer_new = audio_new_buffer;
|
|
|
|
id->p_decoder->pf_aout_buffer_del = audio_del_buffer;
|
Forward port of branches/0.8.1-jpsaman-thedj revision 12070. The OSD menu subsystem consists of two parts a core part (src/osd, include/vlc_osd.h) and a subfilter (modules/video_filter/osdmenu.c). The OSD menu can be used locally or it can be streamed. It depends on the way the functionality is called from the vlc commandline. Currently there is only one way to make the subpictures appear on the video and that is through the rc-interface. The following commands are supported by it: "menu on" (show OSD menu), "menu off" (hide OSD menu), "menu left" (highlight button on the left), "menu right" (highlight button on the right), "menu up" (highlight button above), "menu down" (highlight button below) or "menu select" (perform hotkey action). When there is no button on the left, right, up or down then the menu-command will be ignored.
To stream use a commandline similar to this:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg --extraintf rc --sout '#transcode{sfilter=osdmenu}:std{mux=ts,access=udp,url=127.0.0.1:1234}' -vvvv
For local playback a commandline like this is needed:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg -vvvv
Have fun with the basic functionality - jpsaman.
2005-08-11 00:08:50 +02:00
|
|
|
/* id->p_decoder->p_cfg = p_sys->p_audio_cfg; */
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
|
2004-08-27 15:31:23 +02:00
|
|
|
id->p_decoder->p_module =
|
|
|
|
module_Need( id->p_decoder, "decoder", "$codec", 0 );
|
|
|
|
if( !id->p_decoder->p_module )
|
|
|
|
{
|
|
|
|
msg_Err( p_stream, "cannot find decoder" );
|
|
|
|
return VLC_EGENERIC;
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
}
|
2004-08-27 15:31:23 +02:00
|
|
|
id->p_decoder->fmt_out.audio.i_bitspersample =
|
|
|
|
audio_BitsPerSample( id->p_decoder->fmt_out.i_codec );
|
2005-03-17 21:39:52 +01:00
|
|
|
fmt_last = id->p_decoder->fmt_out;
|
|
|
|
/* FIX decoders so we don't have to do this */
|
|
|
|
fmt_last.audio.i_rate = id->p_decoder->fmt_in.audio.i_rate;
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
|
2004-08-27 15:31:23 +02:00
|
|
|
/*
|
|
|
|
* Open encoder
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* Initialization of encoder format structures */
|
|
|
|
es_format_Init( &id->p_encoder->fmt_in, id->p_decoder->fmt_in.i_cat,
|
|
|
|
id->p_decoder->fmt_out.i_codec );
|
|
|
|
id->p_encoder->fmt_in.audio.i_format = id->p_decoder->fmt_out.i_codec;
|
2003-06-29 22:58:16 +02:00
|
|
|
|
2003-11-16 22:07:31 +01:00
|
|
|
/* Initialization of encoder format structures */
|
2006-08-20 22:46:40 +02:00
|
|
|
es_format_Init( &id->p_encoder->fmt_in, AUDIO_ES, VLC_FOURCC('f','l','3','2') );
|
|
|
|
id->p_encoder->fmt_in.audio.i_format = VLC_FOURCC('f','l','3','2');
|
|
|
|
|
2004-08-26 23:27:06 +02:00
|
|
|
id->p_encoder->fmt_in.audio.i_rate = id->p_encoder->fmt_out.audio.i_rate;
|
2003-11-16 22:07:31 +01:00
|
|
|
id->p_encoder->fmt_in.audio.i_physical_channels =
|
2005-04-08 19:44:14 +02:00
|
|
|
id->p_encoder->fmt_out.audio.i_physical_channels;
|
|
|
|
id->p_encoder->fmt_in.audio.i_original_channels =
|
|
|
|
id->p_encoder->fmt_out.audio.i_original_channels;
|
2004-08-26 23:27:06 +02:00
|
|
|
id->p_encoder->fmt_in.audio.i_channels =
|
|
|
|
id->p_encoder->fmt_out.audio.i_channels;
|
2004-08-31 14:02:12 +02:00
|
|
|
id->p_encoder->fmt_in.audio.i_bitspersample =
|
|
|
|
audio_BitsPerSample( id->p_encoder->fmt_in.i_codec );
|
2003-11-16 22:07:31 +01:00
|
|
|
|
2004-04-25 16:15:29 +02:00
|
|
|
id->p_encoder->p_cfg = p_stream->p_sys->p_audio_cfg;
|
2003-10-27 02:04:38 +01:00
|
|
|
id->p_encoder->p_module =
|
2004-08-27 15:31:23 +02:00
|
|
|
module_Need( id->p_encoder, "encoder", p_sys->psz_aenc, VLC_TRUE );
|
2003-10-27 02:04:38 +01:00
|
|
|
if( !id->p_encoder->p_module )
|
2003-07-30 04:00:58 +02:00
|
|
|
{
|
2006-07-04 14:28:23 +02:00
|
|
|
msg_Err( p_stream, "cannot find encoder (%s)", p_sys->psz_aenc );
|
2004-08-27 15:31:23 +02:00
|
|
|
module_Unneed( id->p_decoder, id->p_decoder->p_module );
|
2006-08-28 14:27:59 +02:00
|
|
|
id->p_decoder->p_module = NULL;
|
2003-10-27 21:53:10 +01:00
|
|
|
return VLC_EGENERIC;
|
2003-07-30 04:00:58 +02:00
|
|
|
}
|
2004-08-29 03:12:06 +02:00
|
|
|
id->p_encoder->fmt_in.audio.i_format = id->p_encoder->fmt_in.i_codec;
|
2004-08-31 14:02:12 +02:00
|
|
|
id->p_encoder->fmt_in.audio.i_bitspersample =
|
|
|
|
audio_BitsPerSample( id->p_encoder->fmt_in.i_codec );
|
2003-07-07 17:50:44 +02:00
|
|
|
|
2005-03-18 00:31:38 +01:00
|
|
|
/* Load conversion filters */
|
2005-03-18 08:44:20 +01:00
|
|
|
if( fmt_last.audio.i_channels != id->p_encoder->fmt_in.audio.i_channels ||
|
|
|
|
fmt_last.audio.i_rate != id->p_encoder->fmt_in.audio.i_rate )
|
|
|
|
{
|
|
|
|
/* We'll have to go through fl32 first */
|
|
|
|
es_format_t fmt_out = id->p_encoder->fmt_in;
|
|
|
|
fmt_out.i_codec = fmt_out.audio.i_format = VLC_FOURCC('f','l','3','2');
|
|
|
|
|
|
|
|
id->pp_filter[id->i_filter] =
|
2006-08-06 15:27:58 +02:00
|
|
|
transcode_audio_filter_new( p_stream, id, &fmt_last, &fmt_out, NULL );
|
2005-03-18 08:44:20 +01:00
|
|
|
|
|
|
|
if( id->pp_filter[id->i_filter] ) id->i_filter++;
|
|
|
|
}
|
|
|
|
|
2006-08-06 15:27:58 +02:00
|
|
|
for( i = 0; i < TRANSCODE_FILTERS; i++ )
|
2004-08-27 15:31:23 +02:00
|
|
|
{
|
2006-08-06 15:27:58 +02:00
|
|
|
if( (fmt_last.audio.i_channels !=
|
|
|
|
id->p_encoder->fmt_in.audio.i_channels) ||
|
|
|
|
(fmt_last.audio.i_rate != id->p_encoder->fmt_in.audio.i_rate) ||
|
|
|
|
(fmt_last.i_codec != id->p_encoder->fmt_in.i_codec) )
|
2004-08-27 15:31:23 +02:00
|
|
|
{
|
2005-03-18 00:31:38 +01:00
|
|
|
id->pp_filter[id->i_filter] =
|
|
|
|
transcode_audio_filter_new( p_stream, id, &fmt_last,
|
2006-08-06 15:27:58 +02:00
|
|
|
&id->p_encoder->fmt_in, NULL );
|
2005-03-17 21:39:52 +01:00
|
|
|
|
2006-08-06 15:27:58 +02:00
|
|
|
if( id->pp_filter[id->i_filter] )
|
|
|
|
id->i_filter++;
|
|
|
|
else
|
|
|
|
break;
|
2005-03-17 21:39:52 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-03-18 00:31:38 +01:00
|
|
|
/* Final checks to see if conversions were successful */
|
|
|
|
if( fmt_last.i_codec != id->p_encoder->fmt_in.i_codec )
|
2005-03-17 21:39:52 +01:00
|
|
|
{
|
2005-06-06 19:08:48 +02:00
|
|
|
msg_Err( p_stream, "no audio filter found (%4.4s->%4.4s)",
|
2005-03-18 00:31:38 +01:00
|
|
|
(char *)&fmt_last.i_codec,
|
|
|
|
(char *)&id->p_encoder->fmt_in.i_codec );
|
|
|
|
transcode_audio_close( p_stream, id );
|
|
|
|
return VLC_EGENERIC;
|
|
|
|
}
|
2005-03-17 21:39:52 +01:00
|
|
|
|
2006-08-06 15:27:58 +02:00
|
|
|
/* Load user specified audio filters now */
|
|
|
|
for( i = 0; (i < p_sys->i_afilters) &&
|
|
|
|
(id->i_ufilter < TRANSCODE_FILTERS); i++ )
|
|
|
|
{
|
|
|
|
id->pp_ufilter[id->i_ufilter] =
|
|
|
|
transcode_audio_filter_new( p_stream, id, &fmt_last,
|
|
|
|
&id->p_encoder->fmt_in,
|
|
|
|
p_sys->psz_afilters[i] );
|
|
|
|
|
|
|
|
if( id->pp_ufilter[id->i_ufilter] )
|
|
|
|
id->i_ufilter++;
|
|
|
|
else
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2005-03-18 08:44:20 +01:00
|
|
|
if( fmt_last.audio.i_channels != id->p_encoder->fmt_in.audio.i_channels )
|
2005-03-18 00:31:38 +01:00
|
|
|
{
|
2006-08-28 14:27:59 +02:00
|
|
|
#if 1
|
|
|
|
module_Unneed( id->p_encoder, id->p_encoder->p_module );
|
|
|
|
id->p_encoder->p_module = NULL;
|
|
|
|
|
|
|
|
/* This might work, but only if the encoder is restarted */
|
2005-03-18 00:31:38 +01:00
|
|
|
id->p_encoder->fmt_in.audio.i_channels = fmt_last.audio.i_channels;
|
|
|
|
id->p_encoder->fmt_out.audio.i_channels = fmt_last.audio.i_channels;
|
2005-03-17 21:39:52 +01:00
|
|
|
|
2005-03-18 00:31:38 +01:00
|
|
|
id->p_encoder->fmt_in.audio.i_physical_channels =
|
|
|
|
id->p_encoder->fmt_in.audio.i_original_channels =
|
|
|
|
fmt_last.audio.i_physical_channels;
|
|
|
|
id->p_encoder->fmt_out.audio.i_physical_channels =
|
|
|
|
id->p_encoder->fmt_out.audio.i_original_channels =
|
|
|
|
fmt_last.audio.i_physical_channels;
|
2006-08-28 14:27:59 +02:00
|
|
|
|
|
|
|
msg_Dbg( p_stream, "number of audio channels for mixing changed, "
|
|
|
|
"trying to reopen the encoder for mixing %i to %i channels",
|
|
|
|
fmt_last.audio.i_channels,
|
|
|
|
id->p_encoder->fmt_in.audio.i_channels );
|
|
|
|
|
|
|
|
/* reload encoder */
|
|
|
|
id->p_encoder->p_cfg = p_stream->p_sys->p_audio_cfg;
|
|
|
|
id->p_encoder->p_module =
|
|
|
|
module_Need( id->p_encoder, "encoder", p_sys->psz_aenc, VLC_TRUE );
|
|
|
|
if( !id->p_encoder->p_module )
|
|
|
|
{
|
|
|
|
msg_Err( p_stream, "cannot find encoder (%s)", p_sys->psz_aenc );
|
|
|
|
transcode_audio_close( p_stream, id );
|
|
|
|
return VLC_EGENERIC;
|
|
|
|
}
|
|
|
|
id->p_encoder->fmt_in.audio.i_format = id->p_encoder->fmt_in.i_codec;
|
|
|
|
id->p_encoder->fmt_in.audio.i_bitspersample =
|
|
|
|
audio_BitsPerSample( id->p_encoder->fmt_in.i_codec );
|
2005-06-06 19:08:48 +02:00
|
|
|
#else
|
2006-08-28 14:27:59 +02:00
|
|
|
msg_Err( p_stream, "no audio filter found for mixing from"
|
|
|
|
" %i to %i channels", fmt_last.audio.i_channels,
|
|
|
|
id->p_encoder->fmt_in.audio.i_channels );
|
|
|
|
|
2005-06-06 19:08:48 +02:00
|
|
|
transcode_audio_close( p_stream, id );
|
|
|
|
return VLC_EGENERIC;
|
|
|
|
#endif
|
2005-03-17 21:39:52 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
if( fmt_last.audio.i_rate != id->p_encoder->fmt_in.audio.i_rate )
|
|
|
|
{
|
2005-06-06 19:08:48 +02:00
|
|
|
msg_Err( p_stream, "no audio filter found for resampling from"
|
2005-03-18 00:31:38 +01:00
|
|
|
" %iHz to %iHz", fmt_last.audio.i_rate,
|
|
|
|
id->p_encoder->fmt_in.audio.i_rate );
|
2005-06-06 19:08:48 +02:00
|
|
|
#if 0
|
|
|
|
/* FIXME : this might work, but only if the encoder is restarted */
|
2005-03-18 00:31:38 +01:00
|
|
|
id->p_encoder->fmt_in.audio.i_rate = fmt_last.audio.i_rate;
|
|
|
|
id->p_encoder->fmt_out.audio.i_rate = fmt_last.audio.i_rate;
|
2005-06-06 19:08:48 +02:00
|
|
|
#else
|
|
|
|
transcode_audio_close( p_stream, id );
|
|
|
|
return VLC_EGENERIC;
|
|
|
|
#endif
|
2004-08-27 15:31:23 +02:00
|
|
|
}
|
|
|
|
|
2004-08-26 23:27:06 +02:00
|
|
|
/* FIXME: Hack for mp3 transcoding support */
|
|
|
|
if( id->p_encoder->fmt_out.i_codec == VLC_FOURCC( 'm','p','3',' ' ) )
|
|
|
|
id->p_encoder->fmt_out.i_codec = VLC_FOURCC( 'm','p','g','a' );
|
2003-10-27 18:50:54 +01:00
|
|
|
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
return VLC_SUCCESS;
|
|
|
|
}
|
|
|
|
|
2004-08-26 23:27:06 +02:00
|
|
|
static void transcode_audio_close( sout_stream_t *p_stream,
|
|
|
|
sout_stream_id_t *id )
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
{
|
2004-08-27 15:31:23 +02:00
|
|
|
int i;
|
2003-06-29 22:58:16 +02:00
|
|
|
|
2004-08-27 15:31:23 +02:00
|
|
|
/* Close decoder */
|
|
|
|
if( id->p_decoder->p_module )
|
|
|
|
module_Unneed( id->p_decoder, id->p_decoder->p_module );
|
2006-08-28 14:27:59 +02:00
|
|
|
id->p_decoder->p_module = NULL;
|
2004-04-25 16:15:29 +02:00
|
|
|
|
2004-08-27 15:31:23 +02:00
|
|
|
/* Close encoder */
|
|
|
|
if( id->p_encoder->p_module )
|
|
|
|
module_Unneed( id->p_encoder, id->p_encoder->p_module );
|
2006-08-28 14:27:59 +02:00
|
|
|
id->p_encoder->p_module = NULL;
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
|
2004-08-27 15:31:23 +02:00
|
|
|
/* Close filters */
|
|
|
|
for( i = 0; i < id->i_filter; i++ )
|
|
|
|
{
|
|
|
|
vlc_object_detach( id->pp_filter[i] );
|
|
|
|
if( id->pp_filter[i]->p_module )
|
|
|
|
module_Unneed( id->pp_filter[i], id->pp_filter[i]->p_module );
|
|
|
|
vlc_object_destroy( id->pp_filter[i] );
|
|
|
|
}
|
2006-08-06 15:27:58 +02:00
|
|
|
for( i = 0; i < id->i_ufilter; i++ )
|
|
|
|
{
|
|
|
|
vlc_object_detach( id->pp_ufilter[i] );
|
|
|
|
if( id->pp_ufilter[i]->p_module )
|
|
|
|
module_Unneed( id->pp_ufilter[i], id->pp_ufilter[i]->p_module );
|
|
|
|
vlc_object_destroy( id->pp_ufilter[i] );
|
|
|
|
}
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
}
|
|
|
|
|
2004-08-26 23:27:06 +02:00
|
|
|
static int transcode_audio_process( sout_stream_t *p_stream,
|
|
|
|
sout_stream_id_t *id,
|
|
|
|
block_t *in, block_t **out )
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
{
|
2004-08-19 17:01:54 +02:00
|
|
|
sout_stream_sys_t *p_sys = p_stream->p_sys;
|
2004-08-27 15:31:23 +02:00
|
|
|
aout_buffer_t *p_audio_buf;
|
|
|
|
block_t *p_block, *p_audio_block;
|
|
|
|
int i;
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
*out = NULL;
|
2006-07-08 13:16:20 +02:00
|
|
|
input_thread_t *p_input = NULL;
|
2006-08-04 17:17:15 +02:00
|
|
|
|
2006-07-08 13:16:20 +02:00
|
|
|
if( p_stream->p_parent->p_parent && p_stream->p_parent->p_parent->
|
|
|
|
i_object_type == VLC_OBJECT_INPUT )
|
|
|
|
p_input = (input_thread_t *)p_stream->p_parent->p_parent;
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
|
2004-08-27 15:31:23 +02:00
|
|
|
while( (p_audio_buf = id->p_decoder->pf_decode_audio( id->p_decoder,
|
|
|
|
&in )) )
|
2003-05-02 16:51:57 +02:00
|
|
|
{
|
2006-07-08 13:16:20 +02:00
|
|
|
if( p_input )
|
|
|
|
stats_UpdateInteger( p_input, p_input->counters.p_decoded_audio,
|
|
|
|
1, NULL );
|
2004-10-30 17:05:52 +02:00
|
|
|
if( p_sys->b_master_sync )
|
2003-05-02 16:51:57 +02:00
|
|
|
{
|
2004-08-27 15:31:23 +02:00
|
|
|
mtime_t i_dts = date_Get( &id->interpolated_pts ) + 1;
|
2005-08-05 16:46:20 +02:00
|
|
|
if ( p_audio_buf->start_date - i_dts > MASTER_SYNC_MAX_DRIFT
|
|
|
|
|| p_audio_buf->start_date - i_dts < -MASTER_SYNC_MAX_DRIFT )
|
2005-07-27 18:53:25 +02:00
|
|
|
{
|
2005-08-05 16:46:20 +02:00
|
|
|
msg_Dbg( p_stream, "drift is too high, resetting master sync" );
|
2005-07-27 18:53:25 +02:00
|
|
|
date_Set( &id->interpolated_pts, p_audio_buf->start_date );
|
|
|
|
i_dts = p_audio_buf->start_date + 1;
|
|
|
|
}
|
2004-08-27 15:31:23 +02:00
|
|
|
p_sys->i_master_drift = p_audio_buf->start_date - i_dts;
|
|
|
|
date_Increment( &id->interpolated_pts, p_audio_buf->i_nb_samples );
|
|
|
|
p_audio_buf->start_date -= p_sys->i_master_drift;
|
|
|
|
p_audio_buf->end_date -= p_sys->i_master_drift;
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
}
|
2003-05-02 16:51:57 +02:00
|
|
|
|
2004-08-27 15:31:23 +02:00
|
|
|
p_audio_block = p_audio_buf->p_sys;
|
|
|
|
p_audio_block->i_buffer = p_audio_buf->i_nb_bytes;
|
|
|
|
p_audio_block->i_dts = p_audio_block->i_pts =
|
|
|
|
p_audio_buf->start_date;
|
|
|
|
p_audio_block->i_length = p_audio_buf->end_date -
|
|
|
|
p_audio_buf->start_date;
|
|
|
|
p_audio_block->i_samples = p_audio_buf->i_nb_samples;
|
2003-06-25 23:47:05 +02:00
|
|
|
|
2004-08-27 15:31:23 +02:00
|
|
|
/* Run filter chain */
|
|
|
|
for( i = 0; i < id->i_filter; i++ )
|
2004-08-19 17:01:54 +02:00
|
|
|
{
|
2004-08-27 15:31:23 +02:00
|
|
|
p_audio_block =
|
|
|
|
id->pp_filter[i]->pf_audio_filter( id->pp_filter[i],
|
|
|
|
p_audio_block );
|
2004-08-19 17:01:54 +02:00
|
|
|
}
|
|
|
|
|
2006-08-06 15:27:58 +02:00
|
|
|
/* Run user specified filter chain */
|
|
|
|
for( i = 0; i < id->i_ufilter; i++ )
|
|
|
|
{
|
|
|
|
p_audio_block =
|
|
|
|
id->pp_ufilter[i]->pf_audio_filter( id->pp_ufilter[i],
|
|
|
|
p_audio_block );
|
|
|
|
}
|
|
|
|
|
2004-08-27 15:31:23 +02:00
|
|
|
p_audio_buf->p_buffer = p_audio_block->p_buffer;
|
|
|
|
p_audio_buf->i_nb_bytes = p_audio_block->i_buffer;
|
|
|
|
p_audio_buf->i_nb_samples = p_audio_block->i_samples;
|
|
|
|
p_audio_buf->start_date = p_audio_block->i_dts;
|
|
|
|
p_audio_buf->end_date = p_audio_block->i_dts + p_audio_block->i_length;
|
2003-10-30 13:01:01 +01:00
|
|
|
|
2004-08-27 15:31:23 +02:00
|
|
|
p_block = id->p_encoder->pf_encode_audio( id->p_encoder, p_audio_buf );
|
|
|
|
block_ChainAppend( out, p_block );
|
|
|
|
block_Release( p_audio_block );
|
|
|
|
free( p_audio_buf );
|
|
|
|
}
|
2004-03-07 16:58:21 +01:00
|
|
|
|
2004-08-27 15:31:23 +02:00
|
|
|
return VLC_SUCCESS;
|
|
|
|
}
|
2004-03-07 16:58:21 +01:00
|
|
|
|
2004-08-27 15:31:23 +02:00
|
|
|
static void audio_release_buffer( aout_buffer_t *p_buffer )
|
|
|
|
{
|
|
|
|
if( p_buffer && p_buffer->p_sys ) block_Release( p_buffer->p_sys );
|
|
|
|
if( p_buffer ) free( p_buffer );
|
|
|
|
}
|
2004-03-07 16:58:21 +01:00
|
|
|
|
2004-08-27 15:31:23 +02:00
|
|
|
static aout_buffer_t *audio_new_buffer( decoder_t *p_dec, int i_samples )
|
|
|
|
{
|
|
|
|
aout_buffer_t *p_buffer;
|
|
|
|
block_t *p_block;
|
|
|
|
int i_size;
|
2004-03-07 16:58:21 +01:00
|
|
|
|
2004-08-27 15:31:23 +02:00
|
|
|
if( p_dec->fmt_out.audio.i_bitspersample )
|
|
|
|
{
|
2004-08-31 14:02:12 +02:00
|
|
|
i_size = i_samples * p_dec->fmt_out.audio.i_bitspersample / 8 *
|
2004-08-27 15:31:23 +02:00
|
|
|
p_dec->fmt_out.audio.i_channels;
|
|
|
|
}
|
|
|
|
else if( p_dec->fmt_out.audio.i_bytes_per_frame &&
|
|
|
|
p_dec->fmt_out.audio.i_frame_length )
|
|
|
|
{
|
|
|
|
i_size = i_samples * p_dec->fmt_out.audio.i_bytes_per_frame /
|
|
|
|
p_dec->fmt_out.audio.i_frame_length;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
i_size = i_samples * 4 * p_dec->fmt_out.audio.i_channels;
|
|
|
|
}
|
2004-03-07 16:58:21 +01:00
|
|
|
|
2004-08-27 15:31:23 +02:00
|
|
|
p_buffer = malloc( sizeof(aout_buffer_t) );
|
|
|
|
p_buffer->pf_release = audio_release_buffer;
|
|
|
|
p_buffer->p_sys = p_block = block_New( p_dec, i_size );
|
2003-11-22 14:49:12 +01:00
|
|
|
|
2004-08-27 15:31:23 +02:00
|
|
|
p_buffer->p_buffer = p_block->p_buffer;
|
|
|
|
p_buffer->i_size = p_buffer->i_nb_bytes = p_block->i_buffer;
|
|
|
|
p_buffer->i_nb_samples = i_samples;
|
|
|
|
p_block->i_samples = i_samples;
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
|
2004-08-27 15:31:23 +02:00
|
|
|
return p_buffer;
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
}
|
|
|
|
|
2004-08-27 15:31:23 +02:00
|
|
|
static void audio_del_buffer( decoder_t *p_dec, aout_buffer_t *p_buffer )
|
|
|
|
{
|
|
|
|
if( p_buffer && p_buffer->p_sys ) block_Release( p_buffer->p_sys );
|
|
|
|
if( p_buffer ) free( p_buffer );
|
|
|
|
}
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
* video
|
|
|
|
*/
|
2004-08-26 23:27:06 +02:00
|
|
|
static int transcode_video_new( sout_stream_t *p_stream, sout_stream_id_t *id )
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
{
|
2004-04-25 16:15:29 +02:00
|
|
|
sout_stream_sys_t *p_sys = p_stream->p_sys;
|
2004-09-08 14:48:57 +02:00
|
|
|
int i;
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
|
2006-08-06 15:27:58 +02:00
|
|
|
/* Open decoder
|
|
|
|
* Initialization of decoder structures
|
2004-08-26 23:27:06 +02:00
|
|
|
*/
|
2005-04-08 19:44:14 +02:00
|
|
|
id->p_decoder->fmt_out = id->p_decoder->fmt_in;
|
|
|
|
id->p_decoder->fmt_out.i_extra = 0;
|
|
|
|
id->p_decoder->fmt_out.p_extra = 0;
|
2004-08-26 23:27:06 +02:00
|
|
|
id->p_decoder->pf_decode_video = 0;
|
2004-09-08 14:48:57 +02:00
|
|
|
id->p_decoder->pf_vout_buffer_new = video_new_buffer_decoder;
|
|
|
|
id->p_decoder->pf_vout_buffer_del = video_del_buffer_decoder;
|
|
|
|
id->p_decoder->pf_picture_link = video_link_picture_decoder;
|
|
|
|
id->p_decoder->pf_picture_unlink = video_unlink_picture_decoder;
|
|
|
|
id->p_decoder->p_owner = malloc( sizeof(decoder_owner_sys_t) );
|
|
|
|
for( i = 0; i < PICTURE_RING_SIZE; i++ )
|
|
|
|
id->p_decoder->p_owner->pp_pics[i] = 0;
|
2005-06-07 12:28:09 +02:00
|
|
|
id->p_decoder->p_owner->p_sys = p_sys;
|
Forward port of branches/0.8.1-jpsaman-thedj revision 12070. The OSD menu subsystem consists of two parts a core part (src/osd, include/vlc_osd.h) and a subfilter (modules/video_filter/osdmenu.c). The OSD menu can be used locally or it can be streamed. It depends on the way the functionality is called from the vlc commandline. Currently there is only one way to make the subpictures appear on the video and that is through the rc-interface. The following commands are supported by it: "menu on" (show OSD menu), "menu off" (hide OSD menu), "menu left" (highlight button on the left), "menu right" (highlight button on the right), "menu up" (highlight button above), "menu down" (highlight button below) or "menu select" (perform hotkey action). When there is no button on the left, right, up or down then the menu-command will be ignored.
To stream use a commandline similar to this:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg --extraintf rc --sout '#transcode{sfilter=osdmenu}:std{mux=ts,access=udp,url=127.0.0.1:1234}' -vvvv
For local playback a commandline like this is needed:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg -vvvv
Have fun with the basic functionality - jpsaman.
2005-08-11 00:08:50 +02:00
|
|
|
/* id->p_decoder->p_cfg = p_sys->p_video_cfg; */
|
2004-03-06 06:47:59 +01:00
|
|
|
|
2004-08-26 23:27:06 +02:00
|
|
|
id->p_decoder->p_module =
|
|
|
|
module_Need( id->p_decoder, "decoder", "$codec", 0 );
|
2003-05-02 05:41:03 +02:00
|
|
|
|
2004-08-26 23:27:06 +02:00
|
|
|
if( !id->p_decoder->p_module )
|
|
|
|
{
|
|
|
|
msg_Err( p_stream, "cannot find decoder" );
|
|
|
|
return VLC_EGENERIC;
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
}
|
2003-05-02 05:41:03 +02:00
|
|
|
|
2004-08-26 23:27:06 +02:00
|
|
|
/*
|
|
|
|
* Open encoder.
|
|
|
|
* Because some info about the decoded input will only be available
|
|
|
|
* once the first frame is decoded, we actually only test the availability
|
|
|
|
* of the encoder here.
|
|
|
|
*/
|
2003-10-27 02:04:38 +01:00
|
|
|
|
2003-11-16 22:07:31 +01:00
|
|
|
/* Initialization of encoder format structures */
|
2004-08-26 23:27:06 +02:00
|
|
|
es_format_Init( &id->p_encoder->fmt_in, id->p_decoder->fmt_in.i_cat,
|
|
|
|
id->p_decoder->fmt_out.i_codec );
|
|
|
|
id->p_encoder->fmt_in.video.i_chroma = id->p_decoder->fmt_out.i_codec;
|
2003-10-27 02:04:38 +01:00
|
|
|
|
2003-12-08 14:02:40 +01:00
|
|
|
/* The dimensions will be set properly later on.
|
2004-08-26 23:27:06 +02:00
|
|
|
* Just put sensible values so we can test an encoder is available. */
|
2004-04-15 21:12:20 +02:00
|
|
|
id->p_encoder->fmt_in.video.i_width =
|
2004-08-26 23:27:06 +02:00
|
|
|
id->p_encoder->fmt_out.video.i_width ?
|
|
|
|
id->p_encoder->fmt_out.video.i_width :
|
|
|
|
id->p_decoder->fmt_in.video.i_width ?
|
|
|
|
id->p_decoder->fmt_in.video.i_width : 16;
|
2004-04-15 21:12:20 +02:00
|
|
|
id->p_encoder->fmt_in.video.i_height =
|
2004-08-26 23:27:06 +02:00
|
|
|
id->p_encoder->fmt_out.video.i_height ?
|
|
|
|
id->p_encoder->fmt_out.video.i_height :
|
|
|
|
id->p_decoder->fmt_in.video.i_height ?
|
|
|
|
id->p_decoder->fmt_in.video.i_height : 16;
|
|
|
|
id->p_encoder->fmt_in.video.i_frame_rate = 25;
|
|
|
|
id->p_encoder->fmt_in.video.i_frame_rate_base = 1;
|
2003-11-16 22:07:31 +01:00
|
|
|
|
* modules/codec/ffmpeg/encoder.c, modules/stream_out/transcode.c :
- new ffmpeg options available from the command-line : interleaved video,
noise reduction, rate control parameters, i_quant_factor, trellis
quantification, mpeg4 matrix, and thread count
- portable functions to use ffmpeg multithreading capabilities on all
platforms
- hurry up mode now turns off rd and trellis, and also raises the noise
reduction parameter (thus noise reduction is mandatory with hurry up)
- if threads=1, no ffmpeg thread is launched, but the ffmpeg encoding
will be done in a separate thread than the packetizer and decoder
- fixed a bug with mp3 decoding and weird ffmpeg return code
2004-02-20 19:34:28 +01:00
|
|
|
id->p_encoder->i_threads = p_sys->i_threads;
|
2004-04-25 16:15:29 +02:00
|
|
|
id->p_encoder->p_cfg = p_sys->p_video_cfg;
|
|
|
|
|
2003-10-27 02:04:38 +01:00
|
|
|
id->p_encoder->p_module =
|
2004-04-25 18:35:39 +02:00
|
|
|
module_Need( id->p_encoder, "encoder", p_sys->psz_venc, VLC_TRUE );
|
2003-10-27 02:04:38 +01:00
|
|
|
if( !id->p_encoder->p_module )
|
2003-05-03 15:18:16 +02:00
|
|
|
{
|
2006-07-04 14:28:23 +02:00
|
|
|
msg_Err( p_stream, "cannot find encoder (%s)", p_sys->psz_venc );
|
2004-08-26 23:27:06 +02:00
|
|
|
module_Unneed( id->p_decoder, id->p_decoder->p_module );
|
|
|
|
id->p_decoder->p_module = 0;
|
2003-10-27 02:04:38 +01:00
|
|
|
return VLC_EGENERIC;
|
2003-05-03 15:18:16 +02:00
|
|
|
}
|
2003-07-30 04:00:58 +02:00
|
|
|
|
2003-10-27 02:04:38 +01:00
|
|
|
/* Close the encoder.
|
2004-08-26 23:27:06 +02:00
|
|
|
* We'll open it only when we have the first frame. */
|
2003-10-27 02:04:38 +01:00
|
|
|
module_Unneed( id->p_encoder, id->p_encoder->p_module );
|
2005-11-01 00:26:56 +01:00
|
|
|
if( id->p_encoder->fmt_out.p_extra )
|
|
|
|
free( id->p_encoder->fmt_out.p_extra );
|
2004-01-17 13:11:58 +01:00
|
|
|
id->p_encoder->p_module = NULL;
|
2003-05-02 05:41:03 +02:00
|
|
|
|
2004-08-26 23:27:06 +02:00
|
|
|
if( p_sys->i_threads >= 1 )
|
* modules/codec/ffmpeg/encoder.c, modules/stream_out/transcode.c :
- new ffmpeg options available from the command-line : interleaved video,
noise reduction, rate control parameters, i_quant_factor, trellis
quantification, mpeg4 matrix, and thread count
- portable functions to use ffmpeg multithreading capabilities on all
platforms
- hurry up mode now turns off rd and trellis, and also raises the noise
reduction parameter (thus noise reduction is mandatory with hurry up)
- if threads=1, no ffmpeg thread is launched, but the ffmpeg encoding
will be done in a separate thread than the packetizer and decoder
- fixed a bug with mp3 decoding and weird ffmpeg return code
2004-02-20 19:34:28 +01:00
|
|
|
{
|
2005-06-03 12:11:58 +02:00
|
|
|
int i_priority = p_sys->b_high_priority ? VLC_THREAD_PRIORITY_OUTPUT :
|
|
|
|
VLC_THREAD_PRIORITY_VIDEO;
|
* modules/codec/ffmpeg/encoder.c, modules/stream_out/transcode.c :
- new ffmpeg options available from the command-line : interleaved video,
noise reduction, rate control parameters, i_quant_factor, trellis
quantification, mpeg4 matrix, and thread count
- portable functions to use ffmpeg multithreading capabilities on all
platforms
- hurry up mode now turns off rd and trellis, and also raises the noise
reduction parameter (thus noise reduction is mandatory with hurry up)
- if threads=1, no ffmpeg thread is launched, but the ffmpeg encoding
will be done in a separate thread than the packetizer and decoder
- fixed a bug with mp3 decoding and weird ffmpeg return code
2004-02-20 19:34:28 +01:00
|
|
|
p_sys->id_video = id;
|
|
|
|
vlc_mutex_init( p_stream, &p_sys->lock_out );
|
|
|
|
vlc_cond_init( p_stream, &p_sys->cond );
|
|
|
|
memset( p_sys->pp_pics, 0, sizeof(p_sys->pp_pics) );
|
|
|
|
p_sys->i_first_pic = 0;
|
|
|
|
p_sys->i_last_pic = 0;
|
|
|
|
p_sys->p_buffers = NULL;
|
|
|
|
p_sys->b_die = p_sys->b_error = 0;
|
2005-06-03 12:11:58 +02:00
|
|
|
if( vlc_thread_create( p_sys, "encoder", EncoderThread, i_priority,
|
|
|
|
VLC_FALSE ) )
|
* modules/codec/ffmpeg/encoder.c, modules/stream_out/transcode.c :
- new ffmpeg options available from the command-line : interleaved video,
noise reduction, rate control parameters, i_quant_factor, trellis
quantification, mpeg4 matrix, and thread count
- portable functions to use ffmpeg multithreading capabilities on all
platforms
- hurry up mode now turns off rd and trellis, and also raises the noise
reduction parameter (thus noise reduction is mandatory with hurry up)
- if threads=1, no ffmpeg thread is launched, but the ffmpeg encoding
will be done in a separate thread than the packetizer and decoder
- fixed a bug with mp3 decoding and weird ffmpeg return code
2004-02-20 19:34:28 +01:00
|
|
|
{
|
|
|
|
msg_Err( p_stream, "cannot spawn encoder thread" );
|
2004-08-26 23:27:06 +02:00
|
|
|
module_Unneed( id->p_decoder, id->p_decoder->p_module );
|
|
|
|
id->p_decoder->p_module = 0;
|
* modules/codec/ffmpeg/encoder.c, modules/stream_out/transcode.c :
- new ffmpeg options available from the command-line : interleaved video,
noise reduction, rate control parameters, i_quant_factor, trellis
quantification, mpeg4 matrix, and thread count
- portable functions to use ffmpeg multithreading capabilities on all
platforms
- hurry up mode now turns off rd and trellis, and also raises the noise
reduction parameter (thus noise reduction is mandatory with hurry up)
- if threads=1, no ffmpeg thread is launched, but the ffmpeg encoding
will be done in a separate thread than the packetizer and decoder
- fixed a bug with mp3 decoding and weird ffmpeg return code
2004-02-20 19:34:28 +01:00
|
|
|
return VLC_EGENERIC;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
return VLC_SUCCESS;
|
|
|
|
}
|
|
|
|
|
2004-08-26 23:27:06 +02:00
|
|
|
static int transcode_video_encoder_open( sout_stream_t *p_stream,
|
|
|
|
sout_stream_id_t *id )
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
{
|
2004-08-26 23:27:06 +02:00
|
|
|
sout_stream_sys_t *p_sys = p_stream->p_sys;
|
|
|
|
|
2006-03-18 12:27:10 +01:00
|
|
|
/* Calculate scaling, padding, cropping etc. */
|
|
|
|
/* width/height of source */
|
|
|
|
int i_src_width = id->p_decoder->fmt_out.video.i_width;
|
|
|
|
int i_src_height = id->p_decoder->fmt_out.video.i_height;
|
|
|
|
|
|
|
|
/* with/height scaling */
|
|
|
|
float f_scale_width = 1;
|
|
|
|
float f_scale_height = 1;
|
|
|
|
|
|
|
|
/* width/height of output stream */
|
|
|
|
int i_dst_width;
|
|
|
|
int i_dst_height;
|
|
|
|
|
|
|
|
/* aspect ratio */
|
|
|
|
float f_aspect = (float)id->p_decoder->fmt_out.video.i_aspect /
|
|
|
|
VOUT_ASPECT_FACTOR;
|
|
|
|
|
|
|
|
msg_Dbg( p_stream, "decoder aspect is %i:%i",
|
|
|
|
id->p_decoder->fmt_out.video.i_aspect, VOUT_ASPECT_FACTOR );
|
|
|
|
|
|
|
|
/* Change f_aspect from source frame to source pixel */
|
|
|
|
f_aspect = f_aspect * i_src_height / i_src_width;
|
|
|
|
msg_Dbg( p_stream, "source pixel aspect is %f:1", f_aspect );
|
|
|
|
|
|
|
|
/* width/height after cropping */
|
|
|
|
p_sys->i_src_x_offset = p_sys->i_crop_left & ~1;
|
|
|
|
p_sys->i_src_y_offset = p_sys->i_crop_top & ~1;
|
|
|
|
p_sys->i_crop_width = i_src_width - ( p_sys->i_crop_left & ~1 ) -
|
|
|
|
( p_sys->i_crop_right & ~1 );
|
|
|
|
p_sys->i_crop_height = i_src_height - ( p_sys->i_crop_top & ~1 ) -
|
|
|
|
( p_sys->i_crop_bottom & ~1 );
|
|
|
|
|
|
|
|
/* Calculate scaling factor for specified parameters */
|
2004-08-26 23:27:06 +02:00
|
|
|
if( id->p_encoder->fmt_out.video.i_width <= 0 &&
|
|
|
|
id->p_encoder->fmt_out.video.i_height <= 0 && p_sys->f_scale )
|
2004-02-20 20:03:59 +01:00
|
|
|
{
|
2006-03-18 12:27:10 +01:00
|
|
|
/* Global scaling. Make sure width will remain a factor of 16 */
|
2006-02-11 16:21:21 +01:00
|
|
|
float f_real_scale;
|
2006-03-18 12:27:10 +01:00
|
|
|
int i_new_height;
|
|
|
|
int i_new_width = i_src_width * p_sys->f_scale;
|
|
|
|
|
|
|
|
if( i_new_width % 16 <= 7 && i_new_width >= 16 )
|
|
|
|
i_new_width -= i_new_width % 16;
|
2006-02-11 15:50:37 +01:00
|
|
|
else
|
2006-03-18 12:27:10 +01:00
|
|
|
i_new_width += 16 - i_new_width % 16;
|
|
|
|
|
|
|
|
f_real_scale = (float)( i_new_width ) / (float) i_src_width;
|
2006-02-11 15:50:37 +01:00
|
|
|
|
2006-03-18 12:27:10 +01:00
|
|
|
i_new_height = __MAX( 16, i_src_height * (float)f_real_scale );
|
2006-02-11 16:21:21 +01:00
|
|
|
|
2006-03-18 12:27:10 +01:00
|
|
|
f_scale_width = f_real_scale;
|
|
|
|
f_scale_height = (float) i_new_height / (float) i_src_height;
|
2004-08-26 23:27:06 +02:00
|
|
|
}
|
|
|
|
else if( id->p_encoder->fmt_out.video.i_width > 0 &&
|
|
|
|
id->p_encoder->fmt_out.video.i_height <= 0 )
|
|
|
|
{
|
2006-03-18 12:27:10 +01:00
|
|
|
/* Only width specified */
|
|
|
|
f_scale_width = (float)id->p_encoder->fmt_out.video.i_width /
|
|
|
|
p_sys->i_crop_width;
|
|
|
|
f_scale_height = f_scale_width;
|
2004-08-26 23:27:06 +02:00
|
|
|
}
|
|
|
|
else if( id->p_encoder->fmt_out.video.i_width <= 0 &&
|
|
|
|
id->p_encoder->fmt_out.video.i_height > 0 )
|
|
|
|
{
|
2006-03-18 12:27:10 +01:00
|
|
|
/* Only height specified */
|
|
|
|
f_scale_height = (float)id->p_encoder->fmt_out.video.i_height /
|
|
|
|
p_sys->i_crop_height;
|
|
|
|
f_scale_width = f_scale_height;
|
|
|
|
}
|
|
|
|
else if( id->p_encoder->fmt_out.video.i_width > 0 &&
|
|
|
|
id->p_encoder->fmt_out.video.i_height > 0 )
|
|
|
|
{
|
|
|
|
/* Width and height specified */
|
|
|
|
f_scale_width = (float)id->p_encoder->fmt_out.video.i_width
|
|
|
|
/ p_sys->i_crop_width;
|
|
|
|
f_scale_height = (float)id->p_encoder->fmt_out.video.i_height
|
|
|
|
/ p_sys->i_crop_height;
|
|
|
|
}
|
|
|
|
|
2006-08-06 15:27:58 +02:00
|
|
|
/* check maxwidth and maxheight
|
|
|
|
* note: maxwidth and maxheight currently does not handle
|
|
|
|
* canvas and padding, just scaling and cropping.
|
|
|
|
*/
|
2006-03-18 12:27:10 +01:00
|
|
|
if( p_sys->i_maxwidth && f_scale_width > (float)p_sys->i_maxwidth /
|
|
|
|
p_sys->i_crop_width )
|
|
|
|
{
|
|
|
|
f_scale_width = (float)p_sys->i_maxwidth / p_sys->i_crop_width;
|
|
|
|
}
|
|
|
|
if( p_sys->i_maxheight && f_scale_height > (float)p_sys->i_maxheight /
|
|
|
|
p_sys->i_crop_height )
|
|
|
|
{
|
|
|
|
f_scale_height = (float)p_sys->i_maxheight / p_sys->i_crop_height;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Change aspect ratio from source pixel to scaled pixel */
|
|
|
|
f_aspect = f_aspect * f_scale_height / f_scale_width;
|
|
|
|
msg_Dbg( p_stream, "scaled pixel aspect is %f:1", f_aspect );
|
|
|
|
|
2006-08-06 15:27:58 +02:00
|
|
|
/* Correct scaling for target aspect ratio
|
|
|
|
* Shrink video if necessary
|
|
|
|
*/
|
2006-03-18 12:27:10 +01:00
|
|
|
if ( p_sys->i_canvas_aspect > 0 )
|
|
|
|
{
|
|
|
|
float f_target_aspect = (float)p_sys->i_canvas_aspect /
|
|
|
|
VOUT_ASPECT_FACTOR;
|
|
|
|
|
|
|
|
if( p_sys->i_canvas_width > 0 && p_sys->i_canvas_height > 0)
|
|
|
|
{
|
|
|
|
/* Calculate pixel aspect of canvas */
|
|
|
|
f_target_aspect = f_target_aspect / p_sys->i_canvas_width *
|
|
|
|
p_sys->i_canvas_height;
|
|
|
|
}
|
|
|
|
if( f_target_aspect > f_aspect )
|
|
|
|
{
|
|
|
|
/* Reduce width scale to increase aspect */
|
|
|
|
f_scale_width = f_scale_width * f_aspect / f_target_aspect;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* Reduce height scale to decrease aspect */
|
|
|
|
f_scale_height = f_scale_height * f_target_aspect / f_aspect;
|
|
|
|
}
|
|
|
|
f_aspect = f_target_aspect;
|
2006-03-19 02:27:21 +01:00
|
|
|
msg_Dbg( p_stream, "canvas scaled pixel aspect is %f:1", f_aspect );
|
2006-03-18 12:27:10 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* f_scale_width and f_scale_height are now final */
|
2006-08-06 15:27:58 +02:00
|
|
|
/* Calculate width, height from scaling
|
|
|
|
* Make sure its multiple of 2
|
|
|
|
*/
|
2006-03-18 12:27:10 +01:00
|
|
|
i_dst_width = 2 * (int)( p_sys->i_crop_width * f_scale_width / 2 + 0.5 );
|
|
|
|
i_dst_height = 2 *
|
|
|
|
(int)( p_sys->i_crop_height * f_scale_height / 2 + 0.5 );
|
|
|
|
|
|
|
|
p_sys->i_nopadd_width = i_dst_width;
|
|
|
|
p_sys->i_nopadd_height = i_dst_height;
|
|
|
|
p_sys->i_dst_x_offset = 0;
|
|
|
|
p_sys->i_dst_y_offset = 0;
|
|
|
|
|
|
|
|
/* Handle canvas and padding */
|
|
|
|
if( p_sys->i_canvas_width <= 0 )
|
|
|
|
{
|
|
|
|
/* No canvas width set, add explicit padding border */
|
|
|
|
i_dst_width = p_sys->i_nopadd_width + ( p_sys->i_padd_left & ~1 ) +
|
|
|
|
( p_sys->i_padd_right & ~1 );
|
|
|
|
p_sys->i_dst_x_offset = ( p_sys->i_padd_left & ~1 );
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* Canvas set, check if we have to padd or crop */
|
|
|
|
if( p_sys->i_canvas_width < p_sys->i_nopadd_width )
|
|
|
|
{
|
|
|
|
/* need to crop more, but keep same scaling */
|
|
|
|
int i_crop = 2 * (int)( ( p_sys->i_canvas_width & ~1 ) /
|
|
|
|
f_scale_width / 2 + 0.5 );
|
|
|
|
|
|
|
|
p_sys->i_src_x_offset += ( ( p_sys->i_crop_width - i_crop ) / 2 )
|
|
|
|
& ~1;
|
|
|
|
p_sys->i_crop_width = i_crop;
|
|
|
|
i_dst_width = p_sys->i_canvas_width & ~1;
|
|
|
|
p_sys->i_nopadd_width = i_dst_width;
|
|
|
|
}
|
|
|
|
else if( p_sys->i_canvas_width > p_sys->i_nopadd_width )
|
|
|
|
{
|
|
|
|
/* need to padd */
|
|
|
|
i_dst_width = p_sys->i_canvas_width & ~1;
|
|
|
|
p_sys->i_dst_x_offset = ( i_dst_width - p_sys->i_nopadd_width )/2;
|
|
|
|
p_sys->i_dst_x_offset = p_sys->i_dst_x_offset & ~1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if( p_sys->i_canvas_height <= 0 )
|
|
|
|
{
|
|
|
|
/* No canvas set, add padding border */
|
|
|
|
i_dst_height = p_sys->i_nopadd_height + ( p_sys->i_padd_top & ~1 ) +
|
|
|
|
( p_sys->i_padd_bottom & ~1 );
|
|
|
|
p_sys->i_dst_y_offset = ( p_sys->i_padd_top & ~1 );
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* Canvas set, check if we have to padd or crop */
|
|
|
|
if( p_sys->i_canvas_height < p_sys->i_nopadd_height )
|
|
|
|
{
|
|
|
|
/* need to crop more, but keep same scaling */
|
|
|
|
int i_crop = 2 * (int)( ( p_sys->i_canvas_height & ~1 ) /
|
|
|
|
f_scale_height / 2 + 0.5 );
|
|
|
|
|
|
|
|
p_sys->i_src_y_offset += ( ( p_sys->i_crop_height - i_crop ) / 2 )
|
|
|
|
& ~1;
|
|
|
|
p_sys->i_crop_height = i_crop;
|
|
|
|
i_dst_height = p_sys->i_canvas_height & ~1;
|
|
|
|
p_sys->i_nopadd_height = i_dst_height;
|
|
|
|
}
|
|
|
|
else if( p_sys->i_canvas_height > p_sys->i_nopadd_height )
|
|
|
|
{
|
|
|
|
/* need to padd */
|
|
|
|
i_dst_height = p_sys->i_canvas_height & ~1;
|
|
|
|
p_sys->i_dst_y_offset = ( i_dst_height - p_sys->i_nopadd_height )
|
|
|
|
/2;
|
|
|
|
p_sys->i_dst_y_offset = p_sys->i_dst_y_offset & ~1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Change aspect ratio from scaled pixel to output frame */
|
|
|
|
f_aspect = f_aspect * i_dst_width / i_dst_height;
|
|
|
|
|
|
|
|
/* Store calculated values */
|
|
|
|
id->p_encoder->fmt_out.video.i_width = i_dst_width;
|
|
|
|
id->p_encoder->fmt_out.video.i_height = i_dst_height;
|
|
|
|
|
|
|
|
id->p_encoder->fmt_in.video.i_width = i_dst_width;
|
|
|
|
id->p_encoder->fmt_in.video.i_height = i_dst_height;
|
|
|
|
|
2006-03-19 02:27:21 +01:00
|
|
|
msg_Dbg( p_stream, "source %ix%i, crop %ix%i, "
|
2006-03-18 12:27:10 +01:00
|
|
|
"destination %ix%i, padding %ix%i",
|
|
|
|
i_src_width, i_src_height,
|
|
|
|
p_sys->i_crop_width, p_sys->i_crop_height,
|
|
|
|
p_sys->i_nopadd_width, p_sys->i_nopadd_height,
|
|
|
|
i_dst_width, i_dst_height
|
|
|
|
);
|
|
|
|
|
|
|
|
/* Handle frame rate conversion */
|
2004-08-26 23:27:06 +02:00
|
|
|
if( !id->p_encoder->fmt_out.video.i_frame_rate ||
|
|
|
|
!id->p_encoder->fmt_out.video.i_frame_rate_base )
|
|
|
|
{
|
|
|
|
if( id->p_decoder->fmt_out.video.i_frame_rate &&
|
|
|
|
id->p_decoder->fmt_out.video.i_frame_rate_base )
|
|
|
|
{
|
|
|
|
id->p_encoder->fmt_out.video.i_frame_rate =
|
|
|
|
id->p_decoder->fmt_out.video.i_frame_rate;
|
|
|
|
id->p_encoder->fmt_out.video.i_frame_rate_base =
|
|
|
|
id->p_decoder->fmt_out.video.i_frame_rate_base;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* Pick a sensible default value */
|
|
|
|
id->p_encoder->fmt_out.video.i_frame_rate = 25;
|
|
|
|
id->p_encoder->fmt_out.video.i_frame_rate_base = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
id->p_encoder->fmt_in.video.i_frame_rate =
|
|
|
|
id->p_encoder->fmt_out.video.i_frame_rate;
|
|
|
|
id->p_encoder->fmt_in.video.i_frame_rate_base =
|
|
|
|
id->p_encoder->fmt_out.video.i_frame_rate_base;
|
2005-03-22 10:53:11 +01:00
|
|
|
|
2004-08-26 23:27:06 +02:00
|
|
|
date_Init( &id->interpolated_pts,
|
|
|
|
id->p_encoder->fmt_out.video.i_frame_rate,
|
|
|
|
id->p_encoder->fmt_out.video.i_frame_rate_base );
|
|
|
|
|
|
|
|
/* Check whether a particular aspect ratio was requested */
|
|
|
|
if( !id->p_encoder->fmt_out.video.i_aspect )
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
{
|
2006-03-18 12:27:10 +01:00
|
|
|
id->p_encoder->fmt_out.video.i_aspect = (int)( f_aspect * VOUT_ASPECT_FACTOR + 0.5 );
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
}
|
2004-08-26 23:27:06 +02:00
|
|
|
id->p_encoder->fmt_in.video.i_aspect =
|
|
|
|
id->p_encoder->fmt_out.video.i_aspect;
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
|
2006-03-18 12:27:10 +01:00
|
|
|
msg_Dbg( p_stream, "encoder aspect is %i:%i", id->p_encoder->fmt_out.video.i_aspect, VOUT_ASPECT_FACTOR );
|
|
|
|
|
2004-08-26 23:27:06 +02:00
|
|
|
id->p_encoder->p_module =
|
|
|
|
module_Need( id->p_encoder, "encoder", p_sys->psz_venc, VLC_TRUE );
|
|
|
|
if( !id->p_encoder->p_module )
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
{
|
2006-07-04 14:28:23 +02:00
|
|
|
msg_Err( p_stream, "cannot find encoder (%s)", p_sys->psz_venc );
|
2004-08-26 23:27:06 +02:00
|
|
|
return VLC_EGENERIC;
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
}
|
2004-08-26 23:27:06 +02:00
|
|
|
|
|
|
|
id->p_encoder->fmt_in.video.i_chroma = id->p_encoder->fmt_in.i_codec;
|
|
|
|
|
|
|
|
/* Hack for mp2v/mp1v transcoding support */
|
|
|
|
if( id->p_encoder->fmt_out.i_codec == VLC_FOURCC('m','p','1','v') ||
|
|
|
|
id->p_encoder->fmt_out.i_codec == VLC_FOURCC('m','p','2','v') )
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
{
|
2004-08-26 23:27:06 +02:00
|
|
|
id->p_encoder->fmt_out.i_codec = VLC_FOURCC('m','p','g','v');
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
}
|
2004-08-26 23:27:06 +02:00
|
|
|
|
|
|
|
id->id = p_stream->p_sys->p_out->pf_add( p_stream->p_sys->p_out,
|
|
|
|
&id->p_encoder->fmt_out );
|
|
|
|
if( !id->id )
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
{
|
2004-08-26 23:27:06 +02:00
|
|
|
msg_Err( p_stream, "cannot add this stream" );
|
|
|
|
return VLC_EGENERIC;
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
}
|
2004-08-26 23:27:06 +02:00
|
|
|
|
|
|
|
return VLC_SUCCESS;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void transcode_video_close( sout_stream_t *p_stream,
|
|
|
|
sout_stream_id_t *id )
|
|
|
|
{
|
2004-09-08 14:48:57 +02:00
|
|
|
int i, j;
|
2004-08-26 23:27:06 +02:00
|
|
|
|
|
|
|
if( p_stream->p_sys->i_threads >= 1 )
|
2004-08-08 23:14:38 +02:00
|
|
|
{
|
2004-08-26 23:27:06 +02:00
|
|
|
vlc_mutex_lock( &p_stream->p_sys->lock_out );
|
|
|
|
p_stream->p_sys->b_die = 1;
|
|
|
|
vlc_cond_signal( &p_stream->p_sys->cond );
|
|
|
|
vlc_mutex_unlock( &p_stream->p_sys->lock_out );
|
|
|
|
vlc_thread_join( p_stream->p_sys );
|
|
|
|
vlc_mutex_destroy( &p_stream->p_sys->lock_out );
|
|
|
|
vlc_cond_destroy( &p_stream->p_sys->cond );
|
2004-08-08 23:14:38 +02:00
|
|
|
}
|
2004-08-26 23:27:06 +02:00
|
|
|
|
|
|
|
/* Close decoder */
|
|
|
|
if( id->p_decoder->p_module )
|
|
|
|
module_Unneed( id->p_decoder, id->p_decoder->p_module );
|
|
|
|
|
2004-09-08 14:48:57 +02:00
|
|
|
if( id->p_decoder->p_owner )
|
|
|
|
{
|
|
|
|
/* Clean-up pictures ring buffer */
|
|
|
|
for( i = 0; i < PICTURE_RING_SIZE; i++ )
|
|
|
|
{
|
|
|
|
if( id->p_decoder->p_owner->pp_pics[i] )
|
|
|
|
video_del_buffer( VLC_OBJECT(id->p_decoder),
|
|
|
|
id->p_decoder->p_owner->pp_pics[i] );
|
|
|
|
}
|
|
|
|
free( id->p_decoder->p_owner );
|
|
|
|
}
|
|
|
|
|
2004-08-26 23:27:06 +02:00
|
|
|
/* Close encoder */
|
|
|
|
if( id->p_encoder->p_module )
|
|
|
|
module_Unneed( id->p_encoder, id->p_encoder->p_module );
|
|
|
|
|
|
|
|
/* Close filters */
|
|
|
|
for( i = 0; i < id->i_filter; i++ )
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
{
|
2004-08-26 23:27:06 +02:00
|
|
|
vlc_object_detach( id->pp_filter[i] );
|
|
|
|
if( id->pp_filter[i]->p_module )
|
|
|
|
module_Unneed( id->pp_filter[i], id->pp_filter[i]->p_module );
|
2004-09-08 14:48:57 +02:00
|
|
|
|
|
|
|
/* Clean-up pictures ring buffer */
|
|
|
|
for( j = 0; j < PICTURE_RING_SIZE; j++ )
|
|
|
|
{
|
|
|
|
if( id->pp_filter[i]->p_owner->pp_pics[j] )
|
|
|
|
video_del_buffer( VLC_OBJECT(id->pp_filter[i]),
|
|
|
|
id->pp_filter[i]->p_owner->pp_pics[j] );
|
|
|
|
}
|
|
|
|
free( id->pp_filter[i]->p_owner );
|
2004-08-26 23:27:06 +02:00
|
|
|
vlc_object_destroy( id->pp_filter[i] );
|
2006-08-06 15:27:58 +02:00
|
|
|
id->pp_filter[i] = NULL;
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
}
|
2006-08-06 15:27:58 +02:00
|
|
|
|
|
|
|
for( i = 0; i < id->i_ufilter; i++ )
|
2005-06-03 12:11:58 +02:00
|
|
|
{
|
2006-08-06 15:27:58 +02:00
|
|
|
vlc_object_detach( id->pp_ufilter[i] );
|
|
|
|
if( id->pp_ufilter[i]->p_module )
|
|
|
|
module_Unneed( id->pp_ufilter[i], id->pp_ufilter[i]->p_module );
|
2005-06-03 12:11:58 +02:00
|
|
|
|
|
|
|
/* Clean-up pictures ring buffer */
|
|
|
|
for( j = 0; j < PICTURE_RING_SIZE; j++ )
|
|
|
|
{
|
2006-08-06 15:27:58 +02:00
|
|
|
if( id->pp_ufilter[i]->p_owner->pp_pics[j] )
|
|
|
|
video_del_buffer( VLC_OBJECT(id->pp_ufilter[i]),
|
|
|
|
id->pp_ufilter[i]->p_owner->pp_pics[j] );
|
2005-06-03 12:11:58 +02:00
|
|
|
}
|
2006-08-06 15:27:58 +02:00
|
|
|
free( id->pp_ufilter[i]->p_owner );
|
|
|
|
vlc_object_destroy( id->pp_ufilter[i] );
|
|
|
|
id->pp_ufilter[i] = NULL;
|
2005-06-03 12:11:58 +02:00
|
|
|
}
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
}
|
|
|
|
|
2004-08-26 23:27:06 +02:00
|
|
|
static int transcode_video_process( sout_stream_t *p_stream,
|
|
|
|
sout_stream_id_t *id,
|
|
|
|
block_t *in, block_t **out )
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
{
|
2004-08-19 17:01:54 +02:00
|
|
|
sout_stream_sys_t *p_sys = p_stream->p_sys;
|
2004-08-26 23:27:06 +02:00
|
|
|
int i_duplicate = 1, i;
|
2005-08-12 17:51:18 +02:00
|
|
|
picture_t *p_pic, *p_pic2 = NULL;
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
*out = NULL;
|
2006-07-08 13:16:20 +02:00
|
|
|
input_thread_t *p_input = NULL;
|
2006-08-06 15:27:58 +02:00
|
|
|
|
2006-07-08 13:16:20 +02:00
|
|
|
if( p_stream->p_parent->p_parent && p_stream->p_parent->p_parent->
|
|
|
|
i_object_type == VLC_OBJECT_INPUT )
|
|
|
|
p_input = (input_thread_t *)p_stream->p_parent->p_parent;
|
|
|
|
|
2004-08-26 23:27:06 +02:00
|
|
|
while( (p_pic = id->p_decoder->pf_decode_video( id->p_decoder, &in )) )
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
{
|
2004-08-08 23:14:38 +02:00
|
|
|
subpicture_t *p_subpic = 0;
|
2006-07-08 13:16:20 +02:00
|
|
|
if( p_input )
|
|
|
|
stats_UpdateInteger( p_input, p_input->counters.p_decoded_video,
|
|
|
|
1, NULL );
|
2003-10-30 13:01:01 +01:00
|
|
|
|
2005-04-26 14:40:02 +02:00
|
|
|
if( p_stream->p_sout->i_out_pace_nocontrol && p_sys->b_hurry_up )
|
|
|
|
{
|
|
|
|
mtime_t current_date = mdate();
|
2005-04-26 14:44:03 +02:00
|
|
|
if( current_date + 50000 > p_pic->date )
|
2005-04-26 14:40:02 +02:00
|
|
|
{
|
|
|
|
msg_Dbg( p_stream, "late picture skipped ("I64Fd")",
|
2005-04-26 14:44:03 +02:00
|
|
|
current_date + 50000 - p_pic->date );
|
2005-04-26 14:40:02 +02:00
|
|
|
p_pic->pf_release( p_pic );
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-10-30 17:05:52 +02:00
|
|
|
if( p_sys->b_master_sync )
|
2004-08-19 17:01:54 +02:00
|
|
|
{
|
|
|
|
mtime_t i_video_drift;
|
2004-08-19 19:06:51 +02:00
|
|
|
mtime_t i_master_drift = p_sys->i_master_drift;
|
2004-08-26 23:27:06 +02:00
|
|
|
mtime_t i_pts;
|
2004-08-19 19:06:51 +02:00
|
|
|
|
2005-07-27 18:53:25 +02:00
|
|
|
i_pts = date_Get( &id->interpolated_pts ) + 1;
|
2005-08-05 16:46:20 +02:00
|
|
|
if ( p_pic->date - i_pts > MASTER_SYNC_MAX_DRIFT
|
|
|
|
|| p_pic->date - i_pts < -MASTER_SYNC_MAX_DRIFT )
|
2004-08-19 19:06:51 +02:00
|
|
|
{
|
2005-08-05 16:46:20 +02:00
|
|
|
msg_Dbg( p_stream, "drift is too high, resetting master sync" );
|
2005-07-27 18:53:25 +02:00
|
|
|
date_Set( &id->interpolated_pts, p_pic->date );
|
|
|
|
i_pts = p_pic->date + 1;
|
2004-08-19 19:06:51 +02:00
|
|
|
}
|
2004-08-26 23:27:06 +02:00
|
|
|
i_video_drift = p_pic->date - i_pts;
|
2004-08-19 17:01:54 +02:00
|
|
|
i_duplicate = 1;
|
|
|
|
|
2004-08-26 23:27:06 +02:00
|
|
|
/* Set the pts of the frame being encoded */
|
|
|
|
p_pic->date = i_pts;
|
|
|
|
|
2004-08-19 19:06:51 +02:00
|
|
|
if( i_video_drift < i_master_drift - 50000 )
|
2004-08-19 17:01:54 +02:00
|
|
|
{
|
2004-09-02 00:26:48 +02:00
|
|
|
#if 0
|
2004-08-19 17:01:54 +02:00
|
|
|
msg_Dbg( p_stream, "dropping frame (%i)",
|
2004-08-19 19:06:51 +02:00
|
|
|
(int)(i_video_drift - i_master_drift) );
|
2004-09-02 00:26:48 +02:00
|
|
|
#endif
|
2004-10-15 00:14:09 +02:00
|
|
|
p_pic->pf_release( p_pic );
|
2005-04-26 14:40:02 +02:00
|
|
|
continue;
|
2004-08-19 17:01:54 +02:00
|
|
|
}
|
2004-08-19 19:06:51 +02:00
|
|
|
else if( i_video_drift > i_master_drift + 50000 )
|
2004-08-19 17:01:54 +02:00
|
|
|
{
|
2004-09-02 00:26:48 +02:00
|
|
|
#if 0
|
2004-08-19 17:01:54 +02:00
|
|
|
msg_Dbg( p_stream, "adding frame (%i)",
|
2004-08-19 19:06:51 +02:00
|
|
|
(int)(i_video_drift - i_master_drift) );
|
2004-09-02 00:26:48 +02:00
|
|
|
#endif
|
2004-08-19 17:01:54 +02:00
|
|
|
i_duplicate = 2;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-08-26 23:27:06 +02:00
|
|
|
if( !id->p_encoder->p_module )
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
{
|
2004-08-26 23:27:06 +02:00
|
|
|
if( transcode_video_encoder_open( p_stream, id ) != VLC_SUCCESS )
|
2003-10-27 18:50:54 +01:00
|
|
|
{
|
2005-03-08 14:15:56 +01:00
|
|
|
p_pic->pf_release( p_pic );
|
2004-08-26 23:27:06 +02:00
|
|
|
transcode_video_close( p_stream, id );
|
2003-10-08 23:01:07 +02:00
|
|
|
id->b_transcode = VLC_FALSE;
|
2004-08-30 18:28:38 +02:00
|
|
|
return VLC_EGENERIC;
|
2003-10-08 23:01:07 +02:00
|
|
|
}
|
|
|
|
|
2004-08-29 03:12:06 +02:00
|
|
|
/* Deinterlace */
|
|
|
|
if( p_stream->p_sys->b_deinterlace )
|
|
|
|
{
|
|
|
|
id->pp_filter[id->i_filter] =
|
|
|
|
vlc_object_create( p_stream, VLC_OBJECT_FILTER );
|
|
|
|
vlc_object_attach( id->pp_filter[id->i_filter], p_stream );
|
|
|
|
|
|
|
|
id->pp_filter[id->i_filter]->pf_vout_buffer_new =
|
2004-09-08 14:48:57 +02:00
|
|
|
video_new_buffer_filter;
|
2004-08-29 03:12:06 +02:00
|
|
|
id->pp_filter[id->i_filter]->pf_vout_buffer_del =
|
2004-09-08 14:48:57 +02:00
|
|
|
video_del_buffer_filter;
|
2004-08-29 03:12:06 +02:00
|
|
|
|
|
|
|
id->pp_filter[id->i_filter]->fmt_in = id->p_decoder->fmt_out;
|
|
|
|
id->pp_filter[id->i_filter]->fmt_out = id->p_decoder->fmt_out;
|
2005-05-20 17:02:25 +02:00
|
|
|
id->pp_filter[id->i_filter]->p_cfg = p_sys->p_deinterlace_cfg;
|
2004-08-29 03:12:06 +02:00
|
|
|
id->pp_filter[id->i_filter]->p_module =
|
|
|
|
module_Need( id->pp_filter[id->i_filter],
|
2005-05-20 17:02:25 +02:00
|
|
|
"video filter2", p_sys->psz_deinterlace, 0 );
|
2004-09-08 14:48:57 +02:00
|
|
|
if( id->pp_filter[id->i_filter]->p_module )
|
|
|
|
{
|
|
|
|
id->pp_filter[id->i_filter]->p_owner =
|
|
|
|
malloc( sizeof(filter_owner_sys_t) );
|
|
|
|
for( i = 0; i < PICTURE_RING_SIZE; i++ )
|
|
|
|
id->pp_filter[id->i_filter]->p_owner->pp_pics[i] = 0;
|
2005-06-07 12:28:09 +02:00
|
|
|
id->pp_filter[id->i_filter]->p_owner->p_sys = p_sys;
|
2004-09-08 14:48:57 +02:00
|
|
|
|
|
|
|
id->i_filter++;
|
|
|
|
}
|
2004-08-29 03:12:06 +02:00
|
|
|
else
|
|
|
|
{
|
|
|
|
msg_Dbg( p_stream, "no video filter found" );
|
|
|
|
vlc_object_detach( id->pp_filter[id->i_filter] );
|
|
|
|
vlc_object_destroy( id->pp_filter[id->i_filter] );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-08-26 23:27:06 +02:00
|
|
|
/* Check if we need a filter for chroma conversion or resizing */
|
|
|
|
if( id->p_decoder->fmt_out.video.i_chroma !=
|
|
|
|
id->p_encoder->fmt_in.video.i_chroma ||
|
2006-08-04 17:17:15 +02:00
|
|
|
|
2006-03-18 12:27:10 +01:00
|
|
|
(int)id->p_decoder->fmt_out.video.i_width != p_sys->i_crop_width ||
|
|
|
|
p_sys->i_crop_width != p_sys->i_nopadd_width ||
|
|
|
|
p_sys->i_nopadd_width != (int)id->p_encoder->fmt_out.video.i_width ||
|
2006-08-04 17:17:15 +02:00
|
|
|
|
2006-03-18 12:27:10 +01:00
|
|
|
(int)id->p_decoder->fmt_out.video.i_height != p_sys->i_crop_height ||
|
|
|
|
p_sys->i_crop_height != p_sys->i_nopadd_height ||
|
|
|
|
p_sys->i_nopadd_height != (int)id->p_encoder->fmt_out.video.i_height)
|
2003-10-08 23:01:07 +02:00
|
|
|
{
|
2004-08-29 03:12:06 +02:00
|
|
|
id->pp_filter[id->i_filter] =
|
2004-08-26 23:27:06 +02:00
|
|
|
vlc_object_create( p_stream, VLC_OBJECT_FILTER );
|
2004-08-29 03:12:06 +02:00
|
|
|
vlc_object_attach( id->pp_filter[id->i_filter], p_stream );
|
|
|
|
|
|
|
|
id->pp_filter[id->i_filter]->pf_vout_buffer_new =
|
2004-09-08 14:48:57 +02:00
|
|
|
video_new_buffer_filter;
|
2004-08-29 03:12:06 +02:00
|
|
|
id->pp_filter[id->i_filter]->pf_vout_buffer_del =
|
2004-09-08 14:48:57 +02:00
|
|
|
video_del_buffer_filter;
|
2004-08-29 03:12:06 +02:00
|
|
|
|
|
|
|
id->pp_filter[id->i_filter]->fmt_in = id->p_decoder->fmt_out;
|
|
|
|
id->pp_filter[id->i_filter]->fmt_out = id->p_encoder->fmt_in;
|
2005-05-20 17:02:25 +02:00
|
|
|
id->pp_filter[id->i_filter]->p_cfg = NULL;
|
2006-03-18 12:27:10 +01:00
|
|
|
|
|
|
|
id->pp_filter[id->i_filter]->fmt_in.video.i_x_offset = p_sys->i_src_x_offset;
|
|
|
|
id->pp_filter[id->i_filter]->fmt_in.video.i_y_offset = p_sys->i_src_y_offset;
|
|
|
|
id->pp_filter[id->i_filter]->fmt_in.video.i_visible_width = p_sys->i_crop_width;
|
|
|
|
id->pp_filter[id->i_filter]->fmt_in.video.i_visible_height = p_sys->i_crop_height;
|
|
|
|
|
|
|
|
id->pp_filter[id->i_filter]->fmt_out.video.i_x_offset = p_sys->i_dst_x_offset;
|
|
|
|
id->pp_filter[id->i_filter]->fmt_out.video.i_y_offset = p_sys->i_dst_y_offset;
|
|
|
|
id->pp_filter[id->i_filter]->fmt_out.video.i_visible_width = p_sys->i_nopadd_width;
|
|
|
|
id->pp_filter[id->i_filter]->fmt_out.video.i_visible_height = p_sys->i_nopadd_height;
|
|
|
|
|
2004-08-29 03:12:06 +02:00
|
|
|
id->pp_filter[id->i_filter]->p_module =
|
|
|
|
module_Need( id->pp_filter[id->i_filter],
|
2006-03-18 12:27:10 +01:00
|
|
|
"crop padd", 0, 0 );
|
2004-09-08 14:48:57 +02:00
|
|
|
if( id->pp_filter[id->i_filter]->p_module )
|
|
|
|
{
|
|
|
|
id->pp_filter[id->i_filter]->p_owner =
|
|
|
|
malloc( sizeof(filter_owner_sys_t) );
|
|
|
|
for( i = 0; i < PICTURE_RING_SIZE; i++ )
|
|
|
|
id->pp_filter[id->i_filter]->p_owner->pp_pics[i] = 0;
|
2005-06-07 12:28:09 +02:00
|
|
|
id->pp_filter[id->i_filter]->p_owner->p_sys = p_sys;
|
2004-09-08 14:48:57 +02:00
|
|
|
|
|
|
|
id->i_filter++;
|
|
|
|
}
|
2004-08-26 23:27:06 +02:00
|
|
|
else
|
2003-12-07 18:09:33 +01:00
|
|
|
{
|
2004-08-26 23:27:06 +02:00
|
|
|
msg_Dbg( p_stream, "no video filter found" );
|
2004-08-29 03:12:06 +02:00
|
|
|
vlc_object_detach( id->pp_filter[id->i_filter] );
|
|
|
|
vlc_object_destroy( id->pp_filter[id->i_filter] );
|
2004-08-30 18:28:38 +02:00
|
|
|
|
2005-03-08 14:15:56 +01:00
|
|
|
p_pic->pf_release( p_pic );
|
2004-08-30 18:28:38 +02:00
|
|
|
transcode_video_close( p_stream, id );
|
|
|
|
id->b_transcode = VLC_FALSE;
|
|
|
|
return VLC_EGENERIC;
|
2003-12-07 18:09:33 +01:00
|
|
|
}
|
2003-10-08 23:01:07 +02:00
|
|
|
}
|
2005-06-03 12:11:58 +02:00
|
|
|
|
2006-08-06 15:27:58 +02:00
|
|
|
for( i = 0; (i < p_sys->i_vfilters) && (id->i_ufilter < TRANSCODE_FILTERS); i++ )
|
2005-06-03 12:11:58 +02:00
|
|
|
{
|
2006-08-06 15:27:58 +02:00
|
|
|
id->pp_ufilter[id->i_ufilter] =
|
2005-06-03 12:11:58 +02:00
|
|
|
vlc_object_create( p_stream, VLC_OBJECT_FILTER );
|
2006-08-06 15:27:58 +02:00
|
|
|
vlc_object_attach( id->pp_ufilter[id->i_ufilter], p_stream );
|
2005-06-03 12:11:58 +02:00
|
|
|
|
2006-08-06 15:27:58 +02:00
|
|
|
id->pp_ufilter[id->i_ufilter]->pf_vout_buffer_new =
|
2005-06-03 12:11:58 +02:00
|
|
|
video_new_buffer_filter;
|
2006-08-06 15:27:58 +02:00
|
|
|
id->pp_ufilter[id->i_ufilter]->pf_vout_buffer_del =
|
2005-06-03 12:11:58 +02:00
|
|
|
video_del_buffer_filter;
|
|
|
|
|
2006-08-06 15:27:58 +02:00
|
|
|
id->pp_ufilter[id->i_ufilter]->fmt_in = id->p_encoder->fmt_in;
|
|
|
|
id->pp_ufilter[id->i_ufilter]->fmt_out = id->p_encoder->fmt_in;
|
|
|
|
id->pp_ufilter[id->i_ufilter]->p_cfg = p_sys->p_vfilters_cfg[i];
|
|
|
|
id->pp_ufilter[id->i_ufilter]->p_module =
|
|
|
|
module_Need( id->pp_ufilter[id->i_ufilter],
|
2005-06-03 12:11:58 +02:00
|
|
|
"video filter2", p_sys->psz_vfilters[i], 0 );
|
2006-08-06 15:27:58 +02:00
|
|
|
if( id->pp_ufilter[id->i_ufilter]->p_module )
|
2005-06-03 12:11:58 +02:00
|
|
|
{
|
2006-08-06 15:27:58 +02:00
|
|
|
id->pp_ufilter[id->i_ufilter]->p_owner =
|
2005-06-03 12:11:58 +02:00
|
|
|
malloc( sizeof(filter_owner_sys_t) );
|
|
|
|
for( i = 0; i < PICTURE_RING_SIZE; i++ )
|
2006-08-06 15:27:58 +02:00
|
|
|
id->pp_ufilter[id->i_ufilter]->p_owner->pp_pics[i] = 0;
|
|
|
|
id->pp_ufilter[id->i_ufilter]->p_owner->p_sys = p_sys;
|
|
|
|
id->i_ufilter++;
|
2005-06-03 12:11:58 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
msg_Dbg( p_stream, "no video filter found" );
|
2006-08-06 15:27:58 +02:00
|
|
|
vlc_object_detach( id->pp_ufilter[id->i_ufilter] );
|
|
|
|
vlc_object_destroy( id->pp_ufilter[id->i_ufilter] );
|
2006-08-20 22:46:40 +02:00
|
|
|
id->pp_ufilter[id->i_ufilter] = NULL;
|
2005-06-03 12:11:58 +02:00
|
|
|
}
|
|
|
|
}
|
2003-10-08 23:01:07 +02:00
|
|
|
}
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
|
2004-08-26 23:27:06 +02:00
|
|
|
/* Run filter chain */
|
|
|
|
for( i = 0; i < id->i_filter; i++ )
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
{
|
2004-08-26 23:27:06 +02:00
|
|
|
p_pic = id->pp_filter[i]->pf_video_filter(id->pp_filter[i], p_pic);
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
}
|
|
|
|
|
2004-08-26 23:27:06 +02:00
|
|
|
/*
|
|
|
|
* Encoding
|
|
|
|
*/
|
2003-10-27 18:50:54 +01:00
|
|
|
|
2004-08-08 23:14:38 +02:00
|
|
|
/* Check if we have a subpicture to overlay */
|
2004-09-15 17:50:54 +02:00
|
|
|
if( p_sys->p_spu )
|
2004-08-08 23:14:38 +02:00
|
|
|
{
|
2006-09-02 19:03:36 +02:00
|
|
|
p_subpic = spu_SortSubpictures( p_sys->p_spu, p_pic->date,
|
|
|
|
VLC_FALSE /* Fixme: check if stream is paused */ );
|
2004-08-26 23:27:06 +02:00
|
|
|
/* TODO: get another pic */
|
2003-10-30 13:01:01 +01:00
|
|
|
}
|
2003-10-27 18:50:54 +01:00
|
|
|
|
2004-08-08 23:14:38 +02:00
|
|
|
/* Overlay subpicture */
|
|
|
|
if( p_subpic )
|
|
|
|
{
|
2004-09-15 17:50:54 +02:00
|
|
|
int i_scale_width, i_scale_height;
|
|
|
|
video_format_t *p_fmt;
|
2004-08-08 23:14:38 +02:00
|
|
|
|
2004-09-15 17:50:54 +02:00
|
|
|
i_scale_width = id->p_encoder->fmt_in.video.i_width * 1000 /
|
|
|
|
id->p_decoder->fmt_out.video.i_width;
|
|
|
|
i_scale_height = id->p_encoder->fmt_in.video.i_height * 1000 /
|
|
|
|
id->p_decoder->fmt_out.video.i_height;
|
2004-08-08 23:14:38 +02:00
|
|
|
|
2004-09-15 17:50:54 +02:00
|
|
|
if( p_pic->i_refcount && !id->i_filter )
|
2004-08-29 15:18:53 +02:00
|
|
|
{
|
|
|
|
/* We can't modify the picture, we need to duplicate it */
|
2004-09-15 17:50:54 +02:00
|
|
|
picture_t *p_tmp = video_new_buffer_decoder( id->p_decoder );
|
2004-08-29 15:18:53 +02:00
|
|
|
if( p_tmp )
|
|
|
|
{
|
2004-09-15 17:50:54 +02:00
|
|
|
vout_CopyPicture( p_stream, p_tmp, p_pic );
|
2004-08-29 15:18:53 +02:00
|
|
|
p_pic->pf_release( p_pic );
|
|
|
|
p_pic = p_tmp;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-09-15 17:50:54 +02:00
|
|
|
if( id->i_filter )
|
|
|
|
p_fmt = &id->pp_filter[id->i_filter -1]->fmt_out.video;
|
|
|
|
else
|
|
|
|
p_fmt = &id->p_decoder->fmt_out.video;
|
2004-08-08 23:14:38 +02:00
|
|
|
|
2004-11-08 14:58:18 +01:00
|
|
|
/* FIXME (shouldn't have to be done here) */
|
|
|
|
p_fmt->i_sar_num = p_fmt->i_aspect *
|
|
|
|
p_fmt->i_height / p_fmt->i_width;
|
|
|
|
p_fmt->i_sar_den = VOUT_ASPECT_FACTOR;
|
|
|
|
|
2004-09-15 17:50:54 +02:00
|
|
|
spu_RenderSubpictures( p_sys->p_spu, p_fmt, p_pic, p_pic, p_subpic,
|
|
|
|
i_scale_width, i_scale_height );
|
2004-08-08 23:14:38 +02:00
|
|
|
}
|
|
|
|
|
2006-08-06 15:27:58 +02:00
|
|
|
/* Run user specified filter chain */
|
|
|
|
for( i = 0; i < id->i_ufilter; i++ )
|
2005-06-03 12:11:58 +02:00
|
|
|
{
|
2006-08-06 15:27:58 +02:00
|
|
|
p_pic = id->pp_ufilter[i]->pf_video_filter(id->pp_ufilter[i], p_pic);
|
2005-06-03 12:11:58 +02:00
|
|
|
}
|
|
|
|
|
2005-08-12 17:51:18 +02:00
|
|
|
if( p_sys->i_threads == 0 )
|
* modules/codec/ffmpeg/encoder.c, modules/stream_out/transcode.c :
- new ffmpeg options available from the command-line : interleaved video,
noise reduction, rate control parameters, i_quant_factor, trellis
quantification, mpeg4 matrix, and thread count
- portable functions to use ffmpeg multithreading capabilities on all
platforms
- hurry up mode now turns off rd and trellis, and also raises the noise
reduction parameter (thus noise reduction is mandatory with hurry up)
- if threads=1, no ffmpeg thread is launched, but the ffmpeg encoding
will be done in a separate thread than the packetizer and decoder
- fixed a bug with mp3 decoding and weird ffmpeg return code
2004-02-20 19:34:28 +01:00
|
|
|
{
|
|
|
|
block_t *p_block;
|
|
|
|
p_block = id->p_encoder->pf_encode_video( id->p_encoder, p_pic );
|
2004-04-25 20:08:13 +02:00
|
|
|
block_ChainAppend( out, p_block );
|
2005-07-27 18:53:25 +02:00
|
|
|
}
|
2004-08-19 17:01:54 +02:00
|
|
|
|
2005-07-27 18:53:25 +02:00
|
|
|
if( p_sys->b_master_sync )
|
|
|
|
{
|
|
|
|
mtime_t i_pts = date_Get( &id->interpolated_pts ) + 1;
|
2005-08-05 16:46:20 +02:00
|
|
|
if ( p_pic->date - i_pts > MASTER_SYNC_MAX_DRIFT
|
|
|
|
|| p_pic->date - i_pts < -MASTER_SYNC_MAX_DRIFT )
|
2005-07-27 18:53:25 +02:00
|
|
|
{
|
2005-08-05 16:46:20 +02:00
|
|
|
msg_Dbg( p_stream, "drift is too high, resetting master sync" );
|
2005-07-27 18:53:25 +02:00
|
|
|
date_Set( &id->interpolated_pts, p_pic->date );
|
|
|
|
i_pts = p_pic->date + 1;
|
|
|
|
}
|
|
|
|
date_Increment( &id->interpolated_pts, 1 );
|
|
|
|
}
|
2004-09-02 00:26:48 +02:00
|
|
|
|
2005-07-27 18:53:25 +02:00
|
|
|
if( p_sys->b_master_sync && i_duplicate > 1 )
|
|
|
|
{
|
|
|
|
mtime_t i_pts = date_Get( &id->interpolated_pts ) + 1;
|
2005-08-05 16:46:20 +02:00
|
|
|
if ( p_pic->date - i_pts > MASTER_SYNC_MAX_DRIFT
|
|
|
|
|| p_pic->date - i_pts < -MASTER_SYNC_MAX_DRIFT )
|
2005-07-27 18:53:25 +02:00
|
|
|
{
|
2005-08-05 16:46:20 +02:00
|
|
|
msg_Dbg( p_stream, "drift is too high, resetting master sync" );
|
2005-07-27 18:53:25 +02:00
|
|
|
date_Set( &id->interpolated_pts, p_pic->date );
|
|
|
|
i_pts = p_pic->date + 1;
|
|
|
|
}
|
|
|
|
date_Increment( &id->interpolated_pts, 1 );
|
|
|
|
|
|
|
|
if( p_sys->i_threads >= 1 )
|
|
|
|
{
|
|
|
|
/* We can't modify the picture, we need to duplicate it */
|
2005-08-12 17:51:18 +02:00
|
|
|
p_pic2 = video_new_buffer_decoder( id->p_decoder );
|
|
|
|
if( p_pic2 != NULL )
|
2005-07-27 18:53:25 +02:00
|
|
|
{
|
2005-08-12 17:51:18 +02:00
|
|
|
vout_CopyPicture( p_stream, p_pic2, p_pic );
|
|
|
|
p_pic2->date = i_pts;
|
2005-07-27 18:53:25 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
2004-08-19 17:01:54 +02:00
|
|
|
{
|
2005-07-27 18:53:25 +02:00
|
|
|
block_t *p_block;
|
2004-08-19 17:01:54 +02:00
|
|
|
p_pic->date = i_pts;
|
2004-08-26 23:27:06 +02:00
|
|
|
p_block = id->p_encoder->pf_encode_video(id->p_encoder, p_pic);
|
2004-08-19 17:01:54 +02:00
|
|
|
block_ChainAppend( out, p_block );
|
|
|
|
}
|
2005-07-27 18:53:25 +02:00
|
|
|
}
|
2004-08-19 17:01:54 +02:00
|
|
|
|
2005-07-27 18:53:25 +02:00
|
|
|
if( p_sys->i_threads == 0 )
|
2005-08-12 17:51:18 +02:00
|
|
|
{
|
2004-08-26 23:27:06 +02:00
|
|
|
p_pic->pf_release( p_pic );
|
2005-08-12 17:51:18 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
vlc_mutex_lock( &p_sys->lock_out );
|
|
|
|
p_sys->pp_pics[p_sys->i_last_pic++] = p_pic;
|
|
|
|
p_sys->i_last_pic %= PICTURE_RING_SIZE;
|
|
|
|
*out = p_sys->p_buffers;
|
|
|
|
p_sys->p_buffers = NULL;
|
|
|
|
if( p_pic2 != NULL )
|
|
|
|
{
|
|
|
|
p_sys->pp_pics[p_sys->i_last_pic++] = p_pic2;
|
|
|
|
p_sys->i_last_pic %= PICTURE_RING_SIZE;
|
|
|
|
}
|
|
|
|
vlc_cond_signal( &p_sys->cond );
|
|
|
|
vlc_mutex_unlock( &p_sys->lock_out );
|
|
|
|
}
|
* modules/codec/ffmpeg/encoder.c, modules/stream_out/transcode.c :
- new ffmpeg options available from the command-line : interleaved video,
noise reduction, rate control parameters, i_quant_factor, trellis
quantification, mpeg4 matrix, and thread count
- portable functions to use ffmpeg multithreading capabilities on all
platforms
- hurry up mode now turns off rd and trellis, and also raises the noise
reduction parameter (thus noise reduction is mandatory with hurry up)
- if threads=1, no ffmpeg thread is launched, but the ffmpeg encoding
will be done in a separate thread than the packetizer and decoder
- fixed a bug with mp3 decoding and weird ffmpeg return code
2004-02-20 19:34:28 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
return VLC_SUCCESS;
|
|
|
|
}
|
|
|
|
|
2004-08-26 23:27:06 +02:00
|
|
|
static int EncoderThread( sout_stream_sys_t *p_sys )
|
* modules/codec/ffmpeg/encoder.c, modules/stream_out/transcode.c :
- new ffmpeg options available from the command-line : interleaved video,
noise reduction, rate control parameters, i_quant_factor, trellis
quantification, mpeg4 matrix, and thread count
- portable functions to use ffmpeg multithreading capabilities on all
platforms
- hurry up mode now turns off rd and trellis, and also raises the noise
reduction parameter (thus noise reduction is mandatory with hurry up)
- if threads=1, no ffmpeg thread is launched, but the ffmpeg encoding
will be done in a separate thread than the packetizer and decoder
- fixed a bug with mp3 decoding and weird ffmpeg return code
2004-02-20 19:34:28 +01:00
|
|
|
{
|
2004-08-26 23:27:06 +02:00
|
|
|
sout_stream_id_t *id = p_sys->id_video;
|
|
|
|
picture_t *p_pic;
|
* modules/codec/ffmpeg/encoder.c, modules/stream_out/transcode.c :
- new ffmpeg options available from the command-line : interleaved video,
noise reduction, rate control parameters, i_quant_factor, trellis
quantification, mpeg4 matrix, and thread count
- portable functions to use ffmpeg multithreading capabilities on all
platforms
- hurry up mode now turns off rd and trellis, and also raises the noise
reduction parameter (thus noise reduction is mandatory with hurry up)
- if threads=1, no ffmpeg thread is launched, but the ffmpeg encoding
will be done in a separate thread than the packetizer and decoder
- fixed a bug with mp3 decoding and weird ffmpeg return code
2004-02-20 19:34:28 +01:00
|
|
|
|
2004-08-26 23:27:06 +02:00
|
|
|
while( !p_sys->b_die && !p_sys->b_error )
|
* modules/codec/ffmpeg/encoder.c, modules/stream_out/transcode.c :
- new ffmpeg options available from the command-line : interleaved video,
noise reduction, rate control parameters, i_quant_factor, trellis
quantification, mpeg4 matrix, and thread count
- portable functions to use ffmpeg multithreading capabilities on all
platforms
- hurry up mode now turns off rd and trellis, and also raises the noise
reduction parameter (thus noise reduction is mandatory with hurry up)
- if threads=1, no ffmpeg thread is launched, but the ffmpeg encoding
will be done in a separate thread than the packetizer and decoder
- fixed a bug with mp3 decoding and weird ffmpeg return code
2004-02-20 19:34:28 +01:00
|
|
|
{
|
|
|
|
block_t *p_block;
|
|
|
|
|
|
|
|
vlc_mutex_lock( &p_sys->lock_out );
|
2004-08-26 23:27:06 +02:00
|
|
|
while( p_sys->i_last_pic == p_sys->i_first_pic )
|
* modules/codec/ffmpeg/encoder.c, modules/stream_out/transcode.c :
- new ffmpeg options available from the command-line : interleaved video,
noise reduction, rate control parameters, i_quant_factor, trellis
quantification, mpeg4 matrix, and thread count
- portable functions to use ffmpeg multithreading capabilities on all
platforms
- hurry up mode now turns off rd and trellis, and also raises the noise
reduction parameter (thus noise reduction is mandatory with hurry up)
- if threads=1, no ffmpeg thread is launched, but the ffmpeg encoding
will be done in a separate thread than the packetizer and decoder
- fixed a bug with mp3 decoding and weird ffmpeg return code
2004-02-20 19:34:28 +01:00
|
|
|
{
|
|
|
|
vlc_cond_wait( &p_sys->cond, &p_sys->lock_out );
|
2004-08-26 23:27:06 +02:00
|
|
|
if( p_sys->b_die || p_sys->b_error ) break;
|
* modules/codec/ffmpeg/encoder.c, modules/stream_out/transcode.c :
- new ffmpeg options available from the command-line : interleaved video,
noise reduction, rate control parameters, i_quant_factor, trellis
quantification, mpeg4 matrix, and thread count
- portable functions to use ffmpeg multithreading capabilities on all
platforms
- hurry up mode now turns off rd and trellis, and also raises the noise
reduction parameter (thus noise reduction is mandatory with hurry up)
- if threads=1, no ffmpeg thread is launched, but the ffmpeg encoding
will be done in a separate thread than the packetizer and decoder
- fixed a bug with mp3 decoding and weird ffmpeg return code
2004-02-20 19:34:28 +01:00
|
|
|
}
|
2004-08-26 23:27:06 +02:00
|
|
|
if( p_sys->b_die || p_sys->b_error )
|
* modules/codec/ffmpeg/encoder.c, modules/stream_out/transcode.c :
- new ffmpeg options available from the command-line : interleaved video,
noise reduction, rate control parameters, i_quant_factor, trellis
quantification, mpeg4 matrix, and thread count
- portable functions to use ffmpeg multithreading capabilities on all
platforms
- hurry up mode now turns off rd and trellis, and also raises the noise
reduction parameter (thus noise reduction is mandatory with hurry up)
- if threads=1, no ffmpeg thread is launched, but the ffmpeg encoding
will be done in a separate thread than the packetizer and decoder
- fixed a bug with mp3 decoding and weird ffmpeg return code
2004-02-20 19:34:28 +01:00
|
|
|
{
|
|
|
|
vlc_mutex_unlock( &p_sys->lock_out );
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
p_pic = p_sys->pp_pics[p_sys->i_first_pic++];
|
|
|
|
p_sys->i_first_pic %= PICTURE_RING_SIZE;
|
|
|
|
vlc_mutex_unlock( &p_sys->lock_out );
|
|
|
|
|
|
|
|
p_block = id->p_encoder->pf_encode_video( id->p_encoder, p_pic );
|
|
|
|
vlc_mutex_lock( &p_sys->lock_out );
|
2004-04-25 20:08:13 +02:00
|
|
|
block_ChainAppend( &p_sys->p_buffers, p_block );
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
|
2005-03-01 18:30:50 +01:00
|
|
|
vlc_mutex_unlock( &p_sys->lock_out );
|
|
|
|
p_pic->pf_release( p_pic );
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
}
|
|
|
|
|
2004-08-26 23:27:06 +02:00
|
|
|
while( p_sys->i_last_pic != p_sys->i_first_pic )
|
* modules/codec/ffmpeg/encoder.c, modules/stream_out/transcode.c :
- new ffmpeg options available from the command-line : interleaved video,
noise reduction, rate control parameters, i_quant_factor, trellis
quantification, mpeg4 matrix, and thread count
- portable functions to use ffmpeg multithreading capabilities on all
platforms
- hurry up mode now turns off rd and trellis, and also raises the noise
reduction parameter (thus noise reduction is mandatory with hurry up)
- if threads=1, no ffmpeg thread is launched, but the ffmpeg encoding
will be done in a separate thread than the packetizer and decoder
- fixed a bug with mp3 decoding and weird ffmpeg return code
2004-02-20 19:34:28 +01:00
|
|
|
{
|
|
|
|
p_pic = p_sys->pp_pics[p_sys->i_first_pic++];
|
|
|
|
p_sys->i_first_pic %= PICTURE_RING_SIZE;
|
2005-03-01 18:30:50 +01:00
|
|
|
p_pic->pf_release( p_pic );
|
* modules/codec/ffmpeg/encoder.c, modules/stream_out/transcode.c :
- new ffmpeg options available from the command-line : interleaved video,
noise reduction, rate control parameters, i_quant_factor, trellis
quantification, mpeg4 matrix, and thread count
- portable functions to use ffmpeg multithreading capabilities on all
platforms
- hurry up mode now turns off rd and trellis, and also raises the noise
reduction parameter (thus noise reduction is mandatory with hurry up)
- if threads=1, no ffmpeg thread is launched, but the ffmpeg encoding
will be done in a separate thread than the packetizer and decoder
- fixed a bug with mp3 decoding and weird ffmpeg return code
2004-02-20 19:34:28 +01:00
|
|
|
}
|
2004-03-11 18:36:43 +01:00
|
|
|
block_ChainRelease( p_sys->p_buffers );
|
* modules/codec/ffmpeg/encoder.c, modules/stream_out/transcode.c :
- new ffmpeg options available from the command-line : interleaved video,
noise reduction, rate control parameters, i_quant_factor, trellis
quantification, mpeg4 matrix, and thread count
- portable functions to use ffmpeg multithreading capabilities on all
platforms
- hurry up mode now turns off rd and trellis, and also raises the noise
reduction parameter (thus noise reduction is mandatory with hurry up)
- if threads=1, no ffmpeg thread is launched, but the ffmpeg encoding
will be done in a separate thread than the packetizer and decoder
- fixed a bug with mp3 decoding and weird ffmpeg return code
2004-02-20 19:34:28 +01:00
|
|
|
|
|
|
|
return 0;
|
* all: new sout scheme. Now a chain of module are created that can
modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.
With a starting '#' you can specify a chain of modules, it's still
unstable but a lot more powerfull.
You have access to duplicate(that duplicate all stream), transcode
(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.
ex: * to stream and see the stream to udp/ts:ip
--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
* to transcode,see and stream
--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'
Without a starting '#', the url is converted into '#std{acces=,mux=,url}'
Test and report bugs :)
2003-04-13 22:00:21 +02:00
|
|
|
}
|
2003-08-09 16:59:24 +02:00
|
|
|
|
2004-08-26 23:27:06 +02:00
|
|
|
struct picture_sys_t
|
2003-08-09 16:59:24 +02:00
|
|
|
{
|
2004-09-08 14:48:57 +02:00
|
|
|
vlc_object_t *p_owner;
|
2004-08-26 23:27:06 +02:00
|
|
|
};
|
2003-08-09 16:59:24 +02:00
|
|
|
|
2004-08-26 23:27:06 +02:00
|
|
|
static void video_release_buffer( picture_t *p_pic )
|
|
|
|
{
|
|
|
|
if( p_pic && !p_pic->i_refcount && p_pic->pf_release && p_pic->p_sys )
|
2004-03-06 20:30:19 +01:00
|
|
|
{
|
2004-09-08 14:48:57 +02:00
|
|
|
video_del_buffer_decoder( (decoder_t *)p_pic->p_sys->p_owner, p_pic );
|
2004-03-06 20:30:19 +01:00
|
|
|
}
|
2004-08-26 23:27:06 +02:00
|
|
|
else if( p_pic && p_pic->i_refcount > 0 ) p_pic->i_refcount--;
|
|
|
|
}
|
2004-03-06 20:30:19 +01:00
|
|
|
|
2005-06-08 14:06:06 +02:00
|
|
|
static picture_t *video_new_buffer( vlc_object_t *p_this, picture_t **pp_ring,
|
|
|
|
sout_stream_sys_t *p_sys )
|
2004-08-26 23:27:06 +02:00
|
|
|
{
|
2004-09-08 14:48:57 +02:00
|
|
|
decoder_t *p_dec = (decoder_t *)p_this;
|
|
|
|
picture_t *p_pic;
|
|
|
|
int i;
|
2004-08-26 23:27:06 +02:00
|
|
|
|
2004-09-08 14:48:57 +02:00
|
|
|
/* Find an empty space in the picture ring buffer */
|
|
|
|
for( i = 0; i < PICTURE_RING_SIZE; i++ )
|
|
|
|
{
|
|
|
|
if( pp_ring[i] != 0 && pp_ring[i]->i_status == DESTROYED_PICTURE )
|
|
|
|
{
|
|
|
|
pp_ring[i]->i_status = RESERVED_PICTURE;
|
|
|
|
return pp_ring[i];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
for( i = 0; i < PICTURE_RING_SIZE; i++ )
|
|
|
|
{
|
|
|
|
if( pp_ring[i] == 0 ) break;
|
|
|
|
}
|
|
|
|
|
2005-06-08 14:06:06 +02:00
|
|
|
if( i == PICTURE_RING_SIZE && p_sys->i_threads >= 1 )
|
2005-06-07 12:28:09 +02:00
|
|
|
{
|
2005-06-08 14:06:06 +02:00
|
|
|
int i_first_pic = p_sys->i_first_pic;
|
2005-06-07 12:28:09 +02:00
|
|
|
|
2005-06-08 14:06:06 +02:00
|
|
|
if( p_sys->i_first_pic != p_sys->i_last_pic )
|
2005-06-07 12:28:09 +02:00
|
|
|
{
|
|
|
|
/* Encoder still has stuff to encode, wait to clear-up the list */
|
2005-06-08 14:06:06 +02:00
|
|
|
while( p_sys->i_first_pic == i_first_pic )
|
2005-06-07 12:28:09 +02:00
|
|
|
msleep( 100000 );
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Find an empty space in the picture ring buffer */
|
|
|
|
for( i = 0; i < PICTURE_RING_SIZE; i++ )
|
|
|
|
{
|
|
|
|
if( pp_ring[i] != 0 && pp_ring[i]->i_status == DESTROYED_PICTURE )
|
|
|
|
{
|
|
|
|
pp_ring[i]->i_status = RESERVED_PICTURE;
|
|
|
|
return pp_ring[i];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
for( i = 0; i < PICTURE_RING_SIZE; i++ )
|
|
|
|
{
|
|
|
|
if( pp_ring[i] == 0 ) break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-09-08 14:48:57 +02:00
|
|
|
if( i == PICTURE_RING_SIZE )
|
|
|
|
{
|
|
|
|
msg_Err( p_this, "decoder/filter is leaking pictures, "
|
|
|
|
"resetting its ring buffer" );
|
|
|
|
|
|
|
|
for( i = 0; i < PICTURE_RING_SIZE; i++ )
|
|
|
|
{
|
|
|
|
pp_ring[i]->pf_release( pp_ring[i] );
|
|
|
|
}
|
|
|
|
|
|
|
|
i = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
p_pic = malloc( sizeof(picture_t) );
|
2004-08-26 23:27:06 +02:00
|
|
|
p_dec->fmt_out.video.i_chroma = p_dec->fmt_out.i_codec;
|
|
|
|
vout_AllocatePicture( VLC_OBJECT(p_dec), p_pic,
|
|
|
|
p_dec->fmt_out.video.i_chroma,
|
|
|
|
p_dec->fmt_out.video.i_width,
|
|
|
|
p_dec->fmt_out.video.i_height,
|
|
|
|
p_dec->fmt_out.video.i_aspect );
|
|
|
|
|
|
|
|
if( !p_pic->i_planes )
|
2004-03-06 21:49:10 +01:00
|
|
|
{
|
2004-08-26 23:27:06 +02:00
|
|
|
free( p_pic );
|
|
|
|
return 0;
|
2004-03-06 21:49:10 +01:00
|
|
|
}
|
2003-08-09 16:59:24 +02:00
|
|
|
|
2004-08-26 23:27:06 +02:00
|
|
|
p_pic->pf_release = video_release_buffer;
|
|
|
|
p_pic->p_sys = malloc( sizeof(picture_sys_t) );
|
2004-09-08 14:48:57 +02:00
|
|
|
p_pic->p_sys->p_owner = p_this;
|
|
|
|
p_pic->i_status = RESERVED_PICTURE;
|
|
|
|
|
|
|
|
pp_ring[i] = p_pic;
|
2004-08-26 23:27:06 +02:00
|
|
|
return p_pic;
|
|
|
|
}
|
|
|
|
|
2004-09-08 14:48:57 +02:00
|
|
|
static picture_t *video_new_buffer_decoder( decoder_t *p_dec )
|
|
|
|
{
|
|
|
|
return video_new_buffer( VLC_OBJECT(p_dec),
|
2005-06-08 14:06:06 +02:00
|
|
|
p_dec->p_owner->pp_pics, p_dec->p_owner->p_sys );
|
2004-09-08 14:48:57 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static picture_t *video_new_buffer_filter( filter_t *p_filter )
|
|
|
|
{
|
|
|
|
return video_new_buffer( VLC_OBJECT(p_filter),
|
2005-06-08 14:06:06 +02:00
|
|
|
p_filter->p_owner->pp_pics,
|
|
|
|
p_filter->p_owner->p_sys );
|
2004-09-08 14:48:57 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static void video_del_buffer( vlc_object_t *p_this, picture_t *p_pic )
|
2004-08-26 23:27:06 +02:00
|
|
|
{
|
2004-09-01 17:37:40 +02:00
|
|
|
if( p_pic && p_pic->p_data_orig ) free( p_pic->p_data_orig );
|
2004-08-26 23:27:06 +02:00
|
|
|
if( p_pic && p_pic->p_sys ) free( p_pic->p_sys );
|
|
|
|
if( p_pic ) free( p_pic );
|
|
|
|
}
|
|
|
|
|
2004-09-08 14:48:57 +02:00
|
|
|
static void video_del_buffer_decoder( decoder_t *p_decoder, picture_t *p_pic )
|
|
|
|
{
|
|
|
|
p_pic->i_refcount = 0;
|
|
|
|
p_pic->i_status = DESTROYED_PICTURE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void video_del_buffer_filter( filter_t *p_filter, picture_t *p_pic )
|
|
|
|
{
|
|
|
|
p_pic->i_refcount = 0;
|
|
|
|
p_pic->i_status = DESTROYED_PICTURE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void video_link_picture_decoder( decoder_t *p_dec, picture_t *p_pic )
|
2004-08-26 23:27:06 +02:00
|
|
|
{
|
|
|
|
p_pic->i_refcount++;
|
|
|
|
}
|
|
|
|
|
2004-09-08 14:48:57 +02:00
|
|
|
static void video_unlink_picture_decoder( decoder_t *p_dec, picture_t *p_pic )
|
2004-08-26 23:27:06 +02:00
|
|
|
{
|
|
|
|
video_release_buffer( p_pic );
|
2003-08-09 16:59:24 +02:00
|
|
|
}
|
2004-08-08 23:14:38 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
* SPU
|
|
|
|
*/
|
|
|
|
static subpicture_t *spu_new_buffer( decoder_t * );
|
|
|
|
static void spu_del_buffer( decoder_t *, subpicture_t * );
|
|
|
|
|
|
|
|
static int transcode_spu_new( sout_stream_t *p_stream, sout_stream_id_t *id )
|
|
|
|
{
|
|
|
|
sout_stream_sys_t *p_sys = p_stream->p_sys;
|
|
|
|
|
2004-08-26 23:27:06 +02:00
|
|
|
/*
|
|
|
|
* Open decoder
|
|
|
|
*/
|
2004-08-08 23:14:38 +02:00
|
|
|
|
2004-08-26 23:27:06 +02:00
|
|
|
/* Initialization of decoder structures */
|
2004-08-08 23:14:38 +02:00
|
|
|
id->p_decoder->pf_spu_buffer_new = spu_new_buffer;
|
|
|
|
id->p_decoder->pf_spu_buffer_del = spu_del_buffer;
|
2004-09-15 17:50:54 +02:00
|
|
|
id->p_decoder->p_owner = (decoder_owner_sys_t *)p_stream;
|
Forward port of branches/0.8.1-jpsaman-thedj revision 12070. The OSD menu subsystem consists of two parts a core part (src/osd, include/vlc_osd.h) and a subfilter (modules/video_filter/osdmenu.c). The OSD menu can be used locally or it can be streamed. It depends on the way the functionality is called from the vlc commandline. Currently there is only one way to make the subpictures appear on the video and that is through the rc-interface. The following commands are supported by it: "menu on" (show OSD menu), "menu off" (hide OSD menu), "menu left" (highlight button on the left), "menu right" (highlight button on the right), "menu up" (highlight button above), "menu down" (highlight button below) or "menu select" (perform hotkey action). When there is no button on the left, right, up or down then the menu-command will be ignored.
To stream use a commandline similar to this:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg --extraintf rc --sout '#transcode{sfilter=osdmenu}:std{mux=ts,access=udp,url=127.0.0.1:1234}' -vvvv
For local playback a commandline like this is needed:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg -vvvv
Have fun with the basic functionality - jpsaman.
2005-08-11 00:08:50 +02:00
|
|
|
/* id->p_decoder->p_cfg = p_sys->p_spu_cfg; */
|
2004-08-08 23:14:38 +02:00
|
|
|
|
|
|
|
id->p_decoder->p_module =
|
2004-08-26 23:27:06 +02:00
|
|
|
module_Need( id->p_decoder, "decoder", "$codec", 0 );
|
2004-08-08 23:14:38 +02:00
|
|
|
|
|
|
|
if( !id->p_decoder->p_module )
|
|
|
|
{
|
|
|
|
msg_Err( p_stream, "cannot find decoder" );
|
|
|
|
return VLC_EGENERIC;
|
|
|
|
}
|
|
|
|
|
|
|
|
if( !p_sys->b_soverlay )
|
|
|
|
{
|
2006-08-06 15:27:58 +02:00
|
|
|
/* Open encoder */
|
2004-08-08 23:14:38 +02:00
|
|
|
/* Initialization of encoder format structures */
|
2004-08-26 23:27:06 +02:00
|
|
|
es_format_Init( &id->p_encoder->fmt_in, id->p_decoder->fmt_in.i_cat,
|
|
|
|
id->p_decoder->fmt_in.i_codec );
|
2004-08-08 23:14:38 +02:00
|
|
|
|
|
|
|
id->p_encoder->p_cfg = p_sys->p_spu_cfg;
|
|
|
|
|
|
|
|
id->p_encoder->p_module =
|
|
|
|
module_Need( id->p_encoder, "encoder", p_sys->psz_senc, VLC_TRUE );
|
|
|
|
|
|
|
|
if( !id->p_encoder->p_module )
|
|
|
|
{
|
|
|
|
module_Unneed( id->p_decoder, id->p_decoder->p_module );
|
2006-07-04 14:28:23 +02:00
|
|
|
msg_Err( p_stream, "cannot find encoder (%s)", p_sys->psz_senc );
|
2004-08-08 23:14:38 +02:00
|
|
|
return VLC_EGENERIC;
|
|
|
|
}
|
|
|
|
}
|
2004-10-07 11:27:02 +02:00
|
|
|
|
|
|
|
if( !p_sys->p_spu )
|
2004-08-08 23:14:38 +02:00
|
|
|
{
|
2004-09-17 11:11:50 +02:00
|
|
|
p_sys->p_spu = spu_Create( p_stream );
|
|
|
|
spu_Init( p_sys->p_spu );
|
2004-08-08 23:14:38 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
return VLC_SUCCESS;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void transcode_spu_close( sout_stream_t *p_stream, sout_stream_id_t *id)
|
|
|
|
{
|
|
|
|
/* Close decoder */
|
|
|
|
if( id->p_decoder->p_module )
|
|
|
|
module_Unneed( id->p_decoder, id->p_decoder->p_module );
|
|
|
|
|
|
|
|
/* Close encoder */
|
2004-08-26 23:27:06 +02:00
|
|
|
if( id->p_encoder->p_module )
|
|
|
|
module_Unneed( id->p_encoder, id->p_encoder->p_module );
|
2004-08-08 23:14:38 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static int transcode_spu_process( sout_stream_t *p_stream,
|
|
|
|
sout_stream_id_t *id,
|
|
|
|
block_t *in, block_t **out )
|
|
|
|
{
|
|
|
|
sout_stream_sys_t *p_sys = p_stream->p_sys;
|
|
|
|
subpicture_t *p_subpic;
|
2004-08-15 19:08:10 +02:00
|
|
|
*out = NULL;
|
2004-08-08 23:14:38 +02:00
|
|
|
|
|
|
|
p_subpic = id->p_decoder->pf_decode_sub( id->p_decoder, &in );
|
2004-10-30 16:12:35 +02:00
|
|
|
if( !p_subpic ) return VLC_EGENERIC;
|
|
|
|
|
2004-10-30 17:05:52 +02:00
|
|
|
if( p_sys->b_master_sync && p_sys->i_master_drift )
|
2004-08-08 23:14:38 +02:00
|
|
|
{
|
2004-10-30 16:12:35 +02:00
|
|
|
p_subpic->i_start -= p_sys->i_master_drift;
|
|
|
|
if( p_subpic->i_stop ) p_subpic->i_stop -= p_sys->i_master_drift;
|
2004-08-08 23:14:38 +02:00
|
|
|
}
|
|
|
|
|
2004-10-30 16:12:35 +02:00
|
|
|
if( p_sys->b_soverlay )
|
|
|
|
{
|
|
|
|
spu_DisplaySubpicture( p_sys->p_spu, p_subpic );
|
|
|
|
}
|
|
|
|
else
|
2004-08-08 23:14:38 +02:00
|
|
|
{
|
|
|
|
block_t *p_block;
|
2004-08-15 19:08:10 +02:00
|
|
|
|
2004-08-08 23:14:38 +02:00
|
|
|
p_block = id->p_encoder->pf_encode_sub( id->p_encoder, p_subpic );
|
2004-08-15 19:08:10 +02:00
|
|
|
spu_del_buffer( id->p_decoder, p_subpic );
|
|
|
|
|
|
|
|
if( p_block )
|
|
|
|
{
|
|
|
|
block_ChainAppend( out, p_block );
|
|
|
|
return VLC_SUCCESS;
|
|
|
|
}
|
2004-08-08 23:14:38 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
return VLC_EGENERIC;
|
|
|
|
}
|
|
|
|
|
|
|
|
static subpicture_t *spu_new_buffer( decoder_t *p_dec )
|
|
|
|
{
|
2004-09-15 17:50:54 +02:00
|
|
|
sout_stream_t *p_stream = (sout_stream_t *)p_dec->p_owner;
|
|
|
|
return spu_CreateSubpicture( p_stream->p_sys->p_spu );
|
2004-08-08 23:14:38 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static void spu_del_buffer( decoder_t *p_dec, subpicture_t *p_subpic )
|
|
|
|
{
|
2004-09-15 17:50:54 +02:00
|
|
|
sout_stream_t *p_stream = (sout_stream_t *)p_dec->p_owner;
|
|
|
|
spu_DestroySubpicture( p_stream->p_sys->p_spu, p_subpic );
|
2004-08-08 23:14:38 +02:00
|
|
|
}
|
Forward port of branches/0.8.1-jpsaman-thedj revision 12070. The OSD menu subsystem consists of two parts a core part (src/osd, include/vlc_osd.h) and a subfilter (modules/video_filter/osdmenu.c). The OSD menu can be used locally or it can be streamed. It depends on the way the functionality is called from the vlc commandline. Currently there is only one way to make the subpictures appear on the video and that is through the rc-interface. The following commands are supported by it: "menu on" (show OSD menu), "menu off" (hide OSD menu), "menu left" (highlight button on the left), "menu right" (highlight button on the right), "menu up" (highlight button above), "menu down" (highlight button below) or "menu select" (perform hotkey action). When there is no button on the left, right, up or down then the menu-command will be ignored.
To stream use a commandline similar to this:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg --extraintf rc --sout '#transcode{sfilter=osdmenu}:std{mux=ts,access=udp,url=127.0.0.1:1234}' -vvvv
For local playback a commandline like this is needed:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg -vvvv
Have fun with the basic functionality - jpsaman.
2005-08-11 00:08:50 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
* OSD menu
|
|
|
|
*/
|
|
|
|
static int transcode_osd_new( sout_stream_t *p_stream, sout_stream_id_t *id )
|
|
|
|
{
|
|
|
|
sout_stream_sys_t *p_sys = p_stream->p_sys;
|
|
|
|
es_format_t fmt;
|
2005-08-31 22:37:23 +02:00
|
|
|
|
Forward port of branches/0.8.1-jpsaman-thedj revision 12070. The OSD menu subsystem consists of two parts a core part (src/osd, include/vlc_osd.h) and a subfilter (modules/video_filter/osdmenu.c). The OSD menu can be used locally or it can be streamed. It depends on the way the functionality is called from the vlc commandline. Currently there is only one way to make the subpictures appear on the video and that is through the rc-interface. The following commands are supported by it: "menu on" (show OSD menu), "menu off" (hide OSD menu), "menu left" (highlight button on the left), "menu right" (highlight button on the right), "menu up" (highlight button above), "menu down" (highlight button below) or "menu select" (perform hotkey action). When there is no button on the left, right, up or down then the menu-command will be ignored.
To stream use a commandline similar to this:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg --extraintf rc --sout '#transcode{sfilter=osdmenu}:std{mux=ts,access=udp,url=127.0.0.1:1234}' -vvvv
For local playback a commandline like this is needed:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg -vvvv
Have fun with the basic functionality - jpsaman.
2005-08-11 00:08:50 +02:00
|
|
|
fmt.i_cat = SPU_ES;
|
|
|
|
fmt.i_id = 0xbd1f; /* pid ?? */
|
|
|
|
fmt.i_group = 3; /* pmt entry ?? */
|
|
|
|
fmt.i_codec = VLC_FOURCC( 'Y', 'U', 'V', 'A' );
|
|
|
|
fmt.psz_language = strdup( "osd" );
|
2005-08-31 22:37:23 +02:00
|
|
|
|
Forward port of branches/0.8.1-jpsaman-thedj revision 12070. The OSD menu subsystem consists of two parts a core part (src/osd, include/vlc_osd.h) and a subfilter (modules/video_filter/osdmenu.c). The OSD menu can be used locally or it can be streamed. It depends on the way the functionality is called from the vlc commandline. Currently there is only one way to make the subpictures appear on the video and that is through the rc-interface. The following commands are supported by it: "menu on" (show OSD menu), "menu off" (hide OSD menu), "menu left" (highlight button on the left), "menu right" (highlight button on the right), "menu up" (highlight button above), "menu down" (highlight button below) or "menu select" (perform hotkey action). When there is no button on the left, right, up or down then the menu-command will be ignored.
To stream use a commandline similar to this:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg --extraintf rc --sout '#transcode{sfilter=osdmenu}:std{mux=ts,access=udp,url=127.0.0.1:1234}' -vvvv
For local playback a commandline like this is needed:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg -vvvv
Have fun with the basic functionality - jpsaman.
2005-08-11 00:08:50 +02:00
|
|
|
id = malloc( sizeof( sout_stream_id_t ) );
|
|
|
|
memset( id, 0, sizeof(sout_stream_id_t) );
|
|
|
|
|
|
|
|
id->id = NULL;
|
|
|
|
id->p_decoder = NULL;
|
|
|
|
id->p_encoder = NULL;
|
|
|
|
|
|
|
|
/* Create encoder object */
|
|
|
|
id->p_encoder = vlc_object_create( p_stream, VLC_OBJECT_ENCODER );
|
|
|
|
if( !id->p_encoder )
|
|
|
|
{
|
|
|
|
msg_Err( p_stream, "out of memory" );
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
vlc_object_attach( id->p_encoder, p_stream );
|
|
|
|
id->p_encoder->p_module = NULL;
|
|
|
|
|
|
|
|
/* Create fake destination format */
|
|
|
|
es_format_Init( &id->p_encoder->fmt_out, fmt.i_cat, 0 );
|
|
|
|
id->p_encoder->fmt_out.i_id = fmt.i_id;
|
|
|
|
id->p_encoder->fmt_out.i_group = fmt.i_group;
|
|
|
|
id->p_encoder->fmt_out.psz_language = strdup( fmt.psz_language );
|
2006-01-16 22:32:56 +01:00
|
|
|
|
Forward port of branches/0.8.1-jpsaman-thedj revision 12070. The OSD menu subsystem consists of two parts a core part (src/osd, include/vlc_osd.h) and a subfilter (modules/video_filter/osdmenu.c). The OSD menu can be used locally or it can be streamed. It depends on the way the functionality is called from the vlc commandline. Currently there is only one way to make the subpictures appear on the video and that is through the rc-interface. The following commands are supported by it: "menu on" (show OSD menu), "menu off" (hide OSD menu), "menu left" (highlight button on the left), "menu right" (highlight button on the right), "menu up" (highlight button above), "menu down" (highlight button below) or "menu select" (perform hotkey action). When there is no button on the left, right, up or down then the menu-command will be ignored.
To stream use a commandline similar to this:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg --extraintf rc --sout '#transcode{sfilter=osdmenu}:std{mux=ts,access=udp,url=127.0.0.1:1234}' -vvvv
For local playback a commandline like this is needed:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg -vvvv
Have fun with the basic functionality - jpsaman.
2005-08-11 00:08:50 +02:00
|
|
|
if( p_sys->i_osdcodec != 0 || p_sys->psz_osdenc )
|
|
|
|
{
|
|
|
|
msg_Dbg( p_stream, "creating osdmenu transcoding from fcc=`%4.4s' "
|
|
|
|
"to fcc=`%4.4s'", (char*)&fmt.i_codec,
|
|
|
|
(char*)&p_sys->i_osdcodec );
|
|
|
|
|
|
|
|
/* Complete destination format */
|
|
|
|
id->p_encoder->fmt_out.i_codec = p_sys->i_osdcodec;
|
2006-01-16 22:32:56 +01:00
|
|
|
|
2006-08-06 15:27:58 +02:00
|
|
|
/* Open encoder */
|
Forward port of branches/0.8.1-jpsaman-thedj revision 12070. The OSD menu subsystem consists of two parts a core part (src/osd, include/vlc_osd.h) and a subfilter (modules/video_filter/osdmenu.c). The OSD menu can be used locally or it can be streamed. It depends on the way the functionality is called from the vlc commandline. Currently there is only one way to make the subpictures appear on the video and that is through the rc-interface. The following commands are supported by it: "menu on" (show OSD menu), "menu off" (hide OSD menu), "menu left" (highlight button on the left), "menu right" (highlight button on the right), "menu up" (highlight button above), "menu down" (highlight button below) or "menu select" (perform hotkey action). When there is no button on the left, right, up or down then the menu-command will be ignored.
To stream use a commandline similar to this:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg --extraintf rc --sout '#transcode{sfilter=osdmenu}:std{mux=ts,access=udp,url=127.0.0.1:1234}' -vvvv
For local playback a commandline like this is needed:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg -vvvv
Have fun with the basic functionality - jpsaman.
2005-08-11 00:08:50 +02:00
|
|
|
/* Initialization of encoder format structures */
|
|
|
|
es_format_Init( &id->p_encoder->fmt_in, fmt.i_cat, fmt.i_codec );
|
|
|
|
id->p_encoder->fmt_in.psz_language = strdup( fmt.psz_language );
|
|
|
|
|
|
|
|
id->p_encoder->p_cfg = p_sys->p_osd_cfg;
|
|
|
|
|
|
|
|
id->p_encoder->p_module =
|
|
|
|
module_Need( id->p_encoder, "encoder", p_sys->psz_osdenc, VLC_TRUE );
|
|
|
|
|
|
|
|
if( !id->p_encoder->p_module )
|
|
|
|
{
|
2006-07-04 14:28:23 +02:00
|
|
|
msg_Err( p_stream, "cannot find encoder (%s)", p_sys->psz_osdenc );
|
Forward port of branches/0.8.1-jpsaman-thedj revision 12070. The OSD menu subsystem consists of two parts a core part (src/osd, include/vlc_osd.h) and a subfilter (modules/video_filter/osdmenu.c). The OSD menu can be used locally or it can be streamed. It depends on the way the functionality is called from the vlc commandline. Currently there is only one way to make the subpictures appear on the video and that is through the rc-interface. The following commands are supported by it: "menu on" (show OSD menu), "menu off" (hide OSD menu), "menu left" (highlight button on the left), "menu right" (highlight button on the right), "menu up" (highlight button above), "menu down" (highlight button below) or "menu select" (perform hotkey action). When there is no button on the left, right, up or down then the menu-command will be ignored.
To stream use a commandline similar to this:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg --extraintf rc --sout '#transcode{sfilter=osdmenu}:std{mux=ts,access=udp,url=127.0.0.1:1234}' -vvvv
For local playback a commandline like this is needed:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg -vvvv
Have fun with the basic functionality - jpsaman.
2005-08-11 00:08:50 +02:00
|
|
|
goto error;
|
|
|
|
}
|
2006-01-16 22:32:56 +01:00
|
|
|
|
Forward port of branches/0.8.1-jpsaman-thedj revision 12070. The OSD menu subsystem consists of two parts a core part (src/osd, include/vlc_osd.h) and a subfilter (modules/video_filter/osdmenu.c). The OSD menu can be used locally or it can be streamed. It depends on the way the functionality is called from the vlc commandline. Currently there is only one way to make the subpictures appear on the video and that is through the rc-interface. The following commands are supported by it: "menu on" (show OSD menu), "menu off" (hide OSD menu), "menu left" (highlight button on the left), "menu right" (highlight button on the right), "menu up" (highlight button above), "menu down" (highlight button below) or "menu select" (perform hotkey action). When there is no button on the left, right, up or down then the menu-command will be ignored.
To stream use a commandline similar to this:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg --extraintf rc --sout '#transcode{sfilter=osdmenu}:std{mux=ts,access=udp,url=127.0.0.1:1234}' -vvvv
For local playback a commandline like this is needed:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg -vvvv
Have fun with the basic functionality - jpsaman.
2005-08-11 00:08:50 +02:00
|
|
|
/* open output stream */
|
|
|
|
id->id = p_sys->p_out->pf_add( p_sys->p_out, &id->p_encoder->fmt_out );
|
|
|
|
id->b_transcode = VLC_TRUE;
|
|
|
|
|
|
|
|
if( !id->id ) goto error;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
msg_Dbg( p_stream, "not transcoding a stream (fcc=`%4.4s')",
|
|
|
|
(char*)&fmt.i_codec );
|
|
|
|
id->id = p_sys->p_out->pf_add( p_sys->p_out, &fmt );
|
|
|
|
id->b_transcode = VLC_FALSE;
|
|
|
|
|
|
|
|
if( !id->id ) goto error;
|
|
|
|
}
|
|
|
|
|
|
|
|
p_sys->id_osd = id;
|
2005-08-11 22:13:01 +02:00
|
|
|
p_sys->b_es_osd = VLC_TRUE;
|
Forward port of branches/0.8.1-jpsaman-thedj revision 12070. The OSD menu subsystem consists of two parts a core part (src/osd, include/vlc_osd.h) and a subfilter (modules/video_filter/osdmenu.c). The OSD menu can be used locally or it can be streamed. It depends on the way the functionality is called from the vlc commandline. Currently there is only one way to make the subpictures appear on the video and that is through the rc-interface. The following commands are supported by it: "menu on" (show OSD menu), "menu off" (hide OSD menu), "menu left" (highlight button on the left), "menu right" (highlight button on the right), "menu up" (highlight button above), "menu down" (highlight button below) or "menu select" (perform hotkey action). When there is no button on the left, right, up or down then the menu-command will be ignored.
To stream use a commandline similar to this:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg --extraintf rc --sout '#transcode{sfilter=osdmenu}:std{mux=ts,access=udp,url=127.0.0.1:1234}' -vvvv
For local playback a commandline like this is needed:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg -vvvv
Have fun with the basic functionality - jpsaman.
2005-08-11 00:08:50 +02:00
|
|
|
|
|
|
|
if( !p_sys->p_spu )
|
|
|
|
{
|
|
|
|
p_sys->p_spu = spu_Create( p_stream );
|
|
|
|
if( spu_Init( p_sys->p_spu ) != VLC_SUCCESS )
|
|
|
|
msg_Err( p_sys, "spu initialisation failed" );
|
|
|
|
}
|
2006-01-16 22:32:56 +01:00
|
|
|
|
Forward port of branches/0.8.1-jpsaman-thedj revision 12070. The OSD menu subsystem consists of two parts a core part (src/osd, include/vlc_osd.h) and a subfilter (modules/video_filter/osdmenu.c). The OSD menu can be used locally or it can be streamed. It depends on the way the functionality is called from the vlc commandline. Currently there is only one way to make the subpictures appear on the video and that is through the rc-interface. The following commands are supported by it: "menu on" (show OSD menu), "menu off" (hide OSD menu), "menu left" (highlight button on the left), "menu right" (highlight button on the right), "menu up" (highlight button above), "menu down" (highlight button below) or "menu select" (perform hotkey action). When there is no button on the left, right, up or down then the menu-command will be ignored.
To stream use a commandline similar to this:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg --extraintf rc --sout '#transcode{sfilter=osdmenu}:std{mux=ts,access=udp,url=127.0.0.1:1234}' -vvvv
For local playback a commandline like this is needed:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg -vvvv
Have fun with the basic functionality - jpsaman.
2005-08-11 00:08:50 +02:00
|
|
|
if( fmt.psz_language )
|
|
|
|
free( fmt.psz_language );
|
2006-01-16 22:32:56 +01:00
|
|
|
|
Forward port of branches/0.8.1-jpsaman-thedj revision 12070. The OSD menu subsystem consists of two parts a core part (src/osd, include/vlc_osd.h) and a subfilter (modules/video_filter/osdmenu.c). The OSD menu can be used locally or it can be streamed. It depends on the way the functionality is called from the vlc commandline. Currently there is only one way to make the subpictures appear on the video and that is through the rc-interface. The following commands are supported by it: "menu on" (show OSD menu), "menu off" (hide OSD menu), "menu left" (highlight button on the left), "menu right" (highlight button on the right), "menu up" (highlight button above), "menu down" (highlight button below) or "menu select" (perform hotkey action). When there is no button on the left, right, up or down then the menu-command will be ignored.
To stream use a commandline similar to this:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg --extraintf rc --sout '#transcode{sfilter=osdmenu}:std{mux=ts,access=udp,url=127.0.0.1:1234}' -vvvv
For local playback a commandline like this is needed:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg -vvvv
Have fun with the basic functionality - jpsaman.
2005-08-11 00:08:50 +02:00
|
|
|
return VLC_SUCCESS;
|
2006-01-16 22:32:56 +01:00
|
|
|
|
Forward port of branches/0.8.1-jpsaman-thedj revision 12070. The OSD menu subsystem consists of two parts a core part (src/osd, include/vlc_osd.h) and a subfilter (modules/video_filter/osdmenu.c). The OSD menu can be used locally or it can be streamed. It depends on the way the functionality is called from the vlc commandline. Currently there is only one way to make the subpictures appear on the video and that is through the rc-interface. The following commands are supported by it: "menu on" (show OSD menu), "menu off" (hide OSD menu), "menu left" (highlight button on the left), "menu right" (highlight button on the right), "menu up" (highlight button above), "menu down" (highlight button below) or "menu select" (perform hotkey action). When there is no button on the left, right, up or down then the menu-command will be ignored.
To stream use a commandline similar to this:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg --extraintf rc --sout '#transcode{sfilter=osdmenu}:std{mux=ts,access=udp,url=127.0.0.1:1234}' -vvvv
For local playback a commandline like this is needed:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg -vvvv
Have fun with the basic functionality - jpsaman.
2005-08-11 00:08:50 +02:00
|
|
|
error:
|
|
|
|
msg_Err( p_stream, "starting osd encoding thread failed" );
|
|
|
|
if( id->p_encoder->p_module )
|
|
|
|
module_Unneed( id->p_encoder, id->p_encoder->p_module );
|
|
|
|
if( id->p_encoder )
|
|
|
|
{
|
|
|
|
vlc_object_detach( id->p_encoder );
|
|
|
|
vlc_object_destroy( id->p_encoder );
|
|
|
|
}
|
|
|
|
if( fmt.psz_language ) free( fmt.psz_language );
|
|
|
|
if( id ) free( id );
|
|
|
|
p_sys->id_osd = NULL;
|
2005-08-11 22:13:01 +02:00
|
|
|
p_sys->b_es_osd = VLC_FALSE;
|
Forward port of branches/0.8.1-jpsaman-thedj revision 12070. The OSD menu subsystem consists of two parts a core part (src/osd, include/vlc_osd.h) and a subfilter (modules/video_filter/osdmenu.c). The OSD menu can be used locally or it can be streamed. It depends on the way the functionality is called from the vlc commandline. Currently there is only one way to make the subpictures appear on the video and that is through the rc-interface. The following commands are supported by it: "menu on" (show OSD menu), "menu off" (hide OSD menu), "menu left" (highlight button on the left), "menu right" (highlight button on the right), "menu up" (highlight button above), "menu down" (highlight button below) or "menu select" (perform hotkey action). When there is no button on the left, right, up or down then the menu-command will be ignored.
To stream use a commandline similar to this:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg --extraintf rc --sout '#transcode{sfilter=osdmenu}:std{mux=ts,access=udp,url=127.0.0.1:1234}' -vvvv
For local playback a commandline like this is needed:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg -vvvv
Have fun with the basic functionality - jpsaman.
2005-08-11 00:08:50 +02:00
|
|
|
return VLC_EGENERIC;
|
|
|
|
}
|
2006-01-16 22:32:56 +01:00
|
|
|
|
Forward port of branches/0.8.1-jpsaman-thedj revision 12070. The OSD menu subsystem consists of two parts a core part (src/osd, include/vlc_osd.h) and a subfilter (modules/video_filter/osdmenu.c). The OSD menu can be used locally or it can be streamed. It depends on the way the functionality is called from the vlc commandline. Currently there is only one way to make the subpictures appear on the video and that is through the rc-interface. The following commands are supported by it: "menu on" (show OSD menu), "menu off" (hide OSD menu), "menu left" (highlight button on the left), "menu right" (highlight button on the right), "menu up" (highlight button above), "menu down" (highlight button below) or "menu select" (perform hotkey action). When there is no button on the left, right, up or down then the menu-command will be ignored.
To stream use a commandline similar to this:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg --extraintf rc --sout '#transcode{sfilter=osdmenu}:std{mux=ts,access=udp,url=127.0.0.1:1234}' -vvvv
For local playback a commandline like this is needed:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg -vvvv
Have fun with the basic functionality - jpsaman.
2005-08-11 00:08:50 +02:00
|
|
|
static void transcode_osd_close( sout_stream_t *p_stream, sout_stream_id_t *id)
|
2006-01-16 22:32:56 +01:00
|
|
|
{
|
Forward port of branches/0.8.1-jpsaman-thedj revision 12070. The OSD menu subsystem consists of two parts a core part (src/osd, include/vlc_osd.h) and a subfilter (modules/video_filter/osdmenu.c). The OSD menu can be used locally or it can be streamed. It depends on the way the functionality is called from the vlc commandline. Currently there is only one way to make the subpictures appear on the video and that is through the rc-interface. The following commands are supported by it: "menu on" (show OSD menu), "menu off" (hide OSD menu), "menu left" (highlight button on the left), "menu right" (highlight button on the right), "menu up" (highlight button above), "menu down" (highlight button below) or "menu select" (perform hotkey action). When there is no button on the left, right, up or down then the menu-command will be ignored.
To stream use a commandline similar to this:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg --extraintf rc --sout '#transcode{sfilter=osdmenu}:std{mux=ts,access=udp,url=127.0.0.1:1234}' -vvvv
For local playback a commandline like this is needed:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg -vvvv
Have fun with the basic functionality - jpsaman.
2005-08-11 00:08:50 +02:00
|
|
|
sout_stream_sys_t *p_sys = p_stream->p_sys;
|
2006-01-16 22:32:56 +01:00
|
|
|
|
Forward port of branches/0.8.1-jpsaman-thedj revision 12070. The OSD menu subsystem consists of two parts a core part (src/osd, include/vlc_osd.h) and a subfilter (modules/video_filter/osdmenu.c). The OSD menu can be used locally or it can be streamed. It depends on the way the functionality is called from the vlc commandline. Currently there is only one way to make the subpictures appear on the video and that is through the rc-interface. The following commands are supported by it: "menu on" (show OSD menu), "menu off" (hide OSD menu), "menu left" (highlight button on the left), "menu right" (highlight button on the right), "menu up" (highlight button above), "menu down" (highlight button below) or "menu select" (perform hotkey action). When there is no button on the left, right, up or down then the menu-command will be ignored.
To stream use a commandline similar to this:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg --extraintf rc --sout '#transcode{sfilter=osdmenu}:std{mux=ts,access=udp,url=127.0.0.1:1234}' -vvvv
For local playback a commandline like this is needed:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg -vvvv
Have fun with the basic functionality - jpsaman.
2005-08-11 00:08:50 +02:00
|
|
|
/* Close encoder */
|
2005-08-11 22:13:01 +02:00
|
|
|
if( p_sys->b_es_osd && id )
|
Forward port of branches/0.8.1-jpsaman-thedj revision 12070. The OSD menu subsystem consists of two parts a core part (src/osd, include/vlc_osd.h) and a subfilter (modules/video_filter/osdmenu.c). The OSD menu can be used locally or it can be streamed. It depends on the way the functionality is called from the vlc commandline. Currently there is only one way to make the subpictures appear on the video and that is through the rc-interface. The following commands are supported by it: "menu on" (show OSD menu), "menu off" (hide OSD menu), "menu left" (highlight button on the left), "menu right" (highlight button on the right), "menu up" (highlight button above), "menu down" (highlight button below) or "menu select" (perform hotkey action). When there is no button on the left, right, up or down then the menu-command will be ignored.
To stream use a commandline similar to this:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg --extraintf rc --sout '#transcode{sfilter=osdmenu}:std{mux=ts,access=udp,url=127.0.0.1:1234}' -vvvv
For local playback a commandline like this is needed:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg -vvvv
Have fun with the basic functionality - jpsaman.
2005-08-11 00:08:50 +02:00
|
|
|
{
|
|
|
|
if( id->p_encoder->p_module )
|
|
|
|
module_Unneed( id->p_encoder, id->p_encoder->p_module );
|
2006-01-16 22:32:56 +01:00
|
|
|
|
Forward port of branches/0.8.1-jpsaman-thedj revision 12070. The OSD menu subsystem consists of two parts a core part (src/osd, include/vlc_osd.h) and a subfilter (modules/video_filter/osdmenu.c). The OSD menu can be used locally or it can be streamed. It depends on the way the functionality is called from the vlc commandline. Currently there is only one way to make the subpictures appear on the video and that is through the rc-interface. The following commands are supported by it: "menu on" (show OSD menu), "menu off" (hide OSD menu), "menu left" (highlight button on the left), "menu right" (highlight button on the right), "menu up" (highlight button above), "menu down" (highlight button below) or "menu select" (perform hotkey action). When there is no button on the left, right, up or down then the menu-command will be ignored.
To stream use a commandline similar to this:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg --extraintf rc --sout '#transcode{sfilter=osdmenu}:std{mux=ts,access=udp,url=127.0.0.1:1234}' -vvvv
For local playback a commandline like this is needed:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg -vvvv
Have fun with the basic functionality - jpsaman.
2005-08-11 00:08:50 +02:00
|
|
|
if( id->id ) p_sys->p_out->pf_del( p_sys->p_out, id->id );
|
2006-01-16 22:32:56 +01:00
|
|
|
|
Forward port of branches/0.8.1-jpsaman-thedj revision 12070. The OSD menu subsystem consists of two parts a core part (src/osd, include/vlc_osd.h) and a subfilter (modules/video_filter/osdmenu.c). The OSD menu can be used locally or it can be streamed. It depends on the way the functionality is called from the vlc commandline. Currently there is only one way to make the subpictures appear on the video and that is through the rc-interface. The following commands are supported by it: "menu on" (show OSD menu), "menu off" (hide OSD menu), "menu left" (highlight button on the left), "menu right" (highlight button on the right), "menu up" (highlight button above), "menu down" (highlight button below) or "menu select" (perform hotkey action). When there is no button on the left, right, up or down then the menu-command will be ignored.
To stream use a commandline similar to this:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg --extraintf rc --sout '#transcode{sfilter=osdmenu}:std{mux=ts,access=udp,url=127.0.0.1:1234}' -vvvv
For local playback a commandline like this is needed:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg -vvvv
Have fun with the basic functionality - jpsaman.
2005-08-11 00:08:50 +02:00
|
|
|
if( id->p_encoder )
|
|
|
|
{
|
|
|
|
vlc_object_detach( id->p_encoder );
|
|
|
|
vlc_object_destroy( id->p_encoder );
|
|
|
|
}
|
|
|
|
}
|
2005-08-11 22:13:01 +02:00
|
|
|
p_sys->b_es_osd = VLC_FALSE;
|
Forward port of branches/0.8.1-jpsaman-thedj revision 12070. The OSD menu subsystem consists of two parts a core part (src/osd, include/vlc_osd.h) and a subfilter (modules/video_filter/osdmenu.c). The OSD menu can be used locally or it can be streamed. It depends on the way the functionality is called from the vlc commandline. Currently there is only one way to make the subpictures appear on the video and that is through the rc-interface. The following commands are supported by it: "menu on" (show OSD menu), "menu off" (hide OSD menu), "menu left" (highlight button on the left), "menu right" (highlight button on the right), "menu up" (highlight button above), "menu down" (highlight button below) or "menu select" (perform hotkey action). When there is no button on the left, right, up or down then the menu-command will be ignored.
To stream use a commandline similar to this:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg --extraintf rc --sout '#transcode{sfilter=osdmenu}:std{mux=ts,access=udp,url=127.0.0.1:1234}' -vvvv
For local playback a commandline like this is needed:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg -vvvv
Have fun with the basic functionality - jpsaman.
2005-08-11 00:08:50 +02:00
|
|
|
if( id ) free( id );
|
|
|
|
}
|
|
|
|
|
|
|
|
static int transcode_osd_process( sout_stream_t *p_stream,
|
|
|
|
sout_stream_id_t *id,
|
|
|
|
block_t *in, block_t **out )
|
|
|
|
{
|
|
|
|
sout_stream_sys_t *p_sys = p_stream->p_sys;
|
|
|
|
subpicture_t *p_subpic = NULL;
|
2006-01-16 22:32:56 +01:00
|
|
|
|
Forward port of branches/0.8.1-jpsaman-thedj revision 12070. The OSD menu subsystem consists of two parts a core part (src/osd, include/vlc_osd.h) and a subfilter (modules/video_filter/osdmenu.c). The OSD menu can be used locally or it can be streamed. It depends on the way the functionality is called from the vlc commandline. Currently there is only one way to make the subpictures appear on the video and that is through the rc-interface. The following commands are supported by it: "menu on" (show OSD menu), "menu off" (hide OSD menu), "menu left" (highlight button on the left), "menu right" (highlight button on the right), "menu up" (highlight button above), "menu down" (highlight button below) or "menu select" (perform hotkey action). When there is no button on the left, right, up or down then the menu-command will be ignored.
To stream use a commandline similar to this:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg --extraintf rc --sout '#transcode{sfilter=osdmenu}:std{mux=ts,access=udp,url=127.0.0.1:1234}' -vvvv
For local playback a commandline like this is needed:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg -vvvv
Have fun with the basic functionality - jpsaman.
2005-08-11 00:08:50 +02:00
|
|
|
/* Check if we have a subpicture to send */
|
|
|
|
if( p_sys->p_spu && in->i_dts > 0)
|
|
|
|
{
|
2006-09-02 19:03:36 +02:00
|
|
|
p_subpic = spu_SortSubpictures( p_sys->p_spu, in->i_dts, VLC_FALSE );
|
Forward port of branches/0.8.1-jpsaman-thedj revision 12070. The OSD menu subsystem consists of two parts a core part (src/osd, include/vlc_osd.h) and a subfilter (modules/video_filter/osdmenu.c). The OSD menu can be used locally or it can be streamed. It depends on the way the functionality is called from the vlc commandline. Currently there is only one way to make the subpictures appear on the video and that is through the rc-interface. The following commands are supported by it: "menu on" (show OSD menu), "menu off" (hide OSD menu), "menu left" (highlight button on the left), "menu right" (highlight button on the right), "menu up" (highlight button above), "menu down" (highlight button below) or "menu select" (perform hotkey action). When there is no button on the left, right, up or down then the menu-command will be ignored.
To stream use a commandline similar to this:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg --extraintf rc --sout '#transcode{sfilter=osdmenu}:std{mux=ts,access=udp,url=127.0.0.1:1234}' -vvvv
For local playback a commandline like this is needed:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg -vvvv
Have fun with the basic functionality - jpsaman.
2005-08-11 00:08:50 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
msg_Warn( p_stream, "spu channel not initialized, doing it now" );
|
|
|
|
if( !p_sys->p_spu )
|
|
|
|
{
|
|
|
|
p_sys->p_spu = spu_Create( p_stream );
|
|
|
|
if( spu_Init( p_sys->p_spu ) != VLC_SUCCESS )
|
|
|
|
msg_Err( p_stream, "spu initialisation failed" );
|
|
|
|
}
|
|
|
|
}
|
2006-01-16 22:32:56 +01:00
|
|
|
|
Forward port of branches/0.8.1-jpsaman-thedj revision 12070. The OSD menu subsystem consists of two parts a core part (src/osd, include/vlc_osd.h) and a subfilter (modules/video_filter/osdmenu.c). The OSD menu can be used locally or it can be streamed. It depends on the way the functionality is called from the vlc commandline. Currently there is only one way to make the subpictures appear on the video and that is through the rc-interface. The following commands are supported by it: "menu on" (show OSD menu), "menu off" (hide OSD menu), "menu left" (highlight button on the left), "menu right" (highlight button on the right), "menu up" (highlight button above), "menu down" (highlight button below) or "menu select" (perform hotkey action). When there is no button on the left, right, up or down then the menu-command will be ignored.
To stream use a commandline similar to this:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg --extraintf rc --sout '#transcode{sfilter=osdmenu}:std{mux=ts,access=udp,url=127.0.0.1:1234}' -vvvv
For local playback a commandline like this is needed:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg -vvvv
Have fun with the basic functionality - jpsaman.
2005-08-11 00:08:50 +02:00
|
|
|
if( p_subpic )
|
|
|
|
{
|
|
|
|
block_t *p_block = NULL;
|
2006-01-16 22:32:56 +01:00
|
|
|
|
Forward port of branches/0.8.1-jpsaman-thedj revision 12070. The OSD menu subsystem consists of two parts a core part (src/osd, include/vlc_osd.h) and a subfilter (modules/video_filter/osdmenu.c). The OSD menu can be used locally or it can be streamed. It depends on the way the functionality is called from the vlc commandline. Currently there is only one way to make the subpictures appear on the video and that is through the rc-interface. The following commands are supported by it: "menu on" (show OSD menu), "menu off" (hide OSD menu), "menu left" (highlight button on the left), "menu right" (highlight button on the right), "menu up" (highlight button above), "menu down" (highlight button below) or "menu select" (perform hotkey action). When there is no button on the left, right, up or down then the menu-command will be ignored.
To stream use a commandline similar to this:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg --extraintf rc --sout '#transcode{sfilter=osdmenu}:std{mux=ts,access=udp,url=127.0.0.1:1234}' -vvvv
For local playback a commandline like this is needed:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg -vvvv
Have fun with the basic functionality - jpsaman.
2005-08-11 00:08:50 +02:00
|
|
|
if( p_sys->b_master_sync && p_sys->i_master_drift )
|
|
|
|
{
|
|
|
|
p_subpic->i_start -= p_sys->i_master_drift;
|
|
|
|
if( p_subpic->i_stop ) p_subpic->i_stop -= p_sys->i_master_drift;
|
|
|
|
}
|
2006-01-16 22:32:56 +01:00
|
|
|
|
Forward port of branches/0.8.1-jpsaman-thedj revision 12070. The OSD menu subsystem consists of two parts a core part (src/osd, include/vlc_osd.h) and a subfilter (modules/video_filter/osdmenu.c). The OSD menu can be used locally or it can be streamed. It depends on the way the functionality is called from the vlc commandline. Currently there is only one way to make the subpictures appear on the video and that is through the rc-interface. The following commands are supported by it: "menu on" (show OSD menu), "menu off" (hide OSD menu), "menu left" (highlight button on the left), "menu right" (highlight button on the right), "menu up" (highlight button above), "menu down" (highlight button below) or "menu select" (perform hotkey action). When there is no button on the left, right, up or down then the menu-command will be ignored.
To stream use a commandline similar to this:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg --extraintf rc --sout '#transcode{sfilter=osdmenu}:std{mux=ts,access=udp,url=127.0.0.1:1234}' -vvvv
For local playback a commandline like this is needed:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg -vvvv
Have fun with the basic functionality - jpsaman.
2005-08-11 00:08:50 +02:00
|
|
|
p_block = p_sys->id_osd->p_encoder->pf_encode_sub( p_sys->id_osd->p_encoder, p_subpic );
|
|
|
|
if( p_block )
|
|
|
|
{
|
|
|
|
p_block->i_dts = p_block->i_pts = in->i_dts;
|
|
|
|
block_ChainAppend( out, p_block );
|
|
|
|
if( *out )
|
|
|
|
{
|
|
|
|
if( p_sys->p_out->pf_send( p_sys->p_out, p_sys->id_osd->id, *out ) == VLC_SUCCESS )
|
|
|
|
spu_DestroySubpicture( p_sys->p_spu, p_subpic );
|
2006-01-16 22:32:56 +01:00
|
|
|
}
|
|
|
|
return VLC_SUCCESS;
|
Forward port of branches/0.8.1-jpsaman-thedj revision 12070. The OSD menu subsystem consists of two parts a core part (src/osd, include/vlc_osd.h) and a subfilter (modules/video_filter/osdmenu.c). The OSD menu can be used locally or it can be streamed. It depends on the way the functionality is called from the vlc commandline. Currently there is only one way to make the subpictures appear on the video and that is through the rc-interface. The following commands are supported by it: "menu on" (show OSD menu), "menu off" (hide OSD menu), "menu left" (highlight button on the left), "menu right" (highlight button on the right), "menu up" (highlight button above), "menu down" (highlight button below) or "menu select" (perform hotkey action). When there is no button on the left, right, up or down then the menu-command will be ignored.
To stream use a commandline similar to this:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg --extraintf rc --sout '#transcode{sfilter=osdmenu}:std{mux=ts,access=udp,url=127.0.0.1:1234}' -vvvv
For local playback a commandline like this is needed:
./vlc dvdsimple:///dev/dvd --sub-filter=osdmenu --osdmenu-file=share/osdmenu/default.cfg -vvvv
Have fun with the basic functionality - jpsaman.
2005-08-11 00:08:50 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return VLC_EGENERIC;
|
|
|
|
}
|