FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Javier Taibo, "I have found that since version 1.1, FFMPEG changed the way audio streams are retrieved, from packed to planar format. SDL interprets packed audio, as is used in the osgmovie example. To make the audio work when the OSGffmpeg plug-in is compiled against recent FFMPEG versions, FFmpegDecoderAudio must check for planar formats and in these cases request the samples as packed. This way all works as before. It can be checked with osgmovie example application.

Browse Source 
$ osgmovie --audio movie.avi.ffmpeg
  FFmpegImageStream::open audio failed, audio stream will be disabled: unknown audio format

  With the attached FFmpegDecoderAudio.cpp, audio sounds correctly.

  I am also attaching a modified version of FindFFmpeg.cmake that allows to set as FFMPEG_DIR the ffmpeg compiled in the source directory structure. It should not break anything as it only adds some additional search paths.
"


git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14654 16af8721-9629-0410-8352-f15c8da7e697
This commit is contained in:
Robert Osfield
2015-01-07 14:14:55 +00:00
parent bf794165d5
commit d409ffcb91
9 changed files with 270 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/osgPlugins/ffmpeg/ReaderWriterFFmpeg.cpp
View File

@@ -96,13 +96,20 @@ public:
supportsExtension("3gp", "3G multi-media format");
supportsExtension("sdp", "Session Description Protocol");
supportsExtension("m2ts", "MPEG-2 Transport Stream");
supportsExtension("ts", "MPEG-2 Transport Stream");
supportsOption("format", "Force setting input format (e.g. vfwcap for Windows webcam)");
supportsOption("pixel_format", "Set pixel format");
supportsOption("frame_size", "Set frame size (e.g. 320x240)");
supportsOption("frame_rate", "Set frame rate (e.g. 25)");
// WARNING: This option is kept for backwards compatibility only, use out_sample_rate instead!
supportsOption("audio_sample_rate", "Set audio sampling rate (e.g. 44100)");
supportsOption("out_sample_format", "Set the output sample format (e.g. AV_SAMPLE_FMT_S16)");
supportsOption("out_sample_rate", "Set the output sample rate or frequency in Hz (e.g. 48000)");
supportsOption("out_nb_channels", "Set the output number of channels (e.g. 2 for stereo)");
supportsOption("context", "AVIOContext* for custom IO");
supportsOption("mad", "Max analyze duration (seconds)");
supportsOption("rtsp_transport", "RTSP transport (udp, tcp, udp_multicast or http)");
av_log_set_callback(log_to_osg);
@@ -138,10 +145,22 @@ public:
return readImageStream(filename, parameters.get());
}
#if 1
// NOTE: The original code checks parameters->isFormatAvailable() which returns
// false when a format is not explicitly specified.
// In these cases, the extension is used, which is a problem for videos served
// from URLs without an extension
{
ReadResult rr = readImageStream(filename, parameters.get());
if ( rr.validImage() )
return rr;
}
#else
if (parameters->isFormatAvailable())
{
return readImageStream(filename, parameters.get());
}
#endif
if (! acceptsExtension(ext))
return ReadResult::FILE_NOT_HANDLED;