Skip to content

Commit

Permalink
Revert "addressing #3805: remove deprecated function call 3 (#3861)"
Browse files Browse the repository at this point in the history
This reverts commit f6b6b51.
  • Loading branch information
prabhat00155 authored Jun 7, 2021
1 parent 4c95bb6 commit 11c5053
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
8 changes: 4 additions & 4 deletions torchvision/csrc/io/decoder/audio_stream.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ namespace ffmpeg {

namespace {
bool operator==(const AudioFormat& x, const AVFrame& y) {
return static_cast<int>(x.samples) == y.sample_rate &&
static_cast<int>(x.channels) == y.channels && x.format == y.format;
return x.samples == y.sample_rate && x.channels == y.channels &&
x.format == y.format;
}

bool operator==(const AudioFormat& x, const AVCodecContext& y) {
return static_cast<int>(x.samples) == y.sample_rate &&
static_cast<int>(x.channels) == y.channels && x.format == y.sample_fmt;
return x.samples == y.sample_rate && x.channels == y.channels &&
x.format == y.sample_fmt;
}

AudioFormat& toAudioFormat(AudioFormat& x, const AVFrame& y) {
Expand Down
6 changes: 4 additions & 2 deletions torchvision/csrc/io/decoder/decoder.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,8 @@ int64_t Decoder::seekCallback(int64_t offset, int whence) {
void Decoder::initOnce() {
static std::once_flag flagInit;
std::call_once(flagInit, []() {
av_register_all();
avcodec_register_all();
avformat_network_init();
// register ffmpeg lock manager
av_lockmgr_register(&ffmpeg_lock);
Expand Down Expand Up @@ -395,10 +397,10 @@ bool Decoder::init(
}

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
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)) {
VLOG(1) << "Stream media: " << media << " at index " << i
<< " gets ignored, unknown type";
Expand Down

0 comments on commit 11c5053

Please sign in to comment.