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

demux: remove some old stream header functions

This commit is contained in:
wm4 2013-07-08 00:35:04 +02:00
parent aac5d758c5
commit c4f33d784a
7 changed files with 14 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
demux/demux.c
View File

@ -343,24 +343,6 @@ static void free_sh_sub(sh_sub_t *sh)
free_sh_stream(sh->gsh);
}
sh_audio_t *new_sh_audio_aid(demuxer_t *demuxer, int id, int aid)
{
if (id > MAX_A_STREAMS - 1 || id < 0) {
mp_msg(MSGT_DEMUXER, MSGL_WARN,
"Requested audio stream id overflow (%d > %d)\n", id,
MAX_A_STREAMS);
return NULL;
}
if (demuxer->a_streams[id]) {
mp_tmsg(MSGT_DEMUXER, MSGL_WARN, "WARNING: Audio stream header %d redefined.\n", id);
} else {
mp_tmsg(MSGT_DEMUXER, MSGL_V, "==> Found audio stream: %d\n", id);
new_sh_stream_id(demuxer, STREAM_AUDIO, id, aid);
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AUDIO_ID=%d\n", aid);
}
return demuxer->a_streams[id];
}
static void free_sh_audio(demuxer_t *demuxer, int id)
{
sh_audio_t *sh = demuxer->a_streams[id];
@ -371,24 +353,6 @@ static void free_sh_audio(demuxer_t *demuxer, int id)
free_sh_stream(sh->gsh);
}
sh_video_t *new_sh_video_vid(demuxer_t *demuxer, int id, int vid)
{
if (id > MAX_V_STREAMS - 1 || id < 0) {
mp_msg(MSGT_DEMUXER, MSGL_WARN,
"Requested video stream id overflow (%d > %d)\n", id,
MAX_V_STREAMS);
return NULL;
}
if (demuxer->v_streams[id])
mp_tmsg(MSGT_DEMUXER, MSGL_WARN, "WARNING: Video stream header %d redefined.\n", id);
else {
mp_tmsg(MSGT_DEMUXER, MSGL_V, "==> Found video stream: %d\n", id);
new_sh_stream_id(demuxer, STREAM_VIDEO, id, vid);
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VIDEO_ID=%d\n", vid);
}
return demuxer->v_streams[id];
}
static void free_sh_video(sh_video_t *sh)
{
mp_msg(MSGT_DEMUXER, MSGL_DBG2, "DEMUXER: freeing sh_video at %p\n", sh);

3
demux/demux_mf.c
View File

@ -206,7 +206,8 @@ static demuxer_t* demux_open_mf(demuxer_t* demuxer){
demuxer->movi_end = mf->nr_of_files - 1;
// create a new video stream header
sh_video = new_sh_video(demuxer, 0);
struct sh_stream *sh = new_sh_stream(demuxer, STREAM_VIDEO);
sh_video = sh->video;
// make sure the demuxer knows about the new video stream header
// (even though new_sh_video() ought to take care of it)
demuxer->video->sh = sh_video;

3
demux/demux_mng.c
View File

@ -423,7 +423,8 @@ static demuxer_t * demux_mng_open(demuxer_t * demuxer)
}
// create a new video stream header
sh_video = new_sh_video(demuxer, 0);
struct sh_stream *sh = new_sh_stream(demuxer, STREAM_VIDEO);
sh_video = sh->video;
// Make sure the demuxer knows about the new video stream header
// (even though new_sh_video() ought to take care of it).

4
demux/demux_rawaudio.c
View File

@ -44,13 +44,15 @@ const m_option_t demux_rawaudio_opts[] = {
static demuxer_t* demux_rawaudio_open(demuxer_t* demuxer) {
struct sh_stream *sh;
sh_audio_t* sh_audio;
WAVEFORMATEX* w;
if ((format & AF_FORMAT_SPECIAL_MASK) != 0)
return NULL;
sh_audio = new_sh_audio(demuxer,0);
sh = new_sh_stream(demuxer, STREAM_AUDIO);
sh_audio = sh->audio;
sh_audio->gsh->codec = "mp-pcm";
sh_audio->format = format;
sh_audio->wf = w = malloc(sizeof(*w));

4
demux/demux_rawvideo.c
View File

@ -57,6 +57,7 @@ const m_option_t demux_rawvideo_opts[] = {
static demuxer_t* demux_rawvideo_open(demuxer_t* demuxer) {
struct sh_stream *sh;
sh_video_t* sh_video;
if(!width || !height){
@ -113,7 +114,8 @@ static demuxer_t* demux_rawvideo_open(demuxer_t* demuxer) {
imgsize = width * height * bpp / 8;
}
sh_video = new_sh_video(demuxer,0);
sh = new_sh_stream(demuxer, STREAM_VIDEO);
sh_video = sh->video;
sh_video->gsh->codec=decoder;
sh_video->format=imgfmt;
sh_video->fps=fps;

5
demux/stheader.h
View File

@ -161,11 +161,6 @@ typedef struct sh_sub {
} sh_sub_t;
// demuxer.c:
#define new_sh_audio(d, i) new_sh_audio_aid(d, i, i)
struct sh_audio *new_sh_audio_aid(struct demuxer *demuxer, int id, int aid);
#define new_sh_video(d, i) new_sh_video_vid(d, i, i)
struct sh_video *new_sh_video_vid(struct demuxer *demuxer, int id, int vid);
#define new_sh_sub(d, i) new_sh_sub_sid(d, i, i)
struct sh_stream *new_sh_stream(struct demuxer *demuxer, enum stream_type type);
// video.c:

6
stream/tv.c
View File

@ -708,7 +708,8 @@ static demuxer_t* demux_open_tv(demuxer_t *demuxer)
funcs = tvh->functions;
demuxer->priv=tvh;
sh_video = new_sh_video(demuxer, 0);
struct sh_stream *sh_v = new_sh_stream(demuxer, STREAM_VIDEO);
sh_video = sh_v->video;
/* get IMAGE FORMAT */
int fourcc;
@ -786,7 +787,8 @@ static demuxer_t* demux_open_tv(demuxer_t *demuxer)
goto no_audio;
}
sh_audio = new_sh_audio(demuxer, 0);
struct sh_stream *sh_a = new_sh_stream(demuxer, STREAM_AUDIO);
sh_audio = sh_a->audio;
funcs->control(tvh->priv, TVI_CONTROL_AUD_GET_SAMPLERATE,
&sh_audio->samplerate);