Skip to content

Swig: ignore custom types which are not bound #183

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 2, 2015
Merged

Swig: ignore custom types which are not bound #183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b139293
SWIG: ignore OptionMap type
Nov 24, 2015
55adb30
SWIG: ignore OptionArrayMap and NamesArray types
Nov 24, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/AvTranscoder/Option.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,13 +118,15 @@ class AvExport Option
typedef std::vector<Option> OptionArray;
typedef std::map<std::string, Option> OptionMap; ///< Key: option name / value: option

#ifndef SWIG
/**
* @param outOptions: map or array of options
* @param av_class: a libav context (could be an AVFormatContext or an AVCodecContext).
* @param req_flags: libav flag (AV_OPT_FLAG_XXX), which is a filter for AVOption loaded by the Context (default = 0: no flag restriction).
*/
void AvExport loadOptions( OptionMap& outOptions, void* av_class, int req_flags = 0 );
void AvExport loadOptions( OptionArray& outOptions, void* av_class, int req_flags = 0 );
#endif

}

Expand Down
3 changes: 2 additions & 1 deletion src/AvTranscoder/codec/ICodec.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,9 @@ class AvExport ICodec
int getLatency() const;

OptionArray getOptions(); ///< Get options as array
#ifndef SWIG
OptionMap& getOptionsMap() { return _options; } ///< Get options as map

#endif
Option& getOption( const std::string& optionName ) { return _options.at(optionName); }

#ifndef SWIG
Expand Down
3 changes: 2 additions & 1 deletion src/AvTranscoder/file/FormatContext.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,9 @@ class AvExport FormatContext
size_t getStartTime() const { return _avFormatContext->start_time; }

OptionArray getOptions(); ///< Get options as array
#ifndef SWIG
OptionMap& getOptionsMap() { return _options; } ///< Get options as map

#endif
Option& getOption( const std::string& optionName ) { return _options.at(optionName); }

/**
Expand Down
2 changes: 2 additions & 0 deletions src/AvTranscoder/util.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ AVPixelFormat AvExport getAVPixelFormat( const std::string& pixelFormat );
*/
AVSampleFormat AvExport getAVSampleFormat( const std::string& sampleFormat );

#ifndef SWIG
/**
* @brief Get array of short/long names of all format supported by FFmpeg / libav.
*/
Expand Down Expand Up @@ -77,6 +78,7 @@ OptionArrayMap AvExport getVideoCodecOptions();
* @brief Get the list of options for each audio codec
*/
OptionArrayMap AvExport getAudioCodecOptions();
#endif

}

Expand Down