[xpalt][mediacore] Fork torchvision streaming decoder

Sergiy Bilobrov · facebook-github-bot · commit 42b6db0f2d95 · 2023-02-02T14:46:15.000-08:00
Summary: Created a copy of torchvison decoder for VUE fork

Differential Revision:
D42952641

Privacy Context Container: L1105083

fbshipit-source-id: 65add9b72c94c1a640c463055f465c5e713af3d7
diff --git a/torchvision/csrc/io/decoder/audio_sampler.cpp b/torchvision/csrc/io/decoder/audio_sampler.cpp
@@ -1,4 +1,5 @@
 #include "audio_sampler.h"
+#include <c10/util/Logging.h>
 #include "util.h"
 
 #define AVRESAMPLE_MAX_CHANNELS 32
@@ -120,6 +121,8 @@ int AudioSampler::sample(
       return result;
     }
 
+    TORCH_CHECK_LE(result, outNumSamples);
+
     if (result) {
       if ((result = av_samples_get_buffer_size(
                nullptr,
@@ -163,6 +166,8 @@ 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,4 +1,5 @@
 #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,4 +1,5 @@
 #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,11 +17,6 @@ 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,4 +1,5 @@
 #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,4 +1,5 @@
 #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,4 +1,5 @@
 #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,4 +1,5 @@
 #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,4 +1,5 @@
 #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,3 +1,4 @@
+#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,4 +1,5 @@
 #include "util.h"
+#include <c10/util/Logging.h>
 
 namespace ffmpeg {
 
diff --git a/torchvision/csrc/io/decoder/video_sampler.cpp b/torchvision/csrc/io/decoder/video_sampler.cpp
@@ -1,4 +1,5 @@
 #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,4 +1,5 @@
 #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,4 +1,5 @@`
`1`	`1`	`#include "audio_stream.h"`
	`2`	`+#include <c10/util/Logging.h>`
`2`	`3`	`#include <limits>`
`3`	`4`	`#include "util.h"`
`4`	`5`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`#include "decoder.h"`
	`2`	`+#include <c10/util/Logging.h>`
`2`	`3`	`#include <libavutil/avutil.h>`
`3`	`4`	`#include <future>`
`4`	`5`	`#include <iostream>`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`#include "memory_buffer.h"`
	`2`	`+#include <c10/util/Logging.h>`
`2`	`3`
`3`	`4`	`namespace ffmpeg {`
`4`	`5`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`#include "seekable_buffer.h"`
	`2`	`+#include <c10/util/Logging.h>`
`2`	`3`	`#include <chrono>`
`3`	`4`	`#include "memory_buffer.h"`
`4`	`5`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`#include "stream.h"`
	`2`	`+#include <c10/util/Logging.h>`
`2`	`3`	`#include <stdio.h>`
`3`	`4`	`#include <string.h>`
`4`	`5`	`#include "util.h"`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`#include "subtitle_sampler.h"`
	`2`	`+#include <c10/util/Logging.h>`
`2`	`3`	`#include "util.h"`
`3`	`4`
`4`	`5`	`namespace ffmpeg {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`#include "subtitle_stream.h"`
	`2`	`+#include <c10/util/Logging.h>`
`2`	`3`	`#include <limits>`
`3`	`4`	`#include "util.h"`
`4`	`5`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+#include <c10/util/Logging.h>`
`1`	`2`	`#include <dirent.h>`
`2`	`3`	`#include <gtest/gtest.h>`
`3`	`4`	`#include "memory_buffer.h"`