\r
int64_t nb_frames_;\r
public:\r
- explicit implementation(const s
td::shared_ptr<AVFormatContext>& context, const core::video_format_desc& format_desc)
\r+ explicit implementation(const s
afe_ptr<AVFormatContext>& context, const core::video_format_desc& format_desc)
\r : format_desc_(format_desc) \r
, nb_frames_(0)\r
- , buffer1_(AVCODEC_MAX_AUDIO_FRAME_SIZE*2)\r
- { \r
+ { \r
try\r
{\r
AVCodec* dec;\r
index_ = THROW_ON_ERROR2(av_find_best_stream(context.get(), AVMEDIA_TYPE_AUDIO, -1, -1, &dec, 0), "[audio_decoder]");\r
\r
THROW_ON_ERROR2(avcodec_open(context->streams[index_]->codec, dec), "[audio_decoder]");\r
+ \r
+ codec_context_.reset(context->streams[index_]->codec, avcodec_close);\r
+\r
+ buffer1_.resize(AVCODEC_MAX_AUDIO_FRAME_SIZE*2);\r
+\r
+ if(codec_context_->sample_rate != static_cast<int>(format_desc_.audio_sample_rate) || \r
+ codec_context_->channels != static_cast<int>(format_desc_.audio_channels) ||\r
+ codec_context_->sample_fmt != AV_SAMPLE_FMT_S16)\r
+ { \r
+ auto resampler = av_audio_resample_init(format_desc_.audio_channels, codec_context_->channels,\r
+ format_desc_.audio_sample_rate, codec_context_->sample_rate,\r
+ AV_SAMPLE_FMT_S16, codec_context_->sample_fmt,\r
+ 16, 10, 0, 0.8);\r
+\r
+ buffer2_.resize(AVCODEC_MAX_AUDIO_FRAME_SIZE*2);\r
+\r
+ CASPAR_LOG(warning) << L"Invalid audio format. Resampling." <<\r
+ L" sample_rate:" << static_cast<int>(codec_context_->sample_rate) <<\r
+ L" audio_channels:" << static_cast<int>(codec_context_->channels) <<\r
+ L" sample_fmt:" << static_cast<int>(codec_context_->sample_fmt);\r
+\r
+ if(resampler)\r
+ resampler_.reset(resampler, audio_resample_close);\r
+ else\r
+ codec_context_ = nullptr;\r
+ } \r
}\r
catch(...)\r
{\r
+ index_ = THROW_ON_ERROR2(av_find_best_stream(context.get(), AVMEDIA_TYPE_VIDEO, -1, -1, nullptr, 0), "[audio_decoder]");\r
+\r
CASPAR_LOG_CURRENT_EXCEPTION();\r
- CASPAR_LOG(warning) << "[audio_decoder] Failed to open audio. Running without audio.";\r
- return;\r
+ CASPAR_LOG(warning) << "[audio_decoder] Failed to open audio-stream. Running without audio."; \r
}\r
-\r
- codec_context_.reset(context->streams[index_]->codec, avcodec_close);\r
-\r
- //nb_frames_ = context->streams[index_]->nb_frames;\r
- //if(nb_frames_ == 0)\r
- // nb_frames_ = context->streams[index_]->duration * context->streams[index_]->time_base.den;\r
-\r
- if(codec_context_ &&\r
- (codec_context_->sample_rate != static_cast<int>(format_desc_.audio_sample_rate) || \r
- codec_context_->channels != static_cast<int>(format_desc_.audio_channels)) ||\r
- codec_context_->sample_fmt != AV_SAMPLE_FMT_S16)\r
- { \r
- auto resampler = av_audio_resample_init(format_desc_.audio_channels, codec_context_->channels,\r
- format_desc_.audio_sample_rate, codec_context_->sample_rate,\r
- AV_SAMPLE_FMT_S16, codec_context_->sample_fmt,\r
- 16, 10, 0, 0.8);\r
-\r
- buffer2_.resize(AVCODEC_MAX_AUDIO_FRAME_SIZE*2);\r
-\r
- CASPAR_LOG(warning) << L" Invalid audio format. Resampling.";\r
-\r
- if(resampler)\r
- resampler_.reset(resampler, audio_resample_close);\r
- else\r
- codec_context_ = nullptr;\r
- } \r
}\r
\r
void push(const std::shared_ptr<AVPacket>& packet)\r
{ \r
- if(!codec_context_)\r
- return;\r
-\r
if(packet && packet->stream_index != index_)\r
return;\r
\r
{\r
std::vector<std::shared_ptr<std::vector<int16_t>>> result;\r
\r
+ if(packets_.empty())\r
+ return result;\r
+\r
if(!codec_context_)\r
- result.push_back(std::make_shared<std::vector<int16_t>>(format_desc_.audio_samples_per_frame, 0));\r
- else if(!packets_.empty())\r
- { \r
- auto packet = packets_.front();\r
-\r
- if(packet) \r
- {\r
- result.push_back(decode(*packet));\r
- if(packet->size == 0) \r
- packets_.pop();\r
- }\r
- else \r
- { \r
- avcodec_flush_buffers(codec_context_.get());\r
- result.push_back(nullptr);\r
+ return empty_poll();\r
+ \r
+ auto packet = packets_.front();\r
+\r
+ if(packet) \r
+ {\r
+ result.push_back(decode(*packet));\r
+ if(packet->size == 0) \r
packets_.pop();\r
- }\r
}\r
+ else \r
+ { \r
+ avcodec_flush_buffers(codec_context_.get());\r
+ result.push_back(nullptr);\r
+ packets_.pop();\r
+ } \r
\r
return result;\r
}\r
\r
+ std::vector<std::shared_ptr<std::vector<int16_t>>> empty_poll()\r
+ {\r
+ auto packet = packets_.front();\r
+ packets_.pop();\r
+\r
+ if(!packet) \r
+ return boost::assign::list_of(nullptr);\r
+ \r
+ return boost::assign::list_of(std::make_shared<std::vector<int16_t>>(format_desc_.audio_samples_per_frame, 0)); \r
+ }\r
+\r
std::shared_ptr<std::vector<int16_t>> decode(AVPacket& pkt)\r
{ \r
int written_bytes = buffer1_.size() - FF_INPUT_BUFFER_PADDING_SIZE;\r
\r
bool ready() const\r
{\r
- return !codec_context_ || !packets_.empty();\r
+ return !packets_.empty();\r
}\r
};\r
\r
-audio_decoder::audio_decoder(const s
td::shared_ptr<AVFormatContext>& context, const core::video_format_desc& format_desc) : impl_(new implementation(context, format_desc)){}
\r+audio_decoder::audio_decoder(const s
afe_ptr<AVFormatContext>& context, const core::video_format_desc& format_desc) : impl_(new implementation(context, format_desc)){}
\r void audio_decoder::push(const std::shared_ptr<AVPacket>& packet){impl_->push(packet);}\r
bool audio_decoder::ready() const{return impl_->ready();}\r
std::vector<std::shared_ptr<std::vector<int16_t>>> audio_decoder::poll(){return impl_->poll();}\r
projects / casparcg / blobdiff