Revision f1b94134a4b879bc55c3dacdb496690c8ebdc03f authored by Vikram Fugro on 11 March 2016, 12:16:11 UTC, committed by Jean-Baptiste Kempf on 11 March 2016, 14:57:34 UTC
Allocate the output vlc pictures with dimensions padded, as requested by the decoder (for alignments). This further increases the chances of direct rendering. Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
1 parent 6c813cb
copy.c
/*****************************************************************************
* copy.c
*****************************************************************************
* Copyright (C) 2001, 2002, 2006 VLC authors and VideoLAN
* $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Eric Petit <titer@videolan.org>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation; either version 2.1 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 Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_codec.h>
#include <vlc_block.h>
#include <vlc_bits.h>
/*****************************************************************************
* Module descriptor
*****************************************************************************/
static int Open ( vlc_object_t * );
static void Close( vlc_object_t * );
vlc_module_begin ()
set_category( CAT_SOUT )
set_subcategory( SUBCAT_SOUT_PACKETIZER )
set_description( N_("Copy packetizer") )
set_capability( "packetizer", 1 )
set_callbacks( Open, Close )
vlc_module_end ()
/*****************************************************************************
* Local prototypes
*****************************************************************************/
struct decoder_sys_t
{
block_t *p_block;
void (*pf_parse)( decoder_t *, block_t * );
};
static block_t *Packetize ( decoder_t *, block_t ** );
static block_t *PacketizeSub( decoder_t *, block_t ** );
static void Flush( decoder_t * );
static void ParseWMV3( decoder_t *, block_t * );
/*****************************************************************************
* Open: probe the packetizer and return score
*****************************************************************************
* Tries to launch a decoder and return score so that the interface is able
* to choose.
*****************************************************************************/
static int Open( vlc_object_t *p_this )
{
decoder_t *p_dec = (decoder_t*)p_this;
decoder_sys_t *p_sys;
if( p_dec->fmt_in.i_cat != AUDIO_ES &&
p_dec->fmt_in.i_cat != VIDEO_ES &&
p_dec->fmt_in.i_cat != SPU_ES )
{
msg_Err( p_dec, "invalid ES type" );
return VLC_EGENERIC;
}
if( p_dec->fmt_in.i_cat == SPU_ES )
p_dec->pf_packetize = PacketizeSub;
else
p_dec->pf_packetize = Packetize;
p_dec->pf_flush = Flush;
/* Create the output format */
es_format_Copy( &p_dec->fmt_out, &p_dec->fmt_in );
/* Fix the value of the fourcc for audio */
if( p_dec->fmt_in.i_cat == AUDIO_ES )
{
p_dec->fmt_out.i_codec = vlc_fourcc_GetCodecAudio( p_dec->fmt_in.i_codec,
p_dec->fmt_in.audio.i_bitspersample );
if( !p_dec->fmt_out.i_codec )
{
msg_Err( p_dec, "unknown raw audio sample size" );
return VLC_EGENERIC;
}
}
p_dec->p_sys = p_sys = malloc( sizeof(*p_sys) );
p_sys->p_block = NULL;
switch( p_dec->fmt_in.i_codec )
{
case VLC_CODEC_WMV3:
p_sys->pf_parse = ParseWMV3;
break;
default:
p_sys->pf_parse = NULL;
break;
}
return VLC_SUCCESS;
}
/*****************************************************************************
* Close:
*****************************************************************************/
static void Close( vlc_object_t *p_this )
{
decoder_t *p_dec = (decoder_t*)p_this;
if( p_dec->p_sys->p_block )
{
block_ChainRelease( p_dec->p_sys->p_block );
}
es_format_Clean( &p_dec->fmt_out );
free( p_dec->p_sys );
}
static void Flush( decoder_t *p_dec )
{
block_t *p_ret = p_dec->p_sys->p_block;
if ( p_ret )
{
block_Release( p_ret );
p_dec->p_sys->p_block = NULL;
}
}
/*****************************************************************************
* Packetize: packetize an unit (here copy a complete block )
*****************************************************************************/
static block_t *Packetize ( decoder_t *p_dec, block_t **pp_block )
{
block_t *p_block;
block_t *p_ret = p_dec->p_sys->p_block;
if( pp_block == NULL || *pp_block == NULL )
return NULL;
if( (*pp_block)->i_flags&(BLOCK_FLAG_CORRUPTED) )
{
block_Release( *pp_block );
return NULL;
}
p_block = *pp_block;
*pp_block = NULL;
if( p_block->i_dts <= VLC_TS_INVALID )
{
p_block->i_dts = p_block->i_pts;
}
if( p_block->i_dts <= VLC_TS_INVALID )
{
msg_Dbg( p_dec, "need valid dts" );
block_Release( p_block );
return NULL;
}
if( p_ret != NULL && p_block->i_pts > p_ret->i_pts )
{
if (p_dec->fmt_in.i_codec != VLC_CODEC_OPUS)
p_ret->i_length = p_block->i_pts - p_ret->i_pts;
}
p_dec->p_sys->p_block = p_block;
if( p_ret && p_dec->p_sys->pf_parse )
p_dec->p_sys->pf_parse( p_dec, p_ret );
return p_ret;
}
/*****************************************************************************
* PacketizeSub: packetize an unit (here copy a complete block )
*****************************************************************************/
static block_t *PacketizeSub( decoder_t *p_dec, block_t **pp_block )
{
block_t *p_block;
if( pp_block == NULL || *pp_block == NULL )
return NULL;
if( (*pp_block)->i_flags&(BLOCK_FLAG_CORRUPTED) )
{
block_Release( *pp_block );
return NULL;
}
p_block = *pp_block;
*pp_block = NULL;
if( p_block->i_dts <= VLC_TS_INVALID )
{
p_block->i_dts = p_block->i_pts;
}
if( p_block->i_dts <= VLC_TS_INVALID )
{
msg_Dbg( p_dec, "need valid dts" );
block_Release( p_block );
return NULL;
}
return p_block;
}
/* Parse WMV3 packet and extract frame type information */
static void ParseWMV3( decoder_t *p_dec, block_t *p_block )
{
bs_t s;
/* Parse Sequence header */
bs_init( &s, p_dec->fmt_in.p_extra, p_dec->fmt_in.i_extra );
if( bs_read( &s, 2 ) == 3 )
return;
bs_skip( &s, 22 );
const bool b_range_reduction = bs_read( &s, 1 );
const bool b_has_frames = bs_read( &s, 3 ) > 0;
bs_skip( &s, 2 );
const bool b_frame_interpolation = bs_read( &s, 1 );
if( bs_eof( &s ) )
return;
/* Parse frame type */
bs_init( &s, p_block->p_buffer, p_block->i_buffer );
bs_skip( &s, b_frame_interpolation +
2 +
b_range_reduction );
p_block->i_flags &= ~BLOCK_FLAG_TYPE_MASK;
if( bs_read( &s, 1 ) )
p_block->i_flags |= BLOCK_FLAG_TYPE_P;
else if( !b_has_frames || bs_read( &s, 1 ) )
p_block->i_flags |= BLOCK_FLAG_TYPE_I;
else
p_block->i_flags |= BLOCK_FLAG_TYPE_B;
}
Computing file changes ...