[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[218] mplayerxp
Brought to you by:
olov
Menu
▾
▴
[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[218] mplayerxp
|
From: <nic...@us...> - 2012-10-26 10:58:37
|
Revision: 218
http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=218&view=rev
Author: nickols_k
Date: 2012-10-26 10:58:24 +0000 (Fri, 26 Oct 2012)
Log Message:
-----------
Oops
Modified Paths:
--------------
mplayerxp/libmpdemux/asf.h
mplayerxp/libmpdemux/aviheader.h
mplayerxp/libmpdemux/demux_asf.c
mplayerxp/libmpdemux/demux_audio.c
mplayerxp/libmpdemux/demux_avi.c
mplayerxp/libmpdemux/demux_film.c
mplayerxp/libmpdemux/demux_lavf.c
mplayerxp/libmpdemux/demux_mpg.c
mplayerxp/libmpdemux/demux_mpxp64.c
mplayerxp/libmpdemux/demux_ogg.c
mplayerxp/libmpdemux/demux_pva.c
mplayerxp/libmpdemux/demux_rawvideo.c
mplayerxp/libmpdemux/demux_real.c
mplayerxp/libmpdemux/demux_ty.c
mplayerxp/libmpdemux/demux_viv.c
mplayerxp/libmpdemux/demux_y4m.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/postproc/af_format.c
Modified: mplayerxp/libmpdemux/asf.h
===================================================================
--- mplayerxp/libmpdemux/asf.h 2012-10-26 10:24:02 UTC (rev 217)
+++ mplayerxp/libmpdemux/asf.h 2012-10-26 10:58:24 UTC (rev 218)
@@ -137,7 +137,7 @@
/*
* Some macros to swap little endian structures read from an ASF file
- * into machine endian wtag
+ * into machine endian format
*/
#ifdef WORDS_BIGENDIAN
#define le2me_ASF_obj_header_t(h) { \
Modified: mplayerxp/libmpdemux/aviheader.h
===================================================================
--- mplayerxp/libmpdemux/aviheader.h 2012-10-26 10:24:02 UTC (rev 217)
+++ mplayerxp/libmpdemux/aviheader.h 2012-10-26 10:58:24 UTC (rev 218)
@@ -6,7 +6,7 @@
/*
* Some macros to swap little endian structures read from an AVI file
- * into machine endian wtag
+ * into machine endian format
*/
#ifdef WORDS_BIGENDIAN
#define le2me_MainAVIHeader(h) { \
Modified: mplayerxp/libmpdemux/demux_asf.c
===================================================================
--- mplayerxp/libmpdemux/demux_asf.c 2012-10-26 10:24:02 UTC (rev 217)
+++ mplayerxp/libmpdemux/demux_asf.c 2012-10-26 10:58:24 UTC (rev 218)
@@ -718,7 +718,7 @@
demuxer_driver_t demux_asf =
{
- "ASF - Advanced stream wtag v1 parser",
+ "ASF - Advanced stream format v1 parser",
".asf",
NULL,
asf_probe,
Modified: mplayerxp/libmpdemux/demux_audio.c
===================================================================
--- mplayerxp/libmpdemux/demux_audio.c 2012-10-26 10:24:02 UTC (rev 217)
+++ mplayerxp/libmpdemux/demux_audio.c 2012-10-26 10:58:24 UTC (rev 218)
@@ -988,14 +988,14 @@
break;
}
}
- /* Add here some other audio wtag detection */
+ /* Add here some other audio format detection */
if(step < HDR_SIZE) memmove(hdr,&hdr[step],HDR_SIZE-step);
pos -= step;
}
if(!frmt)
{
- MSG_ERR("Can't detect audio wtag\n");
+ MSG_ERR("Can't detect audio format\n");
return NULL;
}
sh_audio = new_sh_audio(demuxer,0);
@@ -1561,7 +1561,7 @@
return 1;
}
default:
- MSG_ERR("Audio demuxer : unknown wtag %d\n",priv->frmt);
+ MSG_ERR("Audio demuxer : unknown format %d\n",priv->frmt);
}
return 0;
}
Modified: mplayerxp/libmpdemux/demux_avi.c
===================================================================
--- mplayerxp/libmpdemux/demux_avi.c 2012-10-26 10:24:02 UTC (rev 217)
+++ mplayerxp/libmpdemux/demux_avi.c 2012-10-26 10:58:24 UTC (rev 218)
@@ -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 wtag of this information
+ // required to produce the file. Note that the format 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 wtag depends on the hardware used).
+ // required to produce the file (the format 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."
@@ -1167,7 +1167,7 @@
priv->idx_pos_a=0;
priv->idx_pos_v=0;
if(priv->idx_size>1){
- // decide index wtag:
+ // decide index format:
#if 1
if((unsigned long)((AVIINDEXENTRY *)priv->idx)[0].dwChunkOffset<demuxer->movi_start ||
(unsigned long)((AVIINDEXENTRY *)priv->idx)[1].dwChunkOffset<demuxer->movi_start)
Modified: mplayerxp/libmpdemux/demux_film.c
===================================================================
--- mplayerxp/libmpdemux/demux_film.c 2012-10-26 10:24:02 UTC (rev 217)
+++ mplayerxp/libmpdemux/demux_film.c 2012-10-26 10:58:24 UTC (rev 218)
@@ -6,7 +6,7 @@
Sega Saturn CD-ROM games. FILM files have also been found on 3DO
games.
- Details of the FILM file wtag can be found at:
+ Details of the FILM file format can be found at:
http://www.pcisys.net/~melanson/codecs/
TODO: demuxer->movi_length
@@ -300,7 +300,7 @@
sh_audio->wf = (WAVEFORMATEX *)malloc(sizeof(WAVEFORMATEX));
- // uncompressed PCM wtag
+ // uncompressed PCM format
sh_audio->wf->wFormatTag = 1;
sh_audio->wtag = 1;
sh_audio->wf->nChannels = audio_channels;
@@ -331,7 +331,7 @@
sh_audio->wf = (WAVEFORMATEX *)malloc(sizeof(WAVEFORMATEX));
- // uncompressed PCM wtag
+ // uncompressed PCM format
sh_audio->wf->wFormatTag = 1;
sh_audio->wtag = 1;
sh_audio->wf->nChannels = 1;
Modified: mplayerxp/libmpdemux/demux_lavf.c
===================================================================
--- mplayerxp/libmpdemux/demux_lavf.c 2012-10-26 10:24:02 UTC (rev 217)
+++ mplayerxp/libmpdemux/demux_lavf.c 2012-10-26 10:58:24 UTC (rev 218)
@@ -52,7 +52,7 @@
extern int ts_prog;
const config_t lavf_opts[] = {
- {"wtag", &(opt_format), CONF_TYPE_STRING, 0, 0, 0, NULL, "forces wtag of lavf demuxer"},
+ {"format", &(opt_format), CONF_TYPE_STRING, 0, 0, 0, NULL, "forces format 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 wtag %s\n", opt_format);
+ MSG_FATAL("Unknown lavf format %s\n", opt_format);
return 0;
}
MSG_INFO("Forced lavf %s demuxer\n", priv->avif->long_name);
Modified: mplayerxp/libmpdemux/demux_mpg.c
===================================================================
--- mplayerxp/libmpdemux/demux_mpg.c 2012-10-26 10:24:02 UTC (rev 217)
+++ mplayerxp/libmpdemux/demux_mpg.c 2012-10-26 10:58:24 UTC (rev 218)
@@ -750,7 +750,7 @@
MSG_ERR("MPEG: " MSGTR_MissingVideoStreamBug);
else
{
- MSG_V("Not MPEG System Stream wtag...\n");
+ MSG_V("Not MPEG System Stream format...\n");
return 0;
}
}
Modified: mplayerxp/libmpdemux/demux_mpxp64.c
===================================================================
--- mplayerxp/libmpdemux/demux_mpxp64.c 2012-10-26 10:24:02 UTC (rev 217)
+++ mplayerxp/libmpdemux/demux_mpxp64.c 2012-10-26 10:58:24 UTC (rev 218)
@@ -1,6 +1,5 @@
/*
- MPlayerXP's design. MPXPAV64 wtag.
- Implements of ASF v1, AVI stream parsers.
+ MPlayerXP's design. MPXPAV64 format.
*/
#include <stdio.h>
Modified: mplayerxp/libmpdemux/demux_ogg.c
===================================================================
--- mplayerxp/libmpdemux/demux_ogg.c 2012-10-26 10:24:02 UTC (rev 217)
+++ mplayerxp/libmpdemux/demux_ogg.c 2012-10-26 10:58:24 UTC (rev 218)
@@ -55,7 +55,7 @@
} theora_struct_t;
//// OggDS headers
-// Header for the new header wtag
+// Header for the new header format
typedef struct stream_header_video
{
ogg_int32_t width;
Modified: mplayerxp/libmpdemux/demux_pva.c
===================================================================
--- mplayerxp/libmpdemux/demux_pva.c 2012-10-26 10:24:02 UTC (rev 217)
+++ mplayerxp/libmpdemux/demux_pva.c 2012-10-26 10:58:24 UTC (rev 218)
@@ -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 wtag has no fields to describe
+ * Moreover, there would be no way to do that since the PVA stream format has no fields to describe
* the used codecs.
*/
Modified: mplayerxp/libmpdemux/demux_rawvideo.c
===================================================================
--- mplayerxp/libmpdemux/demux_rawvideo.c 2012-10-26 10:24:02 UTC (rev 217)
+++ mplayerxp/libmpdemux/demux_rawvideo.c 2012-10-26 10:58:24 UTC (rev 218)
@@ -16,7 +16,7 @@
typedef struct priv_s {
int use_rawvideo;
- int wtag;
+ int format;
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" },
- // 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" },
+ // format:
+ { "fourcc", &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" },
// 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.wtag);
+ demuxer->stream->driver->control(demuxer->stream,SCTRL_VID_GET_FORMAT,&priv.format);
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.wtag){
+ switch(priv.format){
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 wtag!\n");
+ MSG_ERR("rawvideo: img size not specified and unknown format!\n");
return NULL;
}
sh_video = new_sh_video(demuxer,0);
- sh_video->fourcc=priv.wtag;
+ sh_video->fourcc=priv.format;
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:24:02 UTC (rev 217)
+++ mplayerxp/libmpdemux/demux_real.c 2012-10-26 10:58:24 UTC (rev 218)
@@ -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 wtag)
+static float real_fix_timestamp(real_priv_t* priv, unsigned char* s, int timestamp, unsigned int format)
{
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(wtag==mmioFOURCC('R','V','3','0') || wtag==mmioFOURCC('R','V','4','0')){
- if(wtag==mmioFOURCC('R','V','3','0')){
+ if(format==mmioFOURCC('R','V','3','0') || format==mmioFOURCC('R','V','4','0')){
+ if(format==mmioFOURCC('R','V','3','0')){
SKIP_BITS(3);
pict_type= SHOW_BITS(2);
SKIP_BITS(2 + 7);
@@ -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 wtag\n");
+ MSG_V("Unknown audio stream format\n");
}
} else if (!strncmp(tmps,"video/",6)) {
if (strstr(tmps,"x-pn-realvideo") || strstr(tmps,"x-pn-multirate-realvideo")) {
@@ -1314,7 +1314,7 @@
}
} else {
- MSG_V("Unknown video stream wtag\n");
+ MSG_V("Unknown video stream format\n");
}
} else if (strstr(tmps,"logical-")) {
if (strstr(tmps,"fileinfo")) {
Modified: mplayerxp/libmpdemux/demux_ty.c
===================================================================
--- mplayerxp/libmpdemux/demux_ty.c 2012-10-26 10:24:02 UTC (rev 217)
+++ mplayerxp/libmpdemux/demux_ty.c 2012-10-26 10:58:24 UTC (rev 218)
@@ -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 wtag of the TiVo streams.
+ * information regarding the format of the TiVo streams.
*
* However, no code in the following subsection is directly copied from
* either author.
Modified: mplayerxp/libmpdemux/demux_viv.c
===================================================================
--- mplayerxp/libmpdemux/demux_viv.c 2012-10-26 10:24:02 UTC (rev 217)
+++ mplayerxp/libmpdemux/demux_viv.c 2012-10-26 10:58:24 UTC (rev 218)
@@ -439,7 +439,7 @@
static int bufptr=0;
static int bitcnt=0;
static unsigned char buf=0;
-static int wtag, width, height;
+static int format, 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 */
- wtag = get_bits(&s->gb, 3);
+ format = get_bits(&s->gb, 3);
- if (wtag != 7) {
- MSG_ERR("h263_plus = 0 wtag = %d\n",wtag);
+ if (format != 7) {
+ MSG_ERR("h263_plus = 0 format = %d\n",format);
/* H.263v1 */
- width = h263_format[wtag][0];
- height = h263_format[wtag][1];
+ width = h263_format[format][0];
+ height = h263_format[format][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 wtag */
- MSG_ERR("custom source wtag\n");
+ if (get_bits(&s->gb, 3) != 6){ /* custom source format */
+ MSG_ERR("custom source format\n");
return -1;
}
skip_bits(&s->gb, 12);
Modified: mplayerxp/libmpdemux/demux_y4m.c
===================================================================
--- mplayerxp/libmpdemux/demux_y4m.c 2012-10-26 10:24:02 UTC (rev 217)
+++ mplayerxp/libmpdemux/demux_y4m.c 2012-10-26 10:58:24 UTC (rev 218)
@@ -48,7 +48,7 @@
if (!strncmp("YUV4MPEG ", buf, 9))
{
- MSG_V( "Found older YUV4MPEG wtag (used by xawtv)\n");
+ MSG_V( "Found older YUV4MPEG format (used by xawtv)\n");
priv->is_older = 1;
}
Modified: mplayerxp/libmpdemux/demuxer.h
===================================================================
--- mplayerxp/libmpdemux/demuxer.h 2012-10-26 10:24:02 UTC (rev 217)
+++ mplayerxp/libmpdemux/demuxer.h 2012-10-26 10:58:24 UTC (rev 218)
@@ -116,7 +116,7 @@
off_t movi_end; /**< real end of movie within of stream */
unsigned movi_length; /**< length of movie in secs. Optional!*/
unsigned flags; /**< set of DEMUXF_* bits */
- unsigned file_format; /**< file wtag: DEMUXER_TYPE_*(mpeg/avi/asf). Will be replaced with properties in the further versions */
+ unsigned file_format; /**< file format: DEMUXER_TYPE_*(mpeg/avi/asf). Will be replaced with properties in the further versions */
int synced; /**< indicates stream synchronisation. TODO: mpg->priv */
any_t* priv; /**< private data of demuxer's driver.*/
Modified: mplayerxp/libmpdemux/mp3_hdr.c
===================================================================
--- mplayerxp/libmpdemux/mp3_hdr.c 2012-10-26 10:24:02 UTC (rev 217)
+++ mplayerxp/libmpdemux/mp3_hdr.c 2012-10-26 10:58:24 UTC (rev 218)
@@ -85,7 +85,7 @@
if(channels) *channels=nch;
if(!bitrate_index){
- MSG_DBG2("mp3_hdr: Free wtag not supported.\n");
+ MSG_DBG2("mp3_hdr: Free format not supported.\n");
return -1;
}
Modified: mplayerxp/libmpdemux/mpeg_hdr.c
===================================================================
--- mplayerxp/libmpdemux/mpeg_hdr.c 2012-10-26 10:24:02 UTC (rev 217)
+++ mplayerxp/libmpdemux/mpeg_hdr.c 2012-10-26 10:58:24 UTC (rev 218)
@@ -54,8 +54,8 @@
static int header_process_sequence_extension (mp_mpeg_header_t * picture,
unsigned char * buffer)
{
- /* check chroma wtag, size extensions, marker bit */
-
+ /* check chroma format, size extensions, marker bit */
+
if ( ((buffer[1] & 0x06) == 0x00) ||
((buffer[1] & 0x01) != 0x00) || (buffer[2] & 0xe0) ||
((buffer[3] & 0x01) != 0x01) )
Modified: mplayerxp/libmpdemux/mpxpav64.h
===================================================================
--- mplayerxp/libmpdemux/mpxpav64.h 2012-10-26 10:24:02 UTC (rev 217)
+++ mplayerxp/libmpdemux/mpxpav64.h 2012-10-26 10:58:24 UTC (rev 218)
@@ -1,4 +1,4 @@
-/* MPLayerXP's AudioVideo64 file wtag */
+/* MPLayerXP's AudioVideo64 file format */
#ifndef MPXPAV64_INCLUDED
#define MPXPAV64_INCLUDED 1
Modified: mplayerxp/libmpdemux/mux_lavf.c
===================================================================
--- mplayerxp/libmpdemux/mux_lavf.c 2012-10-26 10:24:02 UTC (rev 217)
+++ mplayerxp/libmpdemux/mux_lavf.c 2012-10-26 10:58:24 UTC (rev 218)
@@ -367,9 +367,9 @@
av_register_all();
priv->oc = av_alloc_format_context();
- if(!priv->oc)
+ if(!priv->oc)
{
- MSG_FATAL("Couldn't get wtag context\n");
+ MSG_FATAL("Couldn't get format context\n");
goto fail;
}
@@ -383,7 +383,7 @@
if(av_set_parameters(priv->oc, NULL) < 0)
{
- MSG_FATAL("Invalid output wtag parameters\n");
+ MSG_FATAL("Invalid output format parameters\n");
goto fail;
}
priv->oc->packet_size= mux_packet_size;
Modified: mplayerxp/libmpdemux/mux_mpxp64.c
===================================================================
--- mplayerxp/libmpdemux/mux_mpxp64.c 2012-10-26 10:24:02 UTC (rev 217)
+++ mplayerxp/libmpdemux/mux_mpxp64.c 2012-10-26 10:58:24 UTC (rev 218)
@@ -1,6 +1,5 @@
/*
- MPlayerXP's design. MPXPAV64 wtag.
- Implements of ASF v1, AVI stream writer.
+ MPlayerXP's design. MPXPAV64 format.
*/
#include <ctype.h>
#include <stdio.h>
Modified: mplayerxp/libmpdemux/muxer.h
===================================================================
--- mplayerxp/libmpdemux/muxer.h 2012-10-26 10:24:02 UTC (rev 217)
+++ mplayerxp/libmpdemux/muxer.h 2012-10-26 10:58:24 UTC (rev 218)
@@ -59,7 +59,7 @@
AVIStreamHeader h; // Rate/Scale and SampleSize must be filled by caller!
// stream specific:
WAVEFORMATEX *wf;
- BITMAPINFOHEADER *bih; // in wtag
+ BITMAPINFOHEADER *bih; // in format
any_t* ImageDesc; // for quicktime codecs
float aspect;
// muxer of that stream
Modified: mplayerxp/libmpdemux/parse_mp4.c
===================================================================
--- mplayerxp/libmpdemux/parse_mp4.c 2012-10-26 10:24:02 UTC (rev 217)
+++ mplayerxp/libmpdemux/parse_mp4.c 2012-10-26 10:58:24 UTC (rev 218)
@@ -1,4 +1,4 @@
-/* parse_mp4.c - MP4 file wtag parser code
+/* parse_mp4.c - MP4 file format parser code
* This file is part of MPlayer, see http://mplayerhq.hu/ for info.
* (c)2002 by Felix Buenemann <atmosfear at users.sourceforge.net>
* File licensed under the GPL, see http://www.fsf.org/ for more info.
Modified: mplayerxp/libmpdemux/parse_mp4.h
===================================================================
--- mplayerxp/libmpdemux/parse_mp4.h 2012-10-26 10:24:02 UTC (rev 217)
+++ mplayerxp/libmpdemux/parse_mp4.h 2012-10-26 10:58:24 UTC (rev 218)
@@ -1,5 +1,5 @@
-/* parse_mp4.h - Headerfile for MP4 file wtag parser code
- * This file is part of MPlayer, see http://mplayerhq.hu/ for info.
+/* parse_mp4.h - Headerfile for MP4 file format parser code
+ * This file is part of MPlayer, see http://mplayerhq.hu/ for info.
* (c)2002 by Felix Buenemann <atmosfear at users.sourceforge.net>
* File licensed under the GPL, see http://www.fsf.org/ for more info.
*/
Modified: mplayerxp/libmpdemux/pnm.c
===================================================================
--- mplayerxp/libmpdemux/pnm.c 2012-10-26 10:24:02 UTC (rev 217)
+++ mplayerxp/libmpdemux/pnm.c 2012-10-26 10:58:24 UTC (rev 218)
@@ -333,7 +333,7 @@
max -= 1;
while(1) {
- /* expecting following chunk wtag: 0x4f <chunk size> <data...> */
+ /* expecting following chunk format: 0x4f <chunk size> <data...> */
if (max < 2)
return -1;
Modified: mplayerxp/libmpdemux/s_dvdread.c
===================================================================
--- mplayerxp/libmpdemux/s_dvdread.c 2012-10-26 10:24:02 UTC (rev 217)
+++ mplayerxp/libmpdemux/s_dvdread.c 2012-10-26 10:58:24 UTC (rev 218)
@@ -264,7 +264,7 @@
// 1 - stereo
// 5 - 5.1
d->audio_streams[d->nr_of_channels].channels=audio->channels;
- MSG_V("[open] audio stream: %d audio wtag: %s (%s) language: %s aid: %d\n",
+ MSG_V("[open] audio stream: %d audio format: %s (%s) language: %s aid: %d\n",
d->nr_of_channels,
dvd_audio_stream_types[ audio->audio_format ],
dvd_audio_stream_channels[ audio->channels ],
Modified: mplayerxp/libmpdemux/s_oss.c
===================================================================
--- mplayerxp/libmpdemux/s_oss.c 2012-10-26 10:24:02 UTC (rev 217)
+++ mplayerxp/libmpdemux/s_oss.c 2012-10-26 10:58:24 UTC (rev 218)
@@ -105,9 +105,9 @@
oss_fmt=af_format_encode(&afd);
tmp=oss_fmt;
if(ioctl(stream->fd, SNDCTL_DSP_SETFMT, &oss_fmt)<0)
- MSG_ERR("[s_oss] Can't set wtag %s (will use %s)\n",ao_format_name(tmp),ao_format_name(oss_fmt));
+ MSG_ERR("[s_oss] Can't set format %s (will use %s)\n",ao_format_name(tmp),ao_format_name(oss_fmt));
else
- MSG_DBG2("[o_oss] Did set wtag to %s\n",ao_format_name(oss_fmt));
+ MSG_DBG2("[o_oss] Did set format to %s\n",ao_format_name(oss_fmt));
}
tmp = PCM_ENABLE_INPUT;
if(ioctl(stream->fd, SNDCTL_DSP_SETTRIGGER, &tmp)<0)
Modified: mplayerxp/libmpdemux/s_tv.c
===================================================================
--- mplayerxp/libmpdemux/s_tv.c 2012-10-26 10:24:02 UTC (rev 217)
+++ mplayerxp/libmpdemux/s_tv.c 2012-10-26 10:58:24 UTC (rev 218)
@@ -145,7 +145,7 @@
picture_format = IMGFMT_RGB15;
else
{
- MSG_ERR( "Unknown wtag given: %s\n", tv_param_outfmt);
+ MSG_ERR( "Unknown format given: %s\n", tv_param_outfmt);
MSG_V( "Using default: Planar YV12\n");
picture_format = IMGFMT_YV12;
}
Modified: mplayerxp/libmpdemux/stheader.h
===================================================================
--- mplayerxp/libmpdemux/stheader.h 2012-10-26 10:24:02 UTC (rev 217)
+++ mplayerxp/libmpdemux/stheader.h 2012-10-26 10:58:24 UTC (rev 218)
@@ -14,10 +14,10 @@
demux_stream_t* ds;
struct codecs_st* codec;
int inited;
-// input wtag
+// input format
uint32_t wtag; // analogue of fourcc for sound
unsigned i_bps; // == bitrate (compressed bytes/sec)
-// output wtag:
+// output format:
float timer; // value of old a_frame
unsigned samplerate;
unsigned samplesize;
@@ -48,7 +48,7 @@
// win32 codec stuff:
AVIStreamHeader audio;
WAVEFORMATEX* wf;
-// char wf_ext[64]; // in wtag
+// char wf_ext[64]; // in format
unsigned audio_in_minsize;
unsigned audio_out_minsize;
// other codecs:
@@ -62,10 +62,10 @@
demux_stream_t* ds;
struct codecs_st* codec;
int inited;
-// input wtag
+// input format
uint32_t fourcc;
int is_static; /* default: 0 - means movie; 1 - means picture (.jpg ...)*/
-// output wtag:
+// output format:
float fps;
int chapter_change;
unsigned src_w,src_h;// source picture size (filled by fileformat parser)
@@ -81,7 +81,7 @@
mp_image_t* image;
// win32 codec stuff:
AVIStreamHeader video;
- BITMAPINFOHEADER* bih; // in wtag
+ BITMAPINFOHEADER* bih; // in format
any_t* context; // codec-specific stuff (usually HANDLE or struct pointer)
any_t* ImageDesc; // for quicktime codecs
} sh_video_t;
Modified: mplayerxp/libmpdemux/stream.h
===================================================================
--- mplayerxp/libmpdemux/stream.h 2012-10-26 10:24:02 UTC (rev 217)
+++ mplayerxp/libmpdemux/stream.h 2012-10-26 10:58:24 UTC (rev 218)
@@ -43,7 +43,7 @@
off_t pos; /**< SOF offset from begin of stream */
int eof; /**< indicates EOF */
int type; /**< properties of the stream (see STREAMTYPE_ for detail) */
- int file_format; /**< detected file wtag (by http:// protocol for example) */
+ int file_format; /**< detected file format (by http:// protocol for example) */
int _Errno; /**< keeps value of errno from low-level operations */
unsigned int buf_pos; /**< position whitin of small cache */
unsigned int buf_len; /**< length of small cache */
@@ -142,7 +142,7 @@
#define SCTRL_AUD_GET_CHANNELS 2000 /**< Returns number of channels. Accepts unsigned* as pointer to channels storage */
#define SCTRL_AUD_GET_SAMPLERATE 2001 /**< Returns rate of samples in Hz. Accepts unsigned* as pointer to storage area */
#define SCTRL_AUD_GET_SAMPLESIZE 2002 /**< Returns size fo samples in bits. Accepts unsigned* as pointer to storage area */
-#define SCTRL_AUD_GET_FORMAT 2003 /**< Returns wtag of samples. Accepts unsigned* as pointer to storage area */
+#define SCTRL_AUD_GET_FORMAT 2003 /**< Returns format of samples. Accepts unsigned* as pointer to storage area */
/* These controls extracts language specific info from stream */
#define SCTRL_LNG_GET_AID 3000 /**< Returns audio id from language. Accepts char* as input language name. Stores int* id into this pointer as output. */
Modified: mplayerxp/libmpdemux/sub_cc.c
===================================================================
--- mplayerxp/libmpdemux/sub_cc.c 2012-10-26 10:24:02 UTC (rev 217)
+++ mplayerxp/libmpdemux/sub_cc.c 2012-10-26 10:58:24 UTC (rev 218)
@@ -233,7 +233,7 @@
{
/* The first number may denote a channel number. I don't have the
* EIA-708 standard, so it is hard to say.
- * From what I could figure out so far, the general wtag seems to be:
+ * From what I could figure out so far, the general format seems to be:
*
* repeat
*
Modified: mplayerxp/libmpdemux/sub_ty.c
===================================================================
--- mplayerxp/libmpdemux/sub_ty.c 2012-10-26 10:24:02 UTC (rev 217)
+++ mplayerxp/libmpdemux/sub_ty.c 2012-10-26 10:58:24 UTC (rev 218)
@@ -471,7 +471,7 @@
static int ty_XDSDisplayCount = -1;
-static void ty_AddXDSToDisplay( const char *wtag, ... )
+static void ty_AddXDSToDisplay( const char *format, ... )
{
char line[ 80 ];
int index;
@@ -486,8 +486,8 @@
ty_XDSAddLine = 0;
}
- va_start( ap, wtag );
- vsnprintf( line, 80, wtag, ap );
+ va_start( ap, format );
+ vsnprintf( line, 80, format, ap );
va_end( ap );
MSG_V( "XDS: %s\n", line );
Modified: mplayerxp/libmpdemux/test.c
===================================================================
--- mplayerxp/libmpdemux/test.c 2012-10-26 10:24:02 UTC (rev 217)
+++ mplayerxp/libmpdemux/test.c 2012-10-26 10:58:24 UTC (rev 218)
@@ -44,7 +44,7 @@
exit(1);
}
- printf("success: wtag: %d data: 0x%X - 0x%X\n",file_format, (int)(stream->start_pos),(int)(stream->end_pos));
+ printf("success: format: %d data: 0x%X - 0x%X\n",file_format, (int)(stream->start_pos),(int)(stream->end_pos));
stream_enable_cache(stream,2048*1024,0,0);
Modified: mplayerxp/libmpdemux/tvi_bsdbt848.c
===================================================================
--- mplayerxp/libmpdemux/tvi_bsdbt848.c 2012-10-26 10:24:02 UTC (rev 217)
+++ mplayerxp/libmpdemux/tvi_bsdbt848.c 2012-10-26 10:58:24 UTC (rev 218)
@@ -593,7 +593,7 @@
return(1);
}
-/* that's the real start, we'got the wtag parameters (checked with control) */
+/* that's the real start, we'got the format parameters (checked with control) */
static int start(priv_t *priv)
{
int tmp;
Modified: mplayerxp/libmpdemux/tvi_dummy.c
===================================================================
--- mplayerxp/libmpdemux/tvi_dummy.c 2012-10-26 10:24:02 UTC (rev 217)
+++ mplayerxp/libmpdemux/tvi_dummy.c 2012-10-26 10:58:24 UTC (rev 218)
@@ -40,7 +40,7 @@
return(1);
}
-/* that's the real start, we'got the wtag parameters (checked with control) */
+/* that's the real start, we'got the format parameters (checked with control) */
static int start(priv_t *priv)
{
return(1);
Modified: mplayerxp/libmpdemux/tvi_v4l.c
===================================================================
--- mplayerxp/libmpdemux/tvi_v4l.c 2012-10-26 10:24:02 UTC (rev 217)
+++ mplayerxp/libmpdemux/tvi_v4l.c 2012-10-26 10:58:24 UTC (rev 218)
@@ -55,7 +55,7 @@
/* video */
struct video_picture picture;
- int wtag; /* output wtag */
+ int format; /* output format */
int width;
int height;
int bytesperline;
@@ -133,9 +133,9 @@
return(-1);
}
-static int format2palette(int wtag)
+static int format2palette(int format)
{
- switch(wtag)
+ switch(format)
{
case IMGFMT_RGB15:
return(VIDEO_PALETTE_RGB555);
@@ -300,7 +300,7 @@
MSG_V( "volume=%d bass=%d treble=%d balance=%d mode=%s\n",
priv->audio[i].volume, priv->audio[i].bass, priv->audio[i].treble,
priv->audio[i].balance, audio_mode2name[priv->audio[i].mode]);
- MSG_V( " channels: %d, samplerate: %d, samplesize: %d, wtag: %s\n",
+ MSG_V( " channels: %d, samplerate: %d, samplesize: %d, format: %s\n",
priv->audio_channels[i], priv->audio_samplerate[i], priv->audio_samplesize[i],
ao_format_name(priv->audio_format[i]));
}
@@ -359,7 +359,7 @@
MSG_V("Supported formats: %x\n", ioctl_param);
if (!(ioctl_param & priv->audio_format[priv->audio_id]))
- MSG_WARN("notsupported wtag\n");
+ MSG_WARN("notsupported format\n");
ioctl_param = priv->audio_format[priv->audio_id];
MSG_V("ioctl dsp setfmt: %d\n",
@@ -545,7 +545,7 @@
output_fmt = priv->wtag;
*(int *)arg = output_fmt;
- MSG_V( "Output wtag: %s\n", vo_format_name(output_fmt));
+ MSG_V( "Output format: %s\n", vo_format_name(output_fmt));
return(TVI_CONTROL_TRUE);
}
case TVI_CONTROL_VID_SET_FORMAT:
Modified: mplayerxp/libmpdemux/yuv4mpeg.h
===================================================================
--- mplayerxp/libmpdemux/yuv4mpeg.h 2012-10-26 10:24:02 UTC (rev 217)
+++ mplayerxp/libmpdemux/yuv4mpeg.h 2012-10-26 10:58:24 UTC (rev 218)
@@ -1,7 +1,7 @@
/*
* yuv4mpeg.h: Functions for reading and writing "new" YUV4MPEG2 streams.
*
- * Stream wtag is described at the end of this file.
+ * Stream format is described at the end of this file.
*
*
* Copyright (C) 2001 Matthew J. Marjanovic <ma...@mi...>
@@ -392,7 +392,7 @@
/************************************************************************
************************************************************************
- Description of the (new!, forever?) YUV4MPEG2 stream wtag:
+ Description of the (new!, forever?) YUV4MPEG2 stream format:
STREAM consists of
o one '\n' terminated STREAM-HEADER
Modified: mplayerxp/postproc/af_format.c
===================================================================
--- mplayerxp/postproc/af_format.c 2012-10-26 10:24:02 UTC (rev 217)
+++ mplayerxp/postproc/af_format.c 2012-10-26 10:58:24 UTC (rev 218)
@@ -240,7 +240,7 @@
{
int i=0;
// Print endinaness
-
+
if(format & AF_FORMAT_SPECIAL_MASK){
unsigned short wtag;
unsigned j;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
