Skip to content

V
vlc-gpu
Commit 1f239513 authored by Gildas Bazin's avatar Gildas Bazin
Browse files
Options 

* modules/codec/ffmpeg/*: fixed the code to disable cpu features.
parent 93187b32
Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 29 deletions
modules/codec/ffmpeg/encoder.c
View file @ 1f239513
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* encoder.c: video and audio encoder using the ffmpeg library * encoder.c: video and audio encoder using the ffmpeg library
***************************************************************************** *****************************************************************************
* Copyright (C) 1999-2001 VideoLAN * Copyright (C) 1999-2001 VideoLAN
* $Id: encoder.c,v 1.11 2003/11/28 10:36:58 massiot Exp $ * $Id: encoder.c,v 1.12 2003/11/28 23:40:09 gbazin Exp $
* *
* Authors: Laurent Aimar <fenrir@via.ecp.fr> * Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Gildas Bazin <gbazin@netcourrier.com> * Gildas Bazin <gbazin@netcourrier.com>
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
#include <vlc/decoder.h> #include <vlc/decoder.h>
/* ffmpeg header */ /* ffmpeg header */
#define HAVE_MMX
#ifdef HAVE_FFMPEG_AVCODEC_H #ifdef HAVE_FFMPEG_AVCODEC_H
# include <ffmpeg/avcodec.h> # include <ffmpeg/avcodec.h>
#else #else
...@@ -140,28 +141,24 @@ int E_(OpenEncoder)( vlc_object_t *p_this ) ...@@ -140,28 +141,24 @@ int E_(OpenEncoder)( vlc_object_t *p_this )
p_sys->p_context = p_context = avcodec_alloc_context(); p_sys->p_context = p_context = avcodec_alloc_context();
/* Set CPU capabilities */ /* Set CPU capabilities */
#ifdef HAVE_MMX
p_context->dsp_mask = 0; p_context->dsp_mask = 0;
if( p_enc->p_libvlc->i_cpu & CPU_CAPABILITY_MMX ) if( !(p_enc->p_libvlc->i_cpu & CPU_CAPABILITY_MMX) )
{ {
p_context->dsp_mask &= FF_MM_MMX; p_context->dsp_mask |= FF_MM_MMX;
} }
if( p_enc->p_libvlc->i_cpu & CPU_CAPABILITY_MMXEXT ) if( !(p_enc->p_libvlc->i_cpu & CPU_CAPABILITY_MMXEXT) )
{ {
p_context->dsp_mask &= FF_MM_MMXEXT; p_context->dsp_mask |= FF_MM_MMXEXT;
} }
if( p_enc->p_libvlc->i_cpu & CPU_CAPABILITY_3DNOW ) if( !(p_enc->p_libvlc->i_cpu & CPU_CAPABILITY_3DNOW) )
{ {
p_context->dsp_mask &= FF_MM_3DNOW; p_context->dsp_mask |= FF_MM_3DNOW;
} }
if( p_enc->p_libvlc->i_cpu & CPU_CAPABILITY_SSE ) if( !(p_enc->p_libvlc->i_cpu & CPU_CAPABILITY_SSE) )
{ {
p_context->dsp_mask &= FF_MM_SSE; p_context->dsp_mask |= FF_MM_SSE;
p_context->dsp_mask &= FF_MM_SSE2; /* FIXME */ p_context->dsp_mask |= FF_MM_SSE2;
} }
/* Hack to make sure everything can be disabled **/
p_context->dsp_mask &= (FF_MM_FORCE >> 1);
#endif
/* Make sure we get extradata filled by the encoder */ /* Make sure we get extradata filled by the encoder */
p_context->extradata_size = 0; p_context->extradata_size = 0;
...@@ -297,7 +294,7 @@ static block_t *EncodeVideo( encoder_t *p_enc, picture_t *p_pict ) ...@@ -297,7 +294,7 @@ static block_t *EncodeVideo( encoder_t *p_enc, picture_t *p_pict )
encoder_sys_t *p_sys = p_enc->p_sys; encoder_sys_t *p_sys = p_enc->p_sys;
AVFrame frame; AVFrame frame;
int i_out, i_plane; int i_out, i_plane;
vlc_bool_t b_hurry_up; vlc_bool_t b_hurry_up = 0;
for( i_plane = 0; i_plane < p_pict->i_planes; i_plane++ ) for( i_plane = 0; i_plane < p_pict->i_planes; i_plane++ )
{ {
......
modules/codec/ffmpeg/ffmpeg.c
View file @ 1f239513
...@@ -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.62 2003/11/28 16:09:07 fenrir Exp $ * $Id: ffmpeg.c,v 1.63 2003/11/28 23:40:09 gbazin Exp $
* *
* Authors: Laurent Aimar <fenrir@via.ecp.fr> * Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Gildas Bazin <gbazin@netcourrier.com> * Gildas Bazin <gbazin@netcourrier.com>
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#include <vlc/decoder.h> #include <vlc/decoder.h>
/* ffmpeg header */ /* ffmpeg header */
#define HAVE_MMX
#ifdef HAVE_FFMPEG_AVCODEC_H #ifdef HAVE_FFMPEG_AVCODEC_H
# include <ffmpeg/avcodec.h> # include <ffmpeg/avcodec.h>
#else #else
...@@ -144,28 +145,24 @@ static int OpenDecoder( vlc_object_t *p_this ) ...@@ -144,28 +145,24 @@ static int OpenDecoder( vlc_object_t *p_this )
p_context = avcodec_alloc_context(); p_context = avcodec_alloc_context();
/* Set CPU capabilities */ /* Set CPU capabilities */
#ifdef HAVE_MMX
p_context->dsp_mask = 0; p_context->dsp_mask = 0;
if( p_dec->p_libvlc->i_cpu & CPU_CAPABILITY_MMX ) if( !(p_dec->p_libvlc->i_cpu & CPU_CAPABILITY_MMX) )
{ {
p_context->dsp_mask &= FF_MM_MMX; p_context->dsp_mask |= FF_MM_MMX;
} }
if( p_dec->p_libvlc->i_cpu & CPU_CAPABILITY_MMXEXT ) if( !(p_dec->p_libvlc->i_cpu & CPU_CAPABILITY_MMXEXT) )
{ {
p_context->dsp_mask &= FF_MM_MMXEXT; p_context->dsp_mask |= FF_MM_MMXEXT;
} }
if( p_dec->p_libvlc->i_cpu & CPU_CAPABILITY_3DNOW ) if( !(p_dec->p_libvlc->i_cpu & CPU_CAPABILITY_3DNOW) )
{ {
p_context->dsp_mask &= FF_MM_3DNOW; p_context->dsp_mask |= FF_MM_3DNOW;
} }
if( p_enc->p_libvlc->i_cpu & CPU_CAPABILITY_SSE ) if( !(p_dec->p_libvlc->i_cpu & CPU_CAPABILITY_SSE) )
{ {
p_context->dsp_mask &= FF_MM_SSE; p_context->dsp_mask |= FF_MM_SSE;
p_context->dsp_mask &= FF_MM_SSE2; /* FIXME */ p_context->dsp_mask |= FF_MM_SSE2;
} }
/* Hack to make sure everything can be disabled **/
p_context->dsp_mask &= (FF_MM_FORCE >> 1);
#endif
switch( i_cat ) switch( i_cat )
{ {
......
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