Commit 1c3f5cd3 authored by Derk-Jan Hartman's avatar Derk-Jan Hartman

* vlc.ebuild: This ebuild should work if we release a test2.

* modules/codec/quicktime.c: I added all the audio formats I know QT can handle.
  except for mp3 ;)
* modules/codec/ffmpeg: added asv1 (disabled), and enabled IV31 on little endian,
  since the problems with this decoder are endian specific according to it's creator.
parent ddccb23f
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* ffmpeg.c: video decoder using ffmpeg library * ffmpeg.c: video decoder using ffmpeg library
***************************************************************************** *****************************************************************************
* Copyright (C) 1999-2001 VideoLAN * Copyright (C) 1999-2001 VideoLAN
* $Id: ffmpeg.c,v 1.37 2003/05/10 11:05:52 hartman Exp $ * $Id: ffmpeg.c,v 1.38 2003/05/21 19:55:25 hartman Exp $
* *
* Authors: Laurent Aimar <fenrir@via.ecp.fr> * Authors: Laurent Aimar <fenrir@via.ecp.fr>
* *
...@@ -615,8 +615,8 @@ static int ffmpeg_GetFfmpegCodec( vlc_fourcc_t i_fourcc, ...@@ -615,8 +615,8 @@ static int ffmpeg_GetFfmpegCodec( vlc_fourcc_t i_fourcc,
psz_name ="Windows Media Audio 2"; psz_name ="Windows Media Audio 2";
break; break;
#if LIBAVCODEC_BUILD >= 4663 #if( ( LIBAVCODEC_BUILD >= 4663 ) && ( defined( WORDS_BIGENDIAN ) ) )
/* Quality of both decoders is not good enough yet /* Quality of this decoder on ppc is not gooed */
case FOURCC_IV31: case FOURCC_IV31:
case FOURCC_iv31: case FOURCC_iv31:
case FOURCC_IV32: case FOURCC_IV32:
...@@ -625,13 +625,25 @@ static int ffmpeg_GetFfmpegCodec( vlc_fourcc_t i_fourcc, ...@@ -625,13 +625,25 @@ static int ffmpeg_GetFfmpegCodec( vlc_fourcc_t i_fourcc,
i_codec = CODEC_ID_INDEO3; i_codec = CODEC_ID_INDEO3;
psz_name = "Indeo v3"; psz_name = "Indeo v3";
break; break;
case FOURCC_vp31: #endif
#if LIBAVCODEC_BUILD >= 4668
/* Not yet finished
case FOURCC_vp31:
case FOURCC_VP31: case FOURCC_VP31:
i_cat = VIDEO_ES; i_cat = VIDEO_ES;
i_codec = CODEC_ID_VP3; i_codec = CODEC_ID_VP3;
psz_name = "On2's VP3 Video"; psz_name = "On2's VP3 Video";
break; */ break;
case FOURCC_asv1:
case FOURCC_ASV1:
i_cat = VIDEO_ES;
i_codec = CODEC_ID_ASV1;
psz_name = "Asus V1";
break;*/
#endif #endif
default: default:
i_cat = UNKNOWN_ES; i_cat = UNKNOWN_ES;
i_codec = CODEC_ID_NONE; i_codec = CODEC_ID_NONE;
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* ffmpeg_vdec.h: video decoder using ffmpeg library * ffmpeg_vdec.h: video decoder using ffmpeg library
***************************************************************************** *****************************************************************************
* Copyright (C) 2001 VideoLAN * Copyright (C) 2001 VideoLAN
* $Id: ffmpeg.h,v 1.19 2003/05/10 11:05:52 hartman Exp $ * $Id: ffmpeg.h,v 1.20 2003/05/21 19:55:25 hartman Exp $
* *
* Authors: Laurent Aimar <fenrir@via.ecp.fr> * Authors: Laurent Aimar <fenrir@via.ecp.fr>
* *
...@@ -175,6 +175,10 @@ int E_( GetPESData )( u8 *p_buf, int i_max, pes_packet_t *p_pes ); ...@@ -175,6 +175,10 @@ int E_( GetPESData )( u8 *p_buf, int i_max, pes_packet_t *p_pes );
#define FOURCC_VP31 VLC_FOURCC('V','P','3','1') #define FOURCC_VP31 VLC_FOURCC('V','P','3','1')
#define FOURCC_vp31 VLC_FOURCC('v','p','3','1') #define FOURCC_vp31 VLC_FOURCC('v','p','3','1')
/* Asus Video 1 */
#define FOURCC_asv1 VLC_FOURCC('a','s','v','1')
#define FOURCC_ASV1 VLC_FOURCC('A','S','V','1')
/***************************************************************************** /*****************************************************************************
* Audio codec fourcc * Audio codec fourcc
*****************************************************************************/ *****************************************************************************/
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* quicktime.c: a quicktime decoder that uses the QT library/dll * quicktime.c: a quicktime decoder that uses the QT library/dll
***************************************************************************** *****************************************************************************
* Copyright (C) 2003 VideoLAN * Copyright (C) 2003 VideoLAN
* $Id: quicktime.c,v 1.2 2003/05/21 15:40:03 hartman Exp $ * $Id: quicktime.c,v 1.3 2003/05/21 19:55:25 hartman Exp $
* *
* Authors: Laurent Aimar <fenrir at via.ecp.fr> * Authors: Laurent Aimar <fenrir at via.ecp.fr>
* Derk-Jan Hartman <thedj at users.sf.net> * Derk-Jan Hartman <thedj at users.sf.net>
...@@ -204,10 +204,22 @@ static int OpenDecoder( vlc_object_t *p_this ) ...@@ -204,10 +204,22 @@ static int OpenDecoder( vlc_object_t *p_this )
case VLC_FOURCC('Q','C','L','P'): /* Qualcomm Purevoice Codec */ case VLC_FOURCC('Q','C','L','P'): /* Qualcomm Purevoice Codec */
case VLC_FOURCC('M','A','C','3'): /* MACE3 audio decoder */ case VLC_FOURCC('M','A','C','3'): /* MACE3 audio decoder */
case VLC_FOURCC('M','A','C','6'): /* MACE6 audio decoder */ case VLC_FOURCC('M','A','C','6'): /* MACE6 audio decoder */
case VLC_FOURCC('i','m','a','4'): /* IMA ADPCM */ case VLC_FOURCC('f','l','3','2'): /* 32-bit Floating Point */
case VLC_FOURCC('f','l','6','4'): /* 64-bit Floating Point */
case VLC_FOURCC('i','n','2','4'): /* 24-bit Interger */
case VLC_FOURCC('i','n','3','2'): /* 32-bit Integer */
case VLC_FOURCC('m','p','4','a'): /* MPEG-4 Audio */
case VLC_FOURCC('d','v','c','a'): /* DV Audio */
case VLC_FOURCC('s','o','w','t'): /* 16-bit Little Endian */
case VLC_FOURCC('t','w','o','s'): /* 16-bit Big Endian */
case VLC_FOURCC('a','l','a','w'): /* ALaw 2:1 */
case VLC_FOURCC('u','l','a','w'): /* mu-Law 2:1 */
case VLC_FOURCC('r','a','w',' '): /* 8-bit offset binaries */
case 0x31: /* MS GSM */ case 0x31: /* MS GSM */
case 0x32: /* MSN Audio */ case 0x32: /* MSN Audio */
case 0x0011: /* DVI IMA */ case 0x0011: /* DVI IMA */
case 0x6D730002: /* Microsoft ADPCM-ACM */
case 0x6D730011: /* DVI Intel IMAADPCM-ACM */
p_fifo->pf_run = RunDecoderAudio; p_fifo->pf_run = RunDecoderAudio;
return VLC_SUCCESS; return VLC_SUCCESS;
......
...@@ -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.2 2003/05/15 15:35:55 hartman Exp $ # $Id: vlc.ebuild,v 1.3 2003/05/21 19:55:25 hartman Exp $
# #
# Authors: Derk-Jan Hartman <thedj at users.sf.net> # Authors: Derk-Jan Hartman <thedj at users.sf.net>
# #
...@@ -24,7 +24,7 @@ IUSE="arts qt ncurses dvd gtk nls 3dfx esd kde X alsa ggi oggvorbis gnome xv oss ...@@ -24,7 +24,7 @@ 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-14 PFFMPEG=ffmpeg-cvs-2003-05-17
PLIBMPEG2=mpeg2dec-0.3.2-cvs PLIBMPEG2=mpeg2dec-0.3.2-cvs
S=${WORKDIR}/${P} S=${WORKDIR}/${P}
...@@ -35,9 +35,13 @@ DESCRIPTION="VLC media player - A videoplayer that plays DVD, ...@@ -35,9 +35,13 @@ DESCRIPTION="VLC media player - A videoplayer that plays DVD,
VCD, files and networkstreams o.a." VCD, files and networkstreams o.a."
# Use the correct CVS snapshot links. # Use the correct CVS snapshot links.
SRC_URI="http://www.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.bz2 SRC_URI="http://www.videolan.org/pub/testing/${P}/${P}.tar.bz2
http://www.videolan.org/pub/videolan/${PN}/${PV}/contrib/libmpeg2.tar.gz http://www.videolan.org/pub/testing/contrib/ffmpeg-20030517.tar.bz2
http://www.videolan.org/pub/videolan/${PN}/${PV}/contrib/ffmpeg.tar.gz" http://www.videolan.org/pub/testing/contrib/mpeg2dec-20030418.tar.gz"
#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/ffmpeg.tar.gz"
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