openshot/libopenshot
0
0
Fork 0
mirror of https://github.com/OpenShot/libopenshot.git synced 2026-03-02 08:53:52 -08:00
Code Issues Packages Projects Releases Wiki Activity

Default to AAC audio codec (#135)

Browse Source 
* Adding strict experimental to FFmpegReader and Writer (hopefully allowing all the encoders to be used)

(cherry picked from commit 1bcd1e5)

* init all formats and codecs before checking if valid

(cherry picked from commit 7250226)
This commit is contained in:
Jonathan Thomas
2018-06-29 15:06:34 -05:00
committed by GitHub
parent ef1fb6320b
commit 9972600931
2 changed files with 37 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/FFmpegWriter.cpp
View File

@@ -298,6 +298,9 @@ 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;
@@ -999,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) {
@@ -1070,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)
{