From 8377788b342919ec0ff4c29f048b907abce994d4 Mon Sep 17 00:00:00 2001 From: Miguel Freitas Date: Sun, 6 Jan 2002 18:56:19 +0000 Subject: updating directshow support with avifile/mplayer changes CVS patchset: 1357 CVS date: 2002/01/06 18:56:19 --- src/libw32dll/DirectShow/DS_AudioDecoder.h | 31 ++++++------------------------ 1 file changed, 6 insertions(+), 25 deletions(-) (limited to 'src/libw32dll/DirectShow/DS_AudioDecoder.h') diff --git a/src/libw32dll/DirectShow/DS_AudioDecoder.h b/src/libw32dll/DirectShow/DS_AudioDecoder.h index b0d01c4c8..9628f65d2 100644 --- a/src/libw32dll/DirectShow/DS_AudioDecoder.h +++ b/src/libw32dll/DirectShow/DS_AudioDecoder.h @@ -1,36 +1,17 @@ #ifndef AVIFILE_DS_AUDIODECODER_H #define AVIFILE_DS_AUDIODECODER_H -#ifndef NOAVIFILE_HEADERS -#include "audiodecoder.h" -#include "except.h" -#else -#include "../libwin32.h" -#endif -#include "DS_Filter.h" +typedef struct _DS_AudioDecoder DS_AudioDecoder; -typedef struct _DS_AudioDecoder -{ - WAVEFORMATEX in_fmt; - AM_MEDIA_TYPE m_sOurType, m_sDestType; - DS_Filter* m_pDS_Filter; - char* m_sVhdr; - char* m_sVhdr2; -}DS_AudioDecoder; - -#ifndef uint_t -#define uint_t int -#endif - -DS_AudioDecoder * DS_AudioDecoder_Create(const CodecInfo * info, const WAVEFORMATEX* wf); +//DS_AudioDecoder * DS_AudioDecoder_Create(const CodecInfo * info, const WAVEFORMATEX* wf); +DS_AudioDecoder * DS_AudioDecoder_Open(char* dllname, GUID* guid, WAVEFORMATEX* wf); void DS_AudioDecoder_Destroy(DS_AudioDecoder *this); -int DS_AudioDecoder_Convert(DS_AudioDecoder *this, const void* in_data, uint_t in_size, - void* out_data, uint_t out_size, - uint_t* size_read, uint_t* size_written); +int DS_AudioDecoder_Convert(DS_AudioDecoder *this, const void* in_data, unsigned int in_size, + void* out_data, unsigned int out_size, + unsigned int* size_read, unsigned int* size_written); int DS_AudioDecoder_GetSrcSize(DS_AudioDecoder *this, int dest_size); - #endif // AVIFILE_DS_AUDIODECODER_H -- cgit v1.2.3