From 0a93237cb5e4642d3b698ff9b7d0cfae5401478c Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 27 May 2015 20:55:51 +0100 Subject: Handle multiple audio streams in a single piece of content in a similar way to the V1 patch. --- src/lib/ffmpeg_decoder.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/lib/ffmpeg_decoder.h') diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h index 6f027ce1c..ec975f439 100644 --- a/src/lib/ffmpeg_decoder.h +++ b/src/lib/ffmpeg_decoder.h @@ -40,6 +40,7 @@ extern "C" { class Log; class FilterGraph; +class FFmpegAudioStream; struct ffmpeg_pts_offset_test; /** @class FFmpegDecoder @@ -57,8 +58,8 @@ private: void seek (ContentTime time, bool); void flush (); - AVSampleFormat audio_sample_format () const; - int bytes_per_audio_sample () const; + AVSampleFormat audio_sample_format (boost::shared_ptr stream) const; + int bytes_per_audio_sample (boost::shared_ptr stream) const; bool decode_video_packet (); void decode_audio_packet (); @@ -67,7 +68,7 @@ private: void decode_bitmap_subtitle (AVSubtitleRect const * rect, ContentTimePeriod period); void maybe_add_subtitle (); - boost::shared_ptr deinterleave_audio (uint8_t** data, int size); + boost::shared_ptr deinterleave_audio (boost::shared_ptr stream, uint8_t** data, int size); std::list image_subtitles_during (ContentTimePeriod, bool starting) const; std::list text_subtitles_during (ContentTimePeriod, bool starting) const; -- cgit v1.2.3