#include <vlc_codec.h>
#include <vlc_block.h>
-#include "vlc_bits.h"
-#include "vlc_block_helper.h"
+#include <vlc_bits.h>
+#include <vlc_block_helper.h>
#include "packetizer_helper.h"
/*****************************************************************************
bool b_frame;
/* Current frame being built */
+ mtime_t i_frame_dts;
+ mtime_t i_frame_pts;
block_t *p_frame;
block_t **pp_last;
mtime_t i_interpolated_dts;
+ bool b_check_startcode;
};
typedef enum
decoder_t *p_dec = (decoder_t*)p_this;
decoder_sys_t *p_sys;
- if( p_dec->fmt_in.i_codec != VLC_FOURCC( 'W', 'V', 'C', '1' ) )
+ if( p_dec->fmt_in.i_codec != VLC_CODEC_VC1 )
return VLC_EGENERIC;
p_dec->pf_packetize = Packetize;
/* Create the output format */
es_format_Copy( &p_dec->fmt_out, &p_dec->fmt_in );
p_dec->p_sys = p_sys = malloc( sizeof( decoder_sys_t ) );
+ if( unlikely( !p_sys ) )
+ return VLC_ENOMEM;
packetizer_Init( &p_sys->packetizer,
p_vc1_startcode, sizeof(p_vc1_startcode),
- NULL, 0,
+ NULL, 0, 4,
PacketizeReset, PacketizeParse, PacketizeValidate, p_dec );
p_sys->b_sequence_header = false;
p_sys->b_entry_point = false;
p_sys->ep.p_ep = NULL;
+ p_sys->i_frame_dts = VLC_TS_INVALID;
+ p_sys->i_frame_pts = VLC_TS_INVALID;
+
p_sys->b_frame = false;
p_sys->p_frame = NULL;
p_sys->pp_last = &p_sys->p_frame;
- p_sys->i_interpolated_dts = -1;
+ p_sys->i_interpolated_dts = VLC_TS_INVALID;
+ p_sys->b_check_startcode = p_dec->fmt_in.b_packetized;
if( p_dec->fmt_out.i_extra > 0 )
{
{
decoder_sys_t *p_sys = p_dec->p_sys;
- return packetizer_Packetize( &p_sys->packetizer, pp_block );
+ if( p_sys->b_check_startcode && pp_block && *pp_block )
+ {
+ /* Fix syntax for (some?) VC1 from asf */
+ const unsigned i_startcode = sizeof(p_vc1_startcode);
+
+ block_t *p_block = *pp_block;
+ if( p_block->i_buffer > 0 &&
+ ( p_block->i_buffer < i_startcode ||
+ memcmp( p_block->p_buffer, p_vc1_startcode, i_startcode ) ) )
+ {
+ *pp_block = p_block = block_Realloc( p_block, i_startcode+1, p_block->i_buffer );
+ if( p_block )
+ {
+ memcpy( p_block->p_buffer, p_vc1_startcode, i_startcode );
+
+ if( p_sys->b_sequence_header && p_sys->sh.b_interlaced &&
+ p_block->i_buffer > i_startcode+1 &&
+ (p_block->p_buffer[i_startcode+1] & 0xc0) == 0xc0 )
+ p_block->p_buffer[i_startcode] = IDU_TYPE_FIELD;
+ else
+ p_block->p_buffer[i_startcode] = IDU_TYPE_FRAME;
+ }
+ }
+ p_sys->b_check_startcode = false;
+ }
+
+ block_t *p_au = packetizer_Packetize( &p_sys->packetizer, pp_block );
+ if( !p_au )
+ p_sys->b_check_startcode = p_dec->fmt_in.b_packetized;
+
+ return p_au;
}
static void PacketizeReset( void *p_private, bool b_broken )
p_sys->pp_last = &p_sys->p_frame;
p_sys->b_frame = false;
}
- p_sys->i_interpolated_dts = 0;
+
+ p_sys->i_frame_dts = VLC_TS_INVALID;
+ p_sys->i_frame_pts = VLC_TS_INVALID;
+ p_sys->i_interpolated_dts = VLC_TS_INVALID;
}
static block_t *PacketizeParse( void *p_private, bool *pb_ts_used, block_t *p_block )
{
decoder_t *p_dec = p_private;
decoder_sys_t *p_sys = p_dec->p_sys;
- if( p_sys->i_interpolated_dts < 0 )
+ if( p_sys->i_interpolated_dts <= VLC_TS_INVALID )
{
msg_Dbg( p_dec, "need a starting pts/dts" );
return VLC_EGENERIC;
if( p_es->i_extra != i_extra )
{
p_es->i_extra = i_extra;
- p_es->p_extra = realloc( p_dec->fmt_out.p_extra, p_es->i_extra );
+ p_es->p_extra = xrealloc( p_es->p_extra, p_es->i_extra );
}
memcpy( p_es->p_extra,
p_sys->sh.p_sh->p_buffer, p_sys->sh.p_sh->i_buffer );
idu != IDU_TYPE_SLICE && idu != IDU_TYPE_SLICE_USER_DATA &&
idu != IDU_TYPE_END_OF_SEQUENCE )
{
+ /* Prepend SH and EP on I */
+ if( p_sys->p_frame->i_flags & BLOCK_FLAG_TYPE_I )
+ {
+ block_t *p_list = block_Duplicate( p_sys->sh.p_sh );
+ block_ChainAppend( &p_list, block_Duplicate( p_sys->ep.p_ep ) );
+ block_ChainAppend( &p_list, p_sys->p_frame );
+
+ p_list->i_flags = p_sys->p_frame->i_flags;
+
+ p_sys->p_frame = p_list;
+ }
+
/* */
p_pic = block_ChainGather( p_sys->p_frame );
+ p_pic->i_dts = p_sys->i_frame_dts;
+ p_pic->i_pts = p_sys->i_frame_pts;
/* */
- if( p_pic->i_dts > 0 )
+ if( p_pic->i_dts > VLC_TS_INVALID )
p_sys->i_interpolated_dts = p_pic->i_dts;
/* We can interpolate dts/pts only if we have a frame rate */
if( p_dec->fmt_out.video.i_frame_rate != 0 && p_dec->fmt_out.video.i_frame_rate_base != 0 )
{
- if( p_sys->i_interpolated_dts > 0 )
+ if( p_sys->i_interpolated_dts > VLC_TS_INVALID )
p_sys->i_interpolated_dts += INT64_C(1000000) *
p_dec->fmt_out.video.i_frame_rate_base /
p_dec->fmt_out.video.i_frame_rate;
//msg_Dbg( p_dec, "-------------- XXX0 dts=%"PRId64" pts=%"PRId64" interpolated=%"PRId64,
// p_pic->i_dts, p_pic->i_pts, p_sys->i_interpolated_dts );
- if( p_pic->i_dts <= 0 )
+ if( p_pic->i_dts <= VLC_TS_INVALID )
p_pic->i_dts = p_sys->i_interpolated_dts;
- if( p_pic->i_pts <= 0 )
+ if( p_pic->i_pts <= VLC_TS_INVALID )
{
if( !p_sys->sh.b_has_bframe || (p_pic->i_flags & BLOCK_FLAG_TYPE_B ) )
p_pic->i_pts = p_pic->i_dts;
/* Reset context */
p_sys->b_frame = false;
+ p_sys->i_frame_dts = VLC_TS_INVALID;
+ p_sys->i_frame_pts = VLC_TS_INVALID;
p_sys->p_frame = NULL;
p_sys->pp_last = &p_sys->p_frame;
}
/* */
- if( p_sys->p_frame )
+ if( p_sys->i_frame_dts <= VLC_TS_INVALID && p_sys->i_frame_pts <= VLC_TS_INVALID )
{
- block_t *p_frame = p_sys->p_frame;
- if( p_frame->i_dts <= 0 && p_frame->i_pts <= 0 )
- {
- p_frame->i_dts = p_frag->i_dts;
- p_frame->i_pts = p_frag->i_pts;
- *pb_used_ts = true;
- }
+ p_sys->i_frame_dts = p_frag->i_dts;
+ p_sys->i_frame_pts = p_frag->i_pts;
+ *pb_used_ts = true;
}
- block_ChainLastAppend( &p_sys->pp_last, p_frag );
+
+ /* We will add back SH and EP on I frames */
+ block_t *p_release = NULL;
+ if( idu != IDU_TYPE_SEQUENCE_HEADER && idu != IDU_TYPE_ENTRY_POINT )
+ block_ChainLastAppend( &p_sys->pp_last, p_frag );
+ else
+ p_release = p_frag;
/* Parse IDU */
if( idu == IDU_TYPE_SEQUENCE_HEADER )
const int i_display_width = bs_read( &s, 14 )+1;
const int i_display_height = bs_read( &s, 14 )+1;
- p_es->video.i_aspect = VOUT_ASPECT_FACTOR * i_display_width / i_display_height;
+ p_es->video.i_sar_num = i_display_width * p_es->video.i_height;
+ p_es->video.i_sar_den = i_display_height * p_es->video.i_width;
if( !p_sys->b_sequence_header )
msg_Dbg( p_dec, "display size %dx%d", i_display_width, i_display_height );
}
p_sys->b_frame = true;
}
+
+ if( p_release )
+ block_Release( p_release );
return p_pic;
}
projects / vlc / blobdiff