summaryrefslogtreecommitdiff
path: root/src/libw32dll/w32codec.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/libw32dll/w32codec.c')
-rw-r--r--src/libw32dll/w32codec.c132
1 files changed, 66 insertions, 66 deletions
diff --git a/src/libw32dll/w32codec.c b/src/libw32dll/w32codec.c
index 464d6c1c2..4dbb560a6 100644
--- a/src/libw32dll/w32codec.c
+++ b/src/libw32dll/w32codec.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: w32codec.c,v 1.128 2003/11/11 18:44:55 f1rmb Exp $
+ * $Id: w32codec.c,v 1.129 2003/11/15 13:01:19 miguelfreitas Exp $
*
* routines for using w32 codecs
* DirectShow support by Miguel Freitas (Nov/2001)
@@ -322,8 +322,8 @@ static char* get_vids_codec_name(w32v_decoder_t *this,
this->yuv_supported=1;
this->driver_type = DRIVER_DS;
this->guid=&msmpeg4_clsid;
- this->stream->meta_info[XINE_META_INFO_VIDEOCODEC]
- = strdup ("MS MPEG-4 V1/V2 (win32)");
+ xine_set_meta_info(this->stream, XINE_META_INFO_VIDEOCODEC,
+ "MS MPEG-4 V1/V2 (win32)");
return "mpg4ds32.ax";
case BUF_VIDEO_MSMPEG4_V3:
@@ -331,45 +331,45 @@ static char* get_vids_codec_name(w32v_decoder_t *this,
this->yuv_supported=1;
this->yuv_hack_needed=1;
this->flipped=1;
- this->stream->meta_info[XINE_META_INFO_VIDEOCODEC]
- = strdup ("MS MPEG-4 V3 (win32)");
+ xine_set_meta_info(this->stream, XINE_META_INFO_VIDEOCODEC,
+ "MS MPEG-4 V3 (win32)");
return "divxc32.dll";
case BUF_VIDEO_IV50:
/* Video in Indeo Video 5 format */
this->yuv_supported=1; /* YUV pic is upside-down :( */
this->flipped=0;
- this->stream->meta_info[XINE_META_INFO_VIDEOCODEC]
- = strdup ("Indeo Video 5 (win32)");
+ xine_set_meta_info(this->stream, XINE_META_INFO_VIDEOCODEC,
+ "Indeo Video 5 (win32)");
return "ir50_32.dll";
case BUF_VIDEO_IV41:
/* Video in Indeo Video 4.1 format */
this->flipped=1;
- this->stream->meta_info[XINE_META_INFO_VIDEOCODEC]
- = strdup ("Indeo Video 4.1 (win32)");
+ xine_set_meta_info(this->stream, XINE_META_INFO_VIDEOCODEC,
+ "Indeo Video 4.1 (win32)");
return "ir41_32.dll";
case BUF_VIDEO_IV32:
/* Video in Indeo Video 3.2 format */
this->flipped=1;
- this->stream->meta_info[XINE_META_INFO_VIDEOCODEC]
- = strdup ("Indeo Video 3.2 (win32)");
+ xine_set_meta_info(this->stream, XINE_META_INFO_VIDEOCODEC,
+ "Indeo Video 3.2 (win32)");
return "ir32_32.dll";
case BUF_VIDEO_IV31:
/* Video in Indeo Video 3.1 format */
this->flipped=1;
- this->stream->meta_info[XINE_META_INFO_VIDEOCODEC]
- = strdup ("Indeo Video 3.1 (win32)");
+ xine_set_meta_info(this->stream, XINE_META_INFO_VIDEOCODEC,
+ "Indeo Video 3.1 (win32)");
return "ir32_32.dll";
case BUF_VIDEO_CINEPAK:
/* Video in Cinepak format */
this->flipped=1;
this->yuv_supported=0;
- this->stream->meta_info[XINE_META_INFO_VIDEOCODEC]
- = strdup ("Cinepak (win32)");
+ xine_set_meta_info(this->stream, XINE_META_INFO_VIDEOCODEC,
+ "Cinepak (win32)");
return "iccvid.dll";
/*** Only 16bit .DLL available (can't load under linux) ***
@@ -381,16 +381,16 @@ static char* get_vids_codec_name(w32v_decoder_t *this,
case BUF_VIDEO_ATIVCR2:
/* Video in ATI VCR2 format */
this->yuv_supported=1;
- this->stream->meta_info[XINE_META_INFO_VIDEOCODEC]
- = strdup ("ATI VCR2 (win32)");
+ xine_set_meta_info(this->stream, XINE_META_INFO_VIDEOCODEC,
+ "ATI VCR2 (win32)");
return "ativcr2.dll";
case BUF_VIDEO_I263:
/* Video in I263 format */
this->flipped=1;
this->yuv_supported=1;
- this->stream->meta_info[XINE_META_INFO_VIDEOCODEC]
- = strdup ("I263 (win32)");
+ xine_set_meta_info(this->stream, XINE_META_INFO_VIDEOCODEC,
+ "I263 (win32)");
return "i263_32.drv";
case BUF_VIDEO_MSVC:
@@ -398,8 +398,8 @@ static char* get_vids_codec_name(w32v_decoder_t *this,
/* note: can't play streams with 8bpp */
this->flipped=1;
this->yuv_supported=0;
- this->stream->meta_info[XINE_META_INFO_VIDEOCODEC]
- = strdup ("MS Windows Video 1 (win32)");
+ xine_set_meta_info(this->stream, XINE_META_INFO_VIDEOCODEC,
+ "MS Windows Video 1 (win32)");
return "msvidc32.dll";
case BUF_VIDEO_DV:
@@ -407,67 +407,67 @@ static char* get_vids_codec_name(w32v_decoder_t *this,
this->yuv_supported=1;
this->driver_type = DRIVER_DS;
this->guid=&dvsd_clsid;
- this->stream->meta_info[XINE_META_INFO_VIDEOCODEC]
- = strdup ("Sony DV (win32)");
+ xine_set_meta_info(this->stream, XINE_META_INFO_VIDEOCODEC,
+ "Sony DV (win32)");
return "qdv.dll";
case BUF_VIDEO_WMV7:
this->yuv_supported=1;
this->driver_type = DRIVER_DS;
this->guid=&wmv1_clsid;
- this->stream->meta_info[XINE_META_INFO_VIDEOCODEC]
- = strdup ("MS WMV 7 (win32)");
+ xine_set_meta_info(this->stream, XINE_META_INFO_VIDEOCODEC,
+ "MS WMV 7 (win32)");
return "wmvds32.ax";
case BUF_VIDEO_WMV8:
this->yuv_supported=1;
this->driver_type = DRIVER_DS;
this->guid=&wmv2_clsid;
- this->stream->meta_info[XINE_META_INFO_VIDEOCODEC]
- = strdup ("MS WMV 8 (win32)");
+ xine_set_meta_info(this->stream, XINE_META_INFO_VIDEOCODEC,
+ "MS WMV 8 (win32)");
return "wmv8ds32.ax";
case BUF_VIDEO_WMV9:
this->yuv_supported=1;
this->driver_type = DRIVER_DMO;
this->guid=&wmv3_clsid;
- this->stream->meta_info[XINE_META_INFO_VIDEOCODEC]
- = strdup ("MS WMV 9 (win32)");
+ xine_set_meta_info(this->stream, XINE_META_INFO_VIDEOCODEC,
+ "MS WMV 9 (win32)");
return "wmv9dmod.dll";
case BUF_VIDEO_VP31:
this->yuv_supported=1;
this->ex_functions=1;
this->flipped=1;
- this->stream->meta_info[XINE_META_INFO_VIDEOCODEC]
- = strdup ("On2 VP3.1 (win32)");
+ xine_set_meta_info(this->stream, XINE_META_INFO_VIDEOCODEC,
+ "On2 VP3.1 (win32)");
return "vp31vfw.dll";
case BUF_VIDEO_VP4:
this->yuv_supported=1;
this->ex_functions=1;
- this->stream->meta_info[XINE_META_INFO_VIDEOCODEC]
- = strdup ("On2 VP4 (win32)");
+ xine_set_meta_info(this->stream, XINE_META_INFO_VIDEOCODEC,
+ "On2 VP4 (win32)");
return "vp4vfw.dll";
case BUF_VIDEO_MSS1:
this->driver_type = DRIVER_DS;
this->guid=&mss1_clsid;
- this->stream->meta_info[XINE_META_INFO_VIDEOCODEC]
- = strdup ("Windows Screen Video (win32)");
+ xine_set_meta_info(this->stream, XINE_META_INFO_VIDEOCODEC,
+ "Windows Screen Video (win32)");
return "msscds32.ax";
case BUF_VIDEO_TSCC:
this->flipped=1;
this->yuv_supported=0;
- this->stream->meta_info[XINE_META_INFO_VIDEOCODEC]
- = strdup ("TechSmith Screen Capture Codec (win32)");
+ xine_set_meta_info(this->stream, XINE_META_INFO_VIDEOCODEC,
+ "TechSmith Screen Capture Codec (win32)");
return "tsccvid.dll";
case BUF_VIDEO_UCOD:
this->yuv_supported=1;
- this->stream->meta_info[XINE_META_INFO_VIDEOCODEC]
- = strdup ("ClearVideo (win32)");
+ xine_set_meta_info(this->stream, XINE_META_INFO_VIDEOCODEC,
+ "ClearVideo (win32)");
return "clrviddd.dll";
}
@@ -719,9 +719,9 @@ static void w32v_decode_data (video_decoder_t *this_gen, buf_element_t *buf) {
this->ratio = (double)this->bih->biWidth/(double)this->bih->biHeight;
- this->stream->stream_info[XINE_STREAM_INFO_VIDEO_WIDTH] = this->bih->biWidth;
- this->stream->stream_info[XINE_STREAM_INFO_VIDEO_HEIGHT] = this->bih->biHeight;
- this->stream->stream_info[XINE_STREAM_INFO_FRAME_DURATION] = this->video_step;
+ xine_set_stream_info(this->stream, XINE_STREAM_INFO_VIDEO_WIDTH, this->bih->biWidth);
+ xine_set_stream_info(this->stream, XINE_STREAM_INFO_VIDEO_HEIGHT, this->bih->biHeight);
+ xine_set_stream_info(this->stream, XINE_STREAM_INFO_FRAME_DURATION, this->video_step);
#ifdef LOG
printf ("w32codec: video_step is %lld\n", this->video_step);
@@ -1011,60 +1011,60 @@ static char* get_auds_codec_name(w32a_decoder_t *this, int buf_type) {
switch (buf_type) {
case BUF_AUDIO_WMAV1:
- this->stream->meta_info[XINE_META_INFO_AUDIOCODEC]
- = strdup ("Windows Media Audio v1 (win32)");
+ xine_set_meta_info(this->stream, XINE_META_INFO_AUDIOCODEC,
+ "Windows Media Audio v1 (win32)");
return "divxa32.acm";
case BUF_AUDIO_WMAV2:
- this->stream->meta_info[XINE_META_INFO_AUDIOCODEC]
- = strdup ("Windows Media Audio v2 (win32)");
+ xine_set_meta_info(this->stream, XINE_META_INFO_AUDIOCODEC,
+ "Windows Media Audio v2 (win32)");
return "divxa32.acm";
case BUF_AUDIO_WMAV3:
this->driver_type = DRIVER_DMO;
this->guid=&wma3_clsid;
- this->stream->meta_info[XINE_META_INFO_AUDIOCODEC]
- = strdup ("Windows Media Audio v3 (win32)");
+ xine_set_meta_info(this->stream, XINE_META_INFO_AUDIOCODEC,
+ "Windows Media Audio v3 (win32)");
return "wma9dmod.dll";
case BUF_AUDIO_WMAV:
this->driver_type = DRIVER_DMO;
this->guid=&wmav_clsid;
- this->stream->meta_info[XINE_META_INFO_AUDIOCODEC]
- = strdup ("Windows Media Audio Voice (win32)");
+ xine_set_meta_info(this->stream, XINE_META_INFO_AUDIOCODEC,
+ "Windows Media Audio Voice (win32)");
return "wmspdmod.dll";
case BUF_AUDIO_MSADPCM:
- this->stream->meta_info[XINE_META_INFO_AUDIOCODEC]
- = strdup ("MS ADPCM (win32)");
+ xine_set_meta_info(this->stream, XINE_META_INFO_AUDIOCODEC,
+ "MS ADPCM (win32)");
return "msadp32.acm";
case BUF_AUDIO_MSIMAADPCM:
- this->stream->meta_info[XINE_META_INFO_AUDIOCODEC]
- = strdup ("MS IMA ADPCM (win32)");
+ xine_set_meta_info(this->stream, XINE_META_INFO_AUDIOCODEC,
+ "MS IMA ADPCM (win32)");
return "imaadp32.acm";
case BUF_AUDIO_MSGSM:
- this->stream->meta_info[XINE_META_INFO_AUDIOCODEC]
- = strdup ("MS GSM (win32)");
+ xine_set_meta_info(this->stream, XINE_META_INFO_AUDIOCODEC,
+ "MS GSM (win32)");
return "msgsm32.acm";
case BUF_AUDIO_IMC:
- this->stream->meta_info[XINE_META_INFO_AUDIOCODEC]
- = strdup ("Intel Music Coder (win32)");
+ xine_set_meta_info(this->stream, XINE_META_INFO_AUDIOCODEC,
+ "Intel Music Coder (win32)");
return "imc32.acm";
case BUF_AUDIO_LH:
- this->stream->meta_info[XINE_META_INFO_AUDIOCODEC]
- = strdup ("Lernout & Hauspie (win32)");
+ xine_set_meta_info(this->stream, XINE_META_INFO_AUDIOCODEC,
+ "Lernout & Hauspie (win32)");
return "lhacm.acm";
case BUF_AUDIO_VOXWARE:
this->driver_type = DRIVER_DS;
this->guid=&CLSID_Voxware;
- this->stream->meta_info[XINE_META_INFO_AUDIOCODEC]
- = strdup ("Voxware Metasound (win32)");
+ xine_set_meta_info(this->stream, XINE_META_INFO_AUDIOCODEC,
+ "Voxware Metasound (win32)");
return "voxmsdec.ax";
case BUF_AUDIO_ACELPNET:
this->driver_type = DRIVER_DS;
this->guid=&CLSID_Acelp;
- this->stream->meta_info[XINE_META_INFO_AUDIOCODEC]
- = strdup ("ACELP.net (win32)");
+ xine_set_meta_info(this->stream, XINE_META_INFO_AUDIOCODEC,
+ "ACELP.net (win32)");
return "acelpdec.ax";
case BUF_AUDIO_VIVOG723:
- this->stream->meta_info[XINE_META_INFO_AUDIOCODEC]
- = strdup ("Vivo G.723/Siren Audio Codec (win32)");
+ xine_set_meta_info(this->stream, XINE_META_INFO_AUDIOCODEC,
+ "Vivo G.723/Siren Audio Codec (win32)");
return "vivog723.acm";
}
printf ("w32codec: this didn't happen: unknown audio buf type %08x\n",
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-12 20:48:18 +0000