\r
struct ffmpeg_consumer : boost::noncopyable\r
{ \r
- std::string filename_;\r
+ const std::string filename_;\r
+ const size_t bitrate_;\r
+ \r
+ const std::shared_ptr<AVFormatContext> oc_;\r
+ const core::video_format_desc format_desc_;\r
+ \r
+ executor executor_;\r
\r
// Audio\r
- AVStream* audio_st_;\r
- std::vector<unsigned char, tbb::cache_aligned_allocator<unsigned char>> audio_outbuf_;\r
+ std::shared_ptr<AVStream> audio_st_;\r
+ std::vector<uint8_t> audio_outbuf_;\r
+\r
+ std::vector<int16_t> audio_input_buffer_;\r
\r
// Video\r
- AVStream* video_st_;\r
- std::vector<uint8_t, tbb::cache_aligned_allocator<unsigned char>> picture_buf_;\r
+ std::shared_ptr<AVStream> video_st_;\r
+ std::vector<uint8_t> video_outbuf_;\r
\r
- std::vector<unsigned char, tbb::cache_aligned_allocator<unsigned char>> video_outbuf_;\r
- SwsContext* img_convert_ctx_;\r
+ std::vector<uint8_t> picture_buf_;\r
+ std::shared_ptr<SwsContext> img_convert_ctx_;\r
\r
- AVOutputFormat* fmt_;\r
- std::shared_ptr<AVFormatContext> oc_;\r
- core::video_format_desc format_desc_;\r
-\r
- std::vector<short, tbb::cache_aligned_allocator<short>> audio_input_buffer_;\r
-\r
- boost::unique_future<void> active_;\r
-\r
- executor executor_;\r
public:\r
- ffmpeg_consumer(const std::string& filename, const core::video_format_desc& format_desc)\r
+ ffmpeg_consumer(const std::string& filename, const core::video_format_desc& format_desc, size_t bitrate)\r
: filename_(filename)\r
- , audio_st_(nullptr)\r
- , video_st_(nullptr)\r
- , fmt_(nullptr)\r
- , img_convert_ctx_(nullptr)\r
+ , bitrate_(bitrate)\r
, video_outbuf_(1920*1080*4)\r
, audio_outbuf_(48000)\r
+ , oc_(avformat_alloc_context(), av_free)\r
, format_desc_(format_desc)\r
- , executor_(L"ffmpeg_consumer")\r
+ , executor_(print())\r
{\r
- active_ = executor_.begin_invoke([]{});\r
-\r
- fmt_ = av_guess_format(nullptr, filename_.c_str(), nullptr);\r
- if (!fmt_) \r
+ if (!oc_)\r
{\r
- CASPAR_LOG(info) << "Could not deduce output format from ffmpeg extension: using MPEG.";\r
- fmt_ = av_guess_format("mpeg", nullptr, nullptr);\r
- filename_ = filename_ + ".avi"; \r
+ BOOST_THROW_EXCEPTION(caspar_exception()\r
+ << msg_info("Could not alloc format-context") \r
+ << boost::errinfo_api_function("avformat_alloc_context"));\r
}\r
- if (!fmt_)\r
- BOOST_THROW_EXCEPTION(caspar_exception() << msg_info("Could not find suitable output format"));\r
+\r
+ executor_.set_capacity(CONSUMER_BUFFER_DEPTH);\r
+\r
+ oc_->oformat = av_guess_format(nullptr, filename_.c_str(), nullptr);\r
+ if (!oc_->oformat)\r
+ BOOST_THROW_EXCEPTION(caspar_exception() << msg_info("Could not find suitable output format."));\r
\r
- oc_.reset(avformat_alloc_context(), av_free);\r
- if (!oc_)\r
- BOOST_THROW_EXCEPTION(caspar_exception() << msg_info("Memory error"));\r
std::copy_n(filename_.c_str(), filename_.size(), oc_->filename);\r
-\r
- oc_->oformat = fmt_;\r
- // To avoid mpeg buffer underflow (http://www.mail-archive.com/libav-user@mplayerhq.hu/msg00194.html)\r
- oc_->preload = static_cast<int>(0.5*AV_TIME_BASE);\r
- oc_->max_delay = static_cast<int>(0.7*AV_TIME_BASE);\r
- \r
+ \r
// Add the audio and video streams using the default format codecs and initialize the codecs .\r
- if (fmt_->video_codec != CODEC_ID_NONE) \r
- video_st_ = add_video_stream(fmt_->video_codec);\r
+ if (oc_->oformat->video_codec != CODEC_ID_NONE) \r
+ video_st_ = add_video_stream(oc_->oformat->video_codec);\r
\r
- if (fmt_->audio_codec != CODEC_ID_NONE) \r
- audio_st_ = add_audio_stream(fmt_->audio_codec); \r
+ //if (oc_->oformat->audio_codec != CODEC_ID_NONE) \r
+ // audio_st_ = add_audio_stream(oc_->oformat->audio_codec); \r
\r
// Set the output parameters (must be done even if no parameters). \r
- int errn = 0;\r
- if ((errn = -av_set_parameters(oc_.get(), nullptr)) > 0)\r
+ int errn = av_set_parameters(oc_.get(), nullptr);\r
+ if (errn < 0)\r
+ {\r
BOOST_THROW_EXCEPTION(\r
file_read_error() << \r
msg_info("Invalid output format parameters") <<\r
boost::errinfo_api_function("avcodec_open") <<\r
- boost::errinfo_errno(errn) <<\r
+ boost::errinfo_errno(AVUNERROR(errn)) <<\r
boost::errinfo_file_name(filename_));\r
+ }\r
\r
dump_format(oc_.get(), 0, filename_.c_str(), 1);\r
\r
}\r
\r
// Open the output ffmpeg, if needed.\r
- if (!(fmt_->flags & AVFMT_NOFILE)) \r
+ if (!(oc_->oformat->flags & AVFMT_NOFILE)) \r
{\r
- int errn = 0;\r
- if ((errn = -url_fopen(&oc_->pb, filename_.c_str(), URL_WRONLY)) > 0) \r
+ int errn = url_fopen(&oc_->pb, filename_.c_str(), URL_WRONLY);\r
+ if (errn < 0) \r
+ {\r
BOOST_THROW_EXCEPTION(\r
file_not_found() << \r
msg_info("Could not open file") <<\r
boost::errinfo_api_function("url_fopen") <<\r
- boost::errinfo_errno(errn) <<\r
+ boost::errinfo_errno(AVUNERROR(errn)) <<\r
boost::errinfo_file_name(filename_));\r
+ }\r
}\r
\r
av_write_header(oc_.get()); // write the stream header, if any \r
\r
~ffmpeg_consumer()\r
{ \r
- executor_.invoke([]{});\r
executor_.stop();\r
+ executor_.join();\r
\r
- av_write_trailer(oc_.get());\r
+ audio_st_.reset();\r
+ video_st_.reset();\r
\r
- // Close each codec.\r
- if (video_st_) \r
- avcodec_close(video_st_->codec);\r
+ av_write_trailer(oc_.get());\r
\r
- if (audio_st_)\r
- avcodec_close(audio_st_->codec);\r
- \r
- // Free the streams.\r
- for(size_t i = 0; i < oc_->nb_streams; ++i) \r
- {\r
- av_freep(&oc_->streams[i]->codec);\r
- av_freep(&oc_->streams[i]);\r
- }\r
-\r
- if (!(fmt_->flags & AVFMT_NOFILE)) \r
+ if (!(oc_->oformat->flags & AVFMT_NOFILE)) \r
url_fclose(oc_->pb); // Close the output ffmpeg.\r
}\r
\r
return L"ffmpeg[" + widen(filename_) + L"]";\r
}\r
\r
- AVStream* add_video_stream(enum CodecID codec_id)\r
+ std::shared_ptr<AVStream> add_video_stream(enum CodecID codec_id)\r
{ \r
auto st = av_new_stream(oc_.get(), 0);\r
if (!st) \r
- BOOST_THROW_EXCEPTION(caspar_exception() << msg_info("Could not alloc stream"));\r
- \r
- auto c = st->codec;\r
- c->codec_id = codec_id;\r
- c->codec_type = AVMEDIA_TYPE_VIDEO;\r
- \r
- // Put sample parameters.\r
- c->bit_rate = static_cast<int>(static_cast<double>(format_desc_.size)*format_desc_.fps*0.1326);\r
- c->width = format_desc_.width;\r
- c->height = format_desc_.height;\r
- c->time_base.den = static_cast<int>(format_desc_.fps);\r
- c->time_base.num = 1;\r
- c->pix_fmt = c->pix_fmt == -1 ? PIX_FMT_YUV420P : c->pix_fmt;\r
-\r
- // Some formats want stream headers to be separate.\r
- if(oc_->oformat->flags & AVFMT_GLOBALHEADER)\r
- c->flags |= CODEC_FLAG_GLOBAL_HEADER;\r
+ {\r
+ BOOST_THROW_EXCEPTION(caspar_exception() \r
+ << msg_info("Could not alloc video-stream") \r
+ << boost::errinfo_api_function("av_new_stream"));\r
+ }\r
+\r
+ st->codec->codec_id = codec_id;\r
+ st->codec->codec_type = AVMEDIA_TYPE_VIDEO;\r
+ st->codec->bit_rate = bitrate_;\r
+ st->codec->width = format_desc_.width;\r
+ st->codec->height = format_desc_.height;\r
+ st->codec->time_base.den = format_desc_.time_scale;\r
+ st->codec->time_base.num = format_desc_.duration;\r
+ st->codec->pix_fmt = st->codec->pix_fmt == -1 ? PIX_FMT_YUV420P : st->codec->pix_fmt;\r
\r
- return st;\r
+ return std::shared_ptr<AVStream>(st, [](AVStream* st)\r
+ {\r
+ avcodec_close(st->codec);\r
+ //av_freep(st);\r
+ });\r
+ }\r
+ \r
+ std::shared_ptr<AVStream> add_audio_stream(enum CodecID codec_id)\r
+ {\r
+ auto st = av_new_stream(oc_.get(), 1);\r
+ if (!st) \r
+ {\r
+ BOOST_THROW_EXCEPTION(caspar_exception() \r
+ << msg_info("Could not alloc audio-stream") \r
+ << boost::errinfo_api_function("av_new_stream"));\r
+ }\r
+\r
+ st->codec->codec_id = codec_id;\r
+ st->codec->codec_type = AVMEDIA_TYPE_AUDIO;\r
+ st->codec->sample_rate = 48000;\r
+ st->codec->channels = 2;\r
+ st->codec->sample_fmt = SAMPLE_FMT_S16;\r
+ \r
+ return std::shared_ptr<AVStream>(st, [](AVStream* st)\r
+ {\r
+ avcodec_close(st->codec);\r
+ //av_freep(st);\r
+ });\r
}\r
\r
- void open_video(AVStream* st)\r
- { \r
- auto c = st->codec;\r
- \r
- auto codec = avcodec_find_encoder(c->codec_id);\r
+ void open_video(std::shared_ptr<AVStream>& st)\r
+ { \r
+ auto codec = avcodec_find_encoder(st->codec->codec_id);\r
if (!codec)\r
BOOST_THROW_EXCEPTION(caspar_exception() << msg_info("codec not found"));\r
\r
- int errn = 0;\r
- if ((errn = -avcodec_open(c, codec)) > 0)\r
+ int errn = avcodec_open(st->codec, codec);\r
+ if (errn < 0)\r
+ {\r
BOOST_THROW_EXCEPTION(\r
file_read_error() << \r
msg_info("Could not open video codec.") <<\r
boost::errinfo_api_function("avcodec_open") <<\r
- boost::errinfo_errno(errn) <<\r
- boost::errinfo_file_name(filename_)); \r
+ boost::errinfo_errno(AVUNERROR(errn)) <<\r
+ boost::errinfo_file_name(filename_)); \r
+ }\r
+ }\r
+\r
+ void open_audio(std::shared_ptr<AVStream>& st)\r
+ {\r
+ auto codec = avcodec_find_encoder(st->codec->codec_id);\r
+ if (!codec) \r
+ BOOST_THROW_EXCEPTION(caspar_exception() << msg_info("codec not found"));\r
+ \r
+ int errn = avcodec_open(st->codec, codec);\r
+ if (errn < 0)\r
+ {\r
+ BOOST_THROW_EXCEPTION(\r
+ file_read_error() << \r
+ msg_info("Could not open audio codec") <<\r
+ boost::errinfo_api_function("avcodec_open") <<\r
+ boost::errinfo_errno(AVUNERROR(errn)) <<\r
+ boost::errinfo_file_name(filename_));\r
+ }\r
}\r
\r
void encode_video_frame(const safe_ptr<const core::read_frame>& frame)\r
\r
AVCodecContext* c = video_st_->codec;\r
\r
- if (img_convert_ctx_ == nullptr) \r
+ if(!img_convert_ctx_) \r
{\r
- img_convert_ctx_ = sws_getContext(format_desc_.width, format_desc_.height, PIX_FMT_BGRA, c->width, c->height, c->pix_fmt, SWS_BICUBIC, nullptr, nullptr, nullptr);\r
+ img_convert_ctx_.reset(sws_getContext(format_desc_.width, format_desc_.height, PIX_FMT_BGRA, c->width, c->height, c->pix_fmt, SWS_BICUBIC, nullptr, nullptr, nullptr), sws_freeContext);\r
if (img_convert_ctx_ == nullptr) \r
BOOST_THROW_EXCEPTION(caspar_exception() << msg_info("Cannot initialize the conversion context"));\r
}\r
picture_buf_.resize(avpicture_get_size(c->pix_fmt, format_desc_.width, format_desc_.height));\r
avpicture_fill(reinterpret_cast<AVPicture*>(local_av_frame.get()), picture_buf_.data(), c->pix_fmt, format_desc_.width, format_desc_.height);\r
\r
- sws_scale(img_convert_ctx_, av_frame->data, av_frame->linesize, 0, c->height, local_av_frame->data, local_av_frame->linesize);\r
- \r
- int ret = avcodec_encode_video(c, video_outbuf_.data(), video_outbuf_.size(), local_av_frame.get());\r
+ sws_scale(img_convert_ctx_.get(), av_frame->data, av_frame->linesize, 0, c->height, local_av_frame->data, local_av_frame->linesize);\r
\r
- int errn = -ret;\r
- if (errn > 0) \r
+ int errn = avcodec_encode_video(c, video_outbuf_.data(), video_outbuf_.size(), local_av_frame.get());\r
+ if (errn < 0) \r
+ {\r
BOOST_THROW_EXCEPTION(\r
invalid_operation() << \r
msg_info("Could not encode video frame.") <<\r
boost::errinfo_api_function("avcodec_encode_video") <<\r
- boost::errinfo_errno(errn) <<\r
+ boost::errinfo_errno(AVUNERROR(errn)) <<\r
boost::errinfo_file_name(filename_));\r
+ }\r
\r
- auto out_size = ret;\r
AVPacket pkt;\r
av_init_packet(&pkt);\r
- pkt.size = out_size;\r
+ pkt.size = errn;\r
\r
// If zero size, it means the image was buffered.\r
- if (out_size > 0) \r
+ if (errn > 0) \r
{ \r
if (c->coded_frame->pts != AV_NOPTS_VALUE)\r
pkt.pts = av_rescale_q(c->coded_frame->pts, c->time_base, video_st_->time_base);\r
+ \r
if(c->coded_frame->key_frame)\r
pkt.flags |= AV_PKT_FLAG_KEY;\r
\r
pkt.stream_index = video_st_->index;\r
- pkt.data = video_outbuf_.data();\r
+ pkt.data = video_outbuf_.data();\r
\r
if (av_interleaved_write_frame(oc_.get(), &pkt) != 0)\r
BOOST_THROW_EXCEPTION(caspar_exception() << msg_info("Error while writing video frame"));\r
} \r
}\r
-\r
- AVStream* add_audio_stream(enum CodecID codec_id)\r
- {\r
- audio_st_ = av_new_stream(oc_.get(), 1);\r
- if (!audio_st_)\r
- BOOST_THROW_EXCEPTION(caspar_exception() << msg_info("Could not alloc stream"));\r
-\r
- auto c = audio_st_->codec;\r
- c->codec_id = codec_id;\r
- c->codec_type = AVMEDIA_TYPE_AUDIO;\r
-\r
- // Put sample parameters.\r
- c->bit_rate = 192000;\r
- c->sample_rate = 48000;\r
- c->channels = 2;\r
-\r
- // Some formats want stream headers to be separate.\r
- if(oc_->oformat->flags & AVFMT_GLOBALHEADER)\r
- c->flags |= CODEC_FLAG_GLOBAL_HEADER;\r
-\r
- return audio_st_;\r
- }\r
-\r
- void open_audio(AVStream* st)\r
- {\r
- auto c = st->codec;\r
-\r
- // Find the audio encoder.\r
- auto codec = avcodec_find_encoder(c->codec_id);\r
- if (!codec) \r
- BOOST_THROW_EXCEPTION(caspar_exception() << msg_info("codec not found"));\r
\r
- // Open it.\r
- int errn = 0;\r
- if ((errn = -avcodec_open(c, codec)) > 0)\r
- BOOST_THROW_EXCEPTION(\r
- file_read_error() << \r
- msg_info("Could not open audio codec") <<\r
- boost::errinfo_api_function("avcodec_open") <<\r
- boost::errinfo_errno(errn) <<\r
- boost::errinfo_file_name(filename_));\r
- }\r
- \r
void encode_audio_frame(const safe_ptr<const core::read_frame>& frame)\r
{ \r
+ if(!audio_st_)\r
+ return;\r
+\r
if(!frame->audio_data().empty())\r
audio_input_buffer_.insert(audio_input_buffer_.end(), frame->audio_data().begin(), frame->audio_data().end());\r
else\r
\r
bool encode_audio_packet()\r
{ \r
- if(!audio_st_)\r
- return false;\r
-\r
auto c = audio_st_->codec;\r
\r
auto frame_bytes = c->frame_size * 2 * 2; // samples per frame * 2 channels * 2 bytes per sample\r
AVPacket pkt;\r
av_init_packet(&pkt);\r
\r
- int ret = avcodec_encode_audio(c, audio_outbuf_.data(), audio_outbuf_.size(), audio_input_buffer_.data());\r
- \r
- int errn = -ret;\r
- if (errn > 0) \r
+ int errn = avcodec_encode_audio(c, audio_outbuf_.data(), audio_outbuf_.size(), audio_input_buffer_.data());\r
+ if (errn < 0) \r
+ {\r
BOOST_THROW_EXCEPTION(\r
invalid_operation() << \r
msg_info("Could not encode audio samples.") <<\r
boost::errinfo_api_function("avcodec_encode_audio") <<\r
- boost::errinfo_errno(errn) <<\r
+ boost::errinfo_errno(AVUNERROR(errn)) <<\r
boost::errinfo_file_name(filename_));\r
+ }\r
\r
- pkt.size = ret;\r
- audio_input_buffer_ = std::vector<short, tbb::cache_aligned_allocator<short>>(audio_input_buffer_.begin() + frame_bytes/2, audio_input_buffer_.end());\r
+ pkt.size = errn;\r
+ audio_input_buffer_ = std::vector<int16_t>(audio_input_buffer_.begin() + frame_bytes/2, audio_input_buffer_.end());\r
\r
if (c->coded_frame && c->coded_frame->pts != AV_NOPTS_VALUE)\r
pkt.pts = av_rescale_q(c->coded_frame->pts, c->time_base, audio_st_->time_base);\r
- pkt.flags |= AV_PKT_FLAG_KEY;\r
+\r
+ pkt.flags |= AV_PKT_FLAG_KEY;\r
pkt.stream_index = audio_st_->index;\r
- pkt.data = audio_outbuf_.data();\r
+ pkt.data = audio_outbuf_.data();\r
\r
if (av_interleaved_write_frame(oc_.get(), &pkt) != 0)\r
BOOST_THROW_EXCEPTION(caspar_exception() << msg_info("Error while writing audio frame"));\r
\r
void send(const safe_ptr<const core::read_frame>& frame)\r
{\r
- active_.get();\r
- active_ = executor_.begin_invoke([=]\r
+ executor_.begin_invoke([=]\r
{ \r
- auto my_frame = frame;\r
- encode_video_frame(my_frame);\r
- encode_audio_frame(my_frame);\r
+ encode_video_frame(frame);\r
+ encode_audio_frame(frame);\r
});\r
}\r
\r
{\r
const std::wstring filename_;\r
const bool key_only_;\r
+ const size_t bitrate_;\r
\r
std::unique_ptr<ffmpeg_consumer> consumer_;\r
\r
public:\r
\r
- ffmpeg_consumer_proxy(const std::wstring& filename, bool key_only)\r
+ ffmpeg_consumer_proxy(const std::wstring& filename, bool key_only, size_t bitrate)\r
: filename_(filename)\r
- , key_only_(key_only){}\r
+ , key_only_(key_only)\r
+ , bitrate_(bitrate){}\r
\r
virtual void initialize(const core::video_format_desc& format_desc)\r
{\r
- consumer_.reset(new ffmpeg_consumer(narrow(filename_), format_desc));\r
+ consumer_.reset(new ffmpeg_consumer(narrow(filename_), format_desc, bitrate_));\r
}\r
\r
virtual void send(const safe_ptr<const core::read_frame>& frame)\r
{\r
return key_only_;\r
}\r
+ \r
+ virtual bool has_synchronization_clock() const \r
+ {\r
+ return false;\r
+ }\r
\r
virtual const core::video_format_desc& get_video_format_desc() const\r
{\r
boost::filesystem::remove(boost::filesystem::wpath(env::media_folder() + params[1])); // Delete the file if it exists\r
bool key_only = std::find(params.begin(), params.end(), L"KEY_ONLY") != params.end();\r
\r
- return make_safe<ffmpeg_consumer_proxy>(env::media_folder() + params[1], key_only);\r
+ return make_safe<ffmpeg_consumer_proxy>(env::media_folder() + params[1], key_only, 100000000);\r
}\r
\r
safe_ptr<core::frame_consumer> create_ffmpeg_consumer(const boost::property_tree::ptree& ptree)\r
{\r
- std::string filename = ptree.get<std::string>("filename");\r
+ std::string filename = ptree.get<std::string>("path");\r
bool key_only = ptree.get("key-only", false);\r
+ size_t bitrate = ptree.get("bitrate", 100000000);\r
\r
- return make_safe<ffmpeg_consumer_proxy>(env::media_folder() + widen(filename), key_only);\r
+ return make_safe<ffmpeg_consumer_proxy>(env::media_folder() + widen(filename), key_only, bitrate);\r
}\r
\r
}\r
projects / casparcg / commitdiff