Revert "minimal ffmpeg build (commaai#36138)"

This reverts commit 347b230.

Author: mitchellgoffpc

.gitattributes

@@ -15,7 +15,6 @@ third_party/**/*.a filter=lfs diff=lfs merge=lfs -text
 third_party/**/*.so filter=lfs diff=lfs merge=lfs -text
 third_party/**/*.so.* filter=lfs diff=lfs merge=lfs -text
 third_party/**/*.dylib filter=lfs diff=lfs merge=lfs -text
-third_party/ffmpeg/include/**/*.h filter=lfs diff=lfs merge=lfs -text
 third_party/acados/*/t_renderer filter=lfs diff=lfs merge=lfs -text
 third_party/qt5/larch64/bin/lrelease filter=lfs diff=lfs merge=lfs -text
 third_party/qt5/larch64/bin/lupdate filter=lfs diff=lfs merge=lfs -text

SConstruct

@@ -91,7 +91,6 @@ if arch == "larch64":
   ]
 
   libpath = [
-    f"#third_party/ffmpeg/{arch}/lib",
     "/usr/local/lib",
     "/system/vendor/lib64",
     f"#third_party/acados/{arch}/lib",
@@ -115,7 +114,6 @@ else:
     libpath = [
       f"#third_party/libyuv/{arch}/lib",
       f"#third_party/acados/{arch}/lib",
-      f"#third_party/ffmpeg/{arch}/lib",
       f"{brew_prefix}/lib",
       f"{brew_prefix}/opt/[email protected]/lib",
       "/System/Library/Frameworks/OpenGL.framework/Libraries",
@@ -132,7 +130,6 @@ else:
     libpath = [
       f"#third_party/acados/{arch}/lib",
       f"#third_party/libyuv/{arch}/lib",
-      f"#third_party/ffmpeg/{arch}/lib",
       "/usr/lib",
       "/usr/local/lib",
     ]
@@ -180,7 +177,6 @@ env = Environment(
     "#third_party/libyuv/include",
     "#third_party/json11",
     "#third_party/linux/include",
-    "#third_party/ffmpeg/include",
     "#third_party",
     "#msgq",
   ],

system/loggerd/SConscript

@@ -1,8 +1,8 @@
 Import('env', 'arch', 'messaging', 'common', 'visionipc')
 
 libs = [common, messaging, visionipc,
-        'yuv', 'OpenCL', 'pthread', 'zstd',
-        'avformat', 'avcodec', 'avutil', 'x264']
+        'avformat', 'avcodec', 'avutil',
+        'yuv', 'OpenCL', 'pthread', 'zstd']
 
 src = ['logger.cc', 'zstd_writer.cc', 'video_writer.cc', 'encoder/encoder.cc', 'encoder/v4l_encoder.cc', 'encoder/jpeg_encoder.cc']
 if arch != "larch64":

system/loggerd/tests/test_loggerd.py

@@ -316,18 +316,8 @@ def test_record_audio(self, record_audio):
     self._publish_camera_and_audio_messages()
 
     qcamera_ts_path = os.path.join(self._get_latest_log_dir(), 'qcamera.ts')
-
-    # simplest heuristic: look for AAC ADTS syncwords in the TS file
-    def ts_has_audio_stream(ts_path: str) -> bool:
-      try:
-        with open(ts_path, 'rb') as f:
-          data = f.read()
-        # ADTS headers typically start with 0xFFF1 or 0xFFF9
-        return (b"\xFF\xF1" in data) or (b"\xFF\xF9" in data)
-      except Exception:
-        return False
-
-    has_audio_stream = ts_has_audio_stream(qcamera_ts_path)
+    ffprobe_cmd = f"ffprobe -i {qcamera_ts_path} -show_streams -select_streams a -loglevel error"
+    has_audio_stream = subprocess.run(ffprobe_cmd, shell=True, capture_output=True).stdout.strip() != b''
     assert has_audio_stream == record_audio
 
     raw_audio_in_rlog = any(m.which() == 'rawAudioData' for m in LogReader(os.path.join(self._get_latest_log_dir(), 'rlog.zst')))

third_party/.gitignore

@@ -1,3 +1 @@
 *.pyc
-src/
-build/