Move libtorchaudio_ffmpeg to dedicated directory

Differential Revision: D50082877

Pull Request resolved: https://github.com/pytorch/audio/pull/3646

CMakeLists.txt

@@ -177,7 +177,7 @@ if (USE_FFMPEG)
     message(STATUS "Building FFmpeg integration with multi version support")
     add_subdirectory(third_party/ffmpeg/multi)
   endif()
-  add_subdirectory(src/torchaudio/csrc/ffmpeg)
+  add_subdirectory(src/libtorio/ffmpeg)
 endif()
 if (BUILD_CUDA_CTC_DECODER)
   if (NOT USE_CUDA)

docs/source/Doxyfile

@@ -908,9 +908,9 @@ WARN_LOGFILE           =
 # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
 # Note: If this tag is empty the current directory is searched.
 
-INPUT                  = ../torchaudio/csrc/ffmpeg/stream_reader/typedefs.h \
-                         ../torchaudio/csrc/ffmpeg/stream_reader/stream_reader.h \
-                         ../torchaudio/csrc/ffmpeg/stream_writer/stream_writer.h
+INPUT                  = ../src/libtorio/ffmpeg/stream_reader/typedefs.h \
+                         ../src/libtorio/ffmpeg/stream_reader/stream_reader.h \
+                         ../src/libtorio/ffmpeg/stream_writer/stream_writer.h
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses

src/torchaudio/csrc/ffmpeg/compat.cpp → src/libtorio/ffmpeg/compat.cpp

+#include <libtorio/ffmpeg/stream_reader/stream_reader.h>
 #include <torch/script.h>
-#include <torchaudio/csrc/ffmpeg/stream_reader/stream_reader.h>
 #include <stdexcept>
 
 namespace torchaudio {

src/torchaudio/csrc/ffmpeg/ffmpeg.cpp → src/libtorio/ffmpeg/ffmpeg.cpp

 #include <c10/util/Exception.h>
-#include <torchaudio/csrc/ffmpeg/ffmpeg.h>
+#include <libtorio/ffmpeg/ffmpeg.h>
 #include <sstream>
 #include <stdexcept>
 #include <string>

src/torchaudio/csrc/ffmpeg/ffmpeg.h → src/libtorio/ffmpeg/ffmpeg.h

@@ -58,13 +58,13 @@ class Wrapper {
 
  public:
   Wrapper() = delete;
-  Wrapper<T, Deleter>(T* t) : ptr(t){};
+  explicit Wrapper<T, Deleter>(T* t) : ptr(t) {}
   T* operator->() const {
     return ptr.get();
-  };
+  }
   explicit operator bool() const {
     return (bool)ptr;
-  };
+  }
   operator T*() const {
     return ptr.get();
   }
@@ -140,7 +140,7 @@ AVPacketPtr alloc_avpacket();
 // `AutoPacketUnref` handles the second-stage memory management.
 struct AutoPacketUnref {
   AVPacketPtr& p_;
-  AutoPacketUnref(AVPacketPtr& p);
+  explicit AutoPacketUnref(AVPacketPtr& p);
   ~AutoPacketUnref();
   operator AVPacket*() const;
 };

src/torchaudio/csrc/ffmpeg/filter_graph.cpp → src/libtorio/ffmpeg/filter_graph.cpp

-#include <torchaudio/csrc/ffmpeg/filter_graph.h>
+#include <libtorio/ffmpeg/filter_graph.h>
 #include <stdexcept>
 
 namespace torchaudio::io {

src/torchaudio/csrc/ffmpeg/filter_graph.h → src/libtorio/ffmpeg/filter_graph.h

 #pragma once
 
-#include <torchaudio/csrc/ffmpeg/ffmpeg.h>
+#include <libtorio/ffmpeg/ffmpeg.h>
 namespace torchaudio {
 namespace io {
 

src/torchaudio/csrc/ffmpeg/hw_context.cpp → src/libtorio/ffmpeg/hw_context.cpp

-#include <torchaudio/csrc/ffmpeg/hw_context.h>
+#include <libtorio/ffmpeg/hw_context.h>
 
 namespace torchaudio::io {
 namespace {

src/torchaudio/csrc/ffmpeg/hw_context.h → src/libtorio/ffmpeg/hw_context.h

 #pragma once
 
-#include <torchaudio/csrc/ffmpeg/ffmpeg.h>
+#include <libtorio/ffmpeg/ffmpeg.h>
 
 namespace torchaudio::io {
 

src/torchaudio/csrc/ffmpeg/pybind/pybind.cpp → src/libtorio/ffmpeg/pybind/pybind.cpp

+#include <libtorio/ffmpeg/hw_context.h>
+#include <libtorio/ffmpeg/stream_reader/stream_reader.h>
+#include <libtorio/ffmpeg/stream_writer/stream_writer.h>
 #include <torch/extension.h>
-#include <torchaudio/csrc/ffmpeg/hw_context.h>
-#include <torchaudio/csrc/ffmpeg/stream_reader/stream_reader.h>
-#include <torchaudio/csrc/ffmpeg/stream_writer/stream_writer.h>
 
 namespace torchaudio::io {
 namespace {

src/torchaudio/csrc/ffmpeg/stream_reader/buffer/chunked_buffer.cpp → src/libtorio/ffmpeg/stream_reader/buffer/chunked_buffer.cpp

-#include <torchaudio/csrc/ffmpeg/stream_reader/buffer/chunked_buffer.h>
+#include <libtorio/ffmpeg/stream_reader/buffer/chunked_buffer.h>
 
 namespace torchaudio::io::detail {
 

src/torchaudio/csrc/ffmpeg/stream_reader/buffer/chunked_buffer.h → src/libtorio/ffmpeg/stream_reader/buffer/chunked_buffer.h

 #pragma once
-#include <torchaudio/csrc/ffmpeg/ffmpeg.h>
-#include <torchaudio/csrc/ffmpeg/stream_reader/typedefs.h>
+#include <libtorio/ffmpeg/ffmpeg.h>
+#include <libtorio/ffmpeg/stream_reader/typedefs.h>
 
 namespace torchaudio::io::detail {
 

src/torchaudio/csrc/ffmpeg/stream_reader/buffer/unchunked_buffer.cpp → src/libtorio/ffmpeg/stream_reader/buffer/unchunked_buffer.cpp

-#include <torchaudio/csrc/ffmpeg/stream_reader/buffer/unchunked_buffer.h>
+#include <libtorio/ffmpeg/stream_reader/buffer/unchunked_buffer.h>
 
 namespace torchaudio::io::detail {
 

src/torchaudio/csrc/ffmpeg/stream_reader/buffer/unchunked_buffer.h → src/libtorio/ffmpeg/stream_reader/buffer/unchunked_buffer.h

 #pragma once
+#include <libtorio/ffmpeg/ffmpeg.h>
+#include <libtorio/ffmpeg/stream_reader/typedefs.h>
 #include <torch/types.h>
-#include <torchaudio/csrc/ffmpeg/ffmpeg.h>
-#include <torchaudio/csrc/ffmpeg/stream_reader/typedefs.h>
 #include <deque>
 
 namespace torchaudio::io::detail {
@@ -13,7 +13,7 @@ class UnchunkedBuffer {
   AVRational time_base;
 
  public:
-  UnchunkedBuffer(AVRational time_base);
+  explicit UnchunkedBuffer(AVRational time_base);
   bool is_ready() const;
   void push_frame(torch::Tensor frame, int64_t pts_);
   c10::optional<Chunk> pop_chunk();

src/torchaudio/csrc/ffmpeg/stream_reader/conversion.cpp → src/libtorio/ffmpeg/stream_reader/conversion.cpp

+#include <libtorio/ffmpeg/stream_reader/conversion.h>
 #include <torch/torch.h>
-#include <torchaudio/csrc/ffmpeg/stream_reader/conversion.h>
 
 #ifdef USE_CUDA
 #include <c10/cuda/CUDAStream.h>

src/torchaudio/csrc/ffmpeg/stream_reader/conversion.h → src/libtorio/ffmpeg/stream_reader/conversion.h

 #pragma once
+#include <libtorio/ffmpeg/ffmpeg.h>
 #include <torch/types.h>
-#include <torchaudio/csrc/ffmpeg/ffmpeg.h>
 
 namespace torchaudio::io {
 
@@ -12,7 +12,7 @@ class AudioConverter {
   const int num_channels;
 
  public:
-  AudioConverter(int num_channels);
+  explicit AudioConverter(int num_channels);
 
   // Converts AVFrame* into Tensor of [T, C]
   torch::Tensor convert(const AVFrame* src);

src/torchaudio/csrc/ffmpeg/stream_reader/packet_buffer.cpp → src/libtorio/ffmpeg/stream_reader/packet_buffer.cpp

-#include <torchaudio/csrc/ffmpeg/stream_reader/packet_buffer.h>
+#include <libtorio/ffmpeg/stream_reader/packet_buffer.h>
 
 namespace torchaudio::io {
 void PacketBuffer::push_packet(AVPacket* packet) {

src/torchaudio/csrc/ffmpeg/stream_reader/packet_buffer.h → src/libtorio/ffmpeg/stream_reader/packet_buffer.h

 #pragma once
-#include <torchaudio/csrc/ffmpeg/ffmpeg.h>
+#include <libtorio/ffmpeg/ffmpeg.h>
 
 namespace torchaudio {
 namespace io {