Skip to content

V
vlc-2-2
Commit 939b6ea1 authored by Sam Hocevar's avatar Sam Hocevar
Browse files
Options 

  * ./plugins/chroma/i420_rgb8.c: fixed a warning.
  * ./plugins/filter/deinterlace.c: fixed chroma deinterlacing.
  * ./plugins/kde/kde.cpp: the KDE interface compiles again.
  * ./plugins/mpeg_system/mpeg_es.c: fixed a segfault I introduced today.
  * ./plugins/network/ipv4.c: cosmetic fix.
  * ./src/interface/main.c: fixed a typo in the --help output.
  * ./src/misc/netutils.c: fixed a segfault in the vlcs communication; still
    unstable but solving other bugs won't do any good without rewriting the
    whole playlist code. Which I'm doing right now.
parent 64439677
Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 56 deletions
plugins/chroma/i420_rgb8.c
View file @ 939b6ea1
......@@ -2,7 +2,7 @@
* i420_rgb8.c : YUV to bitmap RGB conversion module for vlc
*****************************************************************************
* Copyright (C) 2000 VideoLAN
* $Id: i420_rgb8.c,v 1.3 2002/03/17 17:00:38 sam Exp $
* $Id: i420_rgb8.c,v 1.4 2002/03/19 00:30:44 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -56,7 +56,6 @@ void _M( I420_RGB8 )( vout_thread_t *p_vout, picture_t *p_src,
int i_x, i_y; /* horizontal and vertical indexes */
int i_real_y; /* y % 4 */
int i_right_margin;
int i_rewind;
int i_scale_count; /* scale modulo counter */
int i_chroma_width = p_vout->render.i_width / 2; /* chroma width */
......@@ -110,8 +109,8 @@ void _M( I420_RGB8 )( vout_thread_t *p_vout, picture_t *p_src,
* SetOffset: build offset array for conversion functions
*****************************************************************************
* This function will build an offset array used in later conversion functions.
* It will also set horizontal and vertical scaling indicators. If b_double
* is set, the p_offset structure has interleaved Y and U/V offsets.
* It will also set horizontal and vertical scaling indicators. The p_offset
* structure has interleaved Y and U/V offsets.
*****************************************************************************/
static void SetOffset( int i_width, int i_height, int i_pic_width,
int i_pic_height, boolean_t *pb_hscale,
......
plugins/filter/deinterlace.c
View file @ 939b6ea1
......@@ -2,7 +2,7 @@
* deinterlace.c : deinterlacer plugin for vlc
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
* $Id: deinterlace.c,v 1.7 2002/03/11 07:23:09 gbazin Exp $
* $Id: deinterlace.c,v 1.8 2002/03/19 00:30:44 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -350,24 +350,6 @@ static void vout_Render ( vout_thread_t *p_vout, picture_t *p_pic )
break;
case DEINTERLACE_MODE_BLEND:
if( i_plane != Y_PLANE )
{
for( ; p_out < p_out_end ; )
{
FAST_MEMCPY( p_out, p_in,
p_pic->p[i_plane].i_pitch );
p_out += p_pic->p[i_plane].i_pitch;
FAST_MEMCPY( p_out, p_in,
p_pic->p[i_plane].i_pitch );
p_out += p_pic->p[i_plane].i_pitch;
p_in += 2 * p_pic->p[i_plane].i_pitch;
}
break;
}
if( i_field == 0 )
{
FAST_MEMCPY( p_out, p_in, p_pic->p[i_plane].i_pitch );
......@@ -375,6 +357,8 @@ static void vout_Render ( vout_thread_t *p_vout, picture_t *p_pic )
p_out += p_pic->p[i_plane].i_pitch;
}
p_out_end -= p_outpic->p[i_plane].i_pitch;
for( ; p_out < p_out_end ; )
{
FAST_MEMCPY( p_out, p_in, p_pic->p[i_plane].i_pitch );
......@@ -388,6 +372,15 @@ static void vout_Render ( vout_thread_t *p_vout, picture_t *p_pic )
p_in += 2 * p_pic->p[i_plane].i_pitch;
p_out += p_pic->p[i_plane].i_pitch;
}
#if 0
if( i_field == 0 )
{
p_in -= 2 * p_pic->p[i_plane].i_pitch;
FAST_MEMCPY( p_out, p_in, p_pic->p[i_plane].i_pitch );
}
#endif
break;
}
break;
......
plugins/kde/kde.cpp
View file @ 939b6ea1
......@@ -2,7 +2,7 @@
* kde.cpp : KDE plugin for vlc
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: kde.cpp,v 1.9 2002/03/17 17:00:38 sam Exp $
* $Id: kde.cpp,v 1.10 2002/03/19 00:30:44 sam Exp $
*
* Authors: Andres Krapf <dae@chez.com> Sun Mar 25 2001
*
......@@ -94,7 +94,6 @@ class KThread
~KThread();
// These methods get exported to the core
static int probe ( probedata_t *p_data );
static int open ( intf_thread_t *p_intf );
static void close ( intf_thread_t *p_intf );
static void run ( intf_thread_t *p_intf );
......@@ -105,7 +104,6 @@ class KThread
*****************************************************************************/
static void intf_getfunctions( function_list_t * p_function_list )
{
p_function_list->pf_probe = KThread::probe;
p_function_list->functions.intf.pf_open = KThread::open;
p_function_list->functions.intf.pf_close = KThread::close;
p_function_list->functions.intf.pf_run = KThread::run;
......@@ -170,17 +168,6 @@ KThread::~KThread()
delete p_intf->p_sys->p_about;
}
/*****************************************************************************
* KThread::probe: probe the interface and return a score
*****************************************************************************
* This function tries to initialize KDE and returns a score to the
* plugin manager so that it can select the best plugin.
*****************************************************************************/
int KThread::probe(probedata_t *p_data )
{
return ( 80 );
}
/*****************************************************************************
* KThread::open: initialize and create window
*****************************************************************************/
......
plugins/kde/kde_interface.cpp
View file @ 939b6ea1
......@@ -286,9 +286,10 @@ void KInterface::slotOpenDisk()
source += ':';
source += fDiskDialog->device();
// Select title and chapter
config_PutIntVariable( INPUT_TITLE_VAR, fDiskDialog->title() );
config_PutIntVariable( INPUT_CHAPTER_VAR, fDiskDialog->chapter() );
source += '@';
source += fDiskDialog->title();
source += ',';
source += fDiskDialog->chapter();
// add it to playlist
intf_PlaylistAdd( p_main->p_playlist, PLAYLIST_END, source.latin1() );
......
plugins/mpeg_system/mpeg_es.c
View file @ 939b6ea1
......@@ -2,7 +2,7 @@
* mpeg_es.c : Elementary Stream input module for vlc
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: mpeg_es.c,v 1.6 2002/03/18 19:14:52 sam Exp $
* $Id: mpeg_es.c,v 1.7 2002/03/19 00:30:44 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
......@@ -113,7 +113,7 @@ static int ESInit( input_thread_t * p_input )
if( *p_peek || *(p_peek + 1) || *(p_peek + 2) != 1 )
{
if( *p_input->psz_demux && strncmp( !p_input->psz_demux, "es", 3 ) )
if( *p_input->psz_demux && !strncmp( p_input->psz_demux, "es", 3 ) )
{
/* User forced */
intf_ErrMsg( "input error: this doesn't look like an MPEG ES stream, continuing" );
......@@ -126,7 +126,7 @@ static int ESInit( input_thread_t * p_input )
}
else if( *(p_peek + 3) > 0xb9 )
{
if( *p_input->psz_demux && strncmp( !p_input->psz_demux, "es", 3 ) )
if( *p_input->psz_demux && !strncmp( p_input->psz_demux, "es", 3 ) )
{
/* User forced */
intf_ErrMsg( "input error: this seems to be a system stream (PS plug-in ?), but continuing" );
......
plugins/network/ipv4.c
View file @ 939b6ea1
......@@ -2,7 +2,7 @@
* ipv4.c: IPv4 network abstraction layer
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
* $Id: ipv4.c,v 1.6 2002/03/15 04:41:54 sam Exp $
* $Id: ipv4.c,v 1.7 2002/03/19 00:30:44 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Mathias Kretschmer <mathias@research.att.com>
......@@ -43,6 +43,9 @@
#ifdef WIN32
# include <winsock2.h>
# include <ws2tcpip.h>
# ifndef IN_MULTICAST
# define IN_MULTICAST(a) IN_CLASSD(a)
# endif
#elif !defined( SYS_BEOS ) && !defined( SYS_NTO )
# include <netdb.h> /* hostent ... */
# include <sys/socket.h>
......@@ -213,20 +216,15 @@ static int OpenUDP( network_socket_t * p_socket )
" instead of 0x%x", i_opt, 0x80000 );
}
/* Under Win32 and for the multicast, we bind on INADDR_ANY, so let's call BuildAddr with NULL instead of psz_bind_addr */
/* Build the local socket */
#ifdef WIN32
#ifndef IN_MULTICAST
# define IN_MULTICAST(a) IN_CLASSD(a)
#endif
/* Under Win32 and for the multicast, we bind on INADDR_ANY,
* so let's call BuildAddr with "" instead of psz_bind_addr */
psz_bind_win32 = psz_bind_addr ;
/* Check if this is a multicast socket */
/* Check if this is a multicast socket */
if (IN_MULTICAST( ntohl( inet_addr(psz_bind_addr) ) ) )
{
psz_bind_win32 = "";
......
src/interface/main.c
View file @ 939b6ea1
......@@ -4,7 +4,7 @@
* and spawn threads.
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
* $Id: main.c,v 1.164 2002/03/16 01:40:58 gbazin Exp $
* $Id: main.c,v 1.165 2002/03/19 00:30:44 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
......@@ -226,7 +226,7 @@
#define IPV6_TEXT "force IPv6"
#define IPV6_LONGTEXT NULL
#define IPV4_TEXT "force IPv6"
#define IPV4_TEXT "force IPv4"
#define IPV4_LONGTEXT NULL
#define ADEC_MPEG_TEXT "choose MPEG audio decoder"
......
src/misc/netutils.c
View file @ 939b6ea1
......@@ -2,7 +2,7 @@
* netutils.c: various network functions
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: netutils.c,v 1.60 2002/03/11 07:23:10 gbazin Exp $
* $Id: netutils.c,v 1.61 2002/03/19 00:30:44 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Benoit Steiner <benny@via.ecp.fr>
......@@ -197,7 +197,7 @@ int network_ChannelJoin( int i_channel )
/* Prepare the network_socket_t structure */
socket_desc.i_type = NETWORK_UDP;
socket_desc.psz_bind_addr = NULL;
socket_desc.psz_bind_addr = "";
socket_desc.i_bind_port = 4321;
socket_desc.psz_server_addr = psz_vlcs;
socket_desc.i_server_port = i_port;
......
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