Merge branch 'main' of github.com:pytorch/torchcodec into fltp

Author: NicolasHug

.github/workflows/build_ffmpeg.yaml

@@ -34,7 +34,7 @@ jobs:
       contents: read
     with:
       job-name: Build
-      upload-artifact: ffmpeg-lgpl
+      upload-artifact: ffmpeg-lgpl-linux_x86_64-${{ matrix.ffmpeg-version }}
       repository: pytorch/torchcodec
       script: |
         export FFMPEG_VERSION="${{ matrix.ffmpeg-version }}"
@@ -56,7 +56,7 @@ jobs:
     uses: pytorch/test-infra/.github/workflows/macos_job.yml@main
     with:
       job-name: Build
-      upload-artifact: ffmpeg-lgpl
+      upload-artifact: ffmpeg-lgpl-macos-${{ matrix.ffmpeg-version }}
       repository: pytorch/torchcodec
       runner: macos-14-xlarge
       script: |

packaging/build_ffmpeg.sh

@@ -61,7 +61,8 @@ tar -xf ffmpeg.tar.gz --strip-components 1
     --enable-avfilter \
     --enable-avformat \
     --enable-avutil \
-    --enable-swscale
+    --enable-swscale \
+    --enable-swresample
 
 make -j install
 ls ${prefix}/*
@@ -78,27 +79,31 @@ if [[ "$(uname)" == Darwin ]]; then
         avdevice=libavdevice.58
         avfilter=libavfilter.7
         swscale=libswscale.5
+        swresample=libswresample.3
     elif [[ ${major_ver} == 5 ]]; then
         avutil=libavutil.57
         avcodec=libavcodec.59
         avformat=libavformat.59
         avdevice=libavdevice.59
         avfilter=libavfilter.8
         swscale=libswscale.6
+        swresample=libswresample.4
     elif [[ ${major_ver} == 6 ]]; then
         avutil=libavutil.58
         avcodec=libavcodec.60
         avformat=libavformat.60
         avdevice=libavdevice.60
         avfilter=libavfilter.9
         swscale=libswscale.7
+        swresample=libswresample.4
     elif [[ ${major_ver} == 7 ]]; then
         avutil=libavutil.59
         avcodec=libavcodec.61
         avformat=libavformat.61
         avdevice=libavdevice.61
         avfilter=libavfilter.10
         swscale=libswscale.8
+        swresample=libswresample.5
     else
         printf "Error: unexpected FFmpeg major version: %s\n"  ${major_ver}
         exit 1;
@@ -120,7 +125,7 @@ if [[ "$(uname)" == Darwin ]]; then
     fi
 
     # list up the paths to fix
-    for lib in ${avcodec} ${avdevice} ${avfilter} ${avformat} ${avutil} ${swscale}; do
+    for lib in ${avcodec} ${avdevice} ${avfilter} ${avformat} ${avutil} ${swscale} ${swresample}; do
         ${otool} -l ${prefix}/lib/${lib}.dylib | grep -B2 ${prefix}
     done
 
@@ -155,6 +160,13 @@ if [[ "$(uname)" == Darwin ]]; then
         ${prefix}/lib/${swscale}.dylib
     ${otool} -l ${prefix}/lib/${swscale}.dylib | grep -B2 ${prefix}
 
+    ${install_name_tool} \
+        -change ${prefix}/lib/${avutil}.dylib @rpath/${avutil}.dylib \
+        -delete_rpath ${prefix}/lib \
+        -id @rpath/${swresample}.dylib \
+        ${prefix}/lib/${swresample}.dylib
+    ${otool} -l ${prefix}/lib/${swresample}.dylib | grep -B2 ${prefix}
+
     ${install_name_tool} \
         -change ${prefix}/lib/${avcodec}.dylib @rpath/${avcodec}.dylib \
         -change ${prefix}/lib/${avutil}.dylib @rpath/${avutil}.dylib \

src/torchcodec/decoders/_core/VideoDecoder.cpp

@@ -174,6 +174,7 @@ void VideoDecoder::initializeDecoder() {
       AVSampleFormat format =
           static_cast<AVSampleFormat>(avStream->codecpar->format);
       streamMetadata.sampleFormat = av_get_sample_fmt_name(format);
+      std::cout << "FUCK " << *streamMetadata.sampleFormat << "AFEFMEMFMFE " << std::endl;
       containerMetadata_.numAudioStreams++;
     }
 
@@ -1414,9 +1415,9 @@ UniqueAVFrame VideoDecoder::convertAudioAVFrameSampleFormat(
   #else
   convertedAVFrame->channel_layout = avFrame->channel_layout;
   #endif
+  convertedAVFrame->format = static_cast<int>(desiredSampleFormat);
   convertedAVFrame->sample_rate = avFrame->sample_rate;
   convertedAVFrame->nb_samples = avFrame->nb_samples;
-  convertedAVFrame->format = desiredSampleFormat;
 
   auto status = av_frame_get_buffer(convertedAVFrame.get(), 0);
   TORCH_CHECK(