diff options
Diffstat (limited to 'src/demuxers/demux_qt.c')
| -rw-r--r-- | src/demuxers/demux_qt.c | 68 |
1 files changed, 32 insertions, 36 deletions
diff --git a/src/demuxers/demux_qt.c b/src/demuxers/demux_qt.c index 5225ee46f..9ac9373a0 100644 --- a/src/demuxers/demux_qt.c +++ b/src/demuxers/demux_qt.c @@ -30,7 +30,7 @@ * build_frame_table * free_qt_info * - * $Id: demux_qt.c,v 1.167 2003/10/29 01:45:52 tmmm Exp $ + * $Id: demux_qt.c,v 1.168 2003/10/30 00:49:07 tmattern Exp $ * */ @@ -2160,8 +2160,8 @@ static int demux_qt_send_chunk(demux_plugin_t *this_gen) { video_trak->properties->video.edit_list_compensation = 0; } - this->stream->stream_info[XINE_STREAM_INFO_FRAME_DURATION] = - frame_duration; + xine_set_stream_info(this->stream, XINE_STREAM_INFO_FRAME_DURATION, + frame_duration); debug_video_demux(" qt: sending off video frame %d from offset 0x%llX, %d bytes, media id %d, %lld pts\n", i, @@ -2349,22 +2349,22 @@ static void demux_qt_send_headers(demux_plugin_t *this_gen) { video_trak->properties->video.codec_fourcc ) video_trak->properties->video.codec_buftype = BUF_VIDEO_UNKNOWN; - this->stream->stream_info[XINE_STREAM_INFO_HAS_VIDEO] = 1; - this->stream->stream_info[XINE_STREAM_INFO_VIDEO_WIDTH] = - this->bih.biWidth; - this->stream->stream_info[XINE_STREAM_INFO_VIDEO_HEIGHT] = - this->bih.biHeight; - this->stream->stream_info[XINE_STREAM_INFO_VIDEO_FOURCC] = - video_trak->properties->video.codec_fourcc; + xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 1); + xine_set_stream_info(this->stream, XINE_STREAM_INFO_VIDEO_WIDTH, + this->bih.biWidth); + xine_set_stream_info(this->stream, XINE_STREAM_INFO_VIDEO_HEIGHT, + this->bih.biHeight); + xine_set_stream_info(this->stream, XINE_STREAM_INFO_VIDEO_FOURCC, + video_trak->properties->video.codec_fourcc); } else { memset(&this->bih, 0, sizeof(this->bih)); this->bih.biSize = sizeof(this->bih); - this->stream->stream_info[XINE_STREAM_INFO_HAS_VIDEO] = 0; - this->stream->stream_info[XINE_STREAM_INFO_VIDEO_WIDTH] = 0; - this->stream->stream_info[XINE_STREAM_INFO_VIDEO_HEIGHT] = 0; - this->stream->stream_info[XINE_STREAM_INFO_VIDEO_FOURCC] = 0; + xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 0); + xine_set_stream_info(this->stream, XINE_STREAM_INFO_VIDEO_WIDTH, 0); + xine_set_stream_info(this->stream, XINE_STREAM_INFO_VIDEO_HEIGHT, 0); + xine_set_stream_info(this->stream, XINE_STREAM_INFO_VIDEO_FOURCC, 0); } @@ -2377,39 +2377,35 @@ static void demux_qt_send_headers(demux_plugin_t *this_gen) { audio_trak->properties->audio.codec_fourcc ) audio_trak->properties->audio.codec_buftype = BUF_AUDIO_UNKNOWN; - this->stream->stream_info[XINE_STREAM_INFO_HAS_AUDIO] = 1; - this->stream->stream_info[XINE_STREAM_INFO_AUDIO_CHANNELS] = - audio_trak->properties->audio.channels; - this->stream->stream_info[XINE_STREAM_INFO_AUDIO_SAMPLERATE] = - audio_trak->properties->audio.sample_rate; - this->stream->stream_info[XINE_STREAM_INFO_AUDIO_BITS] = - audio_trak->properties->audio.bits; - this->stream->stream_info[XINE_STREAM_INFO_AUDIO_FOURCC] = - audio_trak->properties->audio.codec_fourcc; + xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 1); + xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_CHANNELS, + audio_trak->properties->audio.channels); + xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_SAMPLERATE, + audio_trak->properties->audio.sample_rate); + xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_BITS, + audio_trak->properties->audio.bits); + xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_FOURCC, + audio_trak->properties->audio.codec_fourcc); } else { - this->stream->stream_info[XINE_STREAM_INFO_HAS_AUDIO] = 0; - this->stream->stream_info[XINE_STREAM_INFO_AUDIO_CHANNELS] = 0; - this->stream->stream_info[XINE_STREAM_INFO_AUDIO_SAMPLERATE] = 0; - this->stream->stream_info[XINE_STREAM_INFO_AUDIO_BITS] = 0; - this->stream->stream_info[XINE_STREAM_INFO_AUDIO_FOURCC] = 0; + xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 0); + xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_CHANNELS, 0); + xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_SAMPLERATE, 0); + xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_BITS, 0); + xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_FOURCC, 0); } /* copy over the meta information like artist and title */ if (this->qt->copyright) - this->stream->meta_info[XINE_META_INFO_ARTIST] = - strdup(this->qt->copyright); + xine_set_meta_info(this->stream, XINE_META_INFO_ARTIST, this->qt->copyright); if (this->qt->name) - this->stream->meta_info[XINE_META_INFO_TITLE] = - strdup(this->qt->name); + xine_set_meta_info(this->stream, XINE_META_INFO_TITLE, this->qt->name); else if (this->qt->description) - this->stream->meta_info[XINE_META_INFO_TITLE] = - strdup(this->qt->description); + xine_set_meta_info(this->stream, XINE_META_INFO_TITLE, this->qt->description); if (this->qt->comment) - this->stream->meta_info[XINE_META_INFO_COMMENT] = - strdup(this->qt->comment); + xine_set_meta_info(this->stream, XINE_META_INFO_COMMENT, this->qt->comment); /* send start buffers */ xine_demux_control_start(this->stream); |