Remove some demuxers and decoders

Most of these demuxers and decoders are provided in better form by
libav, while the mplayer builtin ones are essentially unmaintained. The
only legimitate use case for not using the libav ones was working around
libav bugs or bugs related to the way mplayer uses libav. Instead of
trying to keep dead code alive, development effort should go into
improving libav or the mplayer libav glue code.

Note that the libav demuxer have been preferred over the mplayer builtin
ones for a while in mplayer2. There were some exceptions: playing DVDs
with dvdnav or playing network sources. (That's because some stream
modules and network.c requested explicit file formats, such as
DEMUXER_TYPE_MPEG_PS, which mapped to builtin demuxers.) With this
commit, they are switched to use libav. One caveat is that the requested
format is not passed to libavformat, instead we rely on the auto probing
to select the correct libav demuxer (see code in demux_open_stream()).

1 files changed, 0 insertions, 523 deletions

diff --git a/libmpcodecs/ad_twin.c b/libmpcodecs/ad_twin.c
deleted file mode 100644
index 9aa304e4fc..0000000000
--- a/libmpcodecs/ad_twin.c
+++ /dev/null
@@ -1,523 +0,0 @@
-/*
- * This file is part of MPlayer.
- *
- * MPlayer is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * MPlayer 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with MPlayer; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include "config.h"
-
-#include "ad_internal.h"
-#include "vqf.h"
-#include "libmpdemux/aviprint.h"
-#include "loader/ldt_keeper.h"
-#include "loader/wine/windef.h"
-#include "libaf/af_format.h"
-
-
-static const ad_info_t info =
-{
-    "TWinVQ decoder",
-    "vqf",
-    "Roberto Togni",
-    "Nick Kurshev",
-    "Ported from MPlayerXP"
-};
-
-LIBAD_EXTERN(twin)
-
-void* WINAPI LoadLibraryA(char* name);
-void*  WINAPI GetProcAddress(void* handle, char* func);
-int WINAPI FreeLibrary(void* handle);
-
-static int (*TvqInitialize)( headerInfo *setupInfo, INDEX *index, int dispErrorMessageBox );
-static void (*TvqTerminate)( INDEX *index );
-static void (*TvqGetVectorInfo)(int *bits0[], int *bits1[]);
-
-static void (*TvqDecodeFrame)(INDEX  *indexp, float out[]);
-static int  (*TvqWtypeToBtype)( int w_type, int *btype );
-static void (*TvqUpdateVectorInfo)(int varbits, int *ndiv, int bits0[], int bits1[]);
-
-static int   (*TvqCheckVersion)(char *versionID);
-static void  (*TvqGetConfInfo)(tvqConfInfo *cf);
-static int   (*TvqGetFrameSize)(void);
-static int   (*TvqGetNumFixedBitsPerFrame)(void);
-
-#define BYTE_BIT    8
-#define BBUFSIZ     1024        /* Bit buffer size (bytes) */
-#define BBUFLEN     (BBUFSIZ*BYTE_BIT)  /* Bit buffer length (bits) */
-typedef struct vqf_priv_s
-{
-  float pts;
-  WAVEFORMATEX o_wf;   // out format
-  INDEX index;
-  tvqConfInfo cf;
-  headerInfo hi;
-  int *bits_0[N_INTR_TYPE], *bits_1[N_INTR_TYPE];
-  unsigned framesize;
-  /* stream related */
-  int readable;
-  int ptr;           /* current point in the bit buffer */
-  int nbuf;          /* bit buffer size */
-  char buf[BBUFSIZ];  /* the bit buffer */
-  int skip_cnt;
-}vqf_priv_t;
-
-static void* vqf_dll;
-
-static int load_dll( char *libname )
-{
-#ifdef WIN32_LOADER
-    Setup_LDT_Keeper();
-#endif
-    vqf_dll = LoadLibraryA(libname);
-    if( vqf_dll == NULL )
-    {
-        mp_msg(MSGT_DECAUDIO, MSGL_ERR, "failed loading dll\n" );
-    return 0;
-    }
-  TvqInitialize = GetProcAddress(vqf_dll,"TvqInitialize");
-  TvqTerminate = GetProcAddress(vqf_dll,"TvqTerminate");
-  TvqGetVectorInfo = GetProcAddress(vqf_dll,"TvqGetVectorInfo");
-  TvqDecodeFrame = GetProcAddress(vqf_dll,"TvqDecodeFrame");
-  TvqWtypeToBtype = GetProcAddress(vqf_dll,"TvqWtypeToBtype");
-  TvqUpdateVectorInfo = GetProcAddress(vqf_dll,"TvqUpdateVectorInfo");
-  TvqCheckVersion = GetProcAddress(vqf_dll,"TvqCheckVersion");
-  TvqGetConfInfo = GetProcAddress(vqf_dll,"TvqGetConfInfo");
-  TvqGetFrameSize = GetProcAddress(vqf_dll,"TvqGetFrameSize");
-  TvqGetNumFixedBitsPerFrame = GetProcAddress(vqf_dll,"TvqGetNumFixedBitsPerFrame");
-  return TvqInitialize && TvqTerminate && TvqGetVectorInfo &&
-     TvqDecodeFrame && TvqWtypeToBtype && TvqUpdateVectorInfo &&
-     TvqCheckVersion && TvqGetConfInfo && TvqGetFrameSize &&
-     TvqGetNumFixedBitsPerFrame;
-}
-
-static int init_vqf_audio_codec(sh_audio_t *sh_audio){
-    WAVEFORMATEX *in_fmt=sh_audio->wf;
-    vqf_priv_t*priv=sh_audio->context;
-    int ver;
-    mp_msg(MSGT_DECAUDIO, MSGL_INFO, "======= Win32 (TWinVQ) AUDIO Codec init =======\n");
-
-    sh_audio->channels=in_fmt->nChannels;
-    sh_audio->samplerate=in_fmt->nSamplesPerSec;
-    sh_audio->sample_format=AF_FORMAT_S16_NE;
-//    sh_audio->sample_format=AF_FORMAT_FLOAT_NE;
-    sh_audio->samplesize=af_fmt2bits(sh_audio->sample_format)/8;
-    priv->o_wf.nChannels=in_fmt->nChannels;
-    priv->o_wf.nSamplesPerSec=in_fmt->nSamplesPerSec;
-    priv->o_wf.nBlockAlign=sh_audio->samplesize*in_fmt->nChannels;
-    priv->o_wf.nAvgBytesPerSec=in_fmt->nBlockAlign*in_fmt->nChannels;
-    priv->o_wf.wFormatTag=0x01;
-    priv->o_wf.wBitsPerSample=in_fmt->wBitsPerSample;
-    priv->o_wf.cbSize=0;
-
-    if( mp_msg_test(MSGT_DECAUDIO,MSGL_V) )
-    {
-    mp_msg(MSGT_DECAUDIO, MSGL_V, "Input format:\n");
-    print_wave_header(in_fmt, MSGL_V);
-    mp_msg(MSGT_DECAUDIO, MSGL_V, "Output fmt:\n");
-    print_wave_header(&priv->o_wf, MSGL_V);
-    }
-    memcpy(&priv->hi,&in_fmt[1],sizeof(headerInfo));
-    if((ver=TvqInitialize(&priv->hi,&priv->index,0))){
-    const char *tvqe[]={
-    "No errors",
-    "General error",
-    "Wrong version",
-    "Channel setting error",
-    "Wrong coding mode",
-    "Inner parameter setting error",
-    "Wrong number of VQ pre-selection candidates, used only in encoder" };
-    mp_msg(MSGT_DECAUDIO, MSGL_ERR, "Tvq initialization error: %s\n",ver>=0&&ver<7?tvqe[ver]:"Unknown");
-    return 0;
-    }
-    ver=TvqCheckVersion(priv->hi.ID);
-    if(ver==TVQ_UNKNOWN_VERSION){
-    mp_msg(MSGT_DECAUDIO, MSGL_ERR, "Tvq unknown version of stream\n" );
-    return 0;
-    }
-    TvqGetConfInfo(&priv->cf);
-    TvqGetVectorInfo(priv->bits_0,priv->bits_1);
-    priv->framesize=TvqGetFrameSize();
-    sh_audio->audio_in_minsize=priv->framesize*in_fmt->nChannels;
-    sh_audio->a_in_buffer_size=4*sh_audio->audio_in_minsize;
-    sh_audio->a_in_buffer=av_malloc(sh_audio->a_in_buffer_size);
-    sh_audio->a_in_buffer_len=0;
-
-
-    return 1;
-}
-
-static int close_vqf_audio_codec(sh_audio_t *sh_audio)
-{
-    vqf_priv_t*priv=sh_audio->context;
-    TvqTerminate(&priv->index);
-    return 1;
-}
-
-int init(sh_audio_t *sh_audio)
-{
-    return 1;
-}
-
-int preinit(sh_audio_t *sh_audio)
-{
-  /* Win32 VQF audio codec: */
-  vqf_priv_t *priv;
-  if(!(sh_audio->context=malloc(sizeof(vqf_priv_t)))) return 0;
-  priv=sh_audio->context;
-  if(!load_dll(sh_audio->codec->dll))
-  {
-    mp_msg(MSGT_DECAUDIO, MSGL_ERR, "win32.dll looks broken :(\n");
-    return 0;
-  }
-  if(!init_vqf_audio_codec(sh_audio)){
-    mp_msg(MSGT_DECAUDIO, MSGL_ERR, "TWinVQ initialization fail\n");
-    return 0;
-  }
-  mp_msg(MSGT_DECAUDIO, MSGL_INFO, "INFO: TWinVQ (%s) audio codec init OK!\n",sh_audio->codec->dll);
-  priv->skip_cnt = 2;
-  return 1;
-}
-
-void uninit(sh_audio_t *sh)
-{
-  close_vqf_audio_codec(sh);
-  free(sh->context);
-  FreeLibrary(vqf_dll);
-}
-
-static int control(sh_audio_t *sh_audio,int cmd,void* arg, ...)
-{
-  switch(cmd) {
-      case ADCTRL_QUERY_FORMAT:
-          return CONTROL_TRUE;
-      default:
-          return CONTROL_UNKNOWN;
-  }
-}
-
-static int bread(char   *data,    /* Output: Output data array */
-          int   size,     /* Input:  Length of each data */
-          int   nbits,    /* Input:  Number of bits to write */
-          sh_audio_t *sh)  /* Input:  File pointer */
-{
-    /*--- Variables ---*/
-    int  ibits, iptr, idata, ibufadr, ibufbit, icl;
-    unsigned char mask, tmpdat;
-    int  retval;
-    vqf_priv_t *priv=sh->context;
-
-    /*--- Main operation ---*/
-    retval = 0;
-    mask = 0x1;
-    for ( ibits=0; ibits<nbits; ibits++ ){
-        if ( priv->readable == 0 ){  /* when the file data buffer is empty */
-            priv->nbuf = demux_read_data(sh->ds, priv->buf, BBUFSIZ);
-            priv->nbuf *= 8;
-            priv->readable = 1;
-        }
-        iptr = priv->ptr;           /* current file data buffer pointer */
-        if ( iptr >= priv->nbuf )   /* If data file is empty then return */
-            return retval;
-        ibufadr = iptr/BYTE_BIT;      /* current file data buffer address */
-        ibufbit = iptr%BYTE_BIT;      /* current file data buffer bit */
-        /*  tmpdat = stream->buf[ibufadr] >> (BYTE_BIT-ibufbit-1); */
-        tmpdat = (unsigned char)priv->buf[ibufadr];
-        tmpdat >>= (BYTE_BIT-ibufbit-1);
-        /* current data bit */
-
-        idata = ibits*size;                   /* output data address */
-        data[idata] = (char)(tmpdat & mask);  /* set output data */
-        for (icl=1; icl<size; icl++)
-            data[idata+icl] = 0; /* clear the rest output data buffer */
-        priv->ptr += 1;       /* update data buffer pointer */
-        if (priv->ptr == BBUFLEN){
-            priv->ptr = 0;
-            priv->readable = 0;
-        }
-        ++retval;
-    }
-    return retval;
-}
-
-#define BITS_INT    (sizeof(int)*8)
-
-static int get_bstm(int *data,          /* Input: input data */
-            unsigned nbits,         /* Input: number of bits */
-            sh_audio_t *sh)          /* Input: bit file pointer */
-{
-    unsigned    ibit;
-    unsigned    mask;
-    unsigned    work;
-    char    tmpbit[BITS_INT];
-    int     retval;
-
-    if ( nbits > BITS_INT ){
-        mp_msg(MSGT_DECAUDIO, MSGL_ERR, "get_bstm(): %d: %d Error.\n",
-            nbits, BITS_INT);
-        exit(1);
-    }
-    retval = bread(tmpbit, sizeof(*tmpbit), nbits, sh);
-    for (ibit=retval; ibit<nbits; ibit++){
-        tmpbit[ibit] = 0;
-    }
-    mask = 0x1<<(nbits-1);
-    work=0;
-    for ( ibit=0; ibit<nbits; ibit++ ){
-        work += mask*tmpbit[ibit];
-        mask >>= 1;
-    }
-    *data = work;
-    return retval;
-}
-
-static int GetVqInfo( tvqConfInfoSubBlock *cfg,
-            int bits0[],
-            int bits1[],
-            int variableBits,
-            INDEX *index,
-            sh_audio_t *sh)
-{
-    int idiv;
-    int bitcount = 0;
-
-    if ( index->btype == BLK_LONG ){
-        TvqUpdateVectorInfo( variableBits, &cfg->ndiv, bits0, bits1 ); // re-calculate VQ bits
-    }
-    for ( idiv=0; idiv<cfg->ndiv; idiv++ ){
-        bitcount += get_bstm(&index->wvq[idiv],bits0[idiv],sh); /* CB 0 */
-        bitcount += get_bstm(&index->wvq[idiv+cfg->ndiv],bits1[idiv],sh); /* CB 1 */
-    }
-    return bitcount;
-}
-
-static int GetBseInfo( tvqConfInfo *cf, tvqConfInfoSubBlock *cfg, INDEX *index, sh_audio_t *sh)
-{
-    int i_sup, isf, itmp, idiv;
-    int bitcount = 0;
-
-    for ( i_sup=0; i_sup<cf->N_CH; i_sup++ ){
-        for ( isf=0; isf<cfg->nsf; isf++ ){
-            for ( idiv=0; idiv<cfg->fw_ndiv; idiv++ ){
-                itmp = idiv + ( isf + i_sup * cfg->nsf ) * cfg->fw_ndiv;
-                bitcount += get_bstm(&index->fw[itmp],cfg->fw_nbit,sh);
-            }
-        }
-    }
-    for ( i_sup=0; i_sup<cf->N_CH; i_sup++ ){
-        for ( isf=0; isf<cfg->nsf; isf++ ){
-            bitcount += get_bstm(&index->fw_alf[i_sup * cfg->nsf + isf],cf->FW_ARSW_BITS,sh);
-        }
-    }
-    return bitcount;
-}
-
-static int GetGainInfo(tvqConfInfo *cf, tvqConfInfoSubBlock *cfg, INDEX *index, sh_audio_t *sh )
-{
-    int i_sup, iptop, isf;
-    int bitcount = 0;
-
-    for ( i_sup=0; i_sup<cf->N_CH; i_sup++ ){
-        iptop = ( cfg->nsubg + 1 ) * i_sup;
-        bitcount += get_bstm(&index->pow[iptop], cf->GAIN_BITS,sh);
-        for ( isf=0; isf<cfg->nsubg; isf++ ){
-            bitcount += get_bstm(&index->pow[iptop+isf+1], cf->SUB_GAIN_BITS,sh);
-        }
-    }
-    return bitcount;
-}
-
-static int GetLspInfo( tvqConfInfo *cf, INDEX *index, sh_audio_t *sh )
-{
-    int i_sup, itmp;
-    int bitcount = 0;
-
-    for ( i_sup=0; i_sup<cf->N_CH; i_sup++ ){
-        bitcount += get_bstm(&index->lsp[i_sup][0], cf->LSP_BIT0,sh); /* pred. switch */
-        bitcount += get_bstm(&index->lsp[i_sup][1], cf->LSP_BIT1,sh); /* first stage */
-        for ( itmp=0; itmp<cf->LSP_SPLIT; itmp++ ){         /* second stage */
-            bitcount += get_bstm(&index->lsp[i_sup][itmp+2], cf->LSP_BIT2,sh);
-        }
-    }
-
-    return bitcount;
-}
-
-static int GetPpcInfo( tvqConfInfo *cf, INDEX *index, sh_audio_t *sh)
-{
-    int idiv, i_sup;
-    int bitcount = 0;
-    vqf_priv_t*priv=sh->context;
-
-    for ( idiv=0; idiv<cf->N_DIV_P; idiv++ ){
-        bitcount += get_bstm(&(index->pls[idiv]), priv->bits_0[BLK_PPC][idiv],sh);       /*CB0*/
-        bitcount += get_bstm(&(index->pls[idiv+cf->N_DIV_P]), priv->bits_1[BLK_PPC][idiv],sh);/*CB1*/
-    }
-    for (i_sup=0; i_sup<cf->N_CH; i_sup++){
-        bitcount += get_bstm(&(index->pit[i_sup]), cf->BASF_BIT,sh);
-        bitcount += get_bstm(&(index->pgain[i_sup]), cf->PGAIN_BIT,sh);
-    }
-
-    return bitcount;
-}
-
-static int GetEbcInfo( tvqConfInfo *cf, tvqConfInfoSubBlock *cfg, INDEX *index, sh_audio_t *sh)
-{
-    int i_sup, isf, itmp;
-    int bitcount = 0;
-
-    for ( i_sup=0; i_sup<cf->N_CH; i_sup++ ){
-        for ( isf=0; isf<cfg->nsf; isf++){
-            int indexSfOffset = isf * ( cfg->ncrb - cfg->ebc_crb_base ) - cfg->ebc_crb_base;
-            for ( itmp=cfg->ebc_crb_base; itmp<cfg->ncrb; itmp++ ){
-                bitcount += get_bstm(&index->bc[i_sup][itmp+indexSfOffset], cfg->ebc_bits,sh);
-            }
-        }
-    }
-
-    return bitcount;
-}
-
-static int vqf_read_frame(sh_audio_t *sh,INDEX *index)
-{
-    /*--- Variables ---*/
-    tvqConfInfoSubBlock *cfg;
-    int variableBits;
-    int bitcount;
-    int numFixedBitsPerFrame = TvqGetNumFixedBitsPerFrame();
-    int btype;
-    vqf_priv_t *priv=sh->context;
-
-    /*--- Initialization ---*/
-    variableBits = 0;
-    bitcount = 0;
-
-    /*--- read block independent factors ---*/
-    /* Window type */
-    bitcount += get_bstm( &index->w_type, priv->cf.BITS_WTYPE, sh );
-    if ( TvqWtypeToBtype( index->w_type, &index->btype ) ) {
-        mp_msg(MSGT_DECAUDIO, MSGL_ERR, "Error: unknown window type: %d\n", index->w_type);
-        return 0;
-    }
-    btype = index->btype;
-
-    /*--- read block dependent factors ---*/
-    cfg = &priv->cf.cfg[btype]; // set the block dependent paremeters table
-
-    bitcount += variableBits;
-
-    /* Interleaved vector quantization */
-    bitcount += GetVqInfo( cfg, priv->bits_0[btype], priv->bits_1[btype], variableBits, index, sh );
-
-    /* Bark-scale envelope */
-    bitcount += GetBseInfo( &priv->cf, cfg, index, sh );
-    /* Gain */
-    bitcount += GetGainInfo( &priv->cf, cfg, index, sh );
-    /* LSP */
-    bitcount += GetLspInfo( &priv->cf, index, sh );
-    /* PPC */
-    if ( cfg->ppc_enable ){
-        bitcount += GetPpcInfo( &priv->cf, index, sh );
-    }
-    /* Energy Balance Calibration */
-    if ( cfg->ebc_enable ){
-        bitcount += GetEbcInfo( &priv->cf, cfg, index, sh );
-    }
-
-    return bitcount == numFixedBitsPerFrame ? bitcount/8 : 0;
-}
-
-static void frtobuf_s16(float out[],       /* Input  --- input data frame */
-        short bufout[],    /* Output --- output data buffer array */
-        unsigned frameSize,   /* Input  --- frame size */
-        unsigned numChannels) /* Input  --- number of channels */
-{
-    /*--- Variables ---*/
-    unsigned ismp, ich;
-    float *ptr;
-    float dtmp;
-
-    for ( ich=0; ich<numChannels; ich++ ){
-        ptr = out+ich*frameSize;
-        for ( ismp=0; ismp<frameSize; ismp++ ){
-            dtmp = ptr[ismp];
-            if ( dtmp >= 0. ) {
-                if ( dtmp > 32700. )
-                dtmp = 32700.;
-                bufout[ismp*numChannels+ich] = (short)(dtmp+0.5);
-            } else {
-                if ( dtmp < -32700. )
-                dtmp = -32700.;
-                bufout[ismp*numChannels+ich] = (short)(dtmp-0.5);
-            }
-        }
-    }
-}
-
-static void frtobuf_float(float out[],       /* Input  --- input data frame */
-        float bufout[],    /* Output --- output data buffer array */
-        unsigned frameSize,   /* Input  --- frame size */
-        unsigned numChannels) /* Input  --- number of channels */
-{
-    /*--- Variables ---*/
-    unsigned ismp, ich;
-    float *ptr;
-    float dtmp;
-
-    for ( ich=0; ich<numChannels; ich++ ){
-        ptr = out+ich*frameSize;
-        for ( ismp=0; ismp<frameSize; ismp++ ){
-            dtmp = ptr[ismp];
-            if ( dtmp >= 0. ) {
-                if ( dtmp > 32700. )
-                dtmp = 32700.;
-                bufout[ismp*numChannels+ich] = dtmp/32767.;
-            } else {
-                if ( dtmp < -32700. )
-                dtmp = -32700.;
-                bufout[ismp*numChannels+ich] = dtmp/32767.;
-            }
-        }
-    }
-}
-
-int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int maxlen)
-{
-    int l, len=0;
-    vqf_priv_t *priv=sh_audio->context;
-    while(len<minlen)
-    {
-        float out[priv->framesize*sh_audio->channels];
-        l=vqf_read_frame(sh_audio,&priv->index);
-        if(!l) break;
-        TvqDecodeFrame(&priv->index, out);
-        if (priv->skip_cnt) {
-            // Ingnore first two frames, replace them with silence
-            priv->skip_cnt--;
-            memset(buf, 0, priv->framesize*sh_audio->channels*sh_audio->samplesize);
-        } else {
-           if (sh_audio->sample_format == AF_FORMAT_S16_NE)
-               frtobuf_s16(out, (short *)buf, priv->framesize, sh_audio->channels);
-           else
-               frtobuf_float(out, (float *)buf, priv->framesize, sh_audio->channels);
-        }
-        len += priv->framesize*sh_audio->channels*sh_audio->samplesize;
-        buf += priv->framesize*sh_audio->channels*sh_audio->samplesize;
-    }
-    return len;
-}