Skip to content
Snippets Groups Projects
Commit 6d223c4c authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files

mash: remove plugin 

Upstream is gone. Maintainer has left. Build system support is missing.
parent d9faecd8
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
NEWS
+ 1
− 0
View file @ 6d223c4c
......@@ -25,6 +25,7 @@ Visualizations:
Removed modules:
* ios video output: use ios2
* OpenMash H.261 video decoder
Changes between 2.0.x and 2.1.0:
......
modules/LIST
+ 0
− 1
View file @ 6d223c4c
......@@ -196,7 +196,6 @@ $Id$
* macosx_dialog_provider: Minimal Dialog Provider for Mac OS X
* magnify: zoom video filter
* marq: Overlays a marquee on the video
* mash: OpenMash based decoder
* mediacodec: Android Jelly Bean MediaCodec decoder module
* mediadirs: Picture/Music/Video user directories as service discoveries
* minimal_macosx: a minimal Mac OS X GUI, using the FrameWork
......
modules/codec/Modules.am
+ 0
− 1
View file @ 6d223c4c
......@@ -23,7 +23,6 @@ SOURCES_quicktime = quicktime.c
SOURCES_faad = faad.c
SOURCES_dvbsub = dvbsub.c
SOURCES_telx = telx.c
SOURCES_mash = mash.cpp
SOURCES_x264 = x264.c
SOURCES_x262 = x264.c
SOURCES_x26410b = x264.c
......
modules/codec/mash.cpp deleted 100644 → 0
+ 0
− 223
View file @ d9faecd8
/*****************************************************************************
* mash.cpp: Video decoder using openmash codec implementations
*****************************************************************************
* Copyright (C) 2004 VLC authors and VideoLAN
* $Id$
*
* Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
*
* 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 <vlc_block.h>
#include <p64/p64.h>
/*****************************************************************************
* decoder_sys_t : video decoder descriptor
*****************************************************************************/
struct decoder_sys_t
{
/*
* Common properties
*/
mtime_t i_pts;
IntraP64Decoder *p_decoder;
bool b_inited;
int i_counter;
};
/****************************************************************************
* Local prototypes
****************************************************************************/
static int OpenDecoder ( vlc_object_t * );
static void CloseDecoder ( vlc_object_t * );
static void *DecodeBlock ( decoder_t *, block_t ** );
#if 0
static picture_t *DecodeFrame( decoder_t *, block_t * );
static block_t *SendFrame ( decoder_t *, block_t * );
#endif
/*****************************************************************************
* Module descriptor
*****************************************************************************/
vlc_module_begin ()
set_description( N_("Video decoder using openmash") )
set_capability( "decoder", 50 )
set_category( CAT_INPUT )
set_subcategory( SUBCAT_INPUT_VCODEC )
set_callbacks( OpenDecoder, CloseDecoder )
vlc_module_end ()
/*****************************************************************************
* 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;
switch( p_dec->fmt_in.i_codec )
{
/* Planar YUV */
case VLC_CODEC_H261:
break;
default:
return VLC_EGENERIC;
}
/* Allocate the memory needed to store the decoder's structure */
if( ( p_dec->p_sys = p_sys =
(decoder_sys_t *)malloc(sizeof(decoder_sys_t)) ) == NULL )
return VLC_ENOMEM;
/* Misc init */
p_sys->i_pts = VLC_TS_INVALID;
p_sys->b_inited = false;
p_sys->i_counter = 0;
/* Set output properties */
p_dec->fmt_out.i_cat = VIDEO_ES;
p_dec->fmt_out.i_codec = VLC_CODEC_I420;
/* Set callbacks */
p_dec->pf_decode_video = (picture_t *(*)(decoder_t *, block_t **))
DecodeBlock;
p_sys->p_decoder = new IntraP64Decoder();
// foo->sync();
return VLC_SUCCESS;
}
/*****************************************************************************
* CloseDecoder: decoder destruction
*****************************************************************************/
static void CloseDecoder( vlc_object_t *p_this )
{
decoder_t *p_dec = (decoder_t*)p_this;
free( p_dec->p_sys );
}
/****************************************************************************
* DecodeBlock: the whole thing
****************************************************************************
* This function must be fed with complete frames.
****************************************************************************/
static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
{
decoder_sys_t *p_sys = p_dec->p_sys;
block_t *p_block;
picture_t *p_pic;
uint32_t i_video_header;
uint8_t *p_frame;
int cc, sbit, ebit, mba, gob, quant, mvdh, mvdv;
int i_width, i_height;
if( !pp_block || !*pp_block ) return NULL;
p_block = *pp_block;
if( p_sys->i_pts <= VLC_TS_INVALID && p_block->i_pts <= VLC_TS_INVALID &&
p_block->i_dts <= VLC_TS_INVALID )
{
/* We've just started the stream, wait for the first PTS. */
block_Release( p_block );
return NULL;
}
/* Date management */
if( p_block->i_pts > VLC_TS_INVALID )
p_sys->i_pts = p_block->i_pts;
else if( p_block->i_dts > VLC_TS_INVALID )
p_sys->i_pts = p_block->i_dts;
i_video_header = *(uint32_t*)p_block->p_buffer; /* yes, it is native endian */
sbit = i_video_header >> 29; /* start bit position */
ebit = (i_video_header >> 26) & 7; /* end bit position */
msg_Dbg( p_dec, "sbit, ebit: %d,%d", sbit, ebit );
gob = (i_video_header >> 20) & 0xf; /* GOB number */
if( gob > 12 )
{
msg_Warn( p_dec, "invalid gob, buggy vic streamer?");
}
mba = (i_video_header >> 15) & 0x1f; /* Macroblock address predictor */
quant = (i_video_header >> 10) & 0x1f; /* quantizer */
mvdh = (i_video_header >> 5) & 0x1f; /* horizontal motion vector data */
mvdv = i_video_header & 0x1f; /* vertical motion vector data */
cc = p_block->i_buffer - 4;
msg_Dbg( p_dec, "packet size %d", cc );
/* Find out p_vdec->i_raw_size */
p_sys->p_decoder->decode( p_block->p_buffer + 4 /*bp?*/,
cc /*cc?*/,
sbit /*sbit?*/,
ebit /*ebit?*/,
mba /* mba?*/,
gob /* gob?*/,
quant /* quant?*/,
mvdh /* mvdh?*/,
mvdv /* mvdv?*/ );
i_width = p_sys->p_decoder->width();
i_height = p_sys->p_decoder->height();
if( !p_sys->b_inited )
{
msg_Dbg( p_dec, "video size is perhaps %dx%d", i_width,
i_height);
video_format_Setup( &p_dec->fmt_out.video, VLC_CODEC_I420,
i_width, i_height,
1, 1 );
p_sys->b_inited = true;
}
p_pic = NULL;
p_sys->i_counter++;
// p_sys->p_decoder->sync();
if( p_block->i_flags & BLOCK_FLAG_END_OF_FRAME )
{
p_pic = decoder_NewPicture( p_dec );
if( !p_pic )
{
block_Release( p_block );
return NULL;
}
p_sys->p_decoder->sync();
p_sys->i_counter = 0;
p_frame = p_sys->p_decoder->frame();
memcpy( p_dec, p_pic->p[0].p_pixels, p_frame, i_width*i_height );
p_frame += i_width * i_height;
memcpy( p_dec, p_pic->p[1].p_pixels, p_frame, i_width*i_height/4 );
p_frame += i_width * i_height/4;
memcpy( p_dec, p_pic->p[2].p_pixels, p_frame, i_width*i_height/4 );
p_pic->date = p_sys->i_pts;
}
block_Release( p_block);
*pp_block = NULL;
return p_pic;
// return NULL;
}
po/POTFILES.in
+ 0
− 1
View file @ 6d223c4c
......@@ -375,7 +375,6 @@ modules/codec/kate.c
modules/codec/libass.c
modules/codec/libmpeg2.c
modules/codec/lpcm.c
modules/codec/mash.cpp
modules/codec/mpeg_audio.c
modules/codec/omxil/android_mediacodec.c
modules/codec/omxil/omxil.c
......
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

VideoLAN code repository instance