RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

demux_raw: uncrustify 

Should have been done before doing all the changes...
This commit is contained in:
wm4 2013-07-14 17:55:54 +02:00
parent 5ad42d0caf
commit 5ead20bdb3
1 changed files with 166 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
demux/demux_raw.c
View File

@ -44,7 +44,7 @@ static int aformat = AF_FORMAT_S16_NE;
const m_option_t demux_rawaudio_opts[] = {
{ "channels", &channels, &m_option_type_chmap, CONF_MIN, 1 },
{ "rate", &samplerate, CONF_TYPE_INT,CONF_RANGE,1000,8*48000, NULL },
{ "rate", &samplerate, CONF_TYPE_INT, CONF_RANGE, 1000, 8 * 48000, NULL },
{ "format", &aformat, CONF_TYPE_AFMT, 0, 0, 0, NULL },
{NULL, NULL, 0, 0, 0, 0, NULL}
};
@ -55,28 +55,28 @@ static char *codec;
static int width = 0;
static int height = 0;
static float fps = 25;
static int imgsize=0;
static int imgsize = 0;
const m_option_t demux_rawvideo_opts[] = {
// size:
{ "w", &width, CONF_TYPE_INT,CONF_RANGE,1,8192, NULL },
{ "h", &height, CONF_TYPE_INT,CONF_RANGE,1,8192, NULL },
{ "w", &width, CONF_TYPE_INT, CONF_RANGE, 1, 8192, NULL },
{ "h", &height, CONF_TYPE_INT, CONF_RANGE, 1, 8192, NULL },
// format:
{ "format", &vformat, CONF_TYPE_FOURCC, 0, 0 , 0, NULL },
{ "mp-format", &mp_format, CONF_TYPE_IMGFMT, 0, 0 , 0, NULL },
{ "codec", &codec, CONF_TYPE_STRING, 0, 0 , 0, NULL },
{ "format", &vformat, CONF_TYPE_FOURCC, 0, 0, 0, NULL },
{ "mp-format", &mp_format, CONF_TYPE_IMGFMT, 0, 0, 0, NULL },
{ "codec", &codec, CONF_TYPE_STRING, 0, 0, 0, NULL },
// misc:
{ "fps", &fps, CONF_TYPE_FLOAT,CONF_RANGE,0.001,1000, NULL },
{ "size", &imgsize, CONF_TYPE_INT, CONF_RANGE, 1 , 8192*8192*4, NULL },
{ "fps", &fps, CONF_TYPE_FLOAT, CONF_RANGE, 0.001, 1000, NULL },
{ "size", &imgsize, CONF_TYPE_INT, CONF_RANGE, 1, 8192 * 8192 * 4, NULL },
{NULL, NULL, 0, 0, 0, 0, NULL}
};
static int demux_rawaudio_open(demuxer_t* demuxer, enum demux_check check)
static int demux_rawaudio_open(demuxer_t *demuxer, enum demux_check check)
{
struct sh_stream *sh;
sh_audio_t* sh_audio;
WAVEFORMATEX* w;
sh_audio_t *sh_audio;
WAVEFORMATEX *w;
if (check != DEMUX_CHECK_REQUEST && check != DEMUX_CHECK_FORCE)
return -1;
@ -112,16 +112,16 @@ static int demux_rawaudio_open(demuxer_t* demuxer, enum demux_check check)
return 0;
}
static int demux_rawvideo_open(demuxer_t* demuxer, enum demux_check check)
static int demux_rawvideo_open(demuxer_t *demuxer, enum demux_check check)
{
struct sh_stream *sh;
sh_video_t* sh_video;
sh_video_t *sh_video;
if (check != DEMUX_CHECK_REQUEST && check != DEMUX_CHECK_FORCE)
return -1;
if(!width || !height){
mp_msg(MSGT_DEMUX,MSGL_ERR,"rawvideo: width or height not specified!\n");
if (!width || !height) {
mp_msg(MSGT_DEMUX, MSGL_ERR, "rawvideo: width or height not specified!\n");
return -1;
}
@ -137,13 +137,12 @@ static int demux_rawvideo_open(demuxer_t* demuxer, enum demux_check check)
desc.bpp[p] + 7) / 8;
}
}
} else if (codec && codec[0]) {
} else if (codec && codec[0])
decoder = talloc_strdup(demuxer, codec);
}
if (!imgsize) {
int bpp = 0;
switch(vformat){
switch (vformat) {
case MP_FOURCC_I420: case MP_FOURCC_IYUV:
case MP_FOURCC_NV12: case MP_FOURCC_NV21:
case MP_FOURCC_HM12:
@ -168,7 +167,8 @@ static int demux_rawvideo_open(demuxer_t* demuxer, enum demux_check check)
break;
}
if (!bpp) {
mp_msg(MSGT_DEMUX,MSGL_ERR,"rawvideo: img size not specified and unknown format!\n");
mp_msg(MSGT_DEMUX, MSGL_ERR,
"rawvideo: img size not specified and unknown format!\n");
return -1;
}
imgsize = width * height * bpp / 8;
@ -176,12 +176,12 @@ static int demux_rawvideo_open(demuxer_t* demuxer, enum demux_check check)
sh = new_sh_stream(demuxer, STREAM_VIDEO);
sh_video = sh->video;
sh_video->gsh->codec=decoder;
sh_video->format=imgfmt;
sh_video->fps=fps;
sh_video->disp_w=width;
sh_video->disp_h=height;
sh_video->i_bps=fps*imgsize;
sh_video->gsh->codec = decoder;
sh_video->format = imgfmt;
sh_video->fps = fps;
sh_video->disp_w = width;
sh_video->disp_h = height;
sh_video->i_bps = fps * imgsize;
demuxer->movi_start = demuxer->stream->start_pos;
demuxer->movi_end = demuxer->stream->end_pos;
@ -196,7 +196,7 @@ static int demux_rawvideo_open(demuxer_t* demuxer, enum demux_check check)
return 0;
}
static int raw_fill_buffer(demuxer_t* demuxer)
static int raw_fill_buffer(demuxer_t *demuxer)
{
struct priv *p = demuxer->priv;
@ -214,9 +214,11 @@ static int raw_fill_buffer(demuxer_t* demuxer)
return 1;
}
static void raw_seek(demuxer_t *demuxer,float rel_seek_secs,float audio_delay,int flags){
static void raw_seek(demuxer_t *demuxer, float rel_seek_secs, float audio_delay,
int flags)
{
struct priv *p = demuxer->priv;
stream_t* s = demuxer->stream;
stream_t *s = demuxer->stream;
stream_update_size(s);
int64_t start = s->start_pos;
int64_t end = s->end_pos;
@ -225,7 +227,7 @@ static void raw_seek(demuxer_t *demuxer,float rel_seek_secs,float audio_delay,in
pos += (end - start) * rel_seek_secs;
else
pos += rel_seek_secs * p->frame_rate * p->frame_size;
if(pos < 0)
if (pos < 0)
pos = 0;
if (end && pos > end)
pos = end;