ijksdl: remove unused module

ijkmediaplayer/jni/ijkplayer/ff_ffplay_def.h

@@ -216,7 +216,9 @@ typedef struct VideoState {
 #if !CONFIG_AVFILTER
     struct SwsContext *img_convert_ctx;
 #endif
+#ifdef IJK_FFPLAY_MERGE
     SDL_Rect last_display_rect;
+#endif
 
     char filename[1024];
     int width, height, xleft, ytop;

ijkmediaplayer/jni/ijksdl/Android.mk

@@ -32,7 +32,6 @@ LOCAL_SRC_FILES += ijksdl_mutex.c
 LOCAL_SRC_FILES += ijksdl_stdinc.c
 LOCAL_SRC_FILES += ijksdl_thread.c
 LOCAL_SRC_FILES += ijksdl_timer.c
-LOCAL_SRC_FILES += ijksdl_video.c
 LOCAL_SRC_FILES += ijksdl_vout.c
 LOCAL_SRC_FILES += ijksdl_vout_ffmpeg.c
 

ijkmediaplayer/jni/ijksdl/ijksdl_video.c

-/*****************************************************************************
- * ijksdl_video.c
- *****************************************************************************
- *
- * copyright (c) 2013 Zhang Rui <bbcallen@gmail.com>
- *
- * This file is part of ijkPlayer.
- *
- * ijkPlayer 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.
- *
- * ijkPlayer 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 ijkPlayer; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "ijksdl_video.h"
-
-void SDL_FreeSurface(SDL_Surface *surface)
-{
-    // FIXME: implement
-}
-
-SDL_Overlay *SDL_CreateYUVOverlay(int width, int height,
-        Uint32 format, SDL_Surface *display)
-{
-    // FIXME: implement
-    return NULL;
-}
-
-SDL_Surface *SDL_SetVideoMode(int width, int height, int bpp, Uint32 flags)
-{
-    // FIXME: implement
-    return NULL;
-}
-
-int SDL_LockYUVOverlay(SDL_Overlay *overlay)
-{
-    // FIXME: implement
-    return 0;
-}
-
-void SDL_UnlockYUVOverlay(SDL_Overlay *overlay)
-{
-    // FIXME: implement
-}
-
-int SDL_DisplayYUVOverlay(SDL_Overlay *overlay, SDL_Rect *dstrect)
-{
-    // FIXME: implement
-    return 0;
-}
-
-void SDL_FreeYUVOverlay(SDL_Overlay *overlay)
-{
-    // FIXME: implement
-}

ijkmediaplayer/jni/ijksdl/ijksdl_video.h

@@ -26,82 +26,6 @@
 
 #include "ijksdl_stdinc.h"
 
-/** @name Useful data types */
-/*@{*/
-typedef struct SDL_Rect {
-    Sint16 x, y;
-    Uint16 w, h;
-} SDL_Rect;
-
-typedef struct SDL_Color {
-    Uint8 r;
-    Uint8 g;
-    Uint8 b;
-    Uint8 unused;
-} SDL_Color;
-#define SDL_Colour SDL_Color
-
-typedef struct SDL_Palette {
-    int       ncolors;
-    SDL_Color *colors;
-} SDL_Palette;
-/*@}*/
-
-/** Everything in the pixel format structure is read-only */
-typedef struct SDL_PixelFormat {
-    SDL_Palette *palette;
-    Uint8  BitsPerPixel;
-    Uint8  BytesPerPixel;
-    Uint8  Rloss;
-    Uint8  Gloss;
-    Uint8  Bloss;
-    Uint8  Aloss;
-    Uint8  Rshift;
-    Uint8  Gshift;
-    Uint8  Bshift;
-    Uint8  Ashift;
-    Uint32 Rmask;
-    Uint32 Gmask;
-    Uint32 Bmask;
-    Uint32 Amask;
-
-    /** RGB color key information */
-    Uint32 colorkey;
-    /** Alpha value information (per-surface alpha) */
-    Uint8  alpha;
-} SDL_PixelFormat;
-
-/** This structure should be treated as read-only, except for 'pixels',
- *  which, if not NULL, contains the raw pixel data for the surface.
- */
-typedef struct SDL_Surface {
-    Uint32 flags;               /**< Read-only */
-    SDL_PixelFormat *format;        /**< Read-only */
-    int w, h;               /**< Read-only */
-    Uint16 pitch;               /**< Read-only */
-    void *pixels;               /**< Read-write */
-    int offset;             /**< Private */
-
-    /** Hardware-specific surface info */
-    struct private_hwdata *hwdata;
-
-    /** clipping information */
-    SDL_Rect clip_rect;         /**< Read-only */
-    Uint32 unused1;             /**< for binary compatibility */
-
-    /** Allow recursive locks */
-    Uint32 locked;              /**< Private */
-
-    /** info for fast blit mapping to other surfaces */
-    struct SDL_BlitMap *map;        /**< Private */
-
-    /** format version, bumped at every change to invalidate blit maps */
-    unsigned int format_version;        /**< Private */
-
-    /** Reference count -- used when freeing surface */
-    int refcount;               /**< Read-mostly */
-} SDL_Surface;
-
 /** @name SDL_Surface Flags
  *  These are the currently supported flags for the SDL_surface
  */
@@ -138,7 +62,6 @@ typedef struct SDL_Surface {
 
 /*@}*/
 
-
 /*-
  *  http://www.webartz.com/fourcc/indexyuv.htm
  *  http://www.neuro.sfc.keio.ac.jp/~aly/polygon/info/color-space-faq.html
@@ -152,37 +75,4 @@ typedef struct SDL_Surface {
 #define SDL_UYVY_OVERLAY  0x59565955    /**< Packed mode: U0+Y0+V0+Y1 (1 plane) */
 #define SDL_YVYU_OVERLAY  0x55595659    /**< Packed mode: Y0+V0+Y1+U0 (1 plane) */
 
-/** The YUV hardware video overlay */
-typedef struct SDL_Overlay {
-    Uint32 format;              /**< Read-only */
-    int w, h;               /**< Read-only */
-    int planes;             /**< Read-only */
-    Uint16 *pitches;            /**< Read-only */
-    Uint8 **pixels;             /**< Read-write */
-
-    /** @name Hardware-specific surface info */
-        /*@{*/
-    struct private_yuvhwfuncs *hwfuncs;
-    struct private_yuvhwdata *hwdata;
-        /*@{*/
-
-    /** @name Special flags */
-        /*@{*/
-    Uint32 hw_overlay :1;   /**< Flag: This overlay hardware accelerated? */
-    Uint32 UnusedBits :31;
-        /*@}*/
-} SDL_Overlay;
-
-/*-
-void         SDL_FreeSurface(SDL_Surface *surface);
-
-SDL_Overlay *SDL_CreateYUVOverlay(int width, int height,
-                                  Uint32 format, SDL_Surface *display);
-SDL_Surface *SDL_SetVideoMode(int width, int height, int bpp, Uint32 flags);
-int          SDL_LockYUVOverlay(SDL_Overlay *overlay);
-void         SDL_UnlockYUVOverlay(SDL_Overlay *overlay);
-int          SDL_DisplayYUVOverlay(SDL_Overlay *overlay, SDL_Rect *dstrect);
-void         SDL_FreeYUVOverlay(SDL_Overlay *overlay);
-*/
-
 #endif