[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[217] mplayerxp
Brought to you by:
olov
Menu
▾
▴
[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[217] mplayerxp
|
From: <nic...@us...> - 2012-10-26 10:24:16
|
Revision: 217
http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=217&view=rev
Author: nickols_k
Date: 2012-10-26 10:24:02 +0000 (Fri, 26 Oct 2012)
Log Message:
-----------
improve readability of sources
Modified Paths:
--------------
mplayerxp/dump.c
mplayerxp/libmpcodecs/ad_a52.c
mplayerxp/libmpcodecs/ad_acm.c
mplayerxp/libmpcodecs/ad_ffmp3.c
mplayerxp/libmpcodecs/ad_pcm.c
mplayerxp/libmpcodecs/ad_qtaudio.c
mplayerxp/libmpcodecs/ad_real.c
mplayerxp/libmpdemux/asf.h
mplayerxp/libmpdemux/aviheader.h
mplayerxp/libmpdemux/demux_aiff.c
mplayerxp/libmpdemux/demux_asf.c
mplayerxp/libmpdemux/demux_audio.c
mplayerxp/libmpdemux/demux_avi.c
mplayerxp/libmpdemux/demux_dv.c
mplayerxp/libmpdemux/demux_film.c
mplayerxp/libmpdemux/demux_lavf.c
mplayerxp/libmpdemux/demux_mkv.c
mplayerxp/libmpdemux/demux_mov.c
mplayerxp/libmpdemux/demux_mpg.c
mplayerxp/libmpdemux/demux_mpxp64.c
mplayerxp/libmpdemux/demux_nsv.c
mplayerxp/libmpdemux/demux_nuv.c
mplayerxp/libmpdemux/demux_ogg.c
mplayerxp/libmpdemux/demux_pva.c
mplayerxp/libmpdemux/demux_ra.c
mplayerxp/libmpdemux/demux_rawaudio.c
mplayerxp/libmpdemux/demux_rawvideo.c
mplayerxp/libmpdemux/demux_real.c
mplayerxp/libmpdemux/demux_roq.c
mplayerxp/libmpdemux/demux_smjpeg.c
mplayerxp/libmpdemux/demux_ts.c
mplayerxp/libmpdemux/demux_ty.c
mplayerxp/libmpdemux/demux_viv.c
mplayerxp/libmpdemux/demux_vqf.c
mplayerxp/libmpdemux/demux_y4m.c
mplayerxp/libmpdemux/demuxer.c
mplayerxp/libmpdemux/demuxer.h
mplayerxp/libmpdemux/mp3_hdr.c
mplayerxp/libmpdemux/mpeg_hdr.c
mplayerxp/libmpdemux/mpxpav64.h
mplayerxp/libmpdemux/mux_lavf.c
mplayerxp/libmpdemux/mux_mpxp64.c
mplayerxp/libmpdemux/muxer.h
mplayerxp/libmpdemux/parse_mp4.c
mplayerxp/libmpdemux/parse_mp4.h
mplayerxp/libmpdemux/pnm.c
mplayerxp/libmpdemux/s_dvdread.c
mplayerxp/libmpdemux/s_oss.c
mplayerxp/libmpdemux/s_tv.c
mplayerxp/libmpdemux/stheader.h
mplayerxp/libmpdemux/stream.h
mplayerxp/libmpdemux/sub_cc.c
mplayerxp/libmpdemux/sub_ty.c
mplayerxp/libmpdemux/test.c
mplayerxp/libmpdemux/tvi_bsdbt848.c
mplayerxp/libmpdemux/tvi_dummy.c
mplayerxp/libmpdemux/tvi_v4l.c
mplayerxp/libmpdemux/yuv4mpeg.h
mplayerxp/mplayer.c
mplayerxp/postproc/af_crystality.c
Modified: mplayerxp/dump.c
===================================================================
--- mplayerxp/dump.c 2012-10-26 10:04:44 UTC (rev 216)
+++ mplayerxp/dump.c 2012-10-26 10:24:02 UTC (rev 217)
@@ -164,7 +164,7 @@
{
sha->wf=malloc(sizeof(WAVEFORMATEX));
sha->wf->nBlockAlign = 1; //mux_a->h.dwSampleSize;
- sha->wf->wFormatTag = sha->format;
+ sha->wf->wFormatTag = sha->wtag;
sha->wf->nChannels = sha->channels;
sha->wf->nSamplesPerSec = sha->samplerate;
sha->wf->nAvgBytesPerSec=sha->i_bps; //mux_a->h.dwSampleSize*mux_a->wf->nSamplesPerSec;
Modified: mplayerxp/libmpcodecs/ad_a52.c
===================================================================
--- mplayerxp/libmpcodecs/ad_a52.c 2012-10-26 10:04:44 UTC (rev 216)
+++ mplayerxp/libmpcodecs/ad_a52.c 2012-10-26 10:24:02 UTC (rev 217)
@@ -59,11 +59,11 @@
if(c<0) { a52_priv->last_pts=*pts=apts; return -1; } /* EOF*/
sh_audio->a_in_buffer[sh_audio->a_in_buffer_len++]=c;
}
- if(sh_audio->format!=0x2000) swab(sh_audio->a_in_buffer,sh_audio->a_in_buffer,8);
+ if(sh_audio->wtag!=0x2000) swab(sh_audio->a_in_buffer,sh_audio->a_in_buffer,8);
length = a52_syncinfo (sh_audio->a_in_buffer, &flags, &sample_rate, &bit_rate);
if(length>=7 && length<=MAX_AC3_FRAME) break; /* we're done.*/
/* bad file => resync*/
- if(sh_audio->format!=0x2000) swab(sh_audio->a_in_buffer,sh_audio->a_in_buffer,8);
+ if(sh_audio->wtag!=0x2000) swab(sh_audio->a_in_buffer,sh_audio->a_in_buffer,8);
memmove(sh_audio->a_in_buffer,sh_audio->a_in_buffer+1,7);
--sh_audio->a_in_buffer_len;
apts=0;
@@ -72,7 +72,7 @@
sh_audio->samplerate=sample_rate;
sh_audio->i_bps=bit_rate/8;
demux_read_data_r(sh_audio->ds,sh_audio->a_in_buffer+8,length-8,apts?&null_pts:&apts);
- if(sh_audio->format!=0x2000) swab(sh_audio->a_in_buffer+8,sh_audio->a_in_buffer+8,length-8);
+ if(sh_audio->wtag!=0x2000) swab(sh_audio->a_in_buffer+8,sh_audio->a_in_buffer+8,length-8);
a52_priv->last_pts=*pts=apts;
if(crc16_block(sh_audio->a_in_buffer+2,length-2)!=0)
MSG_STATUS("a52: CRC check failed! \n");
Modified: mplayerxp/libmpcodecs/ad_acm.c
===================================================================
--- mplayerxp/libmpcodecs/ad_acm.c 2012-10-26 10:04:44 UTC (rev 216)
+++ mplayerxp/libmpcodecs/ad_acm.c 2012-10-26 10:24:02 UTC (rev 217)
@@ -52,7 +52,7 @@
{
in_fmt=sh_audio->wf=malloc(sizeof(WAVEFORMATEX));
memcpy(in_fmt,&priv->o_wf,sizeof(WAVEFORMATEX));
- in_fmt->wFormatTag=sh_audio->format;
+ in_fmt->wFormatTag=sh_audio->wtag;
}
if(mp_conf.verbose)
@@ -60,7 +60,7 @@
MSG_V("Output fmt:\n");
print_wave_header(&priv->o_wf,sizeof(WAVEFORMATEX));
}
- MSACM_RegisterDriver((const char *)sh_audio->codec->dll_name, sh_audio->format, 0);
+ MSACM_RegisterDriver((const char *)sh_audio->codec->dll_name, sh_audio->wtag, 0);
ret=acmStreamOpen(&priv->srcstream,(HACMDRIVER)NULL,in_fmt,&priv->o_wf,NULL,0,0,0);
if(ret){
if(ret==ACMERR_NOTPOSSIBLE)
Modified: mplayerxp/libmpcodecs/ad_ffmp3.c
===================================================================
--- mplayerxp/libmpcodecs/ad_ffmp3.c 2012-10-26 10:04:44 UTC (rev 216)
+++ mplayerxp/libmpcodecs/ad_ffmp3.c 2012-10-26 10:24:02 UTC (rev 217)
@@ -84,7 +84,7 @@
memcpy(lavc_context->extradata, (char *)sh_audio->codecdata,
lavc_context->extradata_size);
}
- lavc_context->codec_tag = sh_audio->format;
+ lavc_context->codec_tag = sh_audio->wtag;
lavc_context->codec_type = lavc_codec->type;
lavc_context->codec_id = lavc_codec->id;
/* open it */
@@ -160,7 +160,7 @@
int len2=maxlen;
int x=ds_get_packet_r(sh_audio->ds,&start,apts?&null_pts:&apts);
if(x<=0) break; // error
- if(sh_audio->format==mmioFOURCC('d','n','e','t')) swab(start,start,x&(~1));
+ if(sh_audio->wtag==mmioFOURCC('d','n','e','t')) swab(start,start,x&(~1));
av_init_packet(&pkt);
pkt.data = start;
pkt.size = x;
@@ -169,7 +169,7 @@
if(y<x)
{
sh_audio->ds->buffer_pos+=y-x; // put back data (HACK!)
- if(sh_audio->format==mmioFOURCC('d','n','e','t'))
+ if(sh_audio->wtag==mmioFOURCC('d','n','e','t'))
swab(start+y,start+y,(x-y)&~(1));
}
if(len2>0){
Modified: mplayerxp/libmpcodecs/ad_pcm.c
===================================================================
--- mplayerxp/libmpcodecs/ad_pcm.c 2012-10-26 10:04:44 UTC (rev 216)
+++ mplayerxp/libmpcodecs/ad_pcm.c 2012-10-26 10:24:02 UTC (rev 217)
@@ -25,7 +25,7 @@
sh_audio->channels=h->nChannels;
sh_audio->samplerate=h->nSamplesPerSec;
sh_audio->samplesize=(h->wBitsPerSample+7)/8;
- switch(sh_audio->format){ /* hardware formats: */
+ switch(sh_audio->wtag){ /* hardware formats: */
case 0x3: sh_audio->sample_format=AFMT_FLOAT32; break;
case 0x6: sh_audio->sample_format=AFMT_A_LAW;break;
case 0x7: sh_audio->sample_format=AFMT_MU_LAW;break;
Modified: mplayerxp/libmpcodecs/ad_qtaudio.c
===================================================================
--- mplayerxp/libmpcodecs/ad_qtaudio.c 2012-10-26 10:04:44 UTC (rev 216)
+++ mplayerxp/libmpcodecs/ad_qtaudio.c 2012-10-26 10:24:02 UTC (rev 217)
@@ -197,7 +197,7 @@
InputFormatInfo.sampleSize = sh->wf->wBitsPerSample;
OutputFormatInfo.sampleSize = 16;
OutputFormatInfo.sampleRate = InputFormatInfo.sampleRate = sh->wf->nSamplesPerSec;
- InputFormatInfo.format = bswap_32(sh->format); //1363430706;///*1768775988;//*/1902406962;//qdm2//1768775988;//FOUR_CHAR_CODE('ima4');
+ InputFormatInfo.format = bswap_32(sh->wtag); //1363430706;///*1768775988;//*/1902406962;//qdm2//1768775988;//FOUR_CHAR_CODE('ima4');
OutputFormatInfo.format = 1313820229;// FOUR_CHAR_CODE('NONE');
error = SoundConverterOpen(&InputFormatInfo, &OutputFormatInfo, &myConverter);
Modified: mplayerxp/libmpcodecs/ad_real.c
===================================================================
--- mplayerxp/libmpcodecs/ad_real.c 2012-10-26 10:04:44 UTC (rev 216)
+++ mplayerxp/libmpcodecs/ad_real.c 2012-10-26 10:24:02 UTC (rev 217)
@@ -221,12 +221,12 @@
UNUSED(maxlen);
if(sh->a_in_buffer_len<=0){
// fill the buffer!
- if (sh->format == mmioFOURCC('1','4','_','4')) {
+ if (sh->wtag == mmioFOURCC('1','4','_','4')) {
demux_read_data_r(sh->ds, sh->a_in_buffer, sh->wf->nBlockAlign,pts);
sh->a_in_buffer_size=
sh->a_in_buffer_len=sh->wf->nBlockAlign;
} else
- if (sh->format == mmioFOURCC('2','8','_','8')) {
+ if (sh->wtag == mmioFOURCC('2','8','_','8')) {
unsigned i,j;
for (j = 0; j < h; j++)
for (i = 0; i < h/2; i++)
Modified: mplayerxp/libmpdemux/asf.h
===================================================================
--- mplayerxp/libmpdemux/asf.h 2012-10-26 10:04:44 UTC (rev 216)
+++ mplayerxp/libmpdemux/asf.h 2012-10-26 10:24:02 UTC (rev 217)
@@ -137,7 +137,7 @@
/*
* Some macros to swap little endian structures read from an ASF file
- * into machine endian format
+ * into machine endian wtag
*/
#ifdef WORDS_BIGENDIAN
#define le2me_ASF_obj_header_t(h) { \
Modified: mplayerxp/libmpdemux/aviheader.h
===================================================================
--- mplayerxp/libmpdemux/aviheader.h 2012-10-26 10:04:44 UTC (rev 216)
+++ mplayerxp/libmpdemux/aviheader.h 2012-10-26 10:24:02 UTC (rev 217)
@@ -6,7 +6,7 @@
/*
* Some macros to swap little endian structures read from an AVI file
- * into machine endian format
+ * into machine endian wtag
*/
#ifdef WORDS_BIGENDIAN
#define le2me_MainAVIHeader(h) { \
Modified: mplayerxp/libmpdemux/demux_aiff.c
===================================================================
--- mplayerxp/libmpdemux/demux_aiff.c 2012-10-26 10:04:44 UTC (rev 216)
+++ mplayerxp/libmpdemux/demux_aiff.c 2012-10-26 10:24:02 UTC (rev 217)
@@ -54,7 +54,7 @@
priv=demuxer->priv=malloc(sizeof(priv_t));
memset(priv,0,sizeof(priv_t));
sh_audio->wf = w = (WAVEFORMATEX*)malloc(sizeof(WAVEFORMATEX));
- w->wFormatTag = 0x1; sh_audio->format = mmioFOURCC('r','a','w',' '); /* S16BE */
+ w->wFormatTag = 0x1; sh_audio->wtag = mmioFOURCC('r','a','w',' '); /* S16BE */
w->nChannels = sh_audio->channels =
w->nSamplesPerSec = sh_audio->samplerate =
w->nAvgBytesPerSec =
@@ -109,9 +109,9 @@
w->nBlockAlign = sh_audio->channels*sh_audio->samplesize;
if(priv->verc)
{
- sh_audio->format = *((uint32_t *)&buf[18]);
- if(sh_audio->format == mmioFOURCC('N','O','N','E')) sh_audio->format=mmioFOURCC('r','a','w',' ');
- MSG_V("AIFC: fourcc %08X ch %u frames %u bps %u rate %u\n",sh_audio->format,sh_audio->channels,frames,w->wBitsPerSample,sh_audio->samplerate);
+ sh_audio->wtag = *((uint32_t *)&buf[18]);
+ if(sh_audio->wtag == mmioFOURCC('N','O','N','E')) sh_audio->wtag=mmioFOURCC('r','a','w',' ');
+ MSG_V("AIFC: fourcc %08X ch %u frames %u bps %u rate %u\n",sh_audio->wtag,sh_audio->channels,frames,w->wBitsPerSample,sh_audio->samplerate);
}
else
MSG_V("AIFF: ch %u frames %u bps %u rate %u\n",sh_audio->channels,frames,w->wBitsPerSample,sh_audio->samplerate);
Modified: mplayerxp/libmpdemux/demux_asf.c
===================================================================
--- mplayerxp/libmpdemux/demux_asf.c 2012-10-26 10:04:44 UTC (rev 216)
+++ mplayerxp/libmpdemux/demux_asf.c 2012-10-26 10:24:02 UTC (rev 217)
@@ -383,14 +383,14 @@
} else {
sh_audio_t *sh_audio = demuxer->audio->sh;
sh_audio=d_audio->sh;sh_audio->ds=d_audio;
- sh_audio->format=sh_audio->wf->wFormatTag;
+ sh_audio->wtag=sh_audio->wf->wFormatTag;
}
}
}
return demuxer;
}
-// based on asf file-format doc by Eugene [http://divx.euro.ru]
+// based on asf file-wtag doc by Eugene [http://divx.euro.ru]
static void asf_descrambling(asf_priv_t *apriv, unsigned char *src,int len){
unsigned char *dst=malloc(len);
@@ -718,7 +718,7 @@
demuxer_driver_t demux_asf =
{
- "ASF - Advanced stream format v1 parser",
+ "ASF - Advanced stream wtag v1 parser",
".asf",
NULL,
asf_probe,
Modified: mplayerxp/libmpdemux/demux_audio.c
===================================================================
--- mplayerxp/libmpdemux/demux_audio.c 2012-10-26 10:04:44 UTC (rev 216)
+++ mplayerxp/libmpdemux/demux_audio.c 2012-10-26 10:24:02 UTC (rev 217)
@@ -988,14 +988,14 @@
break;
}
}
- /* Add here some other audio format detection */
+ /* Add here some other audio wtag detection */
if(step < HDR_SIZE) memmove(hdr,&hdr[step],HDR_SIZE-step);
pos -= step;
}
if(!frmt)
{
- MSG_ERR("Can't detect audio format\n");
+ MSG_ERR("Can't detect audio wtag\n");
return NULL;
}
sh_audio = new_sh_audio(demuxer,0);
@@ -1005,7 +1005,7 @@
{
uint8_t chunk[4];
uint32_t block_size;
- sh_audio->format = mmioFOURCC('f', 'L', 'a', 'C');
+ sh_audio->wtag = mmioFOURCC('f', 'L', 'a', 'C');
/* loop through the metadata blocks; use a do-while construct since there
* will always be 1 metadata block */
do {
@@ -1078,9 +1078,9 @@
if(id == 27) id=WAVE_FORMAT_ALAW;
else
if(id == 3) id=0x1;
- w->wFormatTag = sh_audio->format = id;
+ w->wFormatTag = sh_audio->wtag = id;
/* Trickly mplayerxp will threat 'raw ' as big-endian */
- if(id == 0x1) sh_audio->format=mmioFOURCC('r','a','w',' ');
+ if(id == 0x1) sh_audio->wtag=mmioFOURCC('r','a','w',' ');
w->nSamplesPerSec = sh_audio->samplerate = stream_read_dword(s);
w->nChannels = sh_audio->channels = stream_read_dword(s);
w->nAvgBytesPerSec = sh_audio->samplerate*sh_audio->samplesize*sh_audio->channels;
@@ -1095,25 +1095,25 @@
break;
case RAW_MP1:
case RAW_MP2:
- sh_audio->format = 0x50;
+ sh_audio->wtag = 0x50;
sh_audio->i_bps=mp3_brate;
sh_audio->samplerate=mp3_samplerate;
sh_audio->channels=mp3_channels;
if(!read_mp3v1_tags(demuxer,hdr,pos)) return 0; /* id3v1 may coexist with id3v2 */
break;
case RAW_MP3:
- sh_audio->format = 0x55;
+ sh_audio->wtag = 0x55;
sh_audio->i_bps=mp3_brate;
sh_audio->samplerate=mp3_samplerate;
sh_audio->channels=mp3_channels;
if(!read_mp3v1_tags(demuxer,hdr,pos)) return 0; /* id3v1 may coexist with id3v2 */
break;
case RAW_AC3:
- sh_audio->format = 0x2000;
+ sh_audio->wtag = 0x2000;
if(!read_ac3_tags(demuxer,hdr,pos,&sh_audio->i_bps,&sh_audio->samplerate,&sh_audio->channels)) return 0;
break;
case RAW_DCA:
- sh_audio->format = 0x2001;
+ sh_audio->wtag = 0x2001;
if(!read_ddca_tags(demuxer,hdr,pos,&sh_audio->i_bps,&sh_audio->samplerate,&sh_audio->channels)) return 0;
sh_audio->i_bps/=8;
break;
@@ -1122,13 +1122,13 @@
const unsigned freqs[4]={ 44100, 48000, 37800, 32000 };
uint32_t frames,ms,profile,encv,sver;
unsigned char bt;
- sh_audio->format = mmioFOURCC('M','P','C',' ');
+ sh_audio->wtag = mmioFOURCC('M','P','C',' ');
stream_seek(s,4);
frames = stream_read_dword(s);
stream_skip(s,2);
bt=stream_read_char(s);
sh_audio->wf = (WAVEFORMATEX *)malloc(sizeof(WAVEFORMATEX));
- sh_audio->wf->wFormatTag = sh_audio->format;
+ sh_audio->wf->wFormatTag = sh_audio->wtag;
sh_audio->wf->nChannels = 2;
sh_audio->wf->nSamplesPerSec = freqs[bt & 3];
sh_audio->wf->nBlockAlign = 32 * 36;
@@ -1163,7 +1163,7 @@
stream_read(s,chunk,4);
if(chunk[0]!=0x01) { MSG_V("VOC unknown block type %02X\n",chunk[0]); return NULL; }
size=chunk[1]|(chunk[2]<<8)|(chunk[3]<<16);
- sh_audio->format = 0x01; /* PCM */
+ sh_audio->wtag = 0x01; /* PCM */
stream_read(s,chunk,2);
if(chunk[1]!=0) { MSG_V("VOC unknown compression type %02X\n",chunk[1]); return NULL; }
demuxer->movi_start=stream_tell(s);
@@ -1172,7 +1172,7 @@
sh_audio->channels=1;
sh_audio->samplesize=1;
sh_audio->wf = w = (WAVEFORMATEX*)malloc(sizeof(WAVEFORMATEX));
- w->wFormatTag = sh_audio->format;
+ w->wFormatTag = sh_audio->wtag;
w->nChannels = sh_audio->channels;
w->nSamplesPerSec = sh_audio->samplerate;
w->nAvgBytesPerSec = sh_audio->samplerate*sh_audio->samplesize*sh_audio->channels;
@@ -1204,7 +1204,7 @@
free_sh_audio(sh_audio);
return NULL;
}
- w->wFormatTag = sh_audio->format = stream_read_word_le(s);
+ w->wFormatTag = sh_audio->wtag = stream_read_word_le(s);
w->nChannels = sh_audio->channels = stream_read_word_le(s);
w->nSamplesPerSec = sh_audio->samplerate = stream_read_dword_le(s);
w->nAvgBytesPerSec = stream_read_dword_le(s);
@@ -1286,9 +1286,9 @@
switch(raw_id)
{
case RAW_MP1:
- case RAW_MP2: sh_audio->format=w->wFormatTag=0x50; break;
- case RAW_MP3: sh_audio->format=w->wFormatTag=0x55; break;
- case RAW_FLAC:sh_audio->format = mmioFOURCC('f', 'L', 'a', 'C'); break;
+ case RAW_MP2: sh_audio->wtag=w->wFormatTag=0x50; break;
+ case RAW_MP3: sh_audio->wtag=w->wFormatTag=0x55; break;
+ case RAW_FLAC:sh_audio->wtag = mmioFOURCC('f', 'L', 'a', 'C'); break;
case RAW_SND_AU: {
unsigned hsize,dsize;
uint32_t id;
@@ -1300,18 +1300,18 @@
if(id == 27) id=WAVE_FORMAT_ALAW;
else
if(id == 3) id=0x1;
- w->wFormatTag = sh_audio->format = id;
+ w->wFormatTag = sh_audio->wtag = id;
/* Trickly mplayerxp will threat 'raw ' as big-endian */
- if(id == 0x1) sh_audio->format=mmioFOURCC('r','a','w',' ');
+ if(id == 0x1) sh_audio->wtag=mmioFOURCC('r','a','w',' ');
break;
}
- case RAW_AC3: sh_audio->format=w->wFormatTag=0x2000; break;
- case RAW_DCA: sh_audio->format=w->wFormatTag=0x2001;
+ case RAW_AC3: sh_audio->wtag=w->wFormatTag=0x2000; break;
+ case RAW_DCA: sh_audio->wtag=w->wFormatTag=0x2001;
if(brate) brate/=8;
break;
default:
case RAW_VOC: break;
- case RAW_MUSEPACK: sh_audio->format = mmioFOURCC('M','P','+',' '); break;
+ case RAW_MUSEPACK: sh_audio->wtag = mmioFOURCC('M','P','+',' '); break;
}
if(brate) sh_audio->i_bps=brate;
if(channels) w->nChannels = sh_audio->channels = channels;
@@ -1320,7 +1320,7 @@
}
stream_seek(s,data_off);
/* id3v1 tags may exist within WAV */
- if(sh_audio->format==0x50 || sh_audio->format==0x55)
+ if(sh_audio->wtag==0x50 || sh_audio->wtag==0x55)
{
stream_seek(s,data_off);
stream_read(s,hdr,4);
@@ -1409,7 +1409,7 @@
frmt=priv->frmt;
if(frmt==RAW_WAV)
{
- switch(sh_audio->format)
+ switch(sh_audio->wtag)
{
case 0x50:
case 0x55: frmt=RAW_MP3; break;
@@ -1561,7 +1561,7 @@
return 1;
}
default:
- MSG_ERR("Audio demuxer : unknown format %d\n",priv->frmt);
+ MSG_ERR("Audio demuxer : unknown wtag %d\n",priv->frmt);
}
return 0;
}
@@ -1709,7 +1709,7 @@
frmt=priv->frmt;
if(frmt==RAW_WAV)
{
- switch(sh_audio->format)
+ switch(sh_audio->wtag)
{
case 0x2000: frmt=RAW_AC3; break;
case 0x2001: frmt=RAW_DCA; break;
Modified: mplayerxp/libmpdemux/demux_avi.c
===================================================================
--- mplayerxp/libmpdemux/demux_avi.c 2012-10-26 10:04:44 UTC (rev 216)
+++ mplayerxp/libmpdemux/demux_avi.c 2012-10-26 10:24:02 UTC (rev 217)
@@ -199,7 +199,7 @@
// for example, "Seattle, aerial view; scenery."
case mmioFOURCC('I','K','E','Y'): hdr="Keywords";break;
// ILGT - Describes the changes in the lightness settings on the digitizer
- // required to produce the file. Note that the format of this information
+ // required to produce the file. Note that the wtag of this information
// depends on the hardware used.
case mmioFOURCC('I','L','G','T'): hdr="Lightness";break;
// IMED - Decribes the original subject of the file, such as
@@ -221,7 +221,7 @@
// file, such as "Microsoft WaveEdit"
case mmioFOURCC('I','S','F','T'): infot=INFOT_ENCODER; hdr="Software";break;
// ISHP - Identifies the change in sharpness for the digitizer
- // required to produce the file (the format depends on the hardware used).
+ // required to produce the file (the wtag depends on the hardware used).
case mmioFOURCC('I','S','H','P'): hdr="Sharpness";break;
// ISRC - Identifies the name of the person or organization who
// suplied the original subject of the file; for example, "Try Research."
@@ -779,7 +779,7 @@
priv->audio_block_size=sh->wf->nBlockAlign;
if(!priv->audio_block_size){
// for PCM audio we can calculate the blocksize:
- if(sh->format==1)
+ if(sh->wtag==1)
priv->audio_block_size=sh->wf->nChannels*(sh->wf->wBitsPerSample/8);
else
priv->audio_block_size=1; // hope the best...
@@ -1167,7 +1167,7 @@
priv->idx_pos_a=0;
priv->idx_pos_v=0;
if(priv->idx_size>1){
- // decide index format:
+ // decide index wtag:
#if 1
if((unsigned long)((AVIINDEXENTRY *)priv->idx)[0].dwChunkOffset<demuxer->movi_start ||
(unsigned long)((AVIINDEXENTRY *)priv->idx)[1].dwChunkOffset<demuxer->movi_start)
@@ -1243,7 +1243,7 @@
sh_audio=NULL;
} else {
sh_audio=d_audio->sh;sh_audio->ds=d_audio;
- sh_audio->format=sh_audio->wf->wFormatTag;
+ sh_audio->wtag=sh_audio->wf->wFormatTag;
}
}
// calc. FPS:
@@ -1310,9 +1310,9 @@
#ifdef HAVE_LIBVORBIS
if(demuxer->audio->id != -2 && sh_a) {
/* support for Ogg-in-AVI: */
- if(sh_a->format == mmioFOURCC('v','r','b','s'))
+ if(sh_a->wtag == mmioFOURCC('v','r','b','s'))
demuxer = init_avi_with_ogg(demuxer);
- else if(sh_a->format == 0x674F) {
+ else if(sh_a->wtag == 0x674F) {
stream_t* s;
demuxer_t *od;
s = new_ds_stream(demuxer->audio);
Modified: mplayerxp/libmpdemux/demux_dv.c
===================================================================
--- mplayerxp/libmpdemux/demux_dv.c 2012-10-26 10:04:44 UTC (rev 216)
+++ mplayerxp/libmpdemux/demux_dv.c 2012-10-26 10:24:02 UTC (rev 217)
@@ -174,7 +174,7 @@
sh_video->ds = demuxer->video;
// custom fourcc for internal MPlayer use
-// sh_video->format = mmioFOURCC('R', 'A', 'D', 'V');
+// sh_video->wtag = mmioFOURCC('R', 'A', 'D', 'V');
sh_video->fourcc = mmioFOURCC('D', 'V', 'S', 'D');
sh_video->src_w = dv_decoder->width;
@@ -207,11 +207,11 @@
sh_audio->ds = demuxer->audio;
MSG_V("demux_open_rawdv() chan: %d samplerate: %d\n",dv_decoder->audio->num_channels,dv_decoder->audio->frequency );
// custom fourcc for internal MPlayer use
- sh_audio->format = mmioFOURCC('R', 'A', 'D', 'V');
+ sh_audio->wtag = mmioFOURCC('R', 'A', 'D', 'V');
sh_audio->wf = malloc(sizeof(WAVEFORMATEX));
memset(sh_audio->wf, 0, sizeof(WAVEFORMATEX));
- sh_audio->wf->wFormatTag = sh_audio->format;
+ sh_audio->wf->wFormatTag = sh_audio->wtag;
sh_audio->wf->nChannels = dv_decoder->audio->num_channels;
sh_audio->wf->wBitsPerSample = 16;
sh_audio->wf->nSamplesPerSec = dv_decoder->audio->frequency;
Modified: mplayerxp/libmpdemux/demux_film.c
===================================================================
--- mplayerxp/libmpdemux/demux_film.c 2012-10-26 10:04:44 UTC (rev 216)
+++ mplayerxp/libmpdemux/demux_film.c 2012-10-26 10:24:02 UTC (rev 217)
@@ -6,7 +6,7 @@
Sega Saturn CD-ROM games. FILM files have also been found on 3DO
games.
- Details of the FILM file format can be found at:
+ Details of the FILM file wtag can be found at:
http://www.pcisys.net/~melanson/codecs/
TODO: demuxer->movi_length
@@ -300,9 +300,9 @@
sh_audio->wf = (WAVEFORMATEX *)malloc(sizeof(WAVEFORMATEX));
- // uncompressed PCM format
+ // uncompressed PCM wtag
sh_audio->wf->wFormatTag = 1;
- sh_audio->format = 1;
+ sh_audio->wtag = 1;
sh_audio->wf->nChannels = audio_channels;
sh_audio->wf->wBitsPerSample = stream_read_char(demuxer->stream);
stream_skip(demuxer->stream, 1); // skip unknown byte
@@ -331,9 +331,9 @@
sh_audio->wf = (WAVEFORMATEX *)malloc(sizeof(WAVEFORMATEX));
- // uncompressed PCM format
+ // uncompressed PCM wtag
sh_audio->wf->wFormatTag = 1;
- sh_audio->format = 1;
+ sh_audio->wtag = 1;
sh_audio->wf->nChannels = 1;
sh_audio->wf->wBitsPerSample = 8;
sh_audio->wf->nSamplesPerSec = 22050;
Modified: mplayerxp/libmpdemux/demux_lavf.c
===================================================================
--- mplayerxp/libmpdemux/demux_lavf.c 2012-10-26 10:04:44 UTC (rev 216)
+++ mplayerxp/libmpdemux/demux_lavf.c 2012-10-26 10:24:02 UTC (rev 217)
@@ -52,7 +52,7 @@
extern int ts_prog;
const config_t lavf_opts[] = {
- {"format", &(opt_format), CONF_TYPE_STRING, 0, 0, 0, NULL, "forces format of lavf demuxer"},
+ {"wtag", &(opt_format), CONF_TYPE_STRING, 0, 0, 0, NULL, "forces wtag of lavf demuxer"},
{"cryptokey", &(opt_cryptokey), CONF_TYPE_STRING, 0, 0, 0, NULL, "specifies cryptokey for lavf demuxer"},
{NULL, NULL, 0, 0, 0, 0, NULL, NULL}
};
@@ -194,7 +194,7 @@
}
priv->avif= av_find_input_format(opt_format);
if (!priv->avif) {
- MSG_FATAL("Unknown lavf format %s\n", opt_format);
+ MSG_FATAL("Unknown lavf wtag %s\n", opt_format);
return 0;
}
MSG_INFO("Forced lavf %s demuxer\n", priv->avif->long_name);
@@ -306,7 +306,7 @@
sh_audio->audio.dwRate /= g;
// printf("sca:%d rat:%d fs:%d sr:%d ba:%d\n", sh_audio->audio.dwScale, sh_audio->audio.dwRate, codec->frame_size, codec->sample_rate, codec->block_align);
sh_audio->ds= demuxer->audio;
- sh_audio->format= codec->codec_tag;
+ sh_audio->wtag= codec->codec_tag;
sh_audio->channels= codec->channels;
sh_audio->samplerate= codec->sample_rate;
sh_audio->i_bps= codec->bit_rate/8;
@@ -322,10 +322,10 @@
sh_audio->samplesize = 2;
break;
case CODEC_ID_PCM_ALAW:
- sh_audio->format = 0x6;
+ sh_audio->wtag = 0x6;
break;
case CODEC_ID_PCM_MULAW:
- sh_audio->format = 0x7;
+ sh_audio->wtag = 0x7;
break;
default:
break;
Modified: mplayerxp/libmpdemux/demux_mkv.c
===================================================================
--- mplayerxp/libmpdemux/demux_mkv.c 2012-10-26 10:04:44 UTC (rev 216)
+++ mplayerxp/libmpdemux/demux_mkv.c 2012-10-26 10:24:02 UTC (rev 217)
@@ -2370,7 +2370,7 @@
}
}
- sh_a->format = track->a_formattag;
+ sh_a->wtag = track->a_formattag;
sh_a->wf->wFormatTag = track->a_formattag;
sh_a->channels = track->a_channels;
sh_a->wf->nChannels = track->a_channels;
@@ -2402,7 +2402,7 @@
sh_a->wf->nAvgBytesPerSec = sh_a->channels * sh_a->samplerate*2;
sh_a->wf->nBlockAlign = sh_a->wf->nAvgBytesPerSec;
if (!strcmp(track->codec_id, MKV_A_PCM_BE))
- sh_a->format = mmioFOURCC('t', 'w', 'o', 's');
+ sh_a->wtag = mmioFOURCC('t', 'w', 'o', 's');
}
else if (!strcmp(track->codec_id, MKV_A_QDMC) ||
!strcmp(track->codec_id, MKV_A_QDMC2))
@@ -2557,7 +2557,7 @@
}
else
{
- sh_a->format = mmioFOURCC('f', 'L', 'a', 'C');
+ sh_a->wtag = mmioFOURCC('f', 'L', 'a', 'C');
ptr = (unsigned char *) track->private_data
+ sizeof (WAVEFORMATEX);
size = track->private_size - sizeof (WAVEFORMATEX);
Modified: mplayerxp/libmpdemux/demux_mov.c
===================================================================
--- mplayerxp/libmpdemux/demux_mov.c 2012-10-26 10:04:44 UTC (rev 216)
+++ mplayerxp/libmpdemux/demux_mov.c 2012-10-26 10:24:02 UTC (rev 217)
@@ -647,7 +647,7 @@
int version=0, adjust;
int is_vorbis = 0;
sh_audio_t* sh=new_sh_audio(demuxer,priv->track_db);
- sh->format=trak->fourcc;
+ sh->wtag=trak->fourcc;
/* crude audio delay from editlist0 hack ::atm */
if(trak->editlist_size>=1) {
@@ -657,7 +657,7 @@
}
}
- switch( sh->format ) {
+ switch( sh->wtag ) {
case 0x726D6173: /* samr */
/* amr narrowband */
trak->samplebytes=sh->samplesize=1;
@@ -777,8 +777,8 @@
if ((len >= 22) &&
(char2int(trak->stdata,52+16)==MOV_FOURCC('e','n','d','a')) &&
(char2short(trak->stdata,52+20))) {
- sh->format=char2int(trak->stdata,52+8);
- MSG_V( "MOV: Found little endian PCM data, reversed fourcc:%04x\n", sh->format);
+ sh->wtag=char2int(trak->stdata,52+8);
+ MSG_V( "MOV: Found little endian PCM data, reversed fourcc:%04x\n", sh->wtag);
}
break;
default:
@@ -817,7 +817,7 @@
if(!mp4_parse_esds(&trak->stdata[36+adjust], atom_len-8, &esds)) {
/* 0xdd is a "user private" id, not an official allocated id (see http://www.mp4ra.org/object.html),
so perform some extra checks to be sure that this is really vorbis audio */
- if(esds.objectTypeId==0xdd && esds.streamType==0x15 && sh->format==0x6134706D && esds.decoderConfigLen > 8)
+ if(esds.objectTypeId==0xdd && esds.streamType==0x15 && sh->wtag==0x6134706D && esds.decoderConfigLen > 8)
{
//vorbis audio
unsigned char *buf[3];
@@ -863,15 +863,15 @@
MSG_V( "demux_mov, vorbis extradata size: %d\n", offset);
is_vorbis = 1;
quit_vorbis_block:
- sh->format = mmioFOURCC('v', 'r', 'b', 's');
+ sh->wtag = mmioFOURCC('v', 'r', 'b', 's');
}
sh->i_bps = esds.avgBitrate/8;
if(esds.objectTypeId==MP4OTI_MPEG1Audio || esds.objectTypeId==MP4OTI_MPEG2AudioPart3)
- sh->format=0x55; // .mp3
+ sh->wtag=0x55; // .mp3
if(esds.objectTypeId==MP4OTI_13kVoice) { // 13K Voice, defined by 3GPP2
- sh->format=mmioFOURCC('Q', 'c', 'l', 'p');
+ sh->wtag=mmioFOURCC('Q', 'c', 'l', 'p');
trak->nchannels=sh->channels=1;
trak->samplebytes=sh->samplesize=1;
}
@@ -879,7 +879,7 @@
// dump away the codec specific configuration for the AAC decoder
if(esds.decoderConfigLen){
if( (esds.decoderConfig[0]>>3) == 29 )
- sh->format = 0x1d61346d; // request multi-channel mp3 decoder
+ sh->wtag = 0x1d61346d; // request multi-channel mp3 decoder
if(!is_vorbis)
{
sh->codecdata_len = esds.decoderConfigLen;
@@ -918,7 +918,7 @@
// Emulate WAVEFORMATEX struct:
sh->wf=malloc(sizeof(WAVEFORMATEX));
memset(sh->wf,0,sizeof(WAVEFORMATEX));
- sh->wf->wFormatTag=afourcc2wtag(sh->format);
+ sh->wf->wFormatTag=afourcc2wtag(sh->wtag);
sh->wf->nChannels=sh->channels;
sh->wf->wBitsPerSample=(trak->stdata[18]<<8)+trak->stdata[19];
// sh->wf->nSamplesPerSec=trak->timescale;
@@ -932,7 +932,7 @@
} else {
sh->wf->nAvgBytesPerSec=sh->wf->nChannels*sh->wf->wBitsPerSample*sh->wf->nSamplesPerSec/8;
// workaround for ms11 ima4
- if (sh->format == 0x1100736d && trak->stdata_len >= 36)
+ if (sh->wtag == 0x1100736d && trak->stdata_len >= 36)
sh->wf->nBlockAlign=char2int(trak->stdata,36);
}
Modified: mplayerxp/libmpdemux/demux_mpg.c
===================================================================
--- mplayerxp/libmpdemux/demux_mpg.c 2012-10-26 10:04:44 UTC (rev 216)
+++ mplayerxp/libmpdemux/demux_mpg.c 2012-10-26 10:24:02 UTC (rev 217)
@@ -151,10 +151,10 @@
new_sh_audio(demux,aid);
sh_a = (sh_audio_t*)demux->a_streams[aid];
switch(aid & 0xE0){ // 1110 0000 b (high 3 bit: type low 5: id)
- case 0x00: sh_a->format=AUDIO_MP2;break;
- case 0xA0: sh_a->format=AUDIO_LPCM_BE;break;
- case 0x80: if((aid & 0xF8) == 0x88) sh_a->format=AUDIO_DTS;
- else sh_a->format=AUDIO_A52;
+ case 0x00: sh_a->wtag=AUDIO_MP2;break;
+ case 0xA0: sh_a->wtag=AUDIO_LPCM_BE;break;
+ case 0x80: if((aid & 0xF8) == 0x88) sh_a->wtag=AUDIO_DTS;
+ else sh_a->wtag=AUDIO_A52;
break;
}
if (mpg_d) mpg_d->a_stream_ids[mpg_d->num_a_streams++] = aid;
@@ -354,7 +354,7 @@
if(priv && ds->sh) {
sh_audio_t *sh = (sh_audio_t *)ds->sh;
if(priv->es_map[id - 0x1B0]) {
- sh->format = priv->es_map[id - 0x1B0];
+ sh->wtag = priv->es_map[id - 0x1B0];
MSG_DBG2("ASSIGNED TO STREAM %d CODEC %x\n", id, priv->es_map[id - 0x1B0]);
}
}
@@ -750,7 +750,7 @@
MSG_ERR("MPEG: " MSGTR_MissingVideoStreamBug);
else
{
- MSG_V("Not MPEG System Stream format...\n");
+ MSG_V("Not MPEG System Stream wtag...\n");
return 0;
}
}
@@ -838,14 +838,14 @@
do {
i = (i+1) % mpg_d->num_a_streams;
sh_a = (sh_audio_t*)demuxer->a_streams[mpg_d->a_stream_ids[i]];
- } while (sh_a->format != sh_audio->format);
+ } while (sh_a->wtag != sh_audio->wtag);
}
else {
for (i = 0; i < mpg_d->num_a_streams; i++)
if (*((int*)arg) == mpg_d->a_stream_ids[i]) break;
if (i < mpg_d->num_a_streams)
sh_a = (sh_audio_t*)demuxer->a_streams[*((int*)arg)];
- if (sh_a->format != sh_audio->format)
+ if (sh_a->wtag != sh_audio->wtag)
i = mpg_d->num_a_streams;
}
if (i < mpg_d->num_a_streams && d_audio->id != mpg_d->a_stream_ids[i]) {
Modified: mplayerxp/libmpdemux/demux_mpxp64.c
===================================================================
--- mplayerxp/libmpdemux/demux_mpxp64.c 2012-10-26 10:04:44 UTC (rev 216)
+++ mplayerxp/libmpdemux/demux_mpxp64.c 2012-10-26 10:24:02 UTC (rev 217)
@@ -1,5 +1,5 @@
/*
- MPlayerXP's design. MPXPAV64 format.
+ MPlayerXP's design. MPXPAV64 wtag.
Implements of ASF v1, AVI stream parsers.
*/
@@ -298,7 +298,7 @@
if(demuxer->audio->id==-1) demuxer->audio->id=id; /* TODO: select best */
demuxer->audio->sh=sh;
sh->ds=demuxer->audio;
- sh->format=sh->wf->wFormatTag;
+ sh->wtag=sh->wf->wFormatTag;
break;
case mmioFOURCC('F','R','C','C'):
if(fsize!=4)
@@ -306,7 +306,7 @@
MSG_ERR("Broken chunk FRCC with size=%i found\n",fsize);
goto do_def;
}
- sh->format=stream_read_dword_le(s);
+ sh->wtag=stream_read_dword_le(s);
if(sh->wf) sh->wf->wFormatTag=0;
break;
do_def:
Modified: mplayerxp/libmpdemux/demux_nsv.c
===================================================================
--- mplayerxp/libmpdemux/demux_nsv.c 2012-10-26 10:04:44 UTC (rev 216)
+++ mplayerxp/libmpdemux/demux_nsv.c 2012-10-26 10:24:02 UTC (rev 217)
@@ -213,7 +213,7 @@
if((demuxer->audio->id != -2) && strncmp(hdr+8,"NONE", 4)){//&&strncmp(hdr+8,"VLB ", 4)){
sh_audio = new_sh_audio ( demuxer, 0 );
demuxer->audio->sh = sh_audio;
- sh_audio->format=mmioFOURCC(hdr[8],hdr[9],hdr[10],hdr[11]);
+ sh_audio->wtag=mmioFOURCC(hdr[8],hdr[9],hdr[10],hdr[11]);
sh_audio->ds = demuxer->audio;
priv->a_format=mmioFOURCC(hdr[8],hdr[9],hdr[10],hdr[11]);
}
Modified: mplayerxp/libmpdemux/demux_nuv.c
===================================================================
--- mplayerxp/libmpdemux/demux_nuv.c 2012-10-26 10:04:44 UTC (rev 216)
+++ mplayerxp/libmpdemux/demux_nuv.c 2012-10-26 10:24:02 UTC (rev 217)
@@ -261,13 +261,13 @@
sh_audio = new_sh_audio(demuxer, 0);
demuxer->audio->sh = sh_audio;
sh_audio->ds = demuxer->audio;
- sh_audio->format = 0x1;
+ sh_audio->wtag = 0x1;
sh_audio->channels = 2;
sh_audio->samplerate = 44100;
sh_audio->wf = malloc(sizeof(WAVEFORMATEX));
memset(sh_audio->wf, 0, sizeof(WAVEFORMATEX));
- sh_audio->wf->wFormatTag = sh_audio->format;
+ sh_audio->wf->wFormatTag = sh_audio->wtag;
sh_audio->wf->nChannels = sh_audio->channels;
sh_audio->wf->wBitsPerSample = 16;
sh_audio->wf->nSamplesPerSec = sh_audio->samplerate;
Modified: mplayerxp/libmpdemux/demux_ogg.c
===================================================================
--- mplayerxp/libmpdemux/demux_ogg.c 2012-10-26 10:04:44 UTC (rev 216)
+++ mplayerxp/libmpdemux/demux_ogg.c 2012-10-26 10:24:02 UTC (rev 217)
@@ -55,7 +55,7 @@
} theora_struct_t;
//// OggDS headers
-// Header for the new header format
+// Header for the new header wtag
typedef struct stream_header_video
{
ogg_int32_t width;
@@ -536,17 +536,17 @@
// We jump nothing for FLAC. Ain't this great? Packet contents have to be
// handled differently for each and every stream type. The joy! The joy!
if(!os->flac && ((*pack->packet & PACKET_TYPE_HEADER) &&
- (ds != d->audio || ( ((sh_audio_t*)ds->sh)->format != FOURCC_VORBIS || os->hdr_packets >= NUM_VORBIS_HDR_PACKETS ) ) &&
+ (ds != d->audio || ( ((sh_audio_t*)ds->sh)->wtag != FOURCC_VORBIS || os->hdr_packets >= NUM_VORBIS_HDR_PACKETS ) ) &&
(ds != d->video || (((sh_video_t*)ds->sh)->fourcc != FOURCC_THEORA))))
return 0;
// For vorbis packet the packet is the data, for other codec we must jump
// the header
- if(ds == d->audio && ((sh_audio_t*)ds->sh)->format == FOURCC_VORBIS) {
+ if(ds == d->audio && ((sh_audio_t*)ds->sh)->wtag == FOURCC_VORBIS) {
context = ((sh_audio_t *)ds->sh)->context;
samplesize = ((sh_audio_t *)ds->sh)->samplesize;
}
- if (ds == d->video && ((sh_audio_t*)ds->sh)->format == FOURCC_THEORA)
+ if (ds == d->video && ((sh_audio_t*)ds->sh)->wtag == FOURCC_THEORA)
context = ((sh_video_t *)ds->sh)->context;
data = demux_ogg_read_packet(os,pack,context,&pts,&flags,samplesize);
@@ -605,7 +605,7 @@
else {
sid = demuxer->audio->id;
/* demux_ogg_read_packet needs decoder context for Vorbis streams */
- if(((sh_audio_t*)demuxer->audio->sh)->format == FOURCC_VORBIS) {
+ if(((sh_audio_t*)demuxer->audio->sh)->wtag == FOURCC_VORBIS) {
context = ((sh_audio_t*)demuxer->audio->sh)->context;
samplesize = ((sh_audio_t*)demuxer->audio->sh)->samplesize;
}
@@ -807,7 +807,7 @@
// Check for Vorbis
if(pack.bytes >= 7 && ! strncmp(&pack.packet[1],"vorbis", 6) ) {
sh_a = new_sh_audio(demuxer,ogg_d->num_sub);
- sh_a->format = FOURCC_VORBIS;
+ sh_a->wtag = FOURCC_VORBIS;
ogg_d->subs[ogg_d->num_sub].vorbis = 1;
ogg_d->subs[ogg_d->num_sub].id = n_audio;
n_audio++;
@@ -862,7 +862,7 @@
#endif
else if (pack.bytes >= 4 && !strncmp (&pack.packet[0], "fLaC", 4)) {
sh_a = new_sh_audio(demuxer,ogg_d->num_sub);
- sh_a->format = mmioFOURCC('f', 'L', 'a', 'C');
+ sh_a->wtag = mmioFOURCC('f', 'L', 'a', 'C');
ogg_d->subs[ogg_d->num_sub].id = n_audio;
n_audio++;
ogg_d->subs[ogg_d->num_sub].flac = 1;
@@ -899,7 +899,7 @@
sh_a = new_sh_audio(demuxer,ogg_d->num_sub);
extra_size = get_uint16(pack.packet+140);
sh_a->wf = (WAVEFORMATEX*)calloc(1,sizeof(WAVEFORMATEX)+extra_size);
- sh_a->format = sh_a->wf->wFormatTag = get_uint16(pack.packet+124);
+ sh_a->wtag = sh_a->wf->wFormatTag = get_uint16(pack.packet+124);
sh_a->channels = sh_a->wf->nChannels = get_uint16(pack.packet+126);
sh_a->samplerate = sh_a->wf->nSamplesPerSec = get_uint32(pack.packet+128);
sh_a->wf->nAvgBytesPerSec = get_uint32(pack.packet+132);
@@ -951,7 +951,7 @@
buffer[4] = '\0';
sh_a = new_sh_audio(demuxer,ogg_d->num_sub);
sh_a->wf = (WAVEFORMATEX*)calloc(1,sizeof(WAVEFORMATEX)+extra_size);
- sh_a->format = sh_a->wf->wFormatTag = strtol(buffer, NULL, 16);
+ sh_a->wtag = sh_a->wf->wFormatTag = strtol(buffer, NULL, 16);
sh_a->channels = sh_a->wf->nChannels = get_uint16(&st->sh.audio.channels);
sh_a->samplerate = sh_a->wf->nSamplesPerSec = get_uint64(&st->samples_per_unit);
sh_a->wf->nAvgBytesPerSec = get_uint32(&st->sh.audio.avgbytespersec);
@@ -1237,7 +1237,7 @@
od->video->id = -2;
od->audio->sh = sh_audio;
sh_audio->ds = od->audio;
- sh_audio->format = FOURCC_VORBIS;
+ sh_audio->wtag = FOURCC_VORBIS;
/// Return the joined demuxers
return new_demuxers_demuxer(demuxer,od,demuxer);
@@ -1278,7 +1278,7 @@
} else {
ds = demuxer->audio;
/* demux_ogg_read_packet needs decoder context for Vorbis streams */
- if(((sh_audio_t*)demuxer->audio->sh)->format == FOURCC_VORBIS)
+ if(((sh_audio_t*)demuxer->audio->sh)->wtag == FOURCC_VORBIS)
context = ((sh_audio_t*)demuxer->audio->sh)->context;
vi = &((ov_struct_t*)((sh_audio_t*)ds->sh)->context)->vi;
rate = (float)vi->rate;
Modified: mplayerxp/libmpdemux/demux_pva.c
===================================================================
--- mplayerxp/libmpdemux/demux_pva.c 2012-10-26 10:04:44 UTC (rev 216)
+++ mplayerxp/libmpdemux/demux_pva.c 2012-10-26 10:24:02 UTC (rev 217)
@@ -160,7 +160,7 @@
/*
* Audio and Video codecs:
* the PVA spec only allows MPEG2 video and MPEG layer II audio. No need to check the formats then.
- * Moreover, there would be no way to do that since the PVA stream format has no fields to describe
+ * Moreover, there would be no way to do that since the PVA stream wtag has no fields to describe
* the used codecs.
*/
@@ -173,7 +173,7 @@
*/
demuxer->audio->sh=sh_audio;
- sh_audio->format=0x50;
+ sh_audio->wtag=0x50;
sh_audio->ds=demuxer->audio;
demuxer->movi_start=0;
Modified: mplayerxp/libmpdemux/demux_ra.c
===================================================================
--- mplayerxp/libmpdemux/demux_ra.c 2012-10-26 10:04:44 UTC (rev 216)
+++ mplayerxp/libmpdemux/demux_ra.c 2012-10-26 10:24:02 UTC (rev 217)
@@ -151,7 +151,7 @@
stream_skip(demuxer->stream, i - 4);
}
i = stream_read_char(demuxer->stream);
- sh->format = stream_read_dword_le(demuxer->stream);
+ sh->wtag = stream_read_dword_le(demuxer->stream);
if (i != 4) {
MSG_WARN("[RealAudio] FourCC size is not 4 (%d), please report to "
"MPlayer developers\n", i);
@@ -193,7 +193,7 @@
if(ra_priv->hdr_size + 8 > stream_tell(demuxer->stream)) {
stream_skip(demuxer->stream, 1);
i = stream_read_char(demuxer->stream);
- sh->format = stream_read_dword_le(demuxer->stream);
+ sh->wtag = stream_read_dword_le(demuxer->stream);
if (i != 4) {
MSG_WARN("[RealAudio] FourCC size is not 4 (%d), please report to "
"MPlayer developers\n", i);
@@ -201,25 +201,25 @@
}
// stream_skip(demuxer->stream, 3);
- if (sh->format != FOURCC_LPCJ) {
+ if (sh->wtag != FOURCC_LPCJ) {
MSG_WARN("[RealAudio] Version 3 with FourCC %8x, please report to "
- "MPlayer developers\n", sh->format);
+ "MPlayer developers\n", sh->wtag);
}
sh->channels = 1;
sh->samplesize = 16;
sh->samplerate = 8000;
ra_priv->frame_size = 240;
- sh->format = FOURCC_144;
+ sh->wtag = FOURCC_144;
} else {
// If a stream does not have fourcc, let's assume it's 14.4
- sh->format = FOURCC_LPCJ;
+ sh->wtag = FOURCC_LPCJ;
sh->channels = 1;
sh->samplesize = 16;
sh->samplerate = 8000;
ra_priv->frame_size = 240;
- sh->format = FOURCC_144;
+ sh->wtag = FOURCC_144;
}
}
@@ -232,9 +232,9 @@
sh->wf->nAvgBytesPerSec = sh->samplerate*sh->samplesize/8;
sh->wf->nBlockAlign = ra_priv->frame_size;
sh->wf->cbSize = 0;
- sh->wf->wFormatTag = sh->format;
+ sh->wf->wFormatTag = sh->wtag;
- switch (sh->format) {
+ switch (sh->wtag) {
case FOURCC_144:
MSG_V("Audio: 14_4\n");
sh->wf->cbSize = 10/*+codecdata_length*/;
@@ -258,7 +258,7 @@
case FOURCC_DNET: /* direct support */
break;
default:
- MSG_V("Audio: Unknown (%d)\n", sh->format);
+ MSG_V("Audio: Unknown (%d)\n", sh->wtag);
}
print_wave_header(sh->wf,sizeof(WAVEFORMATEX));
Modified: mplayerxp/libmpdemux/demux_rawaudio.c
===================================================================
--- mplayerxp/libmpdemux/demux_rawaudio.c 2012-10-26 10:04:44 UTC (rev 216)
+++ mplayerxp/libmpdemux/demux_rawaudio.c 2012-10-26 10:24:02 UTC (rev 217)
@@ -14,14 +14,14 @@
static int channels = 2;
static int samplerate = 44100;
static int samplesize = 2;
-static int format = 0x1; // Raw PCM
+static int wtag = 0x1; // Raw PCM
static const config_t demux_rawaudio_opts[] = {
{ "on", &use_rawaudio, CONF_TYPE_FLAG, 0,0, 1, NULL, "forces treating stream as raw-audio" },
{ "channels", &channels, CONF_TYPE_INT,CONF_RANGE,1,8, NULL, "specifies number of channels in raw-audio steram" },
{ "rate", &samplerate, CONF_TYPE_INT,CONF_RANGE,1000,8*48000, NULL, "specifies sample-rate of raw-audio steram" },
{ "samplesize", &samplesize, CONF_TYPE_INT,CONF_RANGE,1,8, NULL, "specifies sample-size of raw-audio steram" },
- { "format", &format, CONF_TYPE_INT, CONF_MIN, 0 , 0, NULL, "specifies compression-format of raw-audio stream" },
+ { "wtag", &wtag, CONF_TYPE_INT, CONF_MIN, 0 , 0, NULL, "specifies compression-wtag of raw-audio stream" },
{NULL, NULL, 0, 0, 0, 0, NULL, NULL}
};
@@ -47,10 +47,10 @@
demuxer->stream->driver->control(demuxer->stream,SCTRL_AUD_GET_CHANNELS,&channels);
demuxer->stream->driver->control(demuxer->stream,SCTRL_AUD_GET_SAMPLERATE,&samplerate);
demuxer->stream->driver->control(demuxer->stream,SCTRL_AUD_GET_SAMPLESIZE,&samplesize);
- demuxer->stream->driver->control(demuxer->stream,SCTRL_AUD_GET_FORMAT,&format);
+ demuxer->stream->driver->control(demuxer->stream,SCTRL_AUD_GET_FORMAT,&wtag);
sh_audio = new_sh_audio(demuxer,0);
sh_audio->wf = w = (WAVEFORMATEX*)malloc(sizeof(WAVEFORMATEX));
- w->wFormatTag = sh_audio->format = format;
+ w->wFormatTag = sh_audio->wtag = wtag;
w->nChannels = sh_audio->channels = channels;
sh_audio->samplerate = samplerate;
w->nSamplesPerSec = samplerate;
Modified: mplayerxp/libmpdemux/demux_rawvideo.c
===================================================================
--- mplayerxp/libmpdemux/demux_rawvideo.c 2012-10-26 10:04:44 UTC (rev 216)
+++ mplayerxp/libmpdemux/demux_rawvideo.c 2012-10-26 10:24:02 UTC (rev 217)
@@ -16,7 +16,7 @@
typedef struct priv_s {
int use_rawvideo;
- int format;
+ int wtag;
int size_id;
int width;
int height;
@@ -38,13 +38,13 @@
{ "ntsc", &priv.size_id, CONF_TYPE_FLAG,0,0,6, NULL, "sets image size to NTSC standard" },
{ "16cif", &priv.size_id, CONF_TYPE_FLAG,0,0,7, NULL, "sets image size to 16CIF standard" },
{ "sif", &priv.size_id, CONF_TYPE_FLAG,0,0,8, NULL, "sets image size to SIF standard" },
- // format:
- { "format", &priv.format, CONF_TYPE_INT, 0, 0 , 0, NULL, "specifies colorspace (fourcc) in hex or string constant" },
- { "i420", &priv.format, CONF_TYPE_FLAG, 0, 0 , IMGFMT_I420, NULL, "treats raw-video as I420 fourcc" },
- { "yv12", &priv.format, CONF_TYPE_FLAG, 0, 0 , IMGFMT_YV12, NULL, "treats raw-video as YV12 fourcc" },
- { "yuy2", &priv.format, CONF_TYPE_FLAG, 0, 0 , IMGFMT_YUY2, NULL, "treats raw-video as YUY2 fourcc" },
- { "uyvy", &priv.format, CONF_TYPE_FLAG, 0, 0 , IMGFMT_UYVY, NULL, "treats raw-video as UYVY fourcc" },
- { "y8", &priv.format, CONF_TYPE_FLAG, 0, 0 , IMGFMT_Y8, NULL, "treats raw-video as Y8 fourcc" },
+ // wtag:
+ { "wtag", &priv.wtag, CONF_TYPE_INT, 0, 0 , 0, NULL, "specifies colorspace (fourcc) in hex or string constant" },
+ { "i420", &priv.wtag, CONF_TYPE_FLAG, 0, 0 , IMGFMT_I420, NULL, "treats raw-video as I420 fourcc" },
+ { "yv12", &priv.wtag, CONF_TYPE_FLAG, 0, 0 , IMGFMT_YV12, NULL, "treats raw-video as YV12 fourcc" },
+ { "yuy2", &priv.wtag, CONF_TYPE_FLAG, 0, 0 , IMGFMT_YUY2, NULL, "treats raw-video as YUY2 fourcc" },
+ { "uyvy", &priv.wtag, CONF_TYPE_FLAG, 0, 0 , IMGFMT_UYVY, NULL, "treats raw-video as UYVY fourcc" },
+ { "y8", &priv.wtag, CONF_TYPE_FLAG, 0, 0 , IMGFMT_Y8, NULL, "treats raw-video as Y8 fourcc" },
// misc:
{ "fps", &priv.fps, CONF_TYPE_FLOAT,CONF_RANGE,0.001,1000, NULL, "specifies rate in frames per second of raw-video stream" },
{ "size", &priv.imgsize, CONF_TYPE_INT, CONF_RANGE, 1 , 8192*8192*4, NULL, "specifies frame size in bytes" },
@@ -82,7 +82,7 @@
}
demuxer->stream->driver->control(demuxer->stream,SCTRL_VID_GET_WIDTH,&priv.width);
demuxer->stream->driver->control(demuxer->stream,SCTRL_VID_GET_HEIGHT,&priv.height);
- demuxer->stream->driver->control(demuxer->stream,SCTRL_VID_GET_FORMAT,&priv.format);
+ demuxer->stream->driver->control(demuxer->stream,SCTRL_VID_GET_FORMAT,&priv.wtag);
demuxer->stream->driver->control(demuxer->stream,SCTRL_VID_GET_FPS,&priv.fps);
if(!priv.width || !priv.height){
@@ -91,7 +91,7 @@
}
if(!priv.imgsize)
- switch(priv.format){
+ switch(priv.wtag){
case IMGFMT_I420:
case IMGFMT_IYUV:
case IMGFMT_YV12: priv.imgsize=priv.width*priv.height+2*(priv.width>>1)*(priv.height>>1);break;
@@ -99,12 +99,12 @@
case IMGFMT_UYVY: priv.imgsize=priv.width*priv.height*2;break;
case IMGFMT_Y8: priv.imgsize=priv.width*priv.height;break;
default:
- MSG_ERR("rawvideo: img size not specified and unknown format!\n");
+ MSG_ERR("rawvideo: img size not specified and unknown wtag!\n");
return NULL;
}
sh_video = new_sh_video(demuxer,0);
- sh_video->fourcc=priv.format;
+ sh_video->fourcc=priv.wtag;
sh_video->fps=priv.fps;
sh_video->src_w=priv.width;
sh_video->src_h=priv.height;
Modified: mplayerxp/libmpdemux/demux_real.c
===================================================================
--- mplayerxp/libmpdemux/demux_real.c 2012-10-26 10:04:44 UTC (rev 216)
+++ mplayerxp/libmpdemux/demux_real.c 2012-10-26 10:24:02 UTC (rev 217)
@@ -333,7 +333,7 @@
#define SKIP_BITS(n) buffer<<=n
#define SHOW_BITS(n) ((buffer)>>(32-(n)))
-static float real_fix_timestamp(real_priv_t* priv, unsigned char* s, int timestamp, unsigned int format)
+static float real_fix_timestamp(real_priv_t* priv, unsigned char* s, int timestamp, unsigned int wtag)
{
float v_pts;
uint32_t buffer= (s[0]<<24) + (s[1]<<16) + (s[2]<<8) + s[3];
@@ -342,8 +342,8 @@
int orig_kf;
#if 1
- if(format==mmioFOURCC('R','V','3','0') || format==mmioFOURCC('R','V','4','0')){
- if(format==mmioFOURCC('R','V','3','0')){
+ if(wtag==mmioFOURCC('R','V','3','0') || wtag==mmioFOURCC('R','V','4','0')){
+ if(wtag==mmioFOURCC('R','V','3','0')){
SKIP_BITS(3);
pict_type= SHOW_BITS(2);
SKIP_BITS(2 + 7);
@@ -491,7 +491,7 @@
{
unsigned plen;
plen=0;
- if (((sh_audio_t *)ds->sh)->format == mmioFOURCC('M', 'P', '4', 'A')) {
+ if (((sh_audio_t *)ds->sh)->wtag == mmioFOURCC('M', 'P', '4', 'A')) {
uint16_t *sub_packet_lengths, sub_packets, i;
/* AAC in Real: several AAC frames in one Real packet. */
/* Second byte, upper four bits: number of AAC frames */
@@ -1011,15 +1011,15 @@
MSG_WARN("Last header byte is not zero!\n");
stream_skip(demuxer->stream, 1);
i = stream_read_char(demuxer->stream);
- sh->format = stream_read_dword_le(demuxer->stream);
+ sh->wtag = stream_read_dword_le(demuxer->stream);
if (i != 4) {
MSG_WARN("Audio FourCC size is not 4 (%d), please report to "
"MPlayer developers\n", i);
stream_skip(demuxer->stream, i - 4);
}
- if (sh->format != mmioFOURCC('l','p','c','J')) {
+ if (sh->wtag != mmioFOURCC('l','p','c','J')) {
MSG_WARN("Version 3 audio with FourCC %8x, please report to "
- "MPlayer developers\n", sh->format);
+ "MPlayer developers\n", sh->wtag);
}
sh->channels = 1;
sh->samplesize = 16;
@@ -1083,9 +1083,9 @@
sh->wf->nAvgBytesPerSec = bitrate;
sh->wf->nBlockAlign = frame_size;
sh->wf->cbSize = 0;
- sh->format = MKTAG(buf[0], buf[1], buf[2], buf[3]);
+ sh->wtag = MKTAG(buf[0], buf[1], buf[2], buf[3]);
- switch (sh->format)
+ switch (sh->wtag)
{
case MKTAG('d', 'n', 'e', 't'): /* direct support */
break;
@@ -1143,13 +1143,13 @@
stream_skip(demuxer->stream, 1);
stream_read(demuxer->stream, sh->codecdata, sh->codecdata_len);
}
- sh->format = mmioFOURCC('M', 'P', '4', 'A');
+ sh->wtag = mmioFOURCC('M', 'P', '4', 'A');
break;
default:
MSG_V("Audio: Unknown (%s)\n", buf);
}
- sh->wf->wFormatTag = sh->format;
+ sh->wf->wFormatTag = sh->wtag;
if (mp_conf.verbose > 0)
print_wave_header(sh->wf,sizeof(WAVEFORMATEX));
@@ -1186,7 +1186,7 @@
sh->wf->nAvgBytesPerSec = 0;//bitrate;
sh->wf->nBlockAlign = 0;//frame_size;
sh->wf->cbSize = 0;
- sh->wf->wFormatTag = sh->format = mmioFOURCC('a','d','u',0x55);
+ sh->wf->wFormatTag = sh->wtag = mmioFOURCC('a','d','u',0x55);
if(demuxer->audio->id==stream_id){
sh->ds=demuxer->audio;
@@ -1197,7 +1197,7 @@
} else if (strstr(tmps,"x-ralf-mpeg4")) {
MSG_ERR("Real lossless audio not supported yet\n");
} else {
- MSG_V("Unknown audio stream format\n");
+ MSG_V("Unknown audio stream wtag\n");
}
} else if (!strncmp(tmps,"video/",6)) {
if (strstr(tmps,"x-pn-realvideo") || strstr(tmps,"x-pn-multirate-realvideo")) {
@@ -1232,7 +1232,7 @@
if (sh->fps<=0) sh->fps=24; // we probably won't even care about fps
stream_skip(demuxer->stream, 4);
-// if(sh->format==0x30335652 || sh->format==0x30325652 )
+// if(sh->wtag==0x30335652 || sh->wtag==0x30325652 )
if(1)
{
int tmp=stream_read_word(demuxer->stream);
@@ -1245,7 +1245,7 @@
}
stream_skip(demuxer->stream, 2);
- // read codec sub-format (to make difference between low and high rate codec)
+ // read codec sub-wtag (to make difference between low and high rate codec)
((unsigned int*)(sh->bih+1))[0]=stream_read_dword(demuxer->stream);
/* h263 hack */
@@ -1314,7 +1314,7 @@
}
} else {
- MSG_V("Unknown video stream format\n");
+ MSG_V("Unknown video stream wtag\n");
}
} else if (strstr(tmps,"logical-")) {
if (strstr(tmps,"fileinfo")) {
Modified: mplayerxp/libmpdemux/demux_roq.c
===================================================================
--- mplayerxp/libmpdemux/demux_roq.c 2012-10-26 10:04:44 UTC (rev 216)
+++ mplayerxp/libmpdemux/demux_roq.c 2012-10-26 10:24:02 UTC (rev 217)
@@ -171,7 +171,7 @@
sh_audio->wf = (WAVEFORMATEX *)malloc(sizeof(WAVEFORMATEX));
// custom fourcc for internal MPlayer use
- sh_audio->format = mmioFOURCC('R', 'o', 'Q', 'A');
+ sh_audio->wtag = mmioFOURCC('R', 'o', 'Q', 'A');
if (chunk_id == RoQ_SOUND_STEREO)
sh_audio->wf->nChannels = 2;
else
Modified: mplayerxp/libmpdemux/demux_smjpeg.c
===================================================================
--- mplayerxp/libmpdemux/demux_smjpeg.c 2012-10-26 10:04:44 UTC (rev 216)
+++ mplayerxp/libmpdemux/demux_smjpeg.c 2012-10-26 10:24:02 UTC (rev 217)
@@ -4,7 +4,7 @@
Only for testing some files.
Commited only for Nexus' request.
- Based on text by Arpi (SMJPEG-format.txt) and later on
+ Based on text by Arpi (SMJPEG-wtag.txt) and later on
http://www.lokigames.com/development/download/smjpeg/SMJPEG.txt
TODO: demuxer->movi_length
@@ -149,8 +149,8 @@
sh_audio->samplerate = stream_read_word(demuxer->stream);
sh_audio->wf->wBitsPerSample = stream_read_char(demuxer->stream);
sh_audio->channels = stream_read_char(demuxer->stream);
- sh_audio->format = stream_read_dword_le(demuxer->stream);
- sh_audio->wf->wFormatTag = sh_audio->format;
+ sh_audio->wtag = stream_read_dword_le(demuxer->stream);
+ sh_audio->wf->wFormatTag = sh_audio->wtag;
sh_audio->wf->nChannels = sh_audio->channels;
sh_audio->wf->nSamplesPerSec = sh_audio->samplerate;
sh_audio->wf->nAvgBytesPerSec = sh_audio->wf->nChannels*
Modified: mplayerxp/libmpdemux/demux_ts.c
===================================================================
--- mplayerxp/libmpdemux/demux_ts.c 2012-10-26 10:04:44 UTC (rev 216)
+++ mplayerxp/libmpdemux/demux_ts.c 2012-10-26 10:24:02 UTC (rev 217)
@@ -294,13 +294,13 @@
sh_audio_t *sh = new_sh_audio_aid(demuxer, priv->last_aid, es->pid);
if(sh)
{
- sh->format = IS_AUDIO(es->type) ? es->type : es->subtype;
+ sh->wtag = IS_AUDIO(es->type) ? es->type : es->subtype;
sh->ds = demuxer->audio;
priv->ts.streams[es->pid].id = priv->last_aid;
priv->ts.streams[es->pid].sh = sh;
priv->ts.streams[es->pid].type = TYPE_AUDIO;
- MSG_V("\r\nADDED AUDIO PID %d, type: %x stream n. %d\r\n", es->pid, sh->format, priv->last_aid);
+ MSG_V("\r\nADDED AUDIO PID %d, type: %x stream n. %d\r\n", es->pid, sh->wtag, priv->last_aid);
priv->last_aid++;
}
@@ -1010,7 +1010,7 @@
sh_audio = priv->ts.streams[params.apid].sh;
demuxer->audio->id = priv->ts.streams[params.apid].id;
sh_audio->ds = demuxer->audio;
- sh_audio->format = params.atype;
+ sh_audio->wtag = params.atype;
demuxer->audio->sh = sh_audio;
}
Modified: mplayerxp/libmpdemux/demux_ty.c
===================================================================
--- mplayerxp/libmpdemux/demux_ty.c 2012-10-26 10:04:44 UTC (rev 216)
+++ mplayerxp/libmpdemux/demux_ty.c 2012-10-26 10:24:02 UTC (rev 217)
@@ -6,7 +6,7 @@
* The license covers the portions of this file regarding TiVo additions.
*
* Olaf Beck and Tridge (indirectly) were essential at providing
- * information regarding the format of the TiVo streams.
+ * information regarding the wtag of the TiVo streams.
*
* However, no code in the following subsection is directly copied from
* either author.
@@ -584,10 +584,10 @@
ds->sh = demux->a_streams[ aid ];
sh_a = (sh_audio_t*)ds->sh;
switch(aid & 0xE0){ // 1110 0000 b (high 3 bit: type low 5: id)
- case 0x00: sh_a->format=0x50;break; // mpeg
- case 0xA0: sh_a->format=0x10001;break; // dvd pcm
- case 0x80: if((aid & 0xF8) == 0x88) sh_a->format=0x2001;//dts
- else sh_a->format=0x2000;break; // ac3
+ case 0x00: sh_a->wtag=0x50;break; // mpeg
+ case 0xA0: sh_a->wtag=0x10001;break; // dvd pcm
+ case 0x80: if((aid & 0xF8) == 0x88) sh_a->wtag=0x2001;//dts
+ else sh_a->wtag=0x2000;break; // ac3
}
}
}
Modified: mplayerxp/libmpdemux/demux_viv.c
===================================================================
--- mplayerxp/libmpdemux/demux_viv.c 2012-10-26 10:04:44 UTC (rev 216)
+++ mplayerxp/libmpdemux/demux_viv.c 2012-10-26 10:24:02 UTC (rev 217)
@@ -439,7 +439,7 @@
static int bufptr=0;
static int bitcnt=0;
static unsigned char buf=0;
-static int format, width, height;
+static int wtag, width, height;
static unsigned int x_get_bits(int n){
unsigned int x=0;
@@ -488,13 +488,13 @@
skip_bits1(&s->gb); /* camera off */
skip_bits1(&s->gb); /* freeze picture release off */
- format = get_bits(&s->gb, 3);
+ wtag = get_bits(&s->gb, 3);
- if (format != 7) {
- MSG_ERR("h263_plus = 0 format = %d\n",format);
+ if (wtag != 7) {
+ MSG_ERR("h263_plus = 0 wtag = %d\n",wtag);
/* H.263v1 */
- width = h263_format[format][0];
- height = h263_format[format][1];
+ width = h263_format[wtag][0];
+ height = h263_format[wtag][1];
MSG_ERR("%d x %d\n",width,height);
// if (!width) return -1;
@@ -521,8 +521,8 @@
MSG_ERR("H.263v2 A error\n");
return -1;
}
- if (get_bits(&s->gb, 3) != 6){ /* custom source format */
- MSG_ERR("custom source format\n");
+ if (get_bits(&s->gb, 3) != 6){ /* custom source wtag */
+ MSG_ERR("custom source wtag\n");
return -1;
}
skip_bits(&s->gb, 12);
@@ -658,12 +658,12 @@
priv->audio_codec = VIVO_AUDIO_SIREN;
}
- sh->format = UINT_MAX;
+ sh->wtag = UINT_MAX;
if (priv->audio_codec == VIVO_AUDIO_G723)
- sh->format = 0x111;
+ sh->wtag = 0x111;
if (priv->audio_codec == VIVO_AUDIO_SIREN)
- sh->format = 0x112;
- if (sh->format == UINT_MAX)
+ sh->wtag = 0x112;
+ if (sh->wtag == UINT_MAX)
{
MSG_ERR( "VIVO: Not support audio codec (%d)\n",
priv->audio_co...
[truncated message content] |
