Mercurial > mplayer.hg
comparison libmpdemux/demux_ogg.c @ 30582:85aaf16401b5
Move up demux_ogg_sub_id, demux_ogg_sub_reverse_id; avoids forward declarations.
author | diego |
---|---|
date | Wed, 17 Feb 2010 23:25:02 +0000 |
parents | a25d16882312 |
children | c8b12c3fc5a5 |
comparison
equal
deleted
inserted
replaced
30581:fef54a0e6ec2 | 30582:85aaf16401b5 |
---|---|
365 if (!strncasecmp(clang, langlist, strlen(langlist))) | 365 if (!strncasecmp(clang, langlist, strlen(langlist))) |
366 return 1; | 366 return 1; |
367 return 0; | 367 return 0; |
368 } | 368 } |
369 | 369 |
370 static int demux_ogg_sub_reverse_id(demuxer_t *demuxer, int id); | 370 /** \brief Change the current subtitle stream and return its ID. |
371 | |
372 \param demuxer The demuxer whose subtitle stream will be changed. | |
373 \param new_num The number of the new subtitle track. The number must be | |
374 between 0 and ogg_d->n_text - 1. | |
375 | |
376 \returns The Ogg stream number ( = page serial number) of the newly selected | |
377 track. | |
378 */ | |
379 int demux_ogg_sub_id(demuxer_t *demuxer, int index) { | |
380 ogg_demuxer_t *ogg_d = demuxer->priv; | |
381 return (index < 0) ? index : (index >= ogg_d->n_text) ? -1 : ogg_d->text_ids[index]; | |
382 } | |
383 | |
384 /** \brief Translate the ogg track number into the subtitle number. | |
385 * \param demuxer The demuxer about whose subtitles we are inquiring. | |
386 * \param id The ogg track number of the subtitle track. | |
387 */ | |
388 static int demux_ogg_sub_reverse_id(demuxer_t *demuxer, int id) { | |
389 ogg_demuxer_t *ogg_d = demuxer->priv; | |
390 int i; | |
391 for (i = 0; i < ogg_d->n_text; i++) | |
392 if (ogg_d->text_ids[i] == id) return i; | |
393 return -1; | |
394 } | |
371 | 395 |
372 /// Try to print out comments and also check for LANGUAGE= tag | 396 /// Try to print out comments and also check for LANGUAGE= tag |
373 static void demux_ogg_check_comments(demuxer_t *d, ogg_stream_t *os, int id, vorbis_comment *vc) | 397 static void demux_ogg_check_comments(demuxer_t *d, ogg_stream_t *os, int id, vorbis_comment *vc) |
374 { | 398 { |
375 const char *hdr, *val; | 399 const char *hdr, *val; |
638 | 662 |
639 } | 663 } |
640 | 664 |
641 void print_wave_header(WAVEFORMATEX *h, int verbose_level); | 665 void print_wave_header(WAVEFORMATEX *h, int verbose_level); |
642 void print_video_header(BITMAPINFOHEADER *h, int verbose_level); | 666 void print_video_header(BITMAPINFOHEADER *h, int verbose_level); |
643 | |
644 /** \brief Change the current subtitle stream and return its ID. | |
645 | |
646 \param demuxer The demuxer whose subtitle stream will be changed. | |
647 \param new_num The number of the new subtitle track. The number must be | |
648 between 0 and ogg_d->n_text - 1. | |
649 | |
650 \returns The Ogg stream number ( = page serial number) of the newly selected | |
651 track. | |
652 */ | |
653 int demux_ogg_sub_id(demuxer_t *demuxer, int index) { | |
654 ogg_demuxer_t *ogg_d = demuxer->priv; | |
655 return (index < 0) ? index : (index >= ogg_d->n_text) ? -1 : ogg_d->text_ids[index]; | |
656 } | |
657 | |
658 /** \brief Translate the ogg track number into the subtitle number. | |
659 * \param demuxer The demuxer about whose subtitles we are inquiring. | |
660 * \param id The ogg track number of the subtitle track. | |
661 */ | |
662 static int demux_ogg_sub_reverse_id(demuxer_t *demuxer, int id) { | |
663 ogg_demuxer_t *ogg_d = demuxer->priv; | |
664 int i; | |
665 for (i = 0; i < ogg_d->n_text; i++) | |
666 if (ogg_d->text_ids[i] == id) return i; | |
667 return -1; | |
668 } | |
669 | |
670 static void demux_close_ogg(demuxer_t* demuxer); | |
671 | 667 |
672 static void fixup_vorbis_wf(sh_audio_t *sh, ogg_demuxer_t *od) | 668 static void fixup_vorbis_wf(sh_audio_t *sh, ogg_demuxer_t *od) |
673 { | 669 { |
674 int i, offset; | 670 int i, offset; |
675 int ris, init_error = 0; | 671 int ris, init_error = 0; |