[Mplayer-cvslog] CVS: main/loader/dshow DS_AudioDecoder.c,1.8,1.9 DS_AudioDecoder.h,1.5,1.6 DS_VideoDecoder.c,1.15,1.16 DS_VideoDecoder.h,1.4,1.5
Arpi of Ize
arpi at mplayer.dev.hu
Wed Jan 2 18:11:11 CET 2002
Update of /cvsroot/mplayer/main/loader/dshow
In directory mplayer:/var/tmp.root/cvs-serv18606
Modified Files:
DS_AudioDecoder.c DS_AudioDecoder.h DS_VideoDecoder.c
DS_VideoDecoder.h
Log Message:
headers cleanup
Index: DS_AudioDecoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/loader/dshow/DS_AudioDecoder.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- DS_AudioDecoder.c 31 Dec 2001 04:35:20 -0000 1.8
+++ DS_AudioDecoder.c 2 Jan 2002 17:11:09 -0000 1.9
@@ -5,7 +5,26 @@
*********************************************************/
+#ifndef NOAVIFILE_HEADERS
+#include "audiodecoder.h"
+#include "except.h"
+#else
+#include "libwin32.h"
+#endif
+
+#include "DS_Filter.h"
+
+struct _DS_AudioDecoder
+{
+ WAVEFORMATEX in_fmt;
+ AM_MEDIA_TYPE m_sOurType, m_sDestType;
+ DS_Filter* m_pDS_Filter;
+ char* m_sVhdr;
+ char* m_sVhdr2;
+};
+
#include "DS_AudioDecoder.h"
+
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
@@ -122,12 +141,12 @@
free(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)
{
- uint_t written = 0;
- uint_t read = 0;
+ unsigned int written = 0;
+ unsigned int read = 0;
if (!in_data || !out_data)
return -1;
@@ -137,7 +156,7 @@
in_size -= in_size%this->in_fmt.nBlockAlign;
while (in_size>0)
{
- uint_t frame_size = 0;
+ unsigned int frame_size = 0;
char* frame_pointer;
IMediaSample* sample=0;
char* ptr;
Index: DS_AudioDecoder.h
===================================================================
RCS file: /cvsroot/mplayer/main/loader/dshow/DS_AudioDecoder.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DS_AudioDecoder.h 10 Dec 2001 21:53:13 -0000 1.5
+++ DS_AudioDecoder.h 2 Jan 2002 17:11:09 -0000 1.6
@@ -1,37 +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
-{
- 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
+typedef struct _DS_AudioDecoder DS_AudioDecoder;
//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
Index: DS_VideoDecoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/loader/dshow/DS_VideoDecoder.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- DS_VideoDecoder.c 11 Dec 2001 23:29:11 -0000 1.15
+++ DS_VideoDecoder.c 2 Jan 2002 17:11:09 -0000 1.16
@@ -8,7 +8,31 @@
#include "guids.h"
#include "interfaces.h"
+#ifndef NOAVIFILE_HEADERS
+#include "videodecoder.h"
+#else
+#include "libwin32.h"
+#endif
+#include "DS_Filter.h"
+
+struct _DS_VideoDecoder
+{
+ IVideoDecoder iv;
+
+ DS_Filter* m_pDS_Filter;
+ AM_MEDIA_TYPE m_sOurType, m_sDestType;
+ VIDEOINFOHEADER* m_sVhdr;
+ VIDEOINFOHEADER* m_sVhdr2;
+ int m_Caps;//CAPS m_Caps; // capabilities of DirectShow decoder
+ int m_iLastQuality; // remember last quality as integer
+ int m_iMinBuffers;
+ int m_iMaxAuto;
+ int m_bIsDivX; // for speed
+ int m_bIsDivX4; // for speed
+};
+
#include "DS_VideoDecoder.h"
+
#include "../wine/winerror.h"
#ifndef NOAVIFILE_HEADERS
@@ -380,7 +404,7 @@
* bits == 0 - leave unchanged
*/
//int SetDestFmt(DS_VideoDecoder * this, int bits = 24, fourcc_t csp = 0);
-int DS_VideoDecoder_SetDestFmt(DS_VideoDecoder *this, int bits, fourcc_t csp)
+int DS_VideoDecoder_SetDestFmt(DS_VideoDecoder *this, int bits, unsigned int csp)
{
HRESULT result;
int should_test=1;
@@ -584,7 +608,7 @@
return 0;
}
-HRESULT DS_VideoDecoder_GetValue(DS_VideoDecoder *this, const char* name, int* value)
+int DS_VideoDecoder_GetValue(DS_VideoDecoder *this, const char* name, int* value)
{
/*
if (m_bIsDivX4)
@@ -693,7 +717,7 @@
return 0;
}
-HRESULT DS_VideoDecoder_SetValue(DS_VideoDecoder *this, const char* name, int value)
+int DS_VideoDecoder_SetValue(DS_VideoDecoder *this, const char* name, int value)
{
/*
if (m_bIsDivX4)
Index: DS_VideoDecoder.h
===================================================================
RCS file: /cvsroot/mplayer/main/loader/dshow/DS_VideoDecoder.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DS_VideoDecoder.h 10 Dec 2001 21:53:13 -0000 1.4
+++ DS_VideoDecoder.h 2 Jan 2002 17:11:09 -0000 1.5
@@ -1,30 +1,7 @@
#ifndef AVIFILE_DS_VIDEODECODER_H
#define AVIFILE_DS_VIDEODECODER_H
-#ifndef NOAVIFILE_HEADERS
-#include "videodecoder.h"
-#else
-#include "libwin32.h"
-#endif
-#include "DS_Filter.h"
-
-typedef struct _DS_VideoDecoder
-{
- IVideoDecoder iv;
-
- DS_Filter* m_pDS_Filter;
- AM_MEDIA_TYPE m_sOurType, m_sDestType;
- VIDEOINFOHEADER* m_sVhdr;
- VIDEOINFOHEADER* m_sVhdr2;
- int m_Caps;//CAPS m_Caps; // capabilities of DirectShow decoder
- int m_iLastQuality; // remember last quality as integer
- int m_iMinBuffers;
- int m_iMaxAuto;
- int m_bIsDivX; // for speed
- int m_bIsDivX4; // for speed
-}DS_VideoDecoder;
-
-
+typedef struct _DS_VideoDecoder DS_VideoDecoder;
int DS_VideoDecoder_GetCapabilities(DS_VideoDecoder *this);
@@ -42,14 +19,10 @@
* bits == 0 - leave unchanged
*/
//int SetDestFmt(DS_VideoDecoder * this, int bits = 24, fourcc_t csp = 0);
-int DS_VideoDecoder_SetDestFmt(DS_VideoDecoder *this, int bits, fourcc_t csp);
-
-
+int DS_VideoDecoder_SetDestFmt(DS_VideoDecoder *this, int bits, unsigned int csp);
int DS_VideoDecoder_SetDirection(DS_VideoDecoder *this, int d);
-
-HRESULT DS_VideoDecoder_GetValue(DS_VideoDecoder *this, const char* name, int* value);
-
-HRESULT DS_VideoDecoder_SetValue(DS_VideoDecoder *this, const char* name, int value);
+int DS_VideoDecoder_GetValue(DS_VideoDecoder *this, const char* name, int* value);
+int DS_VideoDecoder_SetValue(DS_VideoDecoder *this, const char* name, int value);
#endif /* AVIFILE_DS_VIDEODECODER_H */
More information about the MPlayer-cvslog
mailing list