Skip to content

addressing #3805: remove deprecated function call 3 #3861

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Jun 1, 2021
Merged

addressing #3805: remove deprecated function call 3 #3861

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
26da57b
remove unused functions
bjuncek May 19, 2021
feab5fa
shut up annoying warnings via cast
bjuncek May 19, 2021
f7df1f7
Merge branch 'master' into bkorbar/depretiation_3
prabhat00155 May 21, 2021
a67a676
Merge branch 'master' into bkorbar/depretiation_3
prabhat00155 May 21, 2021
3c57ccd
Merge branch 'master' into bkorbar/depretiation_3
prabhat00155 May 21, 2021
43c545c
prabhat's comments
bjuncek May 24, 2021
df60de7
Fixed clang format error
prabhat00155 Jun 1, 2021
483c87a
Merge branch 'master' into bkorbar/depretiation_3
prabhat00155 Jun 1, 2021
450630b
Merge branch 'master' into bkorbar/depretiation_3
prabhat00155 Jun 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions torchvision/csrc/io/decoder/audio_stream.cpp
View file
Open in desktop
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 x.samples == y.sample_rate && x.channels == y.channels &&
x.format == y.format;
return static_cast<int>(x.samples) == y.sample_rate &&
static_cast<int>(x.channels) == y.channels && x.format == y.format;
}

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

AudioFormat& toAudioFormat(AudioFormat& x, const AVFrame& y) {
Expand Down
6 changes: 2 additions & 4 deletions torchvision/csrc/io/decoder/decoder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,8 +196,6 @@ 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 @@ -397,10 +395,10 @@ bool Decoder::init(
}

bool Decoder::openStreams(std::vector<DecoderMetadata>* metadata) {
for (int i = 0; i < inputCtx_->nb_streams; i++) {
for (int i = 0; i < static_cast<int>(inputCtx_->nb_streams); i++) {
// - find the corespondent format at params_.formats set
MediaFormat format;
const auto media = inputCtx_->streams[i]->codec->codec_type;
const auto media = inputCtx_->streams[i]->codecpar->codec_type;
if (!mapFfmpegType(media, &format.type)) {
VLOG(1) << "Stream media: " << media << " at index " << i
<< " gets ignored, unknown type";
Expand Down