namespace caspar {\r
\r
struct audio_decoder::implementation : boost::noncopyable\r
-{\r
- typedef std::vector<short, tbb::cache_aligned_allocator<short>> aligned_buffer;\r
- \r
+{ \r
AVCodecContext& codec_context_;\r
\r
const core::video_format_desc format_desc_;\r
\r
- aligned_buffer current_chunk_;\r
+ std::vector<short> current_chunk_;\r
+\r
+ std::vector<std::vector<short>> chunks_;\r
\r
public:\r
explicit implementation(AVCodecContext& codec_context, const core::video_format_desc& format_desc) \r
}\r
}\r
\r
-
std::vector<std::vector<short>> execute(std::shared_ptr<AVPacket>&& audio_packet)
\r+
void push(std::shared_ptr<AVPacket>&& audio_packet)
\r { \r
- std::vector<std::vector<short>> result;\r
-\r
if(!audio_packet)\r
- return result;\r
+ return;\r
\r
auto s = current_chunk_.size();\r
current_chunk_.resize(s + 4*format_desc_.audio_sample_rate*2+FF_INPUT_BUFFER_PADDING_SIZE/2);\r
const auto last = current_chunk_.end() - current_chunk_.size() % format_desc_.audio_samples_per_frame;\r
\r
for(auto it = current_chunk_.begin(); it != last; it += format_desc_.audio_samples_per_frame) \r
- result.push_back(std::vector<short>(it, it + format_desc_.audio_samples_per_frame)); \r
+ chunks_.push_back(std::vector<short>(it, it + format_desc_.audio_samples_per_frame)); \r
\r
current_chunk_.erase(current_chunk_.begin(), last);\r
- \r
- return result;\r
+ }\r
+\r
+ bool empty() const\r
+ {\r
+ return chunks_.empty();\r
+ }\r
+\r
+ std::vector<short> front()\r
+ {\r
+ return chunks_.front();\r
+ }\r
+\r
+ void pop()\r
+ {\r
+ chunks_.pop_back();\r
}\r
};\r
\r
audio_decoder::audio_decoder(AVCodecContext& codec_context, const core::video_format_desc& format_desc) : impl_(new implementation(codec_context, format_desc)){}\r
-std::vector<std::vector<short>> audio_decoder::execute(std::shared_ptr<AVPacket>&& audio_packet){return impl_->execute(std::move(audio_packet));}\r
+void audio_decoder::push(std::shared_ptr<AVPacket>&& audio_packet){impl_->push(std::move(audio_packet));}\r
+bool audio_decoder::empty() const {return impl_->empty();}\r
+std::vector<short> audio_decoder::front() {return impl_->front();}\r
+void audio_decoder::pop(){impl_->pop();}\r
}
\ No newline at end of file
\r
struct ffmpeg_producer : public core::frame_producer\r
{\r
- static const size_t DECODED_PACKET_BUFFER_SIZE = 4;\r
- static const size_t MAX_PACKET_OFFSET = 64; // Avoid infinite looping.\r
-\r
const std::wstring filename_;\r
- const bool loop_;\r
\r
const safe_ptr<diagnostics::graph> graph_;\r
boost::timer frame_timer_;\r
- \r
- std::deque<safe_ptr<core::write_frame>> video_frame_buffer_; \r
- std::deque<std::vector<short>> audio_chunk_buffer_;\r
- \r
+ \r
const safe_ptr<core::frame_factory> frame_factory_;\r
\r
input input_; \r
public:\r
explicit ffmpeg_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::wstring& filename, bool loop, int start, int length) \r
: filename_(filename)\r
- , loop_(loop) \r
, graph_(diagnostics::create_graph(narrow(print())))\r
, frame_factory_(frame_factory) \r
- , input_(safe_ptr<diagnostics::graph>(graph_), filename_, loop_, start)\r
+ , input_(safe_ptr<diagnostics::graph>(graph_), filename_, loop, start)\r
{\r
graph_->add_guide("frame-time", 0.5);\r
graph_->set_color("frame-time", diagnostics::color(1.0f, 0.0f, 0.0f));\r
double format_frame_time = 1.0/frame_factory->get_video_format_desc().fps;\r
if(abs(frame_time - format_frame_time) > 0.0001 && abs(frame_time - format_frame_time/2) > 0.0001)\r
CASPAR_LOG(warning) << print() << L" Invalid framerate detected. This may cause distorted audio during playback. frame-time: " << frame_time;\r
-\r
- try\r
- { \r
- video_decoder_.reset(input_.get_video_codec_context() ? \r
- new video_decoder(*input_.get_video_codec_context(), frame_factory) : nullptr);\r
- }\r
- catch(...)\r
- {\r
- CASPAR_LOG_CURRENT_EXCEPTION();\r
- CASPAR_LOG(warning) << print() << " failed to initialize video-decoder.";\r
- }\r
\r
- try\r
- { \r
- audio_decoder_.reset(input_.get_audio_codec_context() ? \r
- new audio_decoder(*input_.get_audio_codec_context(), frame_factory->get_video_format_desc()) : nullptr);\r
- }\r
- catch(...)\r
- {\r
- CASPAR_LOG_CURRENT_EXCEPTION();\r
- CASPAR_LOG(warning) << print() << " failed to initialize audio-decoder.";\r
- } \r
-\r
- if(!video_decoder_ && !audio_decoder_)\r
- {\r
- BOOST_THROW_EXCEPTION(\r
- caspar_exception() <<\r
- source_info(narrow(print())) << \r
- msg_info("Failed to initialize any decoder"));\r
- }\r
+ video_decoder_.reset(input_.get_video_codec_context() ? \r
+ new video_decoder(*input_.get_video_codec_context(), frame_factory) : nullptr);\r
\r
- // Pre-roll since first frames can be heavy.\r
- while(video_frame_buffer_.size() < DECODED_PACKET_BUFFER_SIZE && \r
- audio_chunk_buffer_.size() < DECODED_PACKET_BUFFER_SIZE && \r
- input_.has_packet())\r
- {\r
- try_decode_packet();\r
- }\r
+ audio_decoder_.reset(input_.get_audio_codec_context() ? \r
+ new audio_decoder(*input_.get_audio_codec_context(), frame_factory->get_video_format_desc()) : nullptr); \r
+ \r
+ // Fill buffers.\r
+ decode_next_packets();\r
}\r
\r
virtual safe_ptr<core::basic_frame> receive()\r
{\r
frame_timer_.restart();\r
\r
- std::shared_ptr<core::basic_frame> frame; \r
- for(size_t n = 0; !frame && input_.has_packet() && n < MAX_PACKET_OFFSET ; ++n) \r
- frame = try_get_frame();\r
+ auto result = decode_frame();\r
\r
graph_->update_value("frame-time", static_cast<float>(frame_timer_.elapsed()*frame_factory_->get_video_format_desc().fps*0.5));\r
\r
- if(frame)\r
- return make_safe(frame);\r
- \r
- if(!input_.is_running())\r
- return core::basic_frame::eof();\r
-\r
- if(!video_decoder_ && !audio_decoder_)\r
- return core::basic_frame::eof();\r
- \r
- graph_->add_tag("underflow");\r
- return core::basic_frame::late(); \r
+ return result;\r
}\r
\r
virtual std::wstring print() const\r
{\r
return L"ffmpeg[" + boost::filesystem::wpath(filename_).filename() + L"]";\r
}\r
- \r
- void try_decode_packet()\r
+\r
+ void decode_next_packets()\r
{\r
tbb::parallel_invoke\r
(\r
[&]\r
{\r
- if(video_frame_buffer_.size() < DECODED_PACKET_BUFFER_SIZE)\r
- try_decode_video_packet(input_.get_video_packet());\r
+ std::shared_ptr<AVPacket> pkt;\r
+ for(int n = 0; n < 8 && video_decoder_ && video_decoder_->empty() && input_.try_pop_video_packet(pkt); ++n)\r
+ video_decoder_->push(std::move(pkt));\r
}, \r
[&]\r
{\r
- if(audio_chunk_buffer_.size() < DECODED_PACKET_BUFFER_SIZE)\r
- try_decode_audio_packet(input_.get_audio_packet());\r
+ std::shared_ptr<AVPacket> pkt;\r
+ for(int n = 0; n < 8 && audio_decoder_ && audio_decoder_->empty() && input_.try_pop_audio_packet(pkt); ++n)\r
+ audio_decoder_->push(std::move(pkt));\r
}\r
); \r
}\r
\r
- void try_decode_video_packet(std::shared_ptr<AVPacket>&& video_packet)\r
+ safe_ptr<core::basic_frame> decode_frame()\r
{\r
- if(!video_decoder_)\r
- return;\r
+ decode_next_packets();\r
\r
- try\r
- {\r
- boost::range::push_back(video_frame_buffer_, video_decoder_->execute(std::move(video_packet)));\r
- }\r
- catch(...)\r
+ if(video_decoder_ && !video_decoder_->empty() && audio_decoder_ && !audio_decoder_->empty())\r
{\r
- CASPAR_LOG_CURRENT_EXCEPTION();\r
- video_decoder_.reset();\r
- CASPAR_LOG(warning) << print() << " removed video-stream.";\r
- }\r
- }\r
-\r
- void try_decode_audio_packet(std::shared_ptr<AVPacket>&& audio_packet)\r
- {\r
- if(!audio_decoder_)\r
- return;\r
+ auto frame = std::move(video_decoder_->front()); \r
+ video_decoder_->pop();\r
+ \r
+ frame->audio_data() = std::move(audio_decoder_->front());\r
+ audio_decoder_->pop();\r
\r
- try\r
- {\r
- boost::range::push_back(audio_chunk_buffer_, audio_decoder_->execute(std::move(audio_packet)));\r
+ return frame;\r
}\r
- catch(...)\r
+ else if(video_decoder_ && !video_decoder_->empty() && !audio_decoder_)\r
{\r
- CASPAR_LOG_CURRENT_EXCEPTION();\r
- audio_decoder_.reset();\r
- CASPAR_LOG(warning) << print() << " removed audio-stream.";\r
- }\r
- }\r
-\r
- std::shared_ptr<core::basic_frame> try_get_frame()\r
- { \r
- try_decode_packet();\r
-\r
- std::shared_ptr<core::write_frame> frame; \r
+ auto frame = std::move(video_decoder_->front()); \r
+ video_decoder_->pop();\r
+ frame->get_audio_transform().set_has_audio(false); \r
\r
- if(!video_frame_buffer_.empty() && !audio_chunk_buffer_.empty())\r
+ return frame;\r
+ }\r
+ else if(audio_decoder_ && !audio_decoder_->empty() && !video_decoder_)\r
{\r
- frame = video_frame_buffer_.front(); \r
- video_frame_buffer_.pop_front();\r
+ auto frame = frame_factory_->create_frame(this, 1, 1);\r
+ std::fill(frame->image_data().begin(), frame->image_data().end(), 0);\r
\r
- frame->audio_data() = std::move(audio_chunk_buffer_.front());\r
- audio_chunk_buffer_.pop_front(); \r
+ frame->audio_data() = std::move(audio_decoder_->front());\r
+ audio_decoder_->pop();\r
+\r
+ return frame;\r
}\r
- else if(!video_frame_buffer_.empty() && !audio_decoder_)\r
+ else if(!input_.is_running() || (!video_decoder_ && !audio_decoder_))\r
{\r
- frame = std::move(video_frame_buffer_.front()); \r
- video_frame_buffer_.pop_front();\r
- frame->get_audio_transform().set_has_audio(false); \r
+ return core::basic_frame::eof();\r
}\r
- else if(!audio_chunk_buffer_.empty() && !video_decoder_)\r
+ else\r
{\r
- frame = frame_factory_->create_frame(this, 1, 1);\r
- std::fill(frame->image_data().begin(), frame->image_data().end(), 0);\r
- \r
- frame->audio_data() = std::move(audio_chunk_buffer_.front());\r
- audio_chunk_buffer_.pop_front();\r
+ graph_->add_tag("underflow");\r
+ return core::basic_frame::late();\r
}\r
- \r
- return frame; \r
}\r
};\r
\r
return errn; \r
}\r
\r
- std::shared_ptr<AVPacket> pop()\r
+ bool try_pop(std::shared_ptr<AVPacket>& pkt)\r
{\r
- std::shared_ptr<AVPacket> pkt;\r
- buffer_.try_pop(pkt);\r
- return pkt;\r
+ return buffer_.try_pop(pkt);\r
}\r
\r
void push(const std::shared_ptr<AVPacket>& pkt)\r
stop();\r
}\r
\r
- std::shared_ptr<AVPacket> get_video_packet()\r
- {\r
- return video_stream_.pop();\r
- }\r
\r
- std::shared_ptr<AVPacket> get_audio_packet()\r
+ bool try_pop_video_packet(std::shared_ptr<AVPacket>& packet)\r
{\r
- return audio_stream_.pop();\r
+ return video_stream_.try_pop(packet);\r
}\r
\r
- bool has_packet() const\r
+ bool try_pop_audio_packet(std::shared_ptr<AVPacket>& packet)\r
{\r
- return !video_stream_.empty() || !audio_stream_.empty();\r
+ return audio_stream_.try_pop(packet);\r
}\r
- \r
+\r
double fps()\r
{\r
return fps_;\r
void stop()\r
{\r
executor_.stop();\r
- get_video_packet();\r
- get_audio_packet();\r
+\r
+ // Unblock thread.\r
+ std::shared_ptr<AVPacket> packet;\r
+ try_pop_video_packet(packet);\r
+ try_pop_audio_packet(packet);\r
+\r
CASPAR_LOG(info) << print() << " Stopping.";\r
}\r
\r
: impl_(new implementation(graph, filename, loop, start)){}\r
const std::shared_ptr<AVCodecContext>& input::get_video_codec_context() const{return impl_->video_stream_.ctx();}\r
const std::shared_ptr<AVCodecContext>& input::get_audio_codec_context() const{return impl_->audio_stream_.ctx();}\r
-bool input::has_packet() const{return impl_->has_packet();}\r
bool input::is_running() const {return impl_->executor_.is_running();}\r
-std::shared_ptr<AVPacket> input::get_video_packet(){return impl_->get_video_packet();}\r
-std::shared_ptr<AVPacket> input::get_audio_packet(){return impl_->get_audio_packet();}\r
+bool input::try_pop_video_packet(std::shared_ptr<AVPacket>& packet){return impl_->try_pop_video_packet(packet);}\r
+bool input::try_pop_audio_packet(std::shared_ptr<AVPacket>& packet){return impl_->try_pop_audio_packet(packet);}\r
double input::fps() const { return impl_->fps(); }\r
}
\ No newline at end of file
projects / casparcg / commitdiff