Remove support for libdv

This removes the libdv demuxer and audio/video decoders. FFmpeg has
support for it, and it's even preferred over the internal decoders.

3 files changed, 0 insertions, 281 deletions

diff --git a/libmpdemux/demux_rawdv.c b/libmpdemux/demux_rawdv.c
deleted file mode 100644
index 68e73fd5f0..0000000000
--- a/libmpdemux/demux_rawdv.c
+++ /dev/null
@@ -1,276 +0,0 @@
-/*
- * raw DV file parser
- * copyright (c) 2002 Alexander Neundorf <neundorf@kde.org>
- * based on the fli demuxer
- *
- * This file is part of MPlayer.
- *
- * MPlayer 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.
- *
- * 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser 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 "mp_msg.h"
-
-#include "stream/stream.h"
-#include "demuxer.h"
-#include "stheader.h"
-
-#include <libdv/dv.h>
-#include <libdv/dv_types.h>
-
-#define DV_PAL_FRAME_SIZE  144000
-#define DV_NTSC_FRAME_SIZE 122000
-
-typedef struct
-{
-   int current_frame;
-   int frame_size;
-   off_t current_filepos;
-   int frame_number;
-   dv_decoder_t *decoder;
-} rawdv_frames_t;
-
-static void demux_seek_rawdv(demuxer_t *demuxer,float rel_seek_secs,float audio_delay,int flags)
-{
-   rawdv_frames_t *frames = (rawdv_frames_t *)demuxer->priv;
-   sh_video_t *sh_video = demuxer->video->sh;
-   off_t newpos=(flags&SEEK_ABSOLUTE)?0:frames->current_frame;
-   if(flags&SEEK_FACTOR)
-   {
-      // float 0..1
-      newpos+=rel_seek_secs*frames->frame_number;
-   }
-   else
-   {
-      // secs
-      newpos+=rel_seek_secs*sh_video->fps;
-   }
-   if(newpos<0)
-      newpos=0;
-   else if(newpos>frames->frame_number)
-      newpos=frames->frame_number;
-   frames->current_frame=newpos;
-   frames->current_filepos=newpos*frames->frame_size;
-}
-
-static int rawdv_check_file(demuxer_t *demuxer)
-{
-   unsigned char tmp_buffer[DV_PAL_FRAME_SIZE];
-   int bytes_read=0;
-   int result=0;
-   dv_decoder_t *td;
-
-   mp_msg(MSGT_DEMUX,MSGL_V,"Checking for DV\n");
-
-   bytes_read=stream_read(demuxer->stream,tmp_buffer,DV_PAL_FRAME_SIZE);
-   if ((bytes_read!=DV_PAL_FRAME_SIZE) && (bytes_read!=DV_NTSC_FRAME_SIZE))
-      return 0;
-
-   td=dv_decoder_new(TRUE,TRUE,FALSE);
-   if (!td)
-      return 0;
-
-   td->quality=DV_QUALITY_BEST;
-   result=dv_parse_header(td, tmp_buffer);
-   if (result<0)
-      return 0;
-
-   if ((( td->num_dif_seqs==10) || (td->num_dif_seqs==12))
-       && (td->width==720)
-       && ((td->height==576) || (td->height==480)))
-      result=1;
-   dv_decoder_free(td);
-   if (result)
-      return DEMUXER_TYPE_RAWDV;
-   else
-      return 0;
-}
-
-// return value:
-//     0 = EOF or no stream found
-//     1 = successfully read a packet
-static int demux_rawdv_fill_buffer(demuxer_t *demuxer, demux_stream_t *ds)
-{
-   rawdv_frames_t *frames = (rawdv_frames_t *)demuxer->priv;
-   demux_packet_t* dp_video=NULL;
-   sh_video_t *sh_video = demuxer->video->sh;
-   int bytes_read=0;
-//   fprintf(stderr,"demux_rawdv_fill_buffer() seek to %llu, size: %d\n",frames->current_filepos,frames->frame_size);
-   // fetch the frame from the file
-   // first, position the file properly since ds_read_packet() doesn't
-   // seem to do it, even though it takes a file offset as a parameter
-   stream_seek(demuxer->stream, frames->current_filepos);
-
-   dp_video=new_demux_packet(frames->frame_size);
-   bytes_read=stream_read(demuxer->stream,dp_video->buffer,frames->frame_size);
-   if (bytes_read<frames->frame_size)
-      return 0;
-   dp_video->pts=frames->current_frame/sh_video->fps;
-   dp_video->pos=frames->current_filepos;
-
-   if (demuxer->audio && demuxer->audio->id>=-1)
-   {
-      demux_packet_t* dp_audio=clone_demux_packet(dp_video);
-      ds_add_packet(demuxer->audio,dp_audio);
-   }
-   ds_add_packet(demuxer->video,dp_video);
-   // get the next frame ready
-   frames->current_filepos+=frames->frame_size;
-   frames->current_frame++;
-//   fprintf(stderr," audio->packs: %d , video->packs: %d \n",demuxer->audio->packs, demuxer->video->packs);
-   return 1;
-}
-
-static demuxer_t* demux_open_rawdv(demuxer_t* demuxer)
-{
-   unsigned char dv_frame[DV_PAL_FRAME_SIZE];
-   sh_video_t *sh_video = NULL;
-   rawdv_frames_t *frames = malloc(sizeof(rawdv_frames_t));
-   dv_decoder_t *dv_decoder=NULL;
-
-   mp_msg(MSGT_DEMUXER,MSGL_V,"demux_open_rawdv() end_pos %"PRId64"\n",(int64_t)demuxer->stream->end_pos);
-
-   // go back to the beginning
-   stream_reset(demuxer->stream);
-   stream_seek(demuxer->stream, 0);
-
-   //get the first frame
-   stream_read(demuxer->stream, dv_frame, DV_PAL_FRAME_SIZE);
-
-   //read params from this frame
-   dv_decoder=dv_decoder_new(TRUE,TRUE,FALSE);
-   dv_decoder->quality=DV_QUALITY_BEST;
-
-   if (dv_parse_header(dv_decoder, dv_frame) == -1)
-	   return NULL;
-
-   // create a new video stream header
-   sh_video = new_sh_video(demuxer, 0);
-   if (!sh_video)
-	   return NULL;
-
-   // make sure the demuxer knows about the new video stream header
-   // (even though new_sh_video() ought to take care of it)
-   demuxer->seekable = 1;
-   demuxer->video->sh = sh_video;
-
-   // make sure that the video demuxer stream header knows about its
-   // parent video demuxer stream (this is getting wacky), or else
-   // video_read_properties() will choke
-   sh_video->ds = demuxer->video;
-
-   // custom fourcc for internal MPlayer use
-//   sh_video->format = mmioFOURCC('R', 'A', 'D', 'V');
-   sh_video->format = mmioFOURCC('D', 'V', 'S', 'D');
-
-   sh_video->disp_w = dv_decoder->width;
-   sh_video->disp_h = dv_decoder->height;
-   mp_msg(MSGT_DEMUXER,MSGL_V,"demux_open_rawdv() frame_size: %d w: %d h: %d dif_seq: %d system: %d\n",dv_decoder->frame_size,dv_decoder->width, dv_decoder->height,dv_decoder->num_dif_seqs,dv_decoder->system);
-
-   sh_video->fps= (dv_decoder->system==e_dv_system_525_60?29.97:25);
-   sh_video->frametime = 1.0/sh_video->fps;
-
-  // emulate BITMAPINFOHEADER for win32 decoders:
-  sh_video->bih=calloc(1, sizeof(*sh_video->bih));
-  sh_video->bih->biSize=40;
-  sh_video->bih->biWidth = dv_decoder->width;
-  sh_video->bih->biHeight = dv_decoder->height;
-  sh_video->bih->biPlanes=1;
-  sh_video->bih->biBitCount=24;
-  sh_video->bih->biCompression=sh_video->format; // "DVSD"
-  sh_video->bih->biSizeImage=sh_video->bih->biWidth*sh_video->bih->biHeight*3;
-
-
-   frames->current_filepos=0;
-   frames->current_frame=0;
-   frames->frame_size=dv_decoder->frame_size;
-   frames->frame_number=demuxer->stream->end_pos/frames->frame_size;
-
-   mp_msg(MSGT_DEMUXER,MSGL_V,"demux_open_rawdv() seek to %llu, size: %d, dv_dec->frame_size: %d\n",frames->current_filepos,frames->frame_size, dv_decoder->frame_size);
-    if (dv_decoder->audio != NULL && demuxer->audio->id>=-1){
-       sh_audio_t *sh_audio =  new_sh_audio(demuxer, 0);
-       demuxer->audio->id = 0;
-	    demuxer->audio->sh = sh_audio;
-	    sh_audio->ds = demuxer->audio;
-       mp_msg(MSGT_DEMUXER,MSGL_V,"demux_open_rawdv() chan: %d samplerate: %d\n",dv_decoder->audio->num_channels,dv_decoder->audio->frequency );
-       // custom fourcc for internal MPlayer use
-       sh_audio->format = mmioFOURCC('R', 'A', 'D', 'V');
-
-	sh_audio->wf = calloc(1, sizeof(*sh_audio->wf));
-	sh_audio->wf->wFormatTag = sh_audio->format;
-	sh_audio->wf->nChannels = dv_decoder->audio->num_channels;
-	sh_audio->wf->wBitsPerSample = 16;
-	sh_audio->wf->nSamplesPerSec = dv_decoder->audio->frequency;
-	// info about the input stream:
-	sh_audio->wf->nAvgBytesPerSec = sh_video->fps*dv_decoder->frame_size;
-	sh_audio->wf->nBlockAlign = dv_decoder->frame_size;
-
-//       sh_audio->context=(void*)dv_decoder;
-    }
-   stream_reset(demuxer->stream);
-   stream_seek(demuxer->stream, 0);
-   dv_decoder_free(dv_decoder);  //we keep this in the context of both stream headers
-   demuxer->priv=frames;
-   return demuxer;
-}
-
-static void demux_close_rawdv(demuxer_t* demuxer)
-{
-   rawdv_frames_t *frames = (rawdv_frames_t *)demuxer->priv;
-
-   if(frames==0)
-      return;
-  free(frames);
-}
-
-static int demux_rawdv_control(demuxer_t *demuxer,int cmd, void *arg) {
-    rawdv_frames_t *frames = (rawdv_frames_t *)demuxer->priv;
-    sh_video_t *sh_video=demuxer->video->sh;
-
-    switch(cmd) {
-        case DEMUXER_CTRL_GET_TIME_LENGTH:
-            *((double *)arg)=(double)frames->frame_number / sh_video->fps;
-            return DEMUXER_CTRL_OK;
-
-        case DEMUXER_CTRL_GET_PERCENT_POS:
-            *((int *)arg)=(int)(frames->current_frame * 100. / frames->frame_number);
-            return DEMUXER_CTRL_OK;
-
-        default:
-            return DEMUXER_CTRL_NOTIMPL;
-    }
-}
-
-
-const demuxer_desc_t demuxer_desc_rawdv = {
-  "Raw DV demuxer",
-  "rawdv",
-  "RAWDV",
-  "Alexander Neundorf",
-  "",
-  DEMUXER_TYPE_RAWDV,
-  0, // unsafe autodetect
-  rawdv_check_file,
-  demux_rawdv_fill_buffer,
-  demux_open_rawdv,
-  demux_close_rawdv,
-  demux_seek_rawdv,
-  demux_rawdv_control
-};
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c
index 6f41d62fcc..64533e9307 100644
--- a/libmpdemux/demuxer.c
+++ b/libmpdemux/demuxer.c
@@ -60,7 +60,6 @@ extern const demuxer_desc_t demuxer_desc_avi;
 extern const demuxer_desc_t demuxer_desc_asf;
 extern const demuxer_desc_t demuxer_desc_matroska;
 extern const demuxer_desc_t demuxer_desc_gif;
-extern const demuxer_desc_t demuxer_desc_rawdv;
 extern const demuxer_desc_t demuxer_desc_lavf;
 extern const demuxer_desc_t demuxer_desc_lavf_preferred;
 extern const demuxer_desc_t demuxer_desc_mng;
@@ -86,9 +85,6 @@ const demuxer_desc_t *const demuxer_list[] = {
     &demuxer_desc_gif,
 #endif
     &demuxer_desc_lavf,
-#ifdef CONFIG_LIBDV095
-    &demuxer_desc_rawdv,
-#endif
 #ifdef CONFIG_MNG
     &demuxer_desc_mng,
 #endif
diff --git a/libmpdemux/demuxer.h b/libmpdemux/demuxer.h
index d72f1b2f41..63910240bc 100644
--- a/libmpdemux/demuxer.h
+++ b/libmpdemux/demuxer.h
@@ -53,7 +53,6 @@ enum demuxer_type {
     DEMUXER_TYPE_Y4M,
     DEMUXER_TYPE_MF,
     DEMUXER_TYPE_RAWAUDIO,
-    DEMUXER_TYPE_RAWDV,
     DEMUXER_TYPE_RAWVIDEO,
     DEMUXER_TYPE_GIF,
     DEMUXER_TYPE_MPEG_TS,