Merge pull request #255 from cchampet/fix_outputVideoCodecFlags

cchampet · web-flow · commit 8ddf8e16f88b · 2016-06-23T09:34:02.000+02:00
OutputStream: set global header flag if required + enable experimental codecs
diff --git a/src/AvTranscoder/file/OutputFile.cpp b/src/AvTranscoder/file/OutputFile.cpp
@@ -42,13 +42,7 @@ IOutputStream& OutputFile::addVideoStream(const VideoCodec& videoDesc)
     stream.codec->level = videoDesc.getAVCodecContext().level;
     stream.codec->field_order = videoDesc.getAVCodecContext().field_order;
 
-    // some codecs need/can use extradata to decode
-    uint8_t* srcExtradata = videoDesc.getAVCodecContext().extradata;
-    const int srcExtradataSize = videoDesc.getAVCodecContext().extradata_size;
-    stream.codec->extradata = (uint8_t*)av_malloc(srcExtradataSize + FF_INPUT_BUFFER_PADDING_SIZE);
-    memcpy(stream.codec->extradata, srcExtradata, srcExtradataSize);
-    memset(((uint8_t*)stream.codec->extradata) + srcExtradataSize, 0, FF_INPUT_BUFFER_PADDING_SIZE);
-    stream.codec->extradata_size = videoDesc.getAVCodecContext().extradata_size;
+    setOutputStream(stream, videoDesc);
 
     // need to set the time_base on the AVCodecContext and the AVStream
     // compensating the frame rate with the ticks_per_frame and keeping
@@ -75,6 +69,8 @@ IOutputStream& OutputFile::addAudioStream(const AudioCodec& audioDesc)
     stream.codec->sample_fmt = audioDesc.getAVCodecContext().sample_fmt;
     stream.codec->frame_size = audioDesc.getAVCodecContext().frame_size;
 
+    setOutputStream(stream, audioDesc);
+
     // need to set the time_base on the AVCodecContext of the AVStream
     av_reduce(&stream.codec->time_base.num, &stream.codec->time_base.den, audioDesc.getAVCodecContext().time_base.num,
               audioDesc.getAVCodecContext().time_base.den, INT_MAX);
@@ -319,4 +315,27 @@ void OutputFile::setupRemainingWrappingOptions()
         }
     }
 }
+
+void OutputFile::setOutputStream(AVStream& avStream, const ICodec& codec)
+{
+    // depending on the format, place global headers in extradata instead of every keyframe
+    if (_formatContext.getAVOutputFormat().flags & AVFMT_GLOBALHEADER) {
+        avStream.codec->flags |= CODEC_FLAG_GLOBAL_HEADER;
+    }
+
+    // if the codec is experimental, allow it
+    if(codec.getAVCodec().capabilities & CODEC_CAP_EXPERIMENTAL) {
+        LOG_WARN("This codec is considered experimental by libav/ffmpeg:" << codec.getCodecName());
+        avStream.codec->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL;
+    }
+
+    // some codecs need/can use extradata to decode
+    uint8_t* srcExtradata = codec.getAVCodecContext().extradata;
+    const int srcExtradataSize = codec.getAVCodecContext().extradata_size;
+    avStream.codec->extradata = (uint8_t*)av_malloc(srcExtradataSize + FF_INPUT_BUFFER_PADDING_SIZE);
+    memcpy(avStream.codec->extradata, srcExtradata, srcExtradataSize);
+    memset(((uint8_t*)avStream.codec->extradata) + srcExtradataSize, 0, FF_INPUT_BUFFER_PADDING_SIZE);
+    avStream.codec->extradata_size = codec.getAVCodecContext().extradata_size;
+}
+
 }
diff --git a/src/AvTranscoder/file/OutputFile.hpp b/src/AvTranscoder/file/OutputFile.hpp
@@ -98,6 +98,13 @@ class AvExport OutputFile : public IOutputFile
     void setupRemainingWrappingOptions();
     //@}
 
+    /**
+     * @brief Depending on the format/codec, set general parameters of the stream.
+     * @param avStream: the stream to set.
+     * @param codec; the description of the codec used in the stream.
+     */
+    void setOutputStream(AVStream& avStream, const ICodec& codec);
+
 private:
     FormatContext _formatContext;
     std::vector<OutputStream*> _outputStreams; ///< Has ownership
