hwdummy: remove no longer useful plugin

modules/MODULES_LIST

@@ -164,7 +164,6 @@ $Id$
  * hqdn3d: High Quality denoising filter
  * http: HTTP Network access module
  * httplive: HTTP Live streaming for playback
- * hwdummy: dummy hardware video decoding
  * i420_rgb: planar YUV to packed RGB conversion functions
  * i420_rgb_mmx: MMX accelerated version of i420_rgb
  * i420_rgb_sse2: sse2 accelerated version of i420_rgb

modules/codec/Makefile.am

@@ -335,14 +335,6 @@ if HAVE_AVCODEC_VDA
 codec_LTLIBRARIES += libvda_plugin.la
 endif
 
-libhwdummy_plugin_la_SOURCES = codec/avcodec/hwdummy.c
-libhwdummy_plugin_la_CFLAGS = $(AM_CFLAGS) $(VDPAU_CFLAGS) $(AVCODEC_CFLAGS)
-libhwdummy_plugin_la_LIBADD = $(AVCODEC_LIBS)
-# FIXME: hwdummy only needs libavutil, and only if avcodec < 55.13.0
-if HAVE_AVCODEC_VDPAU
-codec_LTLIBRARIES += libhwdummy_plugin.la
-endif
-
 
 ### OpenMAX ###
 

modules/codec/avcodec/hwdummy.c

-/*****************************************************************************
- * hwdummy.c: dummy hardware decoding acceleration plugin for VLC/libav
- *****************************************************************************
- * Copyright (C) 2013 Rémi Denis-Courmont
- *
- * 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.
- *****************************************************************************/
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <string.h>
-#include <stdlib.h>
-#include <assert.h>
-
-#include <libavutil/mem.h>
-#include <libavcodec/avcodec.h>
-#include <libavcodec/vdpau.h>
-#include <vlc_common.h>
-#include <vlc_plugin.h>
-#include <vlc_fourcc.h>
-#include <vlc_picture.h>
-#include "../../codec/avcodec/va.h"
-
-static int Open(vlc_va_t *, AVCodecContext *, const es_format_t *);
-static void Close(vlc_va_t *);
-
-vlc_module_begin()
-    set_description(N_("Dummy video decoder"))
-    set_capability("hw decoder", 0)
-    set_category(CAT_INPUT)
-    set_subcategory(SUBCAT_INPUT_VCODEC)
-    set_callbacks(Open, Close)
-    add_shortcut("dummy")
-vlc_module_end()
-
-#define DECODER_MAGIC 0xdec0dea0
-#define DATA_MAGIC    0xda1a0000
-#define OPAQUE_MAGIC  0x0da00e00
-
-static int Lock(vlc_va_t *va, void **opaque, uint8_t **data)
-{
-    *data = (void *)(uintptr_t)DATA_MAGIC;
-    *opaque = (void *)(uintptr_t)OPAQUE_MAGIC;
-    (void) va;
-    return VLC_SUCCESS;
-}
-
-static void Unlock(void *opaque, uint8_t *data)
-{
-    assert((uintptr_t)opaque == OPAQUE_MAGIC);
-    assert((uintptr_t)data == DATA_MAGIC);
-}
-
-static VdpStatus Render(VdpDecoder decoder, VdpVideoSurface target,
-                        VdpPictureInfo const *picture_info,
-                        uint32_t bitstream_buffer_count,
-                        VdpBitstreamBuffer const *bitstream_buffers)
-{
-    (void) decoder; (void) target; (void) picture_info;
-    (void) bitstream_buffer_count; (void) bitstream_buffers;
-    assert(decoder == DECODER_MAGIC);
-    assert(target == DATA_MAGIC);
-    return VDP_STATUS_OK;
-}
-
-static int Copy(vlc_va_t *va, picture_t *pic, void *opaque, uint8_t *data)
-{
-    (void) va;
-
-    assert((uintptr_t)opaque == OPAQUE_MAGIC);
-    assert((uintptr_t)data == DATA_MAGIC);
-
-    /* Put some dummy picture content */
-    memset(pic->p[0].p_pixels, 0xF0,
-           pic->p[0].i_pitch * pic->p[0].i_visible_lines);
-    for (int i = 0; i < pic->p[1].i_visible_lines; i++)
-        memset(pic->p[1].p_pixels + (i * pic->p[1].i_pitch), i,
-               pic->p[1].i_visible_pitch);
-    for (int i = 0; i < pic->p[2].i_visible_lines; i++)
-        for (int j = 0; j < pic->p[2].i_visible_pitch; j++)
-            pic->p[2].p_pixels[(i * pic->p[2].i_pitch) + j] = j;
-    return VLC_SUCCESS;
-}
-
-static int Setup(vlc_va_t *va, void **ctxp, vlc_fourcc_t *chromap,
-                 int width, int height)
-{
-    (void) width; (void) height;
-    *ctxp = (AVVDPAUContext *)va->sys;
-    *chromap = VLC_CODEC_YV12;
-    return VLC_SUCCESS;
-}
-
-static int Open(vlc_va_t *va, AVCodecContext *ctx, const es_format_t *fmt)
-{
-    union
-    {
-        char str[4];
-        vlc_fourcc_t fourcc;
-    } u = { .fourcc = fmt->i_codec };
-
-    AVVDPAUContext *hwctx = av_vdpau_alloc_context();
-    if (unlikely(hwctx == NULL))
-       return VLC_ENOMEM;
-
-    msg_Dbg(va, "codec %d (%4.4s) profile %d level %d", ctx->codec_id, u.str,
-            fmt->i_profile, fmt->i_level);
-
-    hwctx->decoder = DECODER_MAGIC;
-    hwctx->render = Render;
-
-    va->sys = (vlc_va_sys_t *)hwctx;
-    va->description = "Dummy video decoding accelerator";
-    va->pix_fmt = AV_PIX_FMT_VDPAU;
-    va->setup = Setup;
-    va->get = Lock;
-    va->release = Unlock;
-    va->extract = Copy;
-    return VLC_SUCCESS;
-}
-
-static void Close(vlc_va_t *va)
-{
-    av_free(va->sys);
-}

modules/hw/vdpau/Makefile.am

@@ -20,7 +20,6 @@ libvdpau_avcodec_plugin_la_CFLAGS = $(AM_CFLAGS) \
 	$(X_CFLAGS) $(AVCODEC_CFLAGS)
 libvdpau_avcodec_plugin_la_LIBADD = libvlc_vdpau.la \
 	$(X_LIBS) $(X_PRE_LIBS) -lX11 $(AVCODEC_LIBS)
-# FIXME: hwdummy only needs libavutil, and only if avcodec < 55.13.0
 if HAVE_AVCODEC_VDPAU
 vdpau_LTLIBRARIES += libvdpau_avcodec_plugin.la
 endif

po/POTFILES.in

@@ -353,7 +353,6 @@ modules/codec/avcodec/chroma.c
 modules/codec/avcodec/dxva2.c
 modules/codec/avcodec/encoder.c
 modules/codec/avcodec/fourcc.c
-modules/codec/avcodec/hwdummy.c
 modules/codec/avcodec/vaapi.c
 modules/codec/avcodec/vda.c
 modules/codec/avcodec/video.c