Commit f070592b authored by Derk-Jan Hartman's avatar Derk-Jan Hartman

* vlc.ebuild: fixed the ebuild. Now i know it should work with a test2 ;)

* modules/gui/macosx/vout.m: removed some code that was preventing us from
  using chroma converters.
* modules/codec/quicktime.c:
  - added the video decoder. only works with SVQ3 atm, returns Invalid
    BITMAPHEADER for some reason in all other cases.
  - did some cleaning up. this might just work under Win32 now aswell,
    gibalou will do some testing tomorrow ;)
  - SVQ3 QT degrades faster then the ffmpeg version, but also recovers
    faster. I'm not yet sure which one i prefer.
parent af520d36
This diff is collapsed.
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* vout.m: MacOS X video output plugin * vout.m: MacOS X video output plugin
***************************************************************************** *****************************************************************************
* Copyright (C) 2001-2003 VideoLAN * Copyright (C) 2001-2003 VideoLAN
* $Id: vout.m,v 1.48 2003/05/21 15:40:03 hartman Exp $ * $Id: vout.m,v 1.49 2003/05/23 00:00:48 hartman Exp $
* *
* Authors: Colin Delacroix <colin@zoy.org> * Authors: Colin Delacroix <colin@zoy.org>
* Florian G. Pflug <fgp@phlo.org> * Florian G. Pflug <fgp@phlo.org>
...@@ -148,29 +148,21 @@ int E_(OpenVideo) ( vlc_object_t *p_this ) ...@@ -148,29 +148,21 @@ int E_(OpenVideo) ( vlc_object_t *p_this )
return( 1 ); return( 1 );
} }
if( vout_ChromaCmp( p_vout->render.i_chroma, VLC_FOURCC('I','4','2','0') ) ) /* Damn QT isn't thread safe. so keep a lock in the p_vlc object */
{ vlc_mutex_lock( &p_vout->p_vlc->quicktime_lock );
/* Damn QT isn't thread safe. so keep a lock in the p_vlc object */
vlc_mutex_lock( &p_vout->p_vlc->quicktime_lock );
err = FindCodec( kYUV420CodecType, bestSpeedCodec, err = FindCodec( kYUV420CodecType, bestSpeedCodec,
nil, &p_vout->p_sys->img_dc ); nil, &p_vout->p_sys->img_dc );
vlc_mutex_unlock( &p_vout->p_vlc->quicktime_lock ); vlc_mutex_unlock( &p_vout->p_vlc->quicktime_lock );
if( err == noErr && p_vout->p_sys->img_dc != 0 ) if( err == noErr && p_vout->p_sys->img_dc != 0 )
{ {
p_vout->output.i_chroma = VLC_FOURCC('I','4','2','0'); p_vout->output.i_chroma = VLC_FOURCC('I','4','2','0');
p_vout->p_sys->i_codec = kYUV420CodecType; p_vout->p_sys->i_codec = kYUV420CodecType;
}
else
{
msg_Err( p_vout, "failed to find an appropriate codec" );
}
} }
else else
{ {
msg_Err( p_vout, "chroma 0x%08x not supported", msg_Err( p_vout, "failed to find an appropriate codec" );
p_vout->render.i_chroma );
} }
if( p_vout->p_sys->img_dc == 0 ) if( p_vout->p_sys->img_dc == 0 )
...@@ -178,7 +170,7 @@ int E_(OpenVideo) ( vlc_object_t *p_this ) ...@@ -178,7 +170,7 @@ int E_(OpenVideo) ( vlc_object_t *p_this )
free( p_vout->p_sys->p_matrix ); free( p_vout->p_sys->p_matrix );
DisposeHandle( (Handle)p_vout->p_sys->h_img_descr ); DisposeHandle( (Handle)p_vout->p_sys->h_img_descr );
free( p_vout->p_sys ); free( p_vout->p_sys );
return( 1 ); return VLC_EGENERIC;
} }
NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init]; NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init];
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# vlc.ebuild: A Gentoo ebuild for vlc # vlc.ebuild: A Gentoo ebuild for vlc
############################################################################### ###############################################################################
# Copyright (C) 2003 VideoLAN # Copyright (C) 2003 VideoLAN
# $Id: vlc.ebuild,v 1.3 2003/05/21 19:55:25 hartman Exp $ # $Id: vlc.ebuild,v 1.4 2003/05/23 00:00:48 hartman Exp $
# #
# Authors: Derk-Jan Hartman <thedj at users.sf.net> # Authors: Derk-Jan Hartman <thedj at users.sf.net>
# #
...@@ -24,8 +24,8 @@ IUSE="arts qt ncurses dvd gtk nls 3dfx esd kde X alsa ggi oggvorbis gnome xv oss ...@@ -24,8 +24,8 @@ IUSE="arts qt ncurses dvd gtk nls 3dfx esd kde X alsa ggi oggvorbis gnome xv oss
# Change these to correspond with the # Change these to correspond with the
# unpacked dirnames of the CVS snapshots. # unpacked dirnames of the CVS snapshots.
PFFMPEG=ffmpeg-cvs-2003-05-17 PFFMPEG=ffmpeg-20030517
PLIBMPEG2=mpeg2dec-0.3.2-cvs PLIBMPEG2=mpeg2dec-20030418
S=${WORKDIR}/${P} S=${WORKDIR}/${P}
SFFMPEG=${WORKDIR}/${PFFMPEG} SFFMPEG=${WORKDIR}/${PFFMPEG}
...@@ -37,11 +37,11 @@ DESCRIPTION="VLC media player - A videoplayer that plays DVD, ...@@ -37,11 +37,11 @@ DESCRIPTION="VLC media player - A videoplayer that plays DVD,
# Use the correct CVS snapshot links. # Use the correct CVS snapshot links.
SRC_URI="http://www.videolan.org/pub/testing/${P}/${P}.tar.bz2 SRC_URI="http://www.videolan.org/pub/testing/${P}/${P}.tar.bz2
http://www.videolan.org/pub/testing/contrib/ffmpeg-20030517.tar.bz2 http://www.videolan.org/pub/testing/contrib/ffmpeg-20030517.tar.bz2
http://www.videolan.org/pub/testing/contrib/mpeg2dec-20030418.tar.gz" http://www.videolan.org/pub/testing/contrib/mpeg2dec-20030418.tar.bz2"
#SRC_URI="http://www.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.bz2 #SRC_URI="http://www.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.bz2
# http://www.videolan.org/pub/videolan/${PN}/${PV}/contrib/libmpeg2.tar.gz # http://www.videolan.org/pub/videolan/${PN}/${PV}/contrib/libmpeg2.tar.bz2
# http://www.videolan.org/pub/videolan/${PN}/${PV}/contrib/ffmpeg.tar.gz" # http://www.videolan.org/pub/videolan/${PN}/${PV}/contrib/ffmpeg.tar.bz2"
HOMEPAGE="http://www.videolan.org" HOMEPAGE="http://www.videolan.org"
SLOT="0" SLOT="0"
......
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