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
hxxx_common.c
/*****************************************************************************
* hxxx_common.c: AVC/HEVC packetizers shared code
*****************************************************************************
* Copyright (C) 2001-2015 VLC authors and VideoLAN
*
* 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.
*****************************************************************************/
#include "hxxx_common.h"
#include <vlc_block.h>
#include <vlc_codec.h>
/****************************************************************************
* PacketizeXXC1: Takes VCL blocks of data and creates annexe B type NAL stream
* Will always use 4 byte 0 0 0 1 startcodes
* Will prepend a SPS and PPS before each keyframe
****************************************************************************/
block_t *PacketizeXXC1( decoder_t *p_dec, uint8_t i_nal_length_size,
block_t **pp_block, pf_annexb_nal_packetizer pf_nal_parser )
{
block_t *p_block;
block_t *p_ret = NULL;
uint8_t *p;
if( !pp_block || !*pp_block )
return NULL;
if( (*pp_block)->i_flags&(BLOCK_FLAG_CORRUPTED) )
{
block_Release( *pp_block );
return NULL;
}
p_block = *pp_block;
*pp_block = NULL;
for( p = p_block->p_buffer; p < &p_block->p_buffer[p_block->i_buffer]; )
{
bool b_dummy;
int i_size = 0;
int i;
if( &p_block->p_buffer[p_block->i_buffer] - p < i_nal_length_size )
break;
for( i = 0; i < i_nal_length_size; i++ )
{
i_size = (i_size << 8) | (*p++);
}
if( i_size <= 0 ||
i_size > ( p_block->p_buffer + p_block->i_buffer - p ) )
{
msg_Err( p_dec, "Broken frame : size %d is too big", i_size );
break;
}
/* Convert AVC to AnnexB */
block_t *p_nal;
/* If data exactly match remaining bytes (1 NAL only or trailing one) */
if( i_size == p_block->p_buffer + p_block->i_buffer - p )
{
p_block->i_buffer = i_size;
p_block->p_buffer = p;
p_nal = block_Realloc( p_block, 4, i_size );
if( p_nal )
p_block = NULL;
}
else
{
p_nal = block_Alloc( 4 + i_size );
if( p_nal )
{
p_nal->i_dts = p_block->i_dts;
p_nal->i_pts = p_block->i_pts;
/* Copy nalu */
memcpy( &p_nal->p_buffer[4], p, i_size );
}
p += i_size;
}
if( !p_nal )
break;
/* Add start code */
p_nal->p_buffer[0] = 0x00;
p_nal->p_buffer[1] = 0x00;
p_nal->p_buffer[2] = 0x00;
p_nal->p_buffer[3] = 0x01;
/* Parse the NAL */
block_t *p_pic;
if( ( p_pic = pf_nal_parser( p_dec, &b_dummy, p_nal ) ) )
{
block_ChainAppend( &p_ret, p_pic );
}
if( !p_block )
break;
}
if( p_block )
block_Release( p_block );
return p_ret;
}
Computing file changes ...