Commit 913debaf authored by Jean-Paul Saman's avatar Jean-Paul Saman

Added HuffYuv and A-law codes for low bitrate and CPU load encodings/transcoding

parent 769e4f67
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* video.c : video encoder using ffmpeg library * video.c : video encoder using ffmpeg library
***************************************************************************** *****************************************************************************
* Copyright (C) 2002 VideoLAN * Copyright (C) 2002 VideoLAN
* $Id: video.c,v 1.4 2003/04/27 23:16:35 gbazin Exp $ * $Id: video.c,v 1.5 2003/07/28 20:25:30 jpsaman Exp $
* *
* Authors: Laurent Aimar * Authors: Laurent Aimar
* *
...@@ -81,6 +81,7 @@ int E_( OpenEncoderVideo ) ( vlc_object_t *p_this ) ...@@ -81,6 +81,7 @@ int E_( OpenEncoderVideo ) ( vlc_object_t *p_this )
case VLC_FOURCC( 'm', 'p', '1', 'v' ): case VLC_FOURCC( 'm', 'p', '1', 'v' ):
case VLC_FOURCC( 'm', 'p', 'g', 'v' ): case VLC_FOURCC( 'm', 'p', 'g', 'v' ):
case VLC_FOURCC( 'm', 'p', '4', 'v' ): case VLC_FOURCC( 'm', 'p', '4', 'v' ):
case VLC_FOURCC( 'h', 'u', 'f', 'f' ):
break; break;
default: default:
return VLC_EGENERIC; return VLC_EGENERIC;
...@@ -167,6 +168,10 @@ static int Init ( video_encoder_t *p_encoder ) ...@@ -167,6 +168,10 @@ static int Init ( video_encoder_t *p_encoder )
p_encoder->p_sys->psz_codec = "MPEG-4"; p_encoder->p_sys->psz_codec = "MPEG-4";
i_codec = CODEC_ID_MPEG4; i_codec = CODEC_ID_MPEG4;
break; break;
case VLC_FOURCC( 'h', 'u', 'f', 'f' ):
p_encoder->p_sys->psz_codec = "Huff YUV";
i_codec = CODEC_ID_HUFFYUV;
break;
default: default:
return VLC_EGENERIC; return VLC_EGENERIC;
} }
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* transcode.c * transcode.c
***************************************************************************** *****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN * Copyright (C) 2001, 2002 VideoLAN
* $Id: transcode.c,v 1.26 2003/07/20 23:30:07 gbazin Exp $ * $Id: transcode.c,v 1.27 2003/07/28 20:25:30 jpsaman Exp $
* *
* Authors: Laurent Aimar <fenrir@via.ecp.fr> * Authors: Laurent Aimar <fenrir@via.ecp.fr>
* *
...@@ -490,6 +490,7 @@ static struct ...@@ -490,6 +490,7 @@ static struct
{ VLC_FOURCC( 'w', 'm', 'a', '1' ), CODEC_ID_WMAV1 }, { VLC_FOURCC( 'w', 'm', 'a', '1' ), CODEC_ID_WMAV1 },
{ VLC_FOURCC( 'w', 'm', 'a', '2' ), CODEC_ID_WMAV2 }, { VLC_FOURCC( 'w', 'm', 'a', '2' ), CODEC_ID_WMAV2 },
{ VLC_FOURCC( 'v', 'o', 'r', 'b' ), CODEC_ID_VORBIS }, { VLC_FOURCC( 'v', 'o', 'r', 'b' ), CODEC_ID_VORBIS },
{ VLC_FOURCC( 'a', 'l', 'a', 'w' ), CODEC_ID_PCM_ALAW },
/* video */ /* video */
{ VLC_FOURCC( 'm', 'p', '4', 'v'), CODEC_ID_MPEG4 }, { VLC_FOURCC( 'm', 'p', '4', 'v'), CODEC_ID_MPEG4 },
...@@ -499,6 +500,7 @@ static struct ...@@ -499,6 +500,7 @@ static struct
{ VLC_FOURCC( 'D', 'I', 'V', '3' ), CODEC_ID_MSMPEG4V3 }, { VLC_FOURCC( 'D', 'I', 'V', '3' ), CODEC_ID_MSMPEG4V3 },
{ VLC_FOURCC( 'H', '2', '6', '3' ), CODEC_ID_H263 }, { VLC_FOURCC( 'H', '2', '6', '3' ), CODEC_ID_H263 },
{ VLC_FOURCC( 'I', '2', '6', '3' ), CODEC_ID_H263I }, { VLC_FOURCC( 'I', '2', '6', '3' ), CODEC_ID_H263I },
{ VLC_FOURCC( 'h', 'u', 'f', 'f' ), CODEC_ID_HUFFYUV },
{ VLC_FOURCC( 'W', 'M', 'V', '1' ), CODEC_ID_WMV1 }, { VLC_FOURCC( 'W', 'M', 'V', '1' ), CODEC_ID_WMV1 },
{ VLC_FOURCC( 'W', 'M', 'V', '2' ), CODEC_ID_WMV2 }, { VLC_FOURCC( 'W', 'M', 'V', '2' ), CODEC_ID_WMV2 },
{ VLC_FOURCC( 'M', 'J', 'P', 'G' ), CODEC_ID_MJPEG }, { VLC_FOURCC( 'M', 'J', 'P', 'G' ), CODEC_ID_MJPEG },
......
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