github
/
mpv
mirror of https://github.com/mpv-player/mpv
1
Fork 0
Code Releases Activity

avisynth demuxer patch by Gianluigi Tiesi <mplayer at netfarm.it> 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14694 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
faust3 2005-02-13 13:39:19 +00:00
parent e0484e940f
commit 9ba19353ed
6 changed files with 632 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libmpdemux/Makefile
View File

@ -21,6 +21,10 @@ SRCS += dvbin.c
SRCS += dvb_tune.c
endif
ifneq ($(W32_LIB),)
SRCS += demux_avs.c
endif
ifeq ($(MATROSKA),yes)
SRCS += demux_mkv.c ebml.c
endif

405
libmpdemux/demux_avs.c Normal file
View File

@ -0,0 +1,405 @@
/*
* Demuxer for avisynth
* Copyright (c) 2005 Gianluigi Tiesi <sherpya@netfarm.it>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library 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
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include "config.h"
#include "mp_msg.h"
#include "help_mp.h"
#include "stream.h"
#include "demuxer.h"
#include "stheader.h"
#include "wine/windef.h"
#ifdef WIN32_LOADER
#include "ldt_keeper.h"
#endif
#include "demux_avs.h"
#define MAX_AVS_SIZE 16 * 1024 /* 16k should be enough */
#undef ENABLE_AUDIO
HMODULE WINAPI LoadLibraryA(LPCSTR);
FARPROC WINAPI GetProcAddress(HMODULE,LPCSTR);
int WINAPI FreeLibrary(HMODULE);
typedef WINAPI AVS_ScriptEnvironment* (*imp_avs_create_script_environment)(int version);
typedef WINAPI AVS_Value (*imp_avs_invoke)(AVS_ScriptEnvironment *, const char * name, AVS_Value args, const char** arg_names);
typedef WINAPI const AVS_VideoInfo *(*imp_avs_get_video_info)(AVS_Clip *);
typedef WINAPI AVS_Clip* (*imp_avs_take_clip)(AVS_Value, AVS_ScriptEnvironment *);
typedef WINAPI AVS_VideoFrame* (*imp_avs_get_frame)(AVS_Clip *, int n);
typedef WINAPI void (*imp_avs_release_video_frame)(AVS_VideoFrame *);
#ifdef ENABLE_AUDIO
//typedef WINAPI int (*imp_avs_get_audio)(AVS_Clip *, void * buf, uint64_t start, uint64_t count);
typedef WINAPI int (*imp_avs_get_audio)(AVS_ScriptEnvironment *, void * buf, uint64_t start, uint64_t count);
#endif
#define Q(string) # string
#define IMPORT_FUNC(x) \
AVS->x = ( imp_##x ) GetProcAddress(AVS->dll, Q(x)); \
if (!AVS->x) { mp_msg(MSGT_DEMUX,MSGL_V,"AVS: failed to load "Q(x)"()\n"); return 0; }
typedef struct tagAVS
{
AVS_ScriptEnvironment *avs_env;
AVS_Value handler;
AVS_Clip *clip;
const AVS_VideoInfo *video_info;
HMODULE dll;
int frameno;
int init;
imp_avs_create_script_environment avs_create_script_environment;
imp_avs_invoke avs_invoke;
imp_avs_get_video_info avs_get_video_info;
imp_avs_take_clip avs_take_clip;
imp_avs_get_frame avs_get_frame;
imp_avs_release_video_frame avs_release_video_frame;
#ifdef ENABLE_AUDIO
imp_avs_get_audio avs_get_audio;
#endif
} AVS_T;
AVS_T *initAVS(const char *filename)
{
AVS_T *AVS = (AVS_T *) malloc (sizeof(AVS_T));
memset(AVS, 0, sizeof(AVS_T));
#ifdef WIN32_LOADER
Setup_LDT_Keeper();
#endif
AVS->dll = LoadLibraryA("avisynth.dll");
if(!AVS->dll)
{
mp_msg(MSGT_DEMUX ,MSGL_V, "AVS: failed to load avisynth.dll\n");
return NULL;
}
/* Dynamic import of needed stuff from avisynth.dll */
IMPORT_FUNC(avs_create_script_environment);
IMPORT_FUNC(avs_create_script_environment);
IMPORT_FUNC(avs_invoke);
IMPORT_FUNC(avs_get_video_info);
IMPORT_FUNC(avs_take_clip);
IMPORT_FUNC(avs_get_frame);
IMPORT_FUNC(avs_release_video_frame);
#ifdef ENABLE_AUDIO
IMPORT_FUNC(avs_get_audio);
#endif
AVS->avs_env = AVS->avs_create_script_environment(AVISYNTH_INTERFACE_VERSION);
if (!AVS->avs_env)
{
mp_msg(MSGT_DEMUX, MSGL_V, "AVS: avs_create_script_environment failed\n");
return NULL;
}
AVS_Value arg0 = avs_new_value_string(filename);
AVS_Value args = avs_new_value_array(&arg0, 1);
AVS->handler = AVS->avs_invoke(AVS->avs_env, "Import", args, 0);
if (avs_is_error(AVS->handler))
{
mp_msg(MSGT_DEMUX, MSGL_V, "AVS: Avisynth error: %s\n", avs_as_string(AVS->handler));
return NULL;
}
if (!avs_is_clip(AVS->handler))
{
mp_msg(MSGT_DEMUX, MSGL_V, "AVS: Avisynth doesn't return a clip\n");
return NULL;
}
return AVS;
}
/* Implement RGB MODES ?? */
#if 0
static __inline int get_mmioFOURCC(const AVS_VideoInfo *v)
{
if (avs_is_rgb(v)) return mmioFOURCC(8, 'R', 'G', 'B');
if (avs_is_rgb24(v)) return mmioFOURCC(24, 'R', 'G', 'B');
if (avs_is_rgb32(v)) return mmioFOURCC(32, 'R', 'G', 'B');
if (avs_is_yv12(v)) return mmioFOURCC('Y', 'V', '1', '2');
if (avs_is_yuy(v)) return mmioFOURCC('Y', 'U', 'Y', ' ');
if (avs_is_yuy2(v)) return mmioFOURCC('Y', 'U', 'Y', '2');
return 0;
}
#endif
int demux_avs_fill_buffer(demuxer_t *demuxer)
{
AVS_VideoFrame *curr_frame;
demux_packet_t *dp = NULL;
AVS_T *AVS = (AVS_T *) demuxer->priv;
demux_stream_t *d_video=demuxer->video;
sh_video_t *sh_video=d_video->sh;
#ifdef ENABLE_AUDIO
demux_stream_t *d_audio=demuxer->audio;
sh_audio_t *sh_audio=d_audio->sh;
#endif
if (AVS->video_info->num_frames < AVS->frameno) return 0; // EOF
curr_frame = AVS->avs_get_frame(AVS->clip, AVS->frameno);
if (!curr_frame)
{
mp_msg(MSGT_DEMUX, MSGL_V, "AVS: error getting frame -- EOF??\n");
return 0;
}
if (avs_has_video(AVS->video_info))
{
dp = new_demux_packet(curr_frame->vfb->data_size);
sh_video->num_frames_decoded++;
sh_video->num_frames++;
d_video->pts=AVS->frameno / sh_video->fps; // OSD
memcpy(dp->buffer, curr_frame->vfb->data + curr_frame->offset, curr_frame->vfb->data_size);
ds_add_packet(demuxer->video, dp);
}
#ifdef ENABLE_AUDIO
/* Audio */
if (avs_has_audio(AVS->video_info))
{
int l = sh_audio->wf->nAvgBytesPerSec;
dp = new_demux_packet(l);
if (AVS->avs_get_audio(AVS->avs_env, dp->buffer, AVS->frameno*sh_video->fps*l, l))
{
mp_msg(MSGT_DEMUX, MSGL_V, "AVS: avs_get_audio() failed\n");
return 0;
}
ds_add_packet(demuxer->audio, dp);
}
#endif
AVS->frameno++;
AVS->avs_release_video_frame(curr_frame);
return 1;
}
int demux_open_avs(demuxer_t* demuxer)
{
sh_video_t *sh_video = NULL;
#ifdef ENABLE_AUDIO
sh_audio_t *sh_audio = NULL;
#endif
int found = 0;
AVS_T *AVS = (AVS_T *) demuxer->priv;
AVS->frameno = 0;
mp_msg(MSGT_DEMUX, MSGL_V, "AVS: demux_open_avs()\n");
demuxer->seekable = 1;
AVS->clip = AVS->avs_take_clip(AVS->handler, AVS->avs_env);
if(!AVS->clip)
{
mp_msg(MSGT_DEMUX, MSGL_V, "AVS: avs_take_clip() failed\n");
return 0;
}
AVS->video_info = AVS->avs_get_video_info(AVS->clip);
if (!AVS->video_info)
{
mp_msg(MSGT_DEMUX, MSGL_V, "AVS: avs_get_video_info() call failed\n");
return 0;
}
if (!avs_is_yv12(AVS->video_info))
{
AVS->handler = AVS->avs_invoke(AVS->avs_env, "ConvertToYV12", avs_new_value_array(&AVS->handler, 1), 0);
if (avs_is_error(AVS->handler))
{
mp_msg(MSGT_DEMUX, MSGL_V, "AVS: Cannot convert input video to YV12: %s\n", avs_as_string(AVS->handler));
return 0;
}
AVS->clip = AVS->avs_take_clip(AVS->handler, AVS->avs_env);
if(!AVS->clip)
{
mp_msg(MSGT_DEMUX, MSGL_V, "AVS: avs_take_clip() failed\n");
return 0;
}
AVS->video_info = AVS->avs_get_video_info(AVS->clip);
if (!AVS->video_info)
{
mp_msg(MSGT_DEMUX, MSGL_V, "AVS: avs_get_video_info() call failed\n");
return 0;
}
}
// TODO check field-based ??
/* Video */
if (avs_has_video(AVS->video_info))
{
found = 1;
sh_video = new_sh_video(demuxer, 0);
demuxer->video->sh = sh_video;
sh_video->ds = demuxer->video;
sh_video->disp_w = AVS->video_info->width;
sh_video->disp_h = AVS->video_info->height;
//sh_video->format = get_mmioFOURCC(AVS->video_info);
sh_video->format = mmioFOURCC('Y', 'V', '1', '2');
sh_video->fps = (float) ((float) AVS->video_info->fps_numerator / (float) AVS->video_info->fps_denominator);
sh_video->frametime = 1.0 / sh_video->fps;
sh_video->bih = (BITMAPINFOHEADER*) malloc(sizeof(BITMAPINFOHEADER) + (256 * 4));
sh_video->bih->biCompression = sh_video->format;
sh_video->bih->biBitCount = avs_bits_per_pixel(AVS->video_info);
//sh_video->bih->biPlanes = 2;
sh_video->bih->biWidth = AVS->video_info->width;
sh_video->bih->biHeight = AVS->video_info->height;
sh_video->num_frames = 0;
sh_video->num_frames_decoded = 0;
}
#ifdef ENABLE_AUDIO
/* Audio */
if (avs_has_audio(AVS->video_info))
{
found = 1;
mp_msg(MSGT_DEMUX, MSGL_V, "AVS: Clip has audio -> Channels = %d - Freq = %d\n", AVS->video_info->nchannels, AVS->video_info->audio_samples_per_second);
sh_audio = new_sh_audio(demuxer, 0);
demuxer->audio->sh = sh_audio;
sh_audio->ds = demuxer->audio;
sh_audio->wf = (WAVEFORMATEX*) malloc(sizeof(WAVEFORMATEX));
sh_audio->wf->wFormatTag = sh_audio->format = 0x1;
sh_audio->wf->nChannels = sh_audio->channels = AVS->video_info->nchannels;
sh_audio->wf->nSamplesPerSec = sh_audio->samplerate = AVS->video_info->audio_samples_per_second;
sh_audio->wf->nAvgBytesPerSec = AVS->video_info->audio_samples_per_second * 4;
sh_audio->wf->nBlockAlign = 4;
sh_audio->wf->wBitsPerSample = sh_audio->samplesize = 16; // AVS->video_info->sample_type ??
sh_audio->wf->cbSize = 0;
sh_audio->i_bps = sh_audio->wf->nAvgBytesPerSec;
sh_audio->o_bps = sh_audio->wf->nAvgBytesPerSec;
}
#endif
AVS->init = 1;
return found;
}
int demux_avs_control(demuxer_t *demuxer, int cmd, void *arg)
{
demux_stream_t *d_video=demuxer->video;
sh_video_t *sh_video=d_video->sh;
AVS_T *AVS = (AVS_T *) demuxer->priv;
switch(cmd)
{
case DEMUXER_CTRL_GET_TIME_LENGTH:
{
if (!AVS->video_info->num_frames) return DEMUXER_CTRL_DONTKNOW;
*((unsigned long *)arg) = AVS->video_info->num_frames / sh_video->fps;
return DEMUXER_CTRL_OK;
}
case DEMUXER_CTRL_GET_PERCENT_POS:
{
if (!AVS->video_info->num_frames) return DEMUXER_CTRL_DONTKNOW;
*((int *)arg) = (int) (AVS->frameno * 100 / AVS->video_info->num_frames);
return DEMUXER_CTRL_OK;
}
default:
return DEMUXER_CTRL_NOTIMPL;
}
}
void demux_close_avs(demuxer_t* demuxer)
{
AVS_T *AVS = (AVS_T *) demuxer->priv;
// TODO release_clip?
if (AVS)
{
if (AVS->dll)
{
mp_msg(MSGT_DEMUX, MSGL_V, "AVS: Unloading avisynth.dll\n");
FreeLibrary(AVS->dll);
}
free(AVS);
}
}
void demux_seek_avs(demuxer_t *demuxer, float rel_seek_secs,int flags)
{
demux_stream_t *d_video=demuxer->video;
sh_video_t *sh_video=d_video->sh;
AVS_T *AVS = (AVS_T *) demuxer->priv;
int video_pos=AVS->frameno;
//mp_msg(MSGT_DEMUX, MSGL_V, "AVS: seek rel_seek_secs = %f - flags = %x\n", rel_seek_secs, flags);
// seek absolute
if (flags&1) video_pos=0;
video_pos += (rel_seek_secs * sh_video->fps);
if (video_pos < 0) video_pos = 0;
if (video_pos > AVS->video_info->num_frames) video_pos = AVS->video_info->num_frames;
AVS->frameno = video_pos;
sh_video->num_frames_decoded = video_pos;
sh_video->num_frames = video_pos;
d_video->pts=AVS->frameno / sh_video->fps; // OSD
}
int avs_check_file(demuxer_t *demuxer, const char *filename)
{
mp_msg(MSGT_DEMUX, MSGL_V, "AVS: avs_check_file - attempting to open file %s\n", filename);
if (!filename) return 0;
/* Avoid crazy memory eating when passing an mpg stream */
if (demuxer->movi_end > MAX_AVS_SIZE)
{
mp_msg(MSGT_DEMUX,MSGL_V, "AVS: File is too big, aborting...\n");
return 0;
}
demuxer->priv = initAVS(filename);
if (demuxer->priv)
{
mp_msg(MSGT_DEMUX,MSGL_V, "AVS: Init Ok\n");
return 1;
}
mp_msg(MSGT_DEMUX,MSGL_V, "AVS: Init failed\n");
return 0;
}

164
libmpdemux/demux_avs.h Normal file
View File

@ -0,0 +1,164 @@
/*
* Demuxer for avisynth
* Copyright (c) 2005 Gianluigi Tiesi <sherpya@netfarm.it>
*
* Avisynth C Interface Version 0.20
* Copyright 2003 Kevin Atkinson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library 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
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
enum { AVISYNTH_INTERFACE_VERSION = 2 };
enum
{
AVS_SAMPLE_INT8 = 1<<0,
AVS_SAMPLE_INT16 = 1<<1,
AVS_SAMPLE_INT24 = 1<<2,
AVS_SAMPLE_INT32 = 1<<3,
AVS_SAMPLE_FLOAT = 1<<4
};
enum
{
AVS_PLANAR_Y=1<<0,
AVS_PLANAR_U=1<<1,
AVS_PLANAR_V=1<<2,
AVS_PLANAR_ALIGNED=1<<3,
AVS_PLANAR_Y_ALIGNED=AVS_PLANAR_Y|AVS_PLANAR_ALIGNED,
AVS_PLANAR_U_ALIGNED=AVS_PLANAR_U|AVS_PLANAR_ALIGNED,
AVS_PLANAR_V_ALIGNED=AVS_PLANAR_V|AVS_PLANAR_ALIGNED
};
// Colorspace properties.
enum
{
AVS_CS_BGR = 1<<28,
AVS_CS_YUV = 1<<29,
AVS_CS_INTERLEAVED = 1<<30,
AVS_CS_PLANAR = 1<<31
};
// Specific colorformats
enum
{
AVS_CS_UNKNOWN = 0,
AVS_CS_BGR24 = 1<<0 | AVS_CS_BGR | AVS_CS_INTERLEAVED,
AVS_CS_BGR32 = 1<<1 | AVS_CS_BGR | AVS_CS_INTERLEAVED,
AVS_CS_YUY2 = 1<<2 | AVS_CS_YUV | AVS_CS_INTERLEAVED,
AVS_CS_YV12 = 1<<3 | AVS_CS_YUV | AVS_CS_PLANAR, // y-v-u, planar
AVS_CS_I420 = 1<<4 | AVS_CS_YUV | AVS_CS_PLANAR, // y-u-v, planar
AVS_CS_IYUV = 1<<4 | AVS_CS_YUV | AVS_CS_PLANAR // same as above
};
typedef struct AVS_Clip AVS_Clip;
typedef struct AVS_ScriptEnvironment AVS_ScriptEnvironment;
typedef struct AVS_Value AVS_Value;
struct AVS_Value {
short type; // 'a'rray, 'c'lip, 'b'ool, 'i'nt, 'f'loat, 's'tring, 'v'oid, or 'l'ong
// for some function e'rror
short array_size;
union {
void * clip; // do not use directly, use avs_take_clip
char boolean;
int integer;
float floating_pt;
const char * string;
const AVS_Value * array;
} d;
};
// AVS_VideoInfo is layed out identicly to VideoInfo
typedef struct AVS_VideoInfo {
int width, height; // width=0 means no video
unsigned fps_numerator, fps_denominator;
int num_frames;
int pixel_type;
int audio_samples_per_second; // 0 means no audio
int sample_type;
uint64_t num_audio_samples;
int nchannels;
// Imagetype properties
int image_type;
} AVS_VideoInfo;
typedef struct AVS_VideoFrameBuffer {
BYTE * data;
int data_size;
// sequence_number is incremented every time the buffer is changed, so
// that stale views can tell they're no longer valid.
long sequence_number;
long refcount;
} AVS_VideoFrameBuffer;
typedef struct AVS_VideoFrame {
int refcount;
AVS_VideoFrameBuffer * vfb;
int offset, pitch, row_size, height, offsetU, offsetV, pitchUV; // U&V offsets are from top of picture.
} AVS_VideoFrame;
static __inline AVS_Value avs_new_value_string(const char * v0)
{ AVS_Value v; v.type = 's'; v.d.string = v0; return v; }
static __inline AVS_Value avs_new_value_array(AVS_Value * v0, int size)
{ AVS_Value v; v.type = 'a'; v.d.array = v0; v.array_size = size; return v; }
static __inline int avs_is_error(AVS_Value v) { return v.type == 'e'; }
static __inline int avs_is_clip(AVS_Value v) { return v.type == 'c'; }
static __inline int avs_is_string(AVS_Value v) { return v.type == 's'; }
static __inline int avs_has_video(const AVS_VideoInfo * p) { return (p->width!=0); }
static __inline int avs_has_audio(const AVS_VideoInfo * p) { return (p->audio_samples_per_second!=0); }
static __inline const char * avs_as_string(AVS_Value v)
{ return avs_is_error(v) || avs_is_string(v) ? v.d.string : 0; }
/* Color spaces */
static __inline int avs_is_rgb(const AVS_VideoInfo * p)
{ return (p->pixel_type&AVS_CS_BGR); }
static __inline int avs_is_rgb24(const AVS_VideoInfo * p)
{ return (p->pixel_type&AVS_CS_BGR24)==AVS_CS_BGR24; } // Clear out additional properties
static __inline int avs_is_rgb32(const AVS_VideoInfo * p)
{ return (p->pixel_type & AVS_CS_BGR32) == AVS_CS_BGR32 ; }
static __inline int avs_is_yuy(const AVS_VideoInfo * p)
{ return (p->pixel_type&AVS_CS_YUV ); }
static __inline int avs_is_yuy2(const AVS_VideoInfo * p)
{ return (p->pixel_type & AVS_CS_YUY2) == AVS_CS_YUY2; }
static __inline int avs_is_yv12(const AVS_VideoInfo * p)
{ return ((p->pixel_type & AVS_CS_YV12) == AVS_CS_YV12)||((p->pixel_type & AVS_CS_I420) == AVS_CS_I420); }
static __inline int avs_bits_per_pixel(const AVS_VideoInfo * p)
{
switch (p->pixel_type) {
case AVS_CS_BGR24: return 24;
case AVS_CS_BGR32: return 32;
case AVS_CS_YUY2: return 16;
case AVS_CS_YV12:
case AVS_CS_I420: return 12;
default: return 0;
}
}

56
libmpdemux/demuxer.c
View File

@ -157,6 +157,9 @@ extern void demux_close_ra(demuxer_t* demuxer);
extern void demux_close_ty(demuxer_t* demuxer);
extern void demux_close_lavf(demuxer_t* demuxer);
extern void demux_close_vqf(demuxer_t* demuxer);
#ifdef USE_WIN32DLL
extern void demux_close_avs(demuxer_t* demuxer);
#endif
#ifdef USE_TV
@ -247,6 +250,10 @@ void free_demuxer(demuxer_t *demuxer){
#ifdef USE_LIBAVFORMAT
case DEMUXER_TYPE_LAVF:
demux_close_lavf(demuxer); break;
#endif
#ifdef USE_WIN32DLL
case DEMUXER_TYPE_AVS:
demux_close_avs(demuxer); break;
#endif
}
// free streams:
@ -339,6 +346,9 @@ extern int demux_smjpeg_fill_buffer(demuxer_t* demux);
extern int demux_lmlm4_fill_buffer(demuxer_t* demux);
extern int demux_mkv_fill_buffer(demuxer_t *d);
extern int demux_lavf_fill_buffer(demuxer_t *d);
#ifdef USE_WIN32DLL
extern int demux_avs_fill_buffer(demuxer_t *d);
#endif
int demux_fill_buffer(demuxer_t *demux,demux_stream_t *ds){
// Note: parameter 'ds' can be NULL!
@ -397,6 +407,9 @@ int demux_fill_buffer(demuxer_t *demux,demux_stream_t *ds){
case DEMUXER_TYPE_VQF: return demux_vqf_fill_buffer(demux);
#ifdef USE_LIBAVFORMAT
case DEMUXER_TYPE_LAVF: return demux_lavf_fill_buffer(demux);
#endif
#ifdef USE_WIN32DLL
case DEMUXER_TYPE_AVS: return demux_avs_fill_buffer(demux);
#endif
}
return 0;
@ -609,6 +622,10 @@ int demux_open_rawdv(demuxer_t* demuxer);
extern int rawdv_check_file(demuxer_t *demuxer);
#endif
#ifdef USE_WIN32DLL
int avs_check_file(demuxer_t *demuxer, const char *filename);
#endif
extern int vivo_check_file(demuxer_t *demuxer);
extern void demux_open_vivo(demuxer_t *demuxer);
extern int y4m_check_file(demuxer_t *demuxer);
@ -646,6 +663,9 @@ extern int demux_mkv_open(demuxer_t *demuxer);
#endif
extern int lavf_check_file(demuxer_t *demuxer);
extern int demux_open_lavf(demuxer_t* demuxer);
#ifdef USE_WIN32DLL
extern int demux_open_avs(demuxer_t* demuxer);
#endif
extern demuxer_t* init_avi_with_ogg(demuxer_t* demuxer);
#ifdef STREAMING_LIVE_DOT_COM
@ -836,7 +856,7 @@ if(file_format==DEMUXER_TYPE_UNKNOWN && filename && extension_parsing==1){
file_format=demuxer_type_by_filename(filename);
if(file_format!=DEMUXER_TYPE_UNKNOWN){
// we like recursion :)
demuxer=demux_open_stream(stream,file_format,audio_id,video_id,dvdsub_id,NULL);
demuxer=demux_open_stream(stream,file_format,audio_id,video_id,dvdsub_id,filename);
if(demuxer) return demuxer; // done!
file_format=DEMUXER_TYPE_UNKNOWN; // continue fuzzy guessing...
mp_msg(MSGT_DEMUXER,MSGL_V,"demuxer: continue fuzzy content-based format guessing...\n");
@ -934,6 +954,19 @@ if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_OGG){
}
}
#endif
#ifdef USE_WIN32DLL
//=============== Try to open as Avisynth file: =================
if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_AVS){
demuxer=new_demuxer(stream,DEMUXER_TYPE_AVS,audio_id,video_id,dvdsub_id);
if (avs_check_file(demuxer, filename)){
mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"AVS");
file_format=DEMUXER_TYPE_AVS;
} else {
free_demuxer(demuxer);
demuxer = NULL;
}
}
#endif
//=============== Try to open as PVA file: =================
if(file_format == DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_PVA){
demuxer=new_demuxer(stream,DEMUXER_TYPE_PVA,audio_id,video_id,dvdsub_id);
@ -1386,6 +1419,12 @@ switch(file_format){
break;
}
#endif
#ifdef USE_WIN32DLL
case DEMUXER_TYPE_AVS: {
if (!demux_open_avs(demuxer)) return NULL;
break;
}
#endif
} // switch(file_format)
pts_from_bps=0; // !!!
if ((sh_video=demuxer->video->sh) && sh_video->bih)
@ -1487,6 +1526,9 @@ int demux_seek_real(demuxer_t *demuxer,float rel_seek_secs,int flags);
int demux_seek_pva(demuxer_t *demuxer,float rel_seek_secs,int flags);
int demux_seek_ts(demuxer_t *demuxer,float rel_seek_secs,int flags);
int demux_seek_lavf(demuxer_t *demuxer,float rel_seek_secs,int flags);
#ifdef USE_WIN32DLL
int demux_seek_avs(demuxer_t *demuxer,float rel_seek_secs,int flags);
#endif
#ifdef HAVE_LIBDV095
int demux_seek_rawdv(demuxer_t *demuxer, float pts, int flags);
@ -1604,6 +1646,10 @@ switch(demuxer->file_format){
#endif
case DEMUXER_TYPE_VQF:
demux_seek_vqf(demuxer,rel_seek_secs,flags); break;
#ifdef USE_WIN32DLL
case DEMUXER_TYPE_AVS:
demux_seek_avs(demuxer,rel_seek_secs,flags); break;
#endif
} // switch(demuxer->file_format)
@ -1671,6 +1717,9 @@ extern int demux_ogg_control(demuxer_t *demuxer, int cmd, void *arg);
extern int demux_real_control(demuxer_t *demuxer, int cmd, void *arg);
extern int demux_lavf_control(demuxer_t *demuxer, int cmd, void *arg);
extern int demux_mov_control(demuxer_t *demuxer, int cmd, void *arg);
#ifdef USE_WIN32DLL
extern int demux_avs_control(demuxer_t *demuxer, int cmd, void *arg);
#endif
int demux_control(demuxer_t *demuxer, int cmd, void *arg) {
switch(demuxer->type) {
@ -1709,7 +1758,10 @@ int demux_control(demuxer_t *demuxer, int cmd, void *arg) {
#endif
case DEMUXER_TYPE_MOV:
return demux_mov_control(demuxer, cmd, arg);
#ifdef USE_WIN32DLL
case DEMUXER_TYPE_AVS:
return demux_avs_control(demuxer, cmd, arg);
#endif
default:
return DEMUXER_CTRL_NOTIMPL;
}

3
libmpdemux/demuxer.h
View File

@ -45,11 +45,12 @@
#define DEMUXER_TYPE_LAVF 35
#define DEMUXER_TYPE_NSV 36
#define DEMUXER_TYPE_VQF 37
#define DEMUXER_TYPE_AVS 38
// This should always match the higest demuxer type number.
// Unless you want to disallow users to force the demuxer to some types
#define DEMUXER_TYPE_MIN 0
#define DEMUXER_TYPE_MAX 37
#define DEMUXER_TYPE_MAX 38
#define DEMUXER_TYPE_DEMUXERS (1<<16)
// A virtual demuxer type for the network code

3
libmpdemux/extension.c
View File

@ -51,6 +51,9 @@ static struct {
{ "vqf", DEMUXER_TYPE_XMMS },
{ "nsv", DEMUXER_TYPE_NSV },
{ "nsa", DEMUXER_TYPE_NSV },
#ifdef USE_WIN32DLL
{ "avs", DEMUXER_TYPE_AVS },
#endif
{ "nut", DEMUXER_TYPE_LAVF }
};