Skip to content

Commit 7ce08ae

Browse files
author
Clement Champetier
committed
InputFile: removed getFormatName/LonName/MimeType
Will be found from getProperties method.
1 parent 50c986a commit 7ce08ae

File tree

2 files changed

+1
-52
lines changed

2 files changed

+1
-52
lines changed

src/AvTranscoder/file/InputFile.cpp

Lines changed: 1 addition & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -126,42 +126,6 @@ InputStream& InputFile::getStream(size_t index)
126126
}
127127
}
128128

129-
std::string InputFile::getFormatName() const
130-
{
131-
if(_formatContext.getAVInputFormat().name == NULL)
132-
{
133-
LOG_WARN("Unknown demuxer format name of '" << _filename << "'.")
134-
return "";
135-
}
136-
return std::string(_formatContext.getAVInputFormat().name);
137-
}
138-
139-
std::string InputFile::getFormatLongName() const
140-
{
141-
if(_formatContext.getAVInputFormat().long_name == NULL)
142-
{
143-
LOG_WARN("Unknown demuxer format long name of '" << _filename << "'.")
144-
return "";
145-
}
146-
return std::string(_formatContext.getAVInputFormat().long_name);
147-
}
148-
149-
std::string InputFile::getFormatMimeType() const
150-
{
151-
#if LIBAVFORMAT_VERSION_MAJOR <= 55
152-
LOG_WARN("Cannot get mime type format of '" << _filename
153-
<< "' because your libavformat library has a major version <= 55.")
154-
return "not available";
155-
#else
156-
if(_formatContext.getAVInputFormat().mime_type == NULL)
157-
{
158-
LOG_WARN("Unknown demuxer format mime type of '" << _filename << "'.")
159-
return "";
160-
}
161-
return std::string(_formatContext.getAVInputFormat().mime_type);
162-
#endif
163-
}
164-
165129
double InputFile::getFps()
166130
{
167131
double fps = 1;
@@ -250,4 +214,4 @@ std::ostream& operator<<(std::ostream& flux, const InputFile& input)
250214

251215
return flux;
252216
}
253-
}
217+
}

src/AvTranscoder/file/InputFile.hpp

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -79,21 +79,6 @@ class AvExport InputFile
7979

8080
std::string getFilename() const { return _filename; }
8181

82-
/**
83-
* @brief A comma separated list of short names for the format, or empty if unknown.
84-
*/
85-
std::string getFormatName() const;
86-
87-
/**
88-
* @brief Descriptive name for the format, meant to be more human-readable than name, or empty if unknown.
89-
*/
90-
std::string getFormatLongName() const;
91-
92-
/**
93-
* @brief Comma-separated list of mime types, or empty if unknown.
94-
*/
95-
std::string getFormatMimeType() const;
96-
9782
FormatContext& getFormatContext() { return _formatContext; }
9883

9984
/**

0 commit comments

Comments
 (0)