Unverified Commit 7fb4ef57 authored by Prabhat Roy's avatar Prabhat Roy Committed by GitHub
Browse files

Revert "addressing #3805: remove deprecated function call 3 (#3861)" (#3989)

This reverts commit f6b6b510.
parent 4c95bb6e
...@@ -7,13 +7,13 @@ namespace ffmpeg { ...@@ -7,13 +7,13 @@ namespace ffmpeg {
namespace { namespace {
bool operator==(const AudioFormat& x, const AVFrame& y) { bool operator==(const AudioFormat& x, const AVFrame& y) {
return static_cast<int>(x.samples) == y.sample_rate && return x.samples == y.sample_rate && x.channels == y.channels &&
static_cast<int>(x.channels) == y.channels && x.format == y.format; x.format == y.format;
} }
bool operator==(const AudioFormat& x, const AVCodecContext& y) { bool operator==(const AudioFormat& x, const AVCodecContext& y) {
return static_cast<int>(x.samples) == y.sample_rate && return x.samples == y.sample_rate && x.channels == y.channels &&
static_cast<int>(x.channels) == y.channels && x.format == y.sample_fmt; x.format == y.sample_fmt;
} }
AudioFormat& toAudioFormat(AudioFormat& x, const AVFrame& y) { AudioFormat& toAudioFormat(AudioFormat& x, const AVFrame& y) {
......
...@@ -196,6 +196,8 @@ int64_t Decoder::seekCallback(int64_t offset, int whence) { ...@@ -196,6 +196,8 @@ int64_t Decoder::seekCallback(int64_t offset, int whence) {
void Decoder::initOnce() { void Decoder::initOnce() {
static std::once_flag flagInit; static std::once_flag flagInit;
std::call_once(flagInit, []() { std::call_once(flagInit, []() {
av_register_all();
avcodec_register_all();
avformat_network_init(); avformat_network_init();
// register ffmpeg lock manager // register ffmpeg lock manager
av_lockmgr_register(&ffmpeg_lock); av_lockmgr_register(&ffmpeg_lock);
...@@ -395,10 +397,10 @@ bool Decoder::init( ...@@ -395,10 +397,10 @@ bool Decoder::init(
} }
bool Decoder::openStreams(std::vector<DecoderMetadata>* metadata) { bool Decoder::openStreams(std::vector<DecoderMetadata>* metadata) {
for (int i = 0; i < static_cast<int>(inputCtx_->nb_streams); i++) { for (int i = 0; i < inputCtx_->nb_streams; i++) {
// - find the corespondent format at params_.formats set // - find the corespondent format at params_.formats set
MediaFormat format; MediaFormat format;
const auto media = inputCtx_->streams[i]->codecpar->codec_type; const auto media = inputCtx_->streams[i]->codec->codec_type;
if (!mapFfmpegType(media, &format.type)) { if (!mapFfmpegType(media, &format.type)) {
VLOG(1) << "Stream media: " << media << " at index " << i VLOG(1) << "Stream media: " << media << " at index " << i
<< " gets ignored, unknown type"; << " gets ignored, unknown type";
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment