Hi David, I have just done a quick merge and compiled against FFmpeg 0.8.4 that I have installed here on my Kubuntu 12.04 system and it compiles and runs fine which is a relief as given the extent of the changes I was worried that it would fail to compile on non 1.0 version of FFmpeg. Do you know how far back in FFmpeg versions that you changes will work?
The change of RGBA to RGB isn't something I am happy with as this will prevent support for movies with alpha, while these might not be the most common form of formats for video they do exist and are used by OSG users. I think the ideal way to resolve this is to check for alpha channel when opening the video and then select RGB or RGBA based on this. Are you familiar with the best way to do this with ffmpeg? Robert. On 9 October 2012 19:31, David Longest <[email protected]> wrote: > Hello Robert, > > > > I have updated the FFmpeg plugin to support the 1.0 release version of > FFmpeg. The files attached were modified in order to facilitate the update. > Below are the details for all changes made. > > > > Header update > > FindFFmpeg.cmake has been changed in order to support the new header include > format for FFmpeg. In the 1.0 release, a new file had been added with the > name “time.h” in the avutil library. The previous method of adding includes > caused conflicts with the ANSI C “time.h” file. Now the include directive > will only use the main include folder. All files using the old include > format have been updated to reflect the change. > > > > Added __STDC_CONSTANT_MACROS define to CMakeLists.txt > > Since there is no guarantee that FFmpegHeaders.hpp will be included before > stdint.h is included, the define has been moved from FFmpegHeaders.hpp to be > part of the CMakeLists.txt for the FFmpeg plugin. This will allow the define > to work on all compilers regardless of include order. > > > > Replaced AVFormatParameters with AVDictionary > > AVFormatParameters is no longer supported in FFmpeg and has been replaced > with a key/value map of strings for each setting. FFmpegParameters and > FFmpegDecoder has been updated to reflect this. > > > > Replaced av_open_input_file with avformat_open_input > > FFmpeg now opens files using avformat_open_input. Since the > av_open_input_file method is deprecated, the FFmpegDecoder class has been > updated to reflect this change. > > > > Added custom AVIOContext field to options > > Since some formats and inputs may not be supported by FFmpeg, I have added a > new parameter that allows a user to allocate their own AVIOContext. This > class will allow for creating a read, seek, and write callback if they > desire. > > > > Checking for start_time validity > > It is possible for some file formats to not provide a start_time to FFmpeg. > This would cause stuttering in the video since the clocks class would be > incorrect. > > > > Removed findVideoStream and findAudioStream > > The new FFmpeg release already has a function that will find the best audio > and video stream. The code has been replaced with this function. > > > > Updated error reporting > > Some functions would not log an error when opening a file or modifying a > file failed. New logs have been added as well as a function to convert error > numbers to their string descriptions. > > > > decode_video has been replaced > > The old decode_video function would remove extra data that some decoders use > in order to properly decode a packet. Now av_codec_decode_video2 has > replaced that function. > > > > Picture format changed from RGBA32 to RGB24 > > Since most video will not contain an alpha channel, using a 24 bit texture > will use less memory. > > > > Thanks, > > David > > > _______________________________________________ > osg-submissions mailing list > [email protected] > http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org > _______________________________________________ osg-submissions mailing list [email protected] http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org
