avTranscoder · cchampet · May 3, 2016 · May 3, 2016 · May 3, 2016 · May 3, 2016
diff --git a/src/AvTranscoder/data/decoded/Frame.cpp b/src/AvTranscoder/data/decoded/Frame.cpp
@@ -40,6 +40,11 @@ Frame::~Frame()
     }
 }
 
+int Frame::getEncodedSize() const
+{
+    return av_frame_get_pkt_size(_frame);
+}
+
 void Frame::copyData(const Frame& frameToRef)
 {
     const int ret = av_frame_copy(_frame, &frameToRef.getAVFrame());

diff --git a/src/AvTranscoder/data/decoded/Frame.hpp b/src/AvTranscoder/data/decoded/Frame.hpp
@@ -43,6 +43,12 @@ class AvExport Frame
      */
     int* getLineSize() const { return _frame->linesize; }
 
+    /**
+     * @return Size of the corresponding packet containing the compressed frame (in bytes)
+     * @warning returns a negative value if the size is unknown
+     */
+    int getEncodedSize() const;
+
     /**
      * @brief Copy the data of the given Frame.
      * @note This function does not allocate anything: the current frame must be already initialized and

diff --git a/src/AvTranscoder/file/FormatContext.cpp b/src/AvTranscoder/file/FormatContext.cpp
@@ -53,7 +53,7 @@ FormatContext::~FormatContext()
 
 void FormatContext::findStreamInfo(AVDictionary** options)
 {
-    int err = avformat_find_stream_info(_avFormatContext, options);
+    const int err = avformat_find_stream_info(_avFormatContext, options);
     if(err < 0)
     {
         throw std::ios_base::failure("Unable to find stream informations: " + getDescriptionFromErrorCode(err));
@@ -65,7 +65,7 @@ void FormatContext::openRessource(const std::string& url, int flags)
     if((_avFormatContext->flags & AVFMT_NOFILE) == AVFMT_NOFILE)
         return;
 
-    int err = avio_open2(&_avFormatContext->pb, url.c_str(), flags, NULL, NULL);
+    const int err = avio_open2(&_avFormatContext->pb, url.c_str(), flags, NULL, NULL);
     if(err < 0)
     {
         throw std::ios_base::failure("Error when opening output format: " + getDescriptionFromErrorCode(err));
@@ -77,7 +77,7 @@ void FormatContext::closeRessource()
     if((_avFormatContext->flags & AVFMT_NOFILE) == AVFMT_NOFILE)
         return;
 
-    int err = avio_close(_avFormatContext->pb);
+    const int err = avio_close(_avFormatContext->pb);
     if(err < 0)
     {
         throw std::ios_base::failure("Error when close output format: " + getDescriptionFromErrorCode(err));
@@ -86,7 +86,7 @@ void FormatContext::closeRessource()
 
 void FormatContext::writeHeader(AVDictionary** options)
 {
-    int ret = avformat_write_header(_avFormatContext, options);
+    const int ret = avformat_write_header(_avFormatContext, options);
     if(ret != 0)
     {
         throw std::runtime_error("Could not write header: " + getDescriptionFromErrorCode(ret));
@@ -115,7 +115,7 @@ void FormatContext::writeFrame(AVPacket& packet, bool interleaved)
 
 void FormatContext::writeTrailer()
 {
-    int ret = av_write_trailer(_avFormatContext);
+    const int ret = av_write_trailer(_avFormatContext);
     if(ret != 0)
     {
         throw std::runtime_error("Could not write trailer: " + getDescriptionFromErrorCode(ret));
@@ -124,7 +124,7 @@ void FormatContext::writeTrailer()
 
 void FormatContext::addMetaData(const std::string& key, const std::string& value)
 {
-    int ret = av_dict_set(&_avFormatContext->metadata, key.c_str(), value.c_str(), 0);
+    const int ret = av_dict_set(&_avFormatContext->metadata, key.c_str(), value.c_str(), 0);
     if(ret < 0)
     {
         LOG_ERROR(getDescriptionFromErrorCode(ret))
@@ -144,8 +144,18 @@ AVStream& FormatContext::addAVStream(const AVCodec& avCodec)
 
 bool FormatContext::seek(const uint64_t position, const int flag)
 {
-    LOG_INFO("Seek in '" << _avFormatContext->filename << "' at " << position << " (in AV_TIME_BASE units)")
-    int err = av_seek_frame(_avFormatContext, -1, position, flag);
+    // Check if the format is a raw bitstreams, without any container.
+    // In this case, avoid seeking.
+    const std::string formatLongName(_avFormatContext->iformat->long_name ? _avFormatContext->iformat->long_name : "");
+    const std::size_t rawIndex = formatLongName.find("raw");
+    if(rawIndex != std::string::npos)
+    {
+        LOG_WARN("Seek in '" << _avFormatContext->filename << "' is not possible since this is a raw bitstreams without access to timing information.")
+        return false;
+    }
+
+    LOG_INFO("Seek in '" << _avFormatContext->filename << "' at " << position << " with flag '"<< flag << "'")
+    const int err = av_seek_frame(_avFormatContext, -1, position, flag);
     if(err < 0)
     {
         LOG_ERROR("Error when seek at " << position << " (in AV_TIME_BASE units) in file")

diff --git a/src/AvTranscoder/file/FormatContext.hpp b/src/AvTranscoder/file/FormatContext.hpp
@@ -78,6 +78,7 @@ class AvExport FormatContext
      * @param position: can be in AV_TIME_BASE units, in frames... depending on the flag value
      * @param flag: seeking mode (AVSEEK_FLAG_xxx)
      * @return seek status
+     * @warn No seek is done if the format is a raw bitstreams
      * @see flushDecoder
      */
     bool seek(const uint64_t position, const int flag);

diff --git a/src/AvTranscoder/properties/FileProperties.cpp b/src/AvTranscoder/properties/FileProperties.cpp
@@ -31,7 +31,7 @@ void FileProperties::extractStreamProperties(IProgress& progress, const EAnalyse
 {
     clearStreamProperties();
 
-    // if the analysis level wiil decode some streams parts, seek at the beginning
+    // Seek at first key frame before the analysis
     if(level > eAnalyseLevelHeader)
         const_cast<FormatContext*>(_formatContext)->seek(0, AVSEEK_FLAG_BACKWARD);
 
@@ -119,7 +119,7 @@ void FileProperties::extractStreamProperties(IProgress& progress, const EAnalyse
         _streams[unknownStreamIndex] = &_unknownStreams.at(streamIndex);
     }
 
-    // if the analysis level has decoded some streams parts, return at the beginning
+    // Seek at first key frame after the analysis
     if(level > eAnalyseLevelHeader)
         const_cast<FormatContext*>(_formatContext)->seek(0, AVSEEK_FLAG_BACKWARD);
 }
@@ -148,15 +148,10 @@ std::string FileProperties::getFormatLongName() const
 std::string FileProperties::getFormatMimeType() const
 {
 #if LIBAVFORMAT_VERSION_MAJOR <= 55
-    LOG_WARN("Cannot get mime type format of '" << getFilename()
-                                                << "' because your libavformat library has a major version <= 55.")
-    return "not available";
+    throw std::runtime_error("cannot get mime type format: libavformat library has a major version <= 55.");
 #else
     if(_avFormatContext->iformat->mime_type == NULL)
-    {
-        LOG_WARN("Unknown demuxer format mime type of '" << getFilename() << "'.")
-        return "";
-    }
+        throw std::runtime_error("Unknown demuxer format mime type");
     return std::string(_avFormatContext->iformat->mime_type);
 #endif
 }
@@ -235,6 +230,7 @@ PropertyVector& FileProperties::fillVector(PropertyVector& data) const
     addProperty(data, "filename", &FileProperties::getFilename);
     addProperty(data, "formatName", &FileProperties::getFormatName);
     addProperty(data, "formatLongName", &FileProperties::getFormatLongName);
+    addProperty(data, "mimeType", &FileProperties::getFormatMimeType);
 
     addProperty(data, "startTime", &FileProperties::getStartTime);
     addProperty(data, "duration", &FileProperties::getDuration);

diff --git a/src/AvTranscoder/properties/PixelProperties.cpp b/src/AvTranscoder/properties/PixelProperties.cpp
@@ -274,7 +274,7 @@ PropertyVector& PixelProperties::fillVector(PropertyVector& data) const
     }
     catch(const std::exception& e)
     {
-        detail::add(data, "colorComponents", e.what());
+        detail::add(data, "colorComponents", detail::propertyValueIfError);
     }
 
     try

diff --git a/src/AvTranscoder/properties/StreamProperties.cpp b/src/AvTranscoder/properties/StreamProperties.cpp
@@ -53,7 +53,10 @@ Rational StreamProperties::getTimeBase() const
 float StreamProperties::getDuration() const
 {
     const Rational timeBase = getTimeBase();
-    return av_q2d(timeBase) * _formatContext->streams[_streamIndex]->duration;
+    const size_t streamDurationInStreamTimeBase = _formatContext->streams[_streamIndex]->duration;
+    if(streamDurationInStreamTimeBase == (size_t)AV_NOPTS_VALUE)
+        throw std::runtime_error("unknown stream duration");
+    return av_q2d(timeBase) * streamDurationInStreamTimeBase;
 }
 
 AVMediaType StreamProperties::getStreamType() const

diff --git a/src/AvTranscoder/properties/StreamProperties.hpp b/src/AvTranscoder/properties/StreamProperties.hpp
@@ -18,6 +18,13 @@ class AvExport StreamProperties
     size_t getStreamIndex() const { return _streamIndex; }
     size_t getStreamId() const;
     Rational getTimeBase() const;
+
+    /**
+     * @return duration of the stream in seconds
+     * @throw runtime_error if the duration is unknown
+     * @note If a source file does not specify a duration, but does specify
+     * a bitrate, this value will be estimated from bitrate and file size.
+     */
     float getDuration() const; ///< in seconds
     AVMediaType getStreamType() const;
-Original file line number
+Diff line change
@@ Expand Up @@
         }
         catch(const std::exception& e)
         {
-            detail::add(data, "colorComponents", e.what());
+            detail::add(data, "colorComponents", detail::propertyValueIfError);
         }
         try
@@ Expand Down @@