Unverified Commit c28797e3 authored by Vasilis Vryniotis's avatar Vasilis Vryniotis Committed by GitHub
Browse files

Fixed compilation warnings on C++ codebase (#3390)

parent 103eec5e
...@@ -24,19 +24,15 @@ struct torch_jpeg_mgr { ...@@ -24,19 +24,15 @@ struct torch_jpeg_mgr {
static void torch_jpeg_init_source(j_decompress_ptr cinfo) {} static void torch_jpeg_init_source(j_decompress_ptr cinfo) {}
static boolean torch_jpeg_fill_input_buffer(j_decompress_ptr cinfo) { static boolean torch_jpeg_fill_input_buffer(j_decompress_ptr cinfo) {
torch_jpeg_mgr* src = (torch_jpeg_mgr*)cinfo->src;
// No more data. Probably an incomplete image; Raise exception. // No more data. Probably an incomplete image; Raise exception.
torch_jpeg_error_ptr myerr = (torch_jpeg_error_ptr)cinfo->err; torch_jpeg_error_ptr myerr = (torch_jpeg_error_ptr)cinfo->err;
strcpy(myerr->jpegLastErrorMsg, "Image is incomplete or truncated"); strcpy(myerr->jpegLastErrorMsg, "Image is incomplete or truncated");
longjmp(myerr->setjmp_buffer, 1); longjmp(myerr->setjmp_buffer, 1);
src->pub.next_input_byte = EOI_BUFFER;
src->pub.bytes_in_buffer = 1;
return TRUE;
} }
static void torch_jpeg_skip_input_data(j_decompress_ptr cinfo, long num_bytes) { static void torch_jpeg_skip_input_data(j_decompress_ptr cinfo, long num_bytes) {
torch_jpeg_mgr* src = (torch_jpeg_mgr*)cinfo->src; torch_jpeg_mgr* src = (torch_jpeg_mgr*)cinfo->src;
if (src->pub.bytes_in_buffer < num_bytes) { if (src->pub.bytes_in_buffer < (size_t)num_bytes) {
// Skipping over all of remaining data; output EOI. // Skipping over all of remaining data; output EOI.
src->pub.next_input_byte = EOI_BUFFER; src->pub.next_input_byte = EOI_BUFFER;
src->pub.bytes_in_buffer = 1; src->pub.bytes_in_buffer = 1;
......
...@@ -28,11 +28,6 @@ struct torch_png_error_mgr { ...@@ -28,11 +28,6 @@ struct torch_png_error_mgr {
using torch_png_error_mgr_ptr = torch_png_error_mgr*; using torch_png_error_mgr_ptr = torch_png_error_mgr*;
void torch_png_warn(png_structp png_ptr, png_const_charp warn_msg) {
/* Display warning to user */
TORCH_WARN_ONCE(warn_msg);
}
void torch_png_error(png_structp png_ptr, png_const_charp error_msg) { void torch_png_error(png_structp png_ptr, png_const_charp error_msg) {
/* png_ptr->err really points to a torch_png_error_mgr struct, so coerce /* png_ptr->err really points to a torch_png_error_mgr struct, so coerce
* pointer */ * pointer */
...@@ -155,7 +150,7 @@ torch::Tensor encode_png(const torch::Tensor& data, int64_t compression_level) { ...@@ -155,7 +150,7 @@ torch::Tensor encode_png(const torch::Tensor& data, int64_t compression_level) {
auto ptr = input.data_ptr<uint8_t>(); auto ptr = input.data_ptr<uint8_t>();
// Encode PNG file // Encode PNG file
for (size_t y = 0; y < height; ++y) { for (int y = 0; y < height; ++y) {
png_write_row(png_write, ptr); png_write_row(png_write, ptr);
ptr += stride; ptr += stride;
} }
......
...@@ -9,7 +9,6 @@ namespace { ...@@ -9,7 +9,6 @@ namespace {
const size_t decoderTimeoutMs = 600000; const size_t decoderTimeoutMs = 600000;
const AVPixelFormat defaultVideoPixelFormat = AV_PIX_FMT_RGB24; const AVPixelFormat defaultVideoPixelFormat = AV_PIX_FMT_RGB24;
const AVSampleFormat defaultAudioSampleFormat = AV_SAMPLE_FMT_FLT;
// returns number of written bytes // returns number of written bytes
template <typename T> template <typename T>
...@@ -291,7 +290,7 @@ std::tuple<torch::Tensor, double> Video::Next() { ...@@ -291,7 +290,7 @@ std::tuple<torch::Tensor, double> Video::Next() {
int outWidth = format.format.video.width; int outWidth = format.format.video.width;
int numChannels = 3; int numChannels = 3;
outFrame = torch::zeros({outHeight, outWidth, numChannels}, torch::kByte); outFrame = torch::zeros({outHeight, outWidth, numChannels}, torch::kByte);
auto numberWrittenBytes = fillVideoTensor(out, outFrame); fillVideoTensor(out, outFrame);
outFrame = outFrame.permute({2, 0, 1}); outFrame = outFrame.permute({2, 0, 1});
} else if (format.type == TYPE_AUDIO) { } else if (format.type == TYPE_AUDIO) {
...@@ -307,7 +306,7 @@ std::tuple<torch::Tensor, double> Video::Next() { ...@@ -307,7 +306,7 @@ std::tuple<torch::Tensor, double> Video::Next() {
outFrame = outFrame =
torch::zeros({numAudioSamples, outAudioChannels}, torch::kFloat); torch::zeros({numAudioSamples, outAudioChannels}, torch::kFloat);
auto numberWrittenBytes = fillAudioTensor(out, outFrame); fillAudioTensor(out, outFrame);
} }
// currently not supporting other formats (will do soon) // currently not supporting other formats (will do soon)
......
...@@ -27,13 +27,11 @@ struct Video : torch::CustomClassHolder { ...@@ -27,13 +27,11 @@ struct Video : torch::CustomClassHolder {
std::tuple<torch::Tensor, double> Next(); std::tuple<torch::Tensor, double> Next();
private: private:
bool video_any_frame = false; // add this to input parameters?
bool succeeded = false; // decoder init flag bool succeeded = false; // decoder init flag
// seekTS and doSeek act as a flag - if it's not set, next function simply // seekTS and doSeek act as a flag - if it's not set, next function simply
// retruns the next frame. If it's set, we look at the global seek // retruns the next frame. If it's set, we look at the global seek
// time in comination with any_frame settings // time in comination with any_frame settings
double seekTS = -1; double seekTS = -1;
bool doSeek = false;
void _getDecoderParams( void _getDecoderParams(
double videoStartS, double videoStartS,
......
...@@ -87,7 +87,7 @@ size_t fillTensor( ...@@ -87,7 +87,7 @@ size_t fillTensor(
} }
T* frameData = frame.numel() > 0 ? frame.data_ptr<T>() : nullptr; T* frameData = frame.numel() > 0 ? frame.data_ptr<T>() : nullptr;
int64_t* framePtsData = framePts.data_ptr<int64_t>(); int64_t* framePtsData = framePts.data_ptr<int64_t>();
CHECK_EQ(framePts.size(0), msgs.size()); CHECK_EQ(framePts.size(0), (int64_t)msgs.size());
size_t avgElementsInFrame = frame.numel() / msgs.size(); size_t avgElementsInFrame = frame.numel() / msgs.size();
size_t offset = 0; size_t offset = 0;
...@@ -491,7 +491,6 @@ torch::List<torch::Tensor> probeVideo( ...@@ -491,7 +491,6 @@ torch::List<torch::Tensor> probeVideo(
videoTimeBase = torch::zeros({2}, torch::kInt); videoTimeBase = torch::zeros({2}, torch::kInt);
int* videoTimeBaseData = videoTimeBase.data_ptr<int>(); int* videoTimeBaseData = videoTimeBase.data_ptr<int>();
const auto& header = videoMetadata; const auto& header = videoMetadata;
const auto& media = header.format;
videoTimeBaseData[0] = header.num; videoTimeBaseData[0] = header.num;
videoTimeBaseData[1] = header.den; videoTimeBaseData[1] = header.den;
......
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