Skip to content

Fixed some ffmpeg deprecation warnings in decoder #4003

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 5 commits into from
Jun 9, 2021
Merged

Fixed some ffmpeg deprecation warnings in decoder #4003

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2bad52d
Fixed some ffmpeg deprecation warnings in decoder
prabhat00155 Jun 8, 2021
dc8b1a5
Fixed clang error
prabhat00155 Jun 8, 2021
72f9081
Merge branch 'master' into prabhat00155/fix_ffmpeg_deprecation
datumbox Jun 8, 2021
33fdf22
Merge branch 'master' into prabhat00155/fix_ffmpeg_deprecation
prabhat00155 Jun 9, 2021
7466aa1
Merge branch 'master' into prabhat00155/fix_ffmpeg_deprecation
prabhat00155 Jun 9, 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
9 changes: 8 additions & 1 deletion torchvision/csrc/io/decoder/decoder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#include "decoder.h"
#include <c10/util/Logging.h>
#include <libavutil/avutil.h>
#include <future>
#include <iostream>
#include <mutex>
Expand Down Expand Up @@ -196,8 +197,10 @@ int64_t Decoder::seekCallback(int64_t offset, int whence) {
void Decoder::initOnce() {
static std::once_flag flagInit;
std::call_once(flagInit, []() {
#if LIBAVUTIL_VERSION_MAJOR < 56 // Before FFMPEG 4.0
av_register_all();
avcodec_register_all();
#endif
avformat_network_init();
// register ffmpeg lock manager
av_lockmgr_register(&ffmpeg_lock);
Expand Down Expand Up @@ -397,10 +400,14 @@ bool Decoder::init(
}

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