Commit 348244d2 authored by Laurent Aimar's avatar Laurent Aimar

* stream_output.h, transrate.c : do not use SOUT_BUFFER_FLAG_GOP anymore

 (may be readded later).

 * mpgv.c: new demuxer using the packetizer (allow to stream ES).
parent 9cbc047c
dnl Autoconf settings for vlc
dnl $Id: configure.ac,v 1.115 2003/11/22 15:53:18 sam Exp $
dnl $Id: configure.ac,v 1.116 2003/11/22 17:03:57 fenrir Exp $
AC_INIT(vlc,0.6.3-cvs)
......@@ -866,7 +866,7 @@ dnl
dnl default modules
dnl
AX_ADD_PLUGINS([dummy rc logger gestures memcpy hotkeys])
AX_ADD_PLUGINS([es mpga m4v mpeg_system ps ts avi asf aac mp4 rawdv])
AX_ADD_PLUGINS([mpgv mpga m4v mpeg_system ps ts avi asf aac mp4 rawdv])
AX_ADD_PLUGINS([spudec mpeg_audio lpcm a52 dts cinepak dvbsub])
AX_ADD_PLUGINS([deinterlace invert adjust wall transform distort clone crop motionblur])
AX_ADD_PLUGINS([float32tos16 float32tos8 float32tou16 float32tou8 a52tospdif dtstospdif fixed32tofloat32 fixed32tos16 s16tofixed32 s16tofloat32 s16tofloat32swab s8tofloat32 u8tofixed32 u8tofloat32])
......
......@@ -2,7 +2,7 @@
* stream_output.h : stream output module
*****************************************************************************
* Copyright (C) 2002 VideoLAN
* $Id: stream_output.h,v 1.16 2003/11/21 15:32:08 fenrir Exp $
* $Id: stream_output.h,v 1.17 2003/11/22 17:03:57 fenrir Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Laurent Aimar <fenrir@via.ecp.fr>
......@@ -39,7 +39,6 @@
*
*/
#define SOUT_BUFFER_FLAGS_HEADER 0x0001
#define SOUT_BUFFER_FLAGS_GOP 0x0002
/*
* Flags for muxer/access private usage.
......
SOURCES_mpeg_system = \
system.c \
system.h \
$(NULL)
SOURCES_es = \
es.c \
$(NULL)
SOURCES_m4v = \
m4v.c \
$(NULL)
SOURCES_ps = \
ps.c \
$(NULL)
SOURCES_ts = \
ts.c \
$(NULL)
SOURCES_ts_dvbpsi = \
ts.c \
$(NULL)
SOURCES_mpga = \
mpga.c \
$(NULL)
SOURCES_mpeg_system = system.c system.h
SOURCES_m4v = m4v.c
SOURCES_ps = ps.c
SOURCES_ts = ts.c
SOURCES_ts_dvbpsi = ts.c
SOURCES_mpga = mpga.c
SOURCES_mpgv = mpgv.c
......@@ -6,7 +6,7 @@
* Copyright (C) 2003 Antoine Missout
* Copyright (C) 2000-2003 Michel Lespinasse <walken@zoy.org>
* Copyright (C) 1999-2000 Aaron Holtzman <aholtzma@ess.engr.uvic.ca>
* $Id: transrate.c,v 1.3 2003/11/21 15:32:08 fenrir Exp $
* $Id: transrate.c,v 1.4 2003/11/22 17:03:57 fenrir Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Laurent Aimar <fenrir@via.ecp.fr>
......@@ -1957,12 +1957,37 @@ static void process_frame( sout_stream_t *p_stream,
static int transrate_video_process( sout_stream_t *p_stream,
sout_stream_id_t *id, sout_buffer_t *in, sout_buffer_t **out )
{
transrate_t *tr = &id->tr;
transrate_t *tr = &id->tr;
bs_transrate_t *bs = &tr->bs;
vlc_bool_t b_gop = VLC_FALSE;
*out = NULL;
if ( in->i_flags & SOUT_BUFFER_FLAGS_GOP )
if( GetDWBE( in->p_buffer ) != 0x100 )
{
uint8_t *p = in->p_buffer;
uint8_t *p_end = &in->p_buffer[in->i_buffer];
uint32_t code = GetDWBE( p );
/* We may have a GOP */
while( p < p_end - 4 )
{
if( code == 0x1b8 )
{
b_gop = VLC_TRUE;
break;
}
else if( code == 0x100 )
{
break;
}
code = ( code << 8 )|p[4];
p++;
}
}
if( b_gop )
{
while ( id->p_current_buffer != NULL )
{
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment