Mercurial > mplayer.hg

changeset 8325:5d5d1b3ec737

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
DMO Audio support (ugly, needs cleanup)
author arpi
date Sun, 01 Dec 2002 16:38:56 +0000
parents 02ec18dbbbbe
children 4849a0cfc2aa
files loader/dmo/DMO_AudioDecoder.c loader/dmo/DMO_AudioDecoder.h loader/dmo/Makefile
diffstat 3 files changed, 186 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/loader/dmo/DMO_AudioDecoder.c	Sun Dec 01 16:38:56 2002 +0000
@@ -0,0 +1,168 @@
+/********************************************************
+
+         DirectShow audio decoder
+	 Copyright 2001 Eugene Kuznetsov  (divx@euro.ru)
+
+*********************************************************/
+
+#ifndef NOAVIFILE_HEADERS
+#include "audiodecoder.h"
+#include "except.h"
+#else
+#include "libwin32.h"
+#endif
+
+#include "DMO_Filter.h"
+#include "DMO_AudioDecoder.h"
+
+struct _DMO_AudioDecoder
+{ 
+    DMO_MEDIA_TYPE m_sOurType, m_sDestType;
+    DMO_Filter* m_pDMO_Filter;
+    char* m_sVhdr;
+    char* m_sVhdr2;
+    int m_iFlushed;
+};
+
+#include "DMO_AudioDecoder.h"
+
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#define __MODULE__ "DirectShow audio decoder"
+
+typedef long STDCALL (*GETCLASS) (GUID*, GUID*, void**);
+
+DMO_AudioDecoder * DMO_AudioDecoder_Open(char* dllname, GUID* guid, WAVEFORMATEX* wf,int out_channels)
+//DMO_AudioDecoder * DMO_AudioDecoder_Create(const CodecInfo * info, const WAVEFORMATEX* wf)
+{
+    DMO_AudioDecoder *this;
+    int sz;
+    WAVEFORMATEX* pWF;
+
+    Setup_LDT_Keeper();
+    Setup_FS_Segment();
+        
+    this = malloc(sizeof(DMO_AudioDecoder));
+    
+    this->m_iFlushed=1;
+    
+    sz = 18 + wf->cbSize;
+    this->m_sVhdr = malloc(sz);
+    memcpy(this->m_sVhdr, wf, sz);
+    this->m_sVhdr2 = malloc(18);
+    memcpy(this->m_sVhdr2, this->m_sVhdr, 18);
+    
+    pWF = (WAVEFORMATEX*)this->m_sVhdr2;
+    pWF->wFormatTag = 1;
+    pWF->wBitsPerSample = 16;
+    pWF->nChannels = out_channels;
+    pWF->nBlockAlign = 2*pWF->nChannels; //pWF->nChannels * (pWF->wBitsPerSample + 7) / 8;
+    pWF->nAvgBytesPerSec = pWF->nBlockAlign * pWF->nSamplesPerSec;
+    pWF->cbSize = 0;
+    
+    memset(&this->m_sOurType, 0, sizeof(this->m_sOurType));
+    this->m_sOurType.majortype=MEDIATYPE_Audio;
+    this->m_sOurType.subtype=MEDIASUBTYPE_PCM;
+    this->m_sOurType.subtype.f1=wf->wFormatTag;
+    this->m_sOurType.formattype=FORMAT_WaveFormatEx;
+    this->m_sOurType.lSampleSize=wf->nBlockAlign;
+    this->m_sOurType.bFixedSizeSamples=1;
+    this->m_sOurType.bTemporalCompression=0;
+    this->m_sOurType.cbFormat=sz;
+    this->m_sOurType.pbFormat=this->m_sVhdr;
+
+    memset(&this->m_sDestType, 0, sizeof(this->m_sDestType));
+    this->m_sDestType.majortype=MEDIATYPE_Audio;
+    this->m_sDestType.subtype=MEDIASUBTYPE_PCM;
+    this->m_sDestType.formattype=FORMAT_WaveFormatEx;
+    this->m_sDestType.bFixedSizeSamples=1;
+    this->m_sDestType.bTemporalCompression=0;
+    this->m_sDestType.lSampleSize=pWF->nBlockAlign;
+    this->m_sDestType.cbFormat=18; //pWF->cbSize;
+    this->m_sDestType.pbFormat=this->m_sVhdr2;
+
+print_wave_header(this->m_sVhdr);
+print_wave_header(this->m_sVhdr2);
+
+        this->m_pDMO_Filter = DMO_FilterCreate(dllname, guid, &this->m_sOurType, &this->m_sDestType);
+	if( !this->m_pDMO_Filter ) {
+           free(this);
+           return NULL;
+        }
+        
+    return this;
+}
+
+void DMO_AudioDecoder_Destroy(DMO_AudioDecoder *this)
+{
+    free(this->m_sVhdr);
+    free(this->m_sVhdr2);
+    DMO_Filter_Destroy(this->m_pDMO_Filter);
+    free(this);
+}
+
+int DMO_AudioDecoder_Convert(DMO_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)
+{
+    DMO_OUTPUT_DATA_BUFFER db;
+    CMediaBuffer* bufferin;
+    unsigned int written = 0;
+    unsigned int read = 0;
+    int r = 0;
+
+    if (!in_data || !out_data)
+	return -1;
+
+    Setup_FS_Segment();
+    
+    //m_pDMO_Filter->m_pMedia->vt->Lock(m_pDMO_Filter->m_pMedia, 1);
+    bufferin = CMediaBufferCreate(in_size, (void*)in_data, in_size, 1);
+    r = this->m_pDMO_Filter->m_pMedia->vt->ProcessInput(this->m_pDMO_Filter->m_pMedia, 0,
+						  (IMediaBuffer*)bufferin,
+						  (this->m_iFlushed) ? DMO_INPUT_DATA_BUFFERF_SYNCPOINT : 0,
+						  0, 0);
+    if (r == 0){
+	((IMediaBuffer*)bufferin)->vt->GetBufferAndLength((IMediaBuffer*)bufferin, 0, &read);
+	this->m_iFlushed = 0;
+    }
+
+    ((IMediaBuffer*)bufferin)->vt->Release((IUnknown*)bufferin);
+
+    //printf("RESULTA: %d 0x%x %ld    %d   %d\n", r, r, read, m_iFlushed, out_size);
+    if (r == 0 || (unsigned)r == DMO_E_NOTACCEPTING){
+	unsigned long status = 0;
+	/* something for process */
+	db.rtTimestamp = 0;
+	db.rtTimelength = 0;
+	db.dwStatus = 0;
+	db.pBuffer = (IMediaBuffer*) CMediaBufferCreate(out_size, out_data, 0, 0);
+	//printf("OUTSIZE  %d\n", out_size);
+	r = this->m_pDMO_Filter->m_pMedia->vt->ProcessOutput(this->m_pDMO_Filter->m_pMedia,
+						       0, 1, &db, &status);
+
+	((IMediaBuffer*)db.pBuffer)->vt->GetBufferAndLength((IMediaBuffer*)db.pBuffer, 0, &written);
+	((IMediaBuffer*)db.pBuffer)->vt->Release((IUnknown*)db.pBuffer);
+ 
+	//printf("RESULTB: %d 0x%x %ld\n", r, r, written);
+	//printf("Converted  %d  -> %d\n", in_size, out_size);
+    }
+    else if (in_size > 0)
+	printf("ProcessInputError  r:0x%x=%d\n", r, r);
+
+    if (size_read)
+	*size_read = read;
+    if (size_written)
+	*size_written = written;
+    return r;
+}
+
+int DMO_AudioDecoder_GetSrcSize(DMO_AudioDecoder *this, int dest_size)
+{
+//    unsigned long inputs, outputs;
+//    Setup_FS_Segment();
+//    this->m_pDMO_Filter->m_pMedia->vt->GetOutputSizeInfo(this->m_pDMO_Filter->m_pMedia, 0, &inputs, &outputs);
+    return ((WAVEFORMATEX*)this->m_sVhdr)->nBlockAlign*4;
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/loader/dmo/DMO_AudioDecoder.h	Sun Dec 01 16:38:56 2002 +0000
@@ -0,0 +1,17 @@
+#ifndef AVIFILE_DMO_AUDIODECODER_H
+#define AVIFILE_DMO_AUDIODECODER_H
+
+typedef struct _DMO_AudioDecoder DMO_AudioDecoder;
+
+//DMO_AudioDecoder * DMO_AudioDecoder_Create(const CodecInfo * info, const WAVEFORMATEX* wf);
+DMO_AudioDecoder * DMO_AudioDecoder_Open(char* dllname, GUID* guid, WAVEFORMATEX* wf,int out_channels);
+
+void DMO_AudioDecoder_Destroy(DMO_AudioDecoder *this);
+
+int DMO_AudioDecoder_Convert(DMO_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 DMO_AudioDecoder_GetSrcSize(DMO_AudioDecoder *this, int dest_size);
+
+#endif // AVIFILE_DMO_AUDIODECODER_H
--- a/loader/dmo/Makefile	Sun Dec 01 02:42:06 2002 +0000
+++ b/loader/dmo/Makefile	Sun Dec 01 16:38:56 2002 +0000
@@ -4,7 +4,7 @@
 include ../../config.mak
 
 # DS_AudioDec.c 
-SRCS	= DMO_VideoDecoder.c  buffer.c  dmo.c  dmo_guids.c
+SRCS	= DMO_AudioDecoder.c DMO_VideoDecoder.c  buffer.c  dmo.c  dmo_guids.c
 OBJS = $(SRCS:.c=.o)
 
 INCLUDE = -I. -I../dshow -I.. $(EXTRA_INC)