[xplat][torchvision] Add torchvision streaming decoder

Sergiy Bilobrov · facebook-github-bot · commit 562bab30e232 · 2023-01-30T17:44:37.000-08:00
Summary:
added compiler flag to replace c10 log by glog and remove dependency on c10 for non-pytorch applications

(Note: this ignores all push blocking failures!)

Differential Revision: D42837755

fbshipit-source-id: cc9661905fd3f8e91aa5fee2e58e3e0dd02fa325
diff --git a/torchvision/csrc/io/decoder/audio_sampler.cpp b/torchvision/csrc/io/decoder/audio_sampler.cpp
@@ -1,5 +1,4 @@
 #include "audio_sampler.h"
-#include <c10/util/Logging.h>
 #include "util.h"
 
 #define AVRESAMPLE_MAX_CHANNELS 32
@@ -121,8 +120,6 @@ int AudioSampler::sample(
       return result;
     }
 
-    TORCH_CHECK_LE(result, outNumSamples);
-
     if (result) {
       if ((result = av_samples_get_buffer_size(
                nullptr,
@@ -166,8 +163,6 @@ int AudioSampler::sample(
 
     av_free(tmpBuffer);
 
-    TORCH_CHECK_LE(result, outNumSamples);
-
     if (result) {
       result = av_samples_get_buffer_size(
           nullptr,
diff --git a/torchvision/csrc/io/decoder/audio_stream.cpp b/torchvision/csrc/io/decoder/audio_stream.cpp
@@ -1,5 +1,4 @@
 #include "audio_stream.h"
-#include <c10/util/Logging.h>
 #include <limits>
 #include "util.h"
 
diff --git a/torchvision/csrc/io/decoder/decoder.cpp b/torchvision/csrc/io/decoder/decoder.cpp
@@ -1,5 +1,4 @@
 #include "decoder.h"
-#include <c10/util/Logging.h>
 #include <libavutil/avutil.h>
 #include <future>
 #include <iostream>
diff --git a/torchvision/csrc/io/decoder/defs.h b/torchvision/csrc/io/decoder/defs.h
@@ -17,6 +17,11 @@ extern "C" {
 #include <libswresample/swresample.h>
 #include "libswscale/swscale.h"
 }
+#ifdef USE_GLOG
+#include <glog/logging.h>
+#else
+#include <c10/util/Logging.h>
+#endif
 
 namespace ffmpeg {
 
diff --git a/torchvision/csrc/io/decoder/memory_buffer.cpp b/torchvision/csrc/io/decoder/memory_buffer.cpp
@@ -1,5 +1,4 @@
 #include "memory_buffer.h"
-#include <c10/util/Logging.h>
 
 namespace ffmpeg {
 
diff --git a/torchvision/csrc/io/decoder/seekable_buffer.cpp b/torchvision/csrc/io/decoder/seekable_buffer.cpp
@@ -1,5 +1,4 @@
 #include "seekable_buffer.h"
-#include <c10/util/Logging.h>
 #include <chrono>
 #include "memory_buffer.h"
 
diff --git a/torchvision/csrc/io/decoder/stream.cpp b/torchvision/csrc/io/decoder/stream.cpp
@@ -1,5 +1,4 @@
 #include "stream.h"
-#include <c10/util/Logging.h>
 #include <stdio.h>
 #include <string.h>
 #include "util.h"
diff --git a/torchvision/csrc/io/decoder/subtitle_sampler.cpp b/torchvision/csrc/io/decoder/subtitle_sampler.cpp
@@ -1,5 +1,4 @@
 #include "subtitle_sampler.h"
-#include <c10/util/Logging.h>
 #include "util.h"
 
 namespace ffmpeg {
diff --git a/torchvision/csrc/io/decoder/subtitle_stream.cpp b/torchvision/csrc/io/decoder/subtitle_stream.cpp
@@ -1,5 +1,4 @@
 #include "subtitle_stream.h"
-#include <c10/util/Logging.h>
 #include <limits>
 #include "util.h"
 
diff --git a/torchvision/csrc/io/decoder/sync_decoder_test.cpp b/torchvision/csrc/io/decoder/sync_decoder_test.cpp
@@ -1,4 +1,3 @@
-#include <c10/util/Logging.h>
 #include <dirent.h>
 #include <gtest/gtest.h>
 #include "memory_buffer.h"
diff --git a/torchvision/csrc/io/decoder/util.cpp b/torchvision/csrc/io/decoder/util.cpp
@@ -1,5 +1,4 @@
 #include "util.h"
-#include <c10/util/Logging.h>
 
 namespace ffmpeg {
 
@@ -265,7 +264,6 @@ std::string generateErrorDesc(int errorCode) {
 
 size_t serialize(const AVSubtitle& sub, ByteStorage* out) {
   const auto len = size(sub);
-  TORCH_CHECK_LE(len, out->tail());
   size_t pos = 0;
   if (!Serializer::serializeItem(out->writableTail(), len, pos, sub)) {
     return 0;
diff --git a/torchvision/csrc/io/decoder/video_sampler.cpp b/torchvision/csrc/io/decoder/video_sampler.cpp
@@ -1,5 +1,4 @@
 #include "video_sampler.h"
-#include <c10/util/Logging.h>
 #include "util.h"
 
 // www.ffmpeg.org/doxygen/0.5/swscale-example_8c-source.html
diff --git a/torchvision/csrc/io/decoder/video_stream.cpp b/torchvision/csrc/io/decoder/video_stream.cpp
@@ -1,5 +1,4 @@
 #include "video_stream.h"
-#include <c10/util/Logging.h>
 #include "util.h"
 
 namespace ffmpeg {

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`#include "audio_stream.h"`
`2`		`-#include <c10/util/Logging.h>`
`3`	`2`	`#include <limits>`
`4`	`3`	`#include "util.h"`
`5`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`#include "decoder.h"`
`2`		`-#include <c10/util/Logging.h>`
`3`	`2`	`#include <libavutil/avutil.h>`
`4`	`3`	`#include <future>`
`5`	`4`	`#include <iostream>`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`#include "memory_buffer.h"`
`2`		`-#include <c10/util/Logging.h>`
`3`	`2`
`4`	`3`	`namespace ffmpeg {`
`5`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`#include "seekable_buffer.h"`
`2`		`-#include <c10/util/Logging.h>`
`3`	`2`	`#include <chrono>`
`4`	`3`	`#include "memory_buffer.h"`
`5`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`#include "stream.h"`
`2`		`-#include <c10/util/Logging.h>`
`3`	`2`	`#include <stdio.h>`
`4`	`3`	`#include <string.h>`
`5`	`4`	`#include "util.h"`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`#include "subtitle_sampler.h"`
`2`		`-#include <c10/util/Logging.h>`
`3`	`2`	`#include "util.h"`
`4`	`3`
`5`	`4`	`namespace ffmpeg {`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`#include "subtitle_stream.h"`
`2`		`-#include <c10/util/Logging.h>`
`3`	`2`	`#include <limits>`
`4`	`3`	`#include "util.h"`
`5`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-#include <c10/util/Logging.h>`
`2`	`1`	`#include <dirent.h>`
`3`	`2`	`#include <gtest/gtest.h>`
`4`	`3`	`#include "memory_buffer.h"`