/*****************************************************************************
* copy.c
*****************************************************************************
- * Copyright (C) 2001, 2002, 2006 the VideoLAN team
+ * 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 General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * 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 General Public License for more details.
+ * 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 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.
+ * 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 <vlc_plugin.h>
#include <vlc_codec.h>
#include <vlc_block.h>
+#include <vlc_bits.h>
/*****************************************************************************
* Module descriptor
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 ParseWMV3( decoder_t *, block_t * );
+
/*****************************************************************************
* Open: probe the packetizer and return score
*****************************************************************************
/* Create the output format */
es_format_Copy( &p_dec->fmt_out, &p_dec->fmt_in );
- /* Fix the value of the fourcc */
- switch( p_dec->fmt_in.i_codec )
+ /* Fix the value of the fourcc for audio */
+ if( p_dec->fmt_in.i_cat == AUDIO_ES )
{
- /* video */
- case VLC_FOURCC( 'm', '4', 's', '2'):
- case VLC_FOURCC( 'M', '4', 'S', '2'):
- case VLC_FOURCC( 'm', 'p', '4', 's'):
- case VLC_FOURCC( 'M', 'P', '4', 'S'):
- case VLC_FOURCC( 'D', 'I', 'V', 'X'):
- case VLC_FOURCC( 'd', 'i', 'v', 'x'):
- case VLC_FOURCC( 'X', 'V', 'I', 'D'):
- case VLC_FOURCC( 'X', 'v', 'i', 'D'):
- case VLC_FOURCC( 'x', 'v', 'i', 'd'):
- case VLC_FOURCC( 'D', 'X', '5', '0'):
- case VLC_FOURCC( 0x04, 0, 0, 0):
- case VLC_FOURCC( '3', 'I', 'V', '2'):
- p_dec->fmt_out.i_codec = VLC_CODEC_MP4V;
- break;
-
- case VLC_FOURCC( 'm', 'p', 'g', '1' ):
- case VLC_FOURCC( 'm', 'p', 'g', '2' ):
- case VLC_CODEC_MP1V:
- case VLC_CODEC_MP2V:
- p_dec->fmt_out.i_codec = VLC_CODEC_MPGV;
- break;
-
- case VLC_FOURCC( 'd', 'i', 'v', '1' ):
- case VLC_FOURCC( 'M', 'P', 'G', '4' ):
- case VLC_FOURCC( 'm', 'p', 'g', '4' ):
- p_dec->fmt_out.i_codec = VLC_CODEC_DIV1;
- break;
-
- case VLC_FOURCC( 'd', 'i', 'v', '2' ):
- case VLC_FOURCC( 'M', 'P', '4', '2' ):
- case VLC_FOURCC( 'm', 'p', '4', '2' ):
- p_dec->fmt_out.i_codec = VLC_CODEC_DIV2;
- break;
-
- case VLC_FOURCC( 'd', 'i', 'v', '3' ):
- case VLC_FOURCC( 'd', 'i', 'v', '4' ):
- case VLC_FOURCC( 'D', 'I', 'V', '4' ):
- case VLC_FOURCC( 'd', 'i', 'v', '5' ):
- case VLC_FOURCC( 'D', 'I', 'V', '5' ):
- case VLC_FOURCC( 'd', 'i', 'v', '6' ):
- case VLC_FOURCC( 'D', 'I', 'V', '6' ):
- case VLC_FOURCC( 'M', 'P', '4', '3' ):
- case VLC_FOURCC( 'm', 'p', '4', '3' ):
- case VLC_FOURCC( 'm', 'p', 'g', '3' ):
- case VLC_FOURCC( 'M', 'P', 'G', '3' ):
- case VLC_FOURCC( 'A', 'P', '4', '1' ):
- p_dec->fmt_out.i_codec = VLC_CODEC_DIV3;
- break;
-
- case VLC_CODEC_H263:
- case VLC_FOURCC( 'U', '2', '6', '3' ):
- case VLC_FOURCC( 'u', '2', '6', '3' ):
- p_dec->fmt_out.i_codec = VLC_FOURCC( 'H', '2', '6', '3' );
- break;
-
- case VLC_FOURCC( 'i', '2', '6', '3' ):
- p_dec->fmt_out.i_codec = VLC_CODEC_H263I;
- break;
-
- case VLC_FOURCC( 'm', 'j', 'p', 'g' ):
- case VLC_FOURCC( 'm', 'j', 'p', 'a' ):
- case VLC_CODEC_JPEG:
- case VLC_FOURCC( 'J', 'P', 'E', 'G' ):
- case VLC_FOURCC( 'J', 'F', 'I', 'F' ):
- p_dec->fmt_out.i_codec = VLC_CODEC_MJPG;
- break;
-
- case VLC_FOURCC( 'd', 'v', 's', 'd' ):
- case VLC_FOURCC( 'D', 'V', 'S', 'D' ):
- case VLC_FOURCC( 'd', 'v', 'h', 'd' ):
- p_dec->fmt_out.i_codec = VLC_FOURCC( 'd', 'v', 's', 'l' );
- break;
-
- /* audio */
- case VLC_FOURCC( 'a', 'r', 'a', 'w' ):
- switch( ( p_dec->fmt_in.audio.i_bitspersample + 7 ) / 8 )
- {
- case 1:
- p_dec->fmt_out.i_codec = VLC_CODEC_U8;
- break;
- case 2:
- p_dec->fmt_out.i_codec = VLC_CODEC_S16L;
- break;
- case 3:
- p_dec->fmt_out.i_codec = VLC_CODEC_S24L;
- break;
- case 4:
- p_dec->fmt_out.i_codec = VLC_CODEC_S32L;
- break;
- default:
- msg_Err( p_dec, "unknown raw audio sample size" );
- return VLC_EGENERIC;
- }
- break;
-
- case VLC_FOURCC( 't', 'w', 'o', 's' ):
- switch( ( p_dec->fmt_in.audio.i_bitspersample + 7 ) / 8 )
- {
- case 1:
- p_dec->fmt_out.i_codec = VLC_CODEC_S8;
- break;
- case 2:
- p_dec->fmt_out.i_codec = VLC_CODEC_S16B;
- break;
- case 3:
- p_dec->fmt_out.i_codec = VLC_CODEC_S24B;
- break;
- case 4:
- p_dec->fmt_out.i_codec = VLC_CODEC_S32B;
- break;
- default:
- msg_Err( p_dec, "unknown raw audio sample size" );
- return VLC_EGENERIC;
- }
- break;
-
- case VLC_FOURCC( 's', 'o', 'w', 't' ):
- switch( ( p_dec->fmt_in.audio.i_bitspersample + 7 ) / 8 )
- {
- case 1:
- p_dec->fmt_out.i_codec = VLC_CODEC_S8;
- break;
- case 2:
- p_dec->fmt_out.i_codec = VLC_CODEC_S16L;
- break;
- case 3:
- p_dec->fmt_out.i_codec = VLC_CODEC_S24L;
- break;
- case 4:
- p_dec->fmt_out.i_codec = VLC_CODEC_S32L;
- break;
- default:
- msg_Err( p_dec, "unknown raw audio sample size" );
- return VLC_EGENERIC;
- }
- break;
+ 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( block_t ) );
+ 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;
}
p_block = *pp_block;
*pp_block = NULL;
- if( p_block->i_dts <= 0 )
+ if( p_block->i_dts <= VLC_TS_INVALID )
{
p_block->i_dts = p_block->i_pts;
}
- if( p_block->i_dts <= 0 )
+ if( p_block->i_dts <= VLC_TS_INVALID )
{
- msg_Dbg( p_dec, "need dts > 0" );
+ 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 )
{
- p_ret->i_length = 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;
}
p_block = *pp_block;
*pp_block = NULL;
- if( p_block->i_dts <= 0 )
+ if( p_block->i_dts <= VLC_TS_INVALID )
{
p_block->i_dts = p_block->i_pts;
}
- if( p_block->i_dts <= 0 )
+ if( p_block->i_dts <= VLC_TS_INVALID )
{
- msg_Dbg( p_dec, "need dts > 0" );
+ 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;
+}
+
projects / vlc / blobdiff