Merge pull request #137 from OpenShot/release

Merge release into develop

Author: jonoomph

.gitlab-ci.yml

@@ -67,7 +67,7 @@ windows-builder-x86:
     - New-Item -ItemType Directory -Force -Path build
     - New-Item -ItemType Directory -Force -Path build\install-x86\python
     - cd build
-    - cmake -D"CMAKE_INSTALL_PREFIX:PATH=$CI_PROJECT_DIR\build\install-x86" -G "MinGW Makefiles" -D"CMAKE_BUILD_TYPE:STRING=Release" ../
+    - cmake -D"CMAKE_INSTALL_PREFIX:PATH=$CI_PROJECT_DIR\build\install-x86" -G "MinGW Makefiles" -D"CMAKE_BUILD_TYPE:STRING=Release" -D"CMAKE_CXX_FLAGS=-m32" -D"CMAKE_EXE_LINKER_FLAGS=-Wl,--large-address-aware" -D"CMAKE_C_FLAGS=-m32" ../
     - mingw32-make install
     - Move-Item -Force -path "C:\msys32\mingw32\lib\python3.6\site-packages\*openshot*" -destination "install-x86\python\"
     - cp src\libopenshot.dll install-x86\lib

include/FFmpegWriter.h

@@ -258,6 +258,9 @@ namespace openshot
 		/// Determine if writer is open or closed
 		bool IsOpen() { return is_open; };
 
+		/// Determine if codec name is valid
+		static bool IsValidCodec(string codec_name);
+
 		/// Open writer
 		void Open();
 

src/FFmpegReader.cpp

@@ -156,10 +156,18 @@ void FFmpegReader::Open()
 			if (pCodec == NULL) {
 				throw InvalidCodec("A valid video codec could not be found for this file.", path);
 			}
+
+			// Init options
+			AVDictionary *opts = NULL;
+			av_dict_set(&opts, "strict", "experimental", 0);
+
 			// Open video codec
-			if (avcodec_open2(pCodecCtx, pCodec, NULL) < 0)
+			if (avcodec_open2(pCodecCtx, pCodec, &opts) < 0)
 				throw InvalidCodec("A video codec was found, but could not be opened.", path);
 
+			// Free options
+			av_dict_free(&opts);
+
 			// Update the File Info struct with video details (if a video stream is found)
 			UpdateVideoInfo();
 		}
@@ -186,10 +194,18 @@ void FFmpegReader::Open()
 			if (aCodec == NULL) {
 				throw InvalidCodec("A valid audio codec could not be found for this file.", path);
 			}
+
+			// Init options
+			AVDictionary *opts = NULL;
+			av_dict_set(&opts, "strict", "experimental", 0);
+
 			// Open audio codec
-			if (avcodec_open2(aCodecCtx, aCodec, NULL) < 0)
+			if (avcodec_open2(aCodecCtx, aCodec, &opts) < 0)
 				throw InvalidCodec("An audio codec was found, but could not be opened.", path);
 
+			// Free options
+			av_dict_free(&opts);
+
 			// Update the File Info struct with audio details (if an audio stream is found)
 			UpdateAudioInfo();
 		}

src/FFmpegWriter.cpp

@@ -296,6 +296,18 @@ void FFmpegWriter::SetOption(StreamType stream, string name, string value)
 
 }
 
+/// Determine if codec name is valid
+bool FFmpegWriter::IsValidCodec(string codec_name) {
+	// Initialize FFMpeg, and register all formats and codecs
+	av_register_all();
+
+	// Find the codec (if any)
+	if (avcodec_find_encoder_by_name(codec_name.c_str()) == NULL)
+		return false;
+	else
+		return true;
+}
+
 // Prepare & initialize streams and open codecs
 void FFmpegWriter::PrepareStreams()
 {
@@ -990,11 +1002,18 @@ void FFmpegWriter::open_audio(AVFormatContext *oc, AVStream *st)
 	if (!codec)
 		throw InvalidCodec("Could not find codec", path);
 
+	// Init options
+	AVDictionary *opts = NULL;
+	av_dict_set(&opts, "strict", "experimental", 0);
+
 	// Open the codec
-	if (avcodec_open2(audio_codec, codec, NULL) < 0)
+	if (avcodec_open2(audio_codec, codec, &opts) < 0)
 		throw InvalidCodec("Could not open codec", path);
 	AV_COPY_PARAMS_FROM_CONTEXT(st, audio_codec);
 
+	// Free options
+	av_dict_free(&opts);
+
 	// Calculate the size of the input frame (i..e how many samples per packet), and the output buffer
 	// TODO: Ugly hack for PCM codecs (will be removed ASAP with new PCM support to compute the input frame size in samples
 	if (audio_codec->frame_size <= 1) {
@@ -1061,11 +1080,18 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVStream *st)
     if(video_codec->max_b_frames && video_codec->codec_id != AV_CODEC_ID_MPEG4 && video_codec->codec_id != AV_CODEC_ID_MPEG1VIDEO && video_codec->codec_id != AV_CODEC_ID_MPEG2VIDEO)
         video_codec->max_b_frames = 0;
 
+	// Init options
+	AVDictionary *opts = NULL;
+	av_dict_set(&opts, "strict", "experimental", 0);
+
 	/* open the codec */
-	if (avcodec_open2(video_codec, codec, NULL) < 0)
+	if (avcodec_open2(video_codec, codec, &opts) < 0)
 		throw InvalidCodec("Could not open codec", path);
 	AV_COPY_PARAMS_FROM_CONTEXT(st, video_codec);
 
+	// Free options
+	av_dict_free(&opts);
+
 	// Add video metadata (if any)
 	for(std::map<string, string>::iterator iter = info.metadata.begin(); iter != info.metadata.end(); ++iter)
 	{

src/bindings/python/CMakeLists.txt

@@ -62,4 +62,4 @@ IF (PYTHONLIBS_FOUND)
 		INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/openshot.py DESTINATION ${PYTHON_MODULE_PATH} )
 
 	ENDIF(PYTHONINTERP_FOUND)
-ENDIF (PYTHONLIBS_FOUND)
+ENDIF (PYTHONLIBS_FOUND)