[vlc-devel] [PATCH 2/5] codec/sdl_image: remove module
Jean-Baptiste Kempf
jb at videolan.org
Wed Sep 30 18:55:19 CEST 2020
Missing NEWS file.
On Wed, 30 Sep 2020, at 16:43, Marvin Scholz wrote:
> Most of the codecs that are supported by this module are already
> supported by FFmpeg anyway and its quite heavy dependency-wise (needing
> SDL and SDL_image).
> Instead, rely on avcodec and remove this module.
> ---
> configure.ac | 13 --
> modules/codec/Makefile.am | 7 -
> modules/codec/sdl_image.c | 268 --------------------------------------
> po/POTFILES.in | 1 -
> 4 files changed, 289 deletions(-)
> delete mode 100644 modules/codec/sdl_image.c
>
> diff --git a/configure.ac b/configure.ac
> index 99e46699424..2f6fe046fc2 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -3522,19 +3522,6 @@ AC_SUBST([WAYLAND_SCANNER])
> AM_CONDITIONAL([HAVE_XKBCOMMON], [test "${have_xkbcommon}" = "yes"])
>
>
> -dnl
> -dnl SDL image decoder module
> -dnl
> -AC_ARG_ENABLE([sdl-image],
> - AS_HELP_STRING([--enable-sdl-image], [SDL image support (default
> enabled)]))
> -AS_IF([test "${enable_sdl_image}" != "no"],[
> - PKG_CHECK_MODULES(SDL_IMAGE, [SDL_image >= 1.2.10], [
> - VLC_ADD_PLUGIN([sdl_image])
> - ], [
> - AC_MSG_WARN([${SDL_IMAGE_PKG_ERRORS}. You should install it
> alongside your SDL package.])
> - ])
> -])
> -
> dnl
> dnl freetype module
> dnl
> diff --git a/modules/codec/Makefile.am b/modules/codec/Makefile.am
> index f8ff8b35bca..1484f512f51 100644
> --- a/modules/codec/Makefile.am
> +++ b/modules/codec/Makefile.am
> @@ -143,13 +143,6 @@ libsvgdec_plugin_la_LIBADD = $(LIBS_svgdec)
> EXTRA_LTLIBRARIES += libsvgdec_plugin.la
> codec_LTLIBRARIES += $(LTLIBsvgdec)
>
> -libsdl_image_plugin_la_SOURCES = codec/sdl_image.c
> -libsdl_image_plugin_la_CFLAGS = $(AM_CFLAGS) $(SDL_IMAGE_CFLAGS)
> -libsdl_image_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
> -libsdl_image_plugin_la_LIBADD = $(SDL_IMAGE_LIBS)
> -EXTRA_LTLIBRARIES += libsdl_image_plugin.la
> -codec_LTLIBRARIES += $(LTLIBsdl_image)
> -
> libxwd_plugin_la_SOURCES = codec/xwd.c
> libxwd_plugin_la_CFLAGS = $(AM_CFLAGS) $(XPROTO_CFLAGS)
> libxwd_plugin_la_LIBADD = $(XPROTO_LIBS)
> diff --git a/modules/codec/sdl_image.c b/modules/codec/sdl_image.c
> deleted file mode 100644
> index e58045a9e69..00000000000
> --- a/modules/codec/sdl_image.c
> +++ /dev/null
> @@ -1,268 +0,0 @@
> -/*****************************************************************************
> - * sdl_image.c: sdl decoder module making use of libsdl_image.
> -
> *****************************************************************************
> - * Copyright (C) 2005 VLC authors and VideoLAN
> - *
> - * Authors: Christophe Massiot <massiot at via.ecp.fr>
> - *
> - * This program is free software; you can redistribute it and/or
> modify it
> - * under the terms of the GNU Lesser General Public License as
> published by
> - * the Free Software Foundation; either version 2.1 of the License, or
> - * (at your option) any later version.
> - *
> - * This program is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> - * GNU Lesser General Public License for more details.
> - *
> - * You should have received a copy of the GNU Lesser General Public
> License
> - * along with this program; if not, write to the Free Software
> Foundation,
> - * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
> -
> *****************************************************************************/
> -
> -/*****************************************************************************
> - * Preamble
> -
> *****************************************************************************/
> -
> -#ifdef HAVE_CONFIG_H
> -# include "config.h"
> -#endif
> -
> -#include <vlc_common.h>
> -#include <vlc_plugin.h>
> -#include <vlc_codec.h>
> -
> -#include <SDL_image.h>
> -
> -/*****************************************************************************
> - * decoder_sys_t : sdl decoder descriptor
> -
> *****************************************************************************/
> -typedef struct
> -{
> - const char *psz_sdl_type;
> -} decoder_sys_t;
> -
> -/*****************************************************************************
> - * Local prototypes
> -
> *****************************************************************************/
> -static int OpenDecoder ( vlc_object_t * );
> -
> -static int DecodeBlock ( decoder_t *, block_t * );
> -
> -/*****************************************************************************
> - * Module descriptor
> -
> *****************************************************************************/
> -vlc_module_begin ()
> - set_category( CAT_INPUT )
> - set_subcategory( SUBCAT_INPUT_VCODEC )
> - set_shortname( N_("SDL Image decoder"))
> - set_description( N_("SDL_image video decoder") )
> - set_capability( "video decoder", 60 )
> - set_callback( OpenDecoder )
> - add_shortcut( "sdl_image" )
> -vlc_module_end ()
> -
> -static const struct supported_fmt_t
> -{
> - vlc_fourcc_t i_fourcc;
> - const char *psz_sdl_type;
> -} p_supported_fmt[] =
> -{
> - { VLC_CODEC_TARGA, "TGA" },
> - { VLC_CODEC_BMP, "BMP" },
> - { VLC_CODEC_PNM, "PNM" },
> - { VLC_FOURCC('x','p','m',' '), "XPM" },
> - { VLC_FOURCC('x','c','f',' '), "XCF" },
> - { VLC_CODEC_PCX, "PCX" },
> - { VLC_CODEC_GIF, "GIF" },
> - { VLC_CODEC_JPEG, "JPG" },
> - { VLC_CODEC_TIFF, "TIF" },
> - { VLC_FOURCC('l','b','m',' '), "LBM" },
> - { VLC_CODEC_PNG, "PNG" }
> -};
> -
> -/*****************************************************************************
> - * OpenDecoder: probe the decoder and return score
> -
> *****************************************************************************/
> -static int OpenDecoder( vlc_object_t *p_this )
> -{
> - decoder_t *p_dec = (decoder_t *)p_this;
> - decoder_sys_t *p_sys;
> - int i;
> -
> - /* Find codec. */
> - for ( i = 0;
> - i < (int)(sizeof(p_supported_fmt)/sizeof(struct
> supported_fmt_t));
> - i++ )
> - {
> - if ( p_supported_fmt[i].i_fourcc == p_dec->fmt_in.i_codec )
> - break;
> - }
> - if ( i == (int)(sizeof(p_supported_fmt)/sizeof(struct
> supported_fmt_t)) )
> - {
> - return VLC_EGENERIC;
> - }
> -
> - /* Allocate the memory needed to store the decoder's structure */
> - if( ( p_dec->p_sys = p_sys =
> - vlc_obj_malloc(p_this, sizeof(decoder_sys_t)) ) == NULL )
> - return VLC_ENOMEM;
> - p_sys->psz_sdl_type = p_supported_fmt[i].psz_sdl_type;
> -
> - /* Set output properties - this is a decoy and isn't used anywhere
> */
> - p_dec->fmt_out.i_codec = VLC_CODEC_RGB32;
> -
> - /* Set callbacks */
> - p_dec->pf_decode = DecodeBlock;
> -
> - return VLC_SUCCESS;
> -}
> -
> -/****************************************************************************
> - * DecodeBlock: the whole thing
> -
> ****************************************************************************
> - * This function must be fed with a complete compressed frame.
> -
> ****************************************************************************/
> -static int DecodeBlock( decoder_t *p_dec, block_t *p_block )
> -{
> - decoder_sys_t *p_sys = p_dec->p_sys;
> - picture_t *p_pic = NULL;
> - SDL_Surface *p_surface;
> - SDL_RWops *p_rw;
> -
> - if( p_block == NULL ) /* No Drain */
> - return VLCDEC_SUCCESS;
> -
> - if( p_block->i_flags & BLOCK_FLAG_CORRUPTED )
> - {
> - block_Release( p_block );
> - return VLCDEC_SUCCESS;
> - }
> -
> - p_rw = SDL_RWFromConstMem( p_block->p_buffer, p_block->i_buffer );
> -
> - /* Decode picture. */
> - p_surface = IMG_LoadTyped_RW( p_rw, 1, (char*)p_sys->psz_sdl_type
> );
> - if ( p_surface == NULL )
> - {
> - msg_Warn( p_dec, "SDL_image couldn't load the image (%s)",
> - IMG_GetError() );
> - goto error;
> - }
> -
> - switch ( p_surface->format->BitsPerPixel )
> - {
> - case 16:
> - p_dec->fmt_out.i_codec = VLC_CODEC_RGB16;
> - break;
> - case 8:
> - case 24:
> - p_dec->fmt_out.i_codec = VLC_CODEC_RGB24;
> - break;
> - case 32:
> - p_dec->fmt_out.i_codec = VLC_CODEC_RGB32;
> - break;
> - default:
> - msg_Warn( p_dec, "unknown bits/pixel format (%d)",
> - p_surface->format->BitsPerPixel );
> - goto error;
> - }
> - p_dec->fmt_out.video.i_width = p_surface->w;
> - p_dec->fmt_out.video.i_height = p_surface->h;
> - p_dec->fmt_out.video.i_sar_num = 1;
> - p_dec->fmt_out.video.i_sar_den = 1;
> -
> - /* Get a new picture. */
> - if( decoder_UpdateVideoFormat( p_dec ) )
> - goto error;
> - p_pic = decoder_NewPicture( p_dec );
> - if ( p_pic == NULL ) goto error;
> -
> - switch ( p_surface->format->BitsPerPixel )
> - {
> - case 8:
> - {
> - for ( int i = 0; i < p_surface->h; i++ )
> - {
> - uint8_t *p_src = (uint8_t*)p_surface->pixels + i *
> p_surface->pitch;
> - uint8_t *p_dst = p_pic->p[0].p_pixels + i *
> p_pic->p[0].i_pitch;
> - for ( int j = 0; j < p_surface->w; j++ )
> - {
> - uint8_t r, g, b;
> - SDL_GetRGB( *(p_src++), p_surface->format,
> - &r, &g, &b );
> - *(p_dst++) = r;
> - *(p_dst++) = g;
> - *(p_dst++) = b;
> - }
> - }
> - break;
> - }
> - case 16:
> - {
> - uint8_t *p_src = p_surface->pixels;
> - uint8_t *p_dst = p_pic->p[0].p_pixels;
> - int i_pitch = p_pic->p[0].i_pitch < p_surface->pitch ?
> - p_pic->p[0].i_pitch : p_surface->pitch;
> -
> - for ( int i = 0; i < p_surface->h; i++ )
> - {
> - memcpy( p_dst, p_src, i_pitch );
> - p_src += p_surface->pitch;
> - p_dst += p_pic->p[0].i_pitch;
> - }
> - break;
> - }
> - case 24:
> - {
> - for ( int i = 0; i < p_surface->h; i++ )
> - {
> - uint8_t *p_src = (uint8_t*)p_surface->pixels + i *
> p_surface->pitch;
> - uint8_t *p_dst = p_pic->p[0].p_pixels + i *
> p_pic->p[0].i_pitch;
> - for ( int j = 0; j < p_surface->w; j++ )
> - {
> - uint8_t r, g, b;
> - uint32_t pixel = 0;
> - memcpy(&pixel, p_src, 3);
> - SDL_GetRGB( pixel, p_surface->format,
> - &r, &g, &b );
> - *(p_dst++) = r;
> - *(p_dst++) = g;
> - *(p_dst++) = b;
> - p_src += 3;
> - }
> - }
> - break;
> - }
> - case 32:
> - {
> - for ( int i = 0; i < p_surface->h; i++ )
> - {
> - uint8_t *p_src = (uint8_t*)p_surface->pixels + i *
> p_surface->pitch;
> - uint8_t *p_dst = p_pic->p[0].p_pixels + i *
> p_pic->p[0].i_pitch;
> - for ( int j = 0; j < p_surface->w; j++ )
> - {
> - uint8_t r, g, b, a;
> - SDL_GetRGBA( *(uint32_t*)p_src, p_surface->format,
> - &r, &g, &b, &a );
> - *(p_dst++) = b;
> - *(p_dst++) = g;
> - *(p_dst++) = r;
> - *(p_dst++) = a;
> - p_src += 4;
> - }
> - }
> - break;
> - }
> - }
> -
> - p_pic->date = (p_block->i_pts != VLC_TICK_INVALID) ?
> - p_block->i_pts : p_block->i_dts;
> -
> - decoder_QueueVideo( p_dec, p_pic );
> -
> -error:
> - if ( p_surface != NULL ) SDL_FreeSurface( p_surface );
> - block_Release( p_block );
> - return VLCDEC_SUCCESS;
> -}
> diff --git a/po/POTFILES.in b/po/POTFILES.in
> index 6ed746ad460..31f38654bf3 100644
> --- a/po/POTFILES.in
> +++ b/po/POTFILES.in
> @@ -324,7 +324,6 @@ modules/codec/schroedinger.c
> modules/codec/scte18.c
> modules/codec/scte18.h
> modules/codec/scte27.c
> -modules/codec/sdl_image.c
> modules/codec/shine.c
> modules/codec/spdif.c
> modules/codec/speex.c
> --
> 2.24.3 (Apple Git-128)
>
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel
--
Jean-Baptiste Kempf - President
+33 672 704 734
More information about the vlc-devel
mailing list