\r
#include "../StdAfx.h"\r
\r
+#include "../ffmpeg_error.h"\r
+#include "../producer/tbb_avcodec.h"\r
+\r
#include "ffmpeg_consumer.h"\r
\r
#include <core/mixer/read_frame.h>\r
+#include <core/mixer/audio/audio_util.h>\r
#include <core/consumer/frame_consumer.h>\r
#include <core/video_format.h>\r
\r
#pragma warning (pop)\r
#endif\r
\r
-namespace caspar { \r
+namespace caspar { namespace ffmpeg {\r
\r
struct ffmpeg_consumer : boost::noncopyable\r
{ \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
std::shared_ptr<SwsContext> img_convert_ctx_;\r
\r
public:\r
- ffmpeg_consumer(const std::string& filename, const core::video_format_desc& format_desc, size_t bitrate)\r
- : filename_(filename)\r
- , bitrate_(bitrate)\r
- , video_outbuf_(1920*1080*4)\r
+ ffmpeg_consumer(const std::string& filename, const core::video_format_desc& format_desc)\r
+ : filename_(filename + ".mov")\r
+ , video_outbuf_(1920*1080*8)\r
, audio_outbuf_(48000)\r
, oc_(avformat_alloc_context(), av_free)\r
, format_desc_(format_desc)\r
, executor_(print())\r
{\r
- if (!oc_)\r
- {\r
- BOOST_THROW_EXCEPTION(caspar_exception()\r
- << msg_info("Could not alloc format-context") \r
- << boost::errinfo_api_function("avformat_alloc_context"));\r
- }\r
-\r
- executor_.set_capacity(core::consumer_buffer_depth());\r
-\r
+ executor_.set_capacity(25);\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
- std::copy_n(filename_.c_str(), filename_.size(), oc_->filename);\r
- \r
- // Add the audio and video streams using the default format codecs and initialize the codecs .\r
- if (oc_->oformat->video_codec != CODEC_ID_NONE) \r
- video_st_ = add_video_stream(oc_->oformat->video_codec);\r
- \r
- //if (oc_->oformat->audio_codec != CODEC_ID_NONE) \r
- // audio_st_ = add_audio_stream(oc_->oformat->audio_codec); \r
+ THROW_ON_ERROR2(av_set_parameters(oc_.get(), nullptr), "[ffmpeg_consumer]");\r
\r
- // Set the output parameters (must be done even if no parameters). \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(AVUNERROR(errn)) <<\r
- boost::errinfo_file_name(filename_));\r
- }\r
+ strcpy_s(oc_->filename, filename_.c_str());\r
\r
+ // Add the audio and video streams using the default format codecs and initialize the codecs .\r
+ video_st_ = add_video_stream(oc_->oformat->video_codec);\r
+ audio_st_ = add_audio_stream(oc_->oformat->audio_codec);\r
+ \r
dump_format(oc_.get(), 0, filename_.c_str(), 1);\r
-\r
- // Now that all the parameters are set, we can open the audio and\r
- // video codecs and allocate the necessary encode buffers.\r
- if (video_st_)\r
- open_video(video_st_);\r
- \r
- try\r
- {\r
- if (audio_st_)\r
- open_audio(audio_st_);\r
- }\r
- catch(...)\r
- {\r
- CASPAR_LOG_CURRENT_EXCEPTION();\r
- audio_st_ = nullptr;\r
- }\r
- \r
+ \r
// Open the output ffmpeg, if needed.\r
if (!(oc_->oformat->flags & AVFMT_NOFILE)) \r
- {\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(AVUNERROR(errn)) <<\r
- boost::errinfo_file_name(filename_));\r
- }\r
- }\r
- \r
- av_write_header(oc_.get()); // write the stream header, if any \r
+ THROW_ON_ERROR2(avio_open(&oc_->pb, filename_.c_str(), URL_WRONLY), "[ffmpeg_consumer]");\r
+ \r
+ THROW_ON_ERROR2(av_write_header(oc_.get()), "[ffmpeg_consumer]");\r
\r
CASPAR_LOG(info) << print() << L" Successfully initialized."; \r
}\r
{ \r
executor_.stop();\r
executor_.join();\r
-\r
- audio_st_.reset();\r
- video_st_.reset();\r
-\r
- av_write_trailer(oc_.get());\r
\r
- if (!(oc_->oformat->flags & AVFMT_NOFILE)) \r
- url_fclose(oc_->pb); // Close the output ffmpeg.\r
- }\r
+ try\r
+ {\r
+ THROW_ON_ERROR2(av_write_trailer(oc_.get()), "[ffmpeg_consumer]");\r
+ \r
+ audio_st_.reset();\r
+ video_st_.reset();\r
+ \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 (!(oc_->oformat->flags & AVFMT_NOFILE)) \r
+ THROW_ON_ERROR2(avio_close(oc_->pb), "[ffmpeg_consumer]"); // Close the output ffmpeg.\r
+ }\r
+ catch(...)\r
+ {\r
+ CASPAR_LOG_CURRENT_EXCEPTION();\r
+ }\r
\r
- const core::video_format_desc& get_video_format_desc() const\r
- {\r
- return format_desc_;\r
}\r
- \r
+ \r
std::wstring print() const\r
{\r
return L"ffmpeg[" + widen(filename_) + L"]";\r
<< boost::errinfo_api_function("av_new_stream"));\r
}\r
\r
- st->codec->codec_id = codec_id;\r
+ st->codec->codec_id = CODEC_ID_DNXHD;\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->bit_rate = 145*1000000;\r
+ st->codec->width = std::min<size_t>(1280, format_desc_.width);\r
+ st->codec->height = std::min<size_t>(720, 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
+ st->codec->pix_fmt = st->codec->pix_fmt == -1 ? PIX_FMT_YUV422P : st->codec->pix_fmt;\r
+
+ if(oc_->oformat->flags & AVFMT_GLOBALHEADER)
+ st->codec->flags |= CODEC_FLAG_GLOBAL_HEADER;\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
+ THROW_ON_ERROR2(tbb_avcodec_open(st->codec, codec), "[ffmpeg_consumer]");\r
+\r
return std::shared_ptr<AVStream>(st, [](AVStream* st)\r
{\r
- avcodec_close(st->codec);\r
- //av_freep(st);\r
+ tbb_avcodec_close(st->codec);\r
});\r
}\r
\r
<< boost::errinfo_api_function("av_new_stream"));\r
}\r
\r
- st->codec->codec_id = codec_id;\r
+ st->codec->codec_id = CODEC_ID_PCM_S16LE;\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
+
+ if(oc_->oformat->flags & AVFMT_GLOBALHEADER)
+ st->codec->flags |= CODEC_FLAG_GLOBAL_HEADER;\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(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 video 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 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
+ THROW_ON_ERROR2(avcodec_open(st->codec, codec), "[ffmpeg_consumer]");\r
+\r
+ return std::shared_ptr<AVStream>(st, [](AVStream* st)\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
+ avcodec_close(st->codec);\r
+ });\r
}\r
\r
void encode_video_frame(const safe_ptr<core::read_frame>& frame)\r
{ \r
- if(!video_st_)\r
- return;\r
-\r
- AVCodecContext* c = video_st_->codec;\r
+ auto c = video_st_->codec;\r
\r
if(!img_convert_ctx_) \r
{\r
avpicture_fill(reinterpret_cast<AVPicture*>(av_frame.get()), const_cast<uint8_t*>(frame->image_data().begin()), PIX_FMT_BGRA, format_desc_.width, format_desc_.height);\r
\r
std::shared_ptr<AVFrame> local_av_frame(avcodec_alloc_frame(), av_free);\r
+ local_av_frame->interlaced_frame = format_desc_.field_mode != core::field_mode::progressive;\r
+ local_av_frame->top_field_first = format_desc_.field_mode == core::field_mode::upper;\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_.get(), av_frame->data, av_frame->linesize, 0, c->height, local_av_frame->data, local_av_frame->linesize);\r
\r
- int errn = avcodec_encode_video(c, video_outbuf_.data(), video_outbuf_.size(), local_av_frame.get());\r
- if (errn < 0) \r
+ int out_size = THROW_ON_ERROR2(avcodec_encode_video(c, video_outbuf_.data(), video_outbuf_.size(), local_av_frame.get()), "[ffmpeg_consumer]");\r
+ if(out_size > 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(AVUNERROR(errn)) <<\r
- boost::errinfo_file_name(filename_));\r
- }\r
-\r
- AVPacket pkt;\r
- av_init_packet(&pkt);\r
- pkt.size = errn;\r
-\r
- // If zero size, it means the image was buffered.\r
- if (errn > 0) \r
- { \r
+ AVPacket pkt;\r
+ av_init_packet(&pkt);\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
+ 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
-\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
+ pkt.stream_index = video_st_->index;\r
+ pkt.data = video_outbuf_.data();\r
+ pkt.size = out_size;\r
+ \r
+ THROW_ON_ERROR2(av_interleaved_write_frame(oc_.get(), &pkt), L"[ffmpeg_consumer]");\r
+ } \r
}\r
\r
void encode_audio_frame(const safe_ptr<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
- audio_input_buffer_.insert(audio_input_buffer_.end(), 3840, 0);\r
-\r
- while(encode_audio_packet()){}\r
- }\r
-\r
- bool encode_audio_packet()\r
- { \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
- if(static_cast<int>(audio_input_buffer_.size()) < frame_bytes/2)\r
- return false;\r
+ auto audio_data = core::audio_32_to_16(frame->audio_data());\r
\r
AVPacket pkt;\r
av_init_packet(&pkt);\r
\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(AVUNERROR(errn)) <<\r
- boost::errinfo_file_name(filename_));\r
- }\r
-\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
\r
pkt.flags |= AV_PKT_FLAG_KEY;\r
pkt.stream_index = audio_st_->index;\r
- pkt.data = audio_outbuf_.data();\r
+ pkt.size = audio_data.size()*2;\r
+ pkt.data = reinterpret_cast<uint8_t*>(audio_data.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
- return true;\r
+ THROW_ON_ERROR2(av_interleaved_write_frame(oc_.get(), &pkt), L"[ffmpeg_consumer]");\r
}\r
- \r
+ \r
void send(const safe_ptr<core::read_frame>& frame)\r
{\r
executor_.begin_invoke([=]\r
encode_audio_frame(frame);\r
});\r
}\r
-\r
- size_t buffer_depth() const { return 1; }\r
};\r
\r
struct ffmpeg_consumer_proxy : public core::frame_consumer\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, size_t bitrate)\r
+ ffmpeg_consumer_proxy(const std::wstring& filename, bool key_only)\r
: filename_(filename)\r
- , key_only_(key_only)\r
- , bitrate_(bitrate){}\r
+ , key_only_(key_only){}\r
\r
- virtual void initialize(const core::video_format_desc& format_desc)\r
+ virtual void initialize(const core::video_format_desc& format_desc, int, int)\r
{\r
- consumer_.reset(new ffmpeg_consumer(narrow(filename_), format_desc, bitrate_));\r
+ consumer_.reset();\r
+ consumer_.reset(new ffmpeg_consumer(narrow(filename_), format_desc));\r
}\r
\r
- virtual void send(const safe_ptr<core::read_frame>& frame)\r
+ virtual bool send(const safe_ptr<core::read_frame>& frame) override\r
{\r
consumer_->send(frame);\r
+ return true;\r
}\r
\r
- virtual std::wstring print() const\r
+ virtual std::wstring print() const override\r
{\r
- return consumer_->print();\r
+ return consumer_ ? consumer_->print() : L"[ffmpeg_consumer]";\r
}\r
-\r
- virtual bool key_only() const\r
- {\r
- return key_only_;\r
- }\r
- \r
- virtual bool has_synchronization_clock() const \r
+ \r
+ virtual bool has_synchronization_clock() const override\r
{\r
return false;\r
}\r
\r
- virtual const core::video_format_desc& get_video_format_desc() const\r
+ virtual size_t buffer_depth() const override\r
{\r
- return consumer_->get_video_format_desc();\r
+ return 1;\r
}\r
}; \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, 100000000);\r
+ return make_safe<ffmpeg_consumer_proxy>(env::media_folder() + params[1], key_only);\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>("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, bitrate);\r
+ return make_safe<ffmpeg_consumer_proxy>(env::media_folder() + widen(filename), key_only);\r
}\r
\r
-}\r
+}}\r
projects / casparcg / commitdiff