revert(54b90ac): "fix?: remove tags from stream and chapter"

This reverts commit 54b90ac7f5.

Dockerfile

@@ -1,51 +1,20 @@
 FROM emscripten/emsdk:5.0.1 AS build
 
+ARG BUILD_USER=1000
 ARG FFMPEG_VERSION=8.0.1
-ARG X264_COMMIT=b35605a
-ARG LAME_VERSION=3.100
 
-ARG PREFIX=/opt/ffmpeg
+ARG PREFIX=/tmp/ffmpeg-build
 ARG MAKEFLAGS="-j4"
 
-RUN wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | sudo tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc
+RUN wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc
 RUN echo "deb https://apt.llvm.org/jammy/ llvm-toolchain-jammy-20 main\ndeb-src https://apt.llvm.org/jammy/ llvm-toolchain-jammy-20 main" > /etc/apt/sources.list.d/llvm.list
 RUN apt-get update
 RUN apt-get install -y libllvm-20-ocaml-dev libllvm20 llvm-20 llvm-20-dev llvm-20-runtime
 RUN apt-get install -y libclang-rt-20-dev-wasm32 libclang-rt-20-dev-wasm64 libc++-20-dev-wasm32 libc++abi-20-dev-wasm32 libclang-rt-20-dev-wasm32 libclang-rt-20-dev-wasm64
 RUN apt-get update && apt-get install -y autoconf libtool build-essential pkgconf
 
-# libx264
-WORKDIR /tmp/
 
-RUN git clone https://code.videolan.org/videolan/x264.git
-
-WORKDIR /tmp/x264
-
-RUN git checkout ${X264_COMMIT} && \
-  emconfigure ./configure \
-  --prefix=${PREFIX} \
-  --host=i686-gnu \
-  --enable-static \
-  --disable-cli \
-  --disable-asm \
-  --extra-cflags="-s USE_PTHREADS=1"
-
-RUN emmake make && emmake make install
-
-WORKDIR /tmp/
-# libmp3lame
-RUN wget -O lame-${LAME_VERSION}.tar.gz https://sourceforge.net/projects/lame/files/lame/${LAME_VERSION}/lame-${LAME_VERSION}.tar.gz/download && \
-  tar zxf lame-${LAME_VERSION}.tar.gz && rm lame-${LAME_VERSION}.tar.gz
-
-WORKDIR /tmp/lame-${LAME_VERSION}
-RUN  emconfigure ./configure \
-  --prefix=${PREFIX} \
-  --host=i686-gnu \
-  --enable-static \
-  --disable-frontend
-
-WORKDIR /tmp/lame-${LAME_VERSION}
-RUN emmake make && emmake make install
+USER ${BUILD_USER}
 
 # Get ffmpeg source.
 WORKDIR /tmp/
@@ -59,49 +28,44 @@ ENV EM_PKG_CONFIG_PATH="${PREFIX}/lib/pkgconfig"
 # Compile ffmpeg.
 WORKDIR /tmp/ffmpeg-${FFMPEG_VERSION}
 RUN emconfigure ./configure \
-  --prefix=${PREFIX} \
-  --target-os=none \
-  --arch=x86_32 \
-  --enable-cross-compile \
-  --disable-debug \
-  --disable-x86asm \
-  --disable-inline-asm \
-  --disable-stripping \
-  --disable-programs \
-  --disable-doc \
-  --disable-all \
-  --enable-avcodec \
-  --enable-avformat \
-  --enable-avfilter \
-  --enable-avdevice \
-  --enable-avutil \
-  --enable-swresample \
-  --enable-swscale \
-  --enable-protocol=file \
-  --enable-decoder=h264,aac,pcm_s16le,mp3 \
-  --enable-demuxer=mov,matroska,mp3 \
-  --enable-muxer=mp4 \
-  --enable-gpl \
-  --enable-libx264 \
-  --enable-libmp3lame \
-  --extra-cflags="$CFLAGS" \
-  --extra-cxxflags="$CFLAGS" \
-  --extra-ldflags="$LDFLAGS" \
-  --nm="llvm-nm -g" \
-  --ar=emar \
-  --as=llvm-as \
-  --ranlib=llvm-ranlib \
-  --cc=emcc \
-  --cxx=em++ \
-  --objcc=emcc \
-  --dep-cc=emcc
+      --prefix=${PREFIX} \
+      --target-os=none \
+      --arch=x86_32 \
+      --enable-cross-compile \
+      --disable-debug \
+      --disable-x86asm \
+      --disable-inline-asm \
+      --disable-stripping \
+      --disable-programs \
+      --disable-doc \
+      --disable-all \
+      --enable-avcodec \
+      --enable-avformat \
+      --enable-avutil \
+      --enable-swresample \
+      --enable-swscale \
+      --enable-protocol=file \
+      --enable-decoder=h264,hevc,vp8,vp9,av1,prores,aac,mp3,opus,vorbis,flac,alac,pcm_s16le,pcm_s16be,pcm_s24le,pcm_s24be \
+      --enable-demuxer=mov,matroska,webm,mpegts,mxf,mp3,wav,ogg,avi,aiff,flac,hevc,h264,av1 \
+      --enable-parser=h264,hevc,vp8,vp9,av1,aac,mpegaudio,opus,vorbis,flac \
+      --extra-cflags="$CFLAGS" \
+      --extra-cxxflags="$CFLAGS" \
+      --extra-ldflags="$LDFLAGS" \
+      --nm="llvm-nm-20 -g" \
+      --ar=emar \
+      --as=llvm-as \
+      --ranlib=llvm-ranlib-20 \
+      --cc=emcc \
+      --cxx=em++ \
+      --objcc=emcc \
+      --dep-cc=emcc
 
 RUN emmake make -j4 && \
   emmake make install
 
 
-COPY ./src/ffprobe-wasm-wrapper.cpp /build/src/ffprobe-wasm-wrapper.cpp
-COPY ./Makefile /build/Makefile
+COPY --chown=${BUILD_USER}:${BUILD_USER} ./src/ffprobe-wasm-wrapper.cpp /build/src/ffprobe-wasm-wrapper.cpp
+COPY --chown=${BUILD_USER}:${BUILD_USER} ./Makefile /build/Makefile
 
 WORKDIR /build
 

Makefile

@@ -1,13 +1,16 @@
-dist/ffprobe-wasm.js:
+dist/ffprobe-wasm.mjs:
 	mkdir -p dist && \
 	emcc --bind \
 	-O3 \
-	-L/opt/ffmpeg/lib \
-	-I/opt/ffmpeg/include/ \
-	-s EXTRA_EXPORTED_RUNTIME_METHODS="[FS, cwrap, ccall, getValue, setValue, writeAsciiToMemory]" \
-	-s INITIAL_MEMORY=268435456 \
-	-lavcodec -lavformat -lavfilter -lavdevice -lswresample -lswscale -lavutil -lm -lx264 \
+	-L/tmp/ffmpeg-build/lib \
+	-I/tmp/ffmpeg-build/include/ \
+	-s EXPORTED_RUNTIME_METHODS="[FS, cwrap, ccall, getValue, setValue, writeAsciiToMemory]" \
+    -s INITIAL_MEMORY=268435456 \
+    -s EXPORT_ES6=1 \
+    -s MODULARIZE=1 \
+    -s EXPORT_NAME="loadFFprobe" \
+	-lavcodec -lavformat -lswresample -lswscale -lavutil -lm \
 	-pthread \
 	-lworkerfs.js \
-	-o dist/ffprobe-wasm.js \
-	src/ffprobe-wasm-wrapper.cpp
+	-o dist/ffprobe-wasm.mjs \
+	src/ffprobe-wasm-wrapper.cpp

src/ffprobe-wasm-wrapper.cpp

@@ -149,7 +149,7 @@ FileInfoResponse get_file_info(std::string filename) {
         .level = (int)pLocalCodecParameters->level,
         .width = (int)pLocalCodecParameters->width,
         .height = (int)pLocalCodecParameters->height,
-        .channels = (int)pLocalCodecParameters->channels,
+        .channels = (int)pLocalCodecParameters->ch_layout.nb_channels,
         .sample_rate = (int)pLocalCodecParameters->sample_rate,
         .frame_size = (int)pLocalCodecParameters->frame_size,
       };
@@ -165,7 +165,6 @@ FileInfoResponse get_file_info(std::string filename) {
       }
 
       r.streams.push_back(stream);
-      free(fourcc);
     }
 
     // Loop through the chapters (if any).
@@ -227,7 +226,7 @@ FramesResponse get_frames(std::string filename, int timestamp) {
     }
 
     // Get streams data.
-    AVCodec  *pCodec = NULL;
+    const AVCodec  *pCodec = NULL;
     AVCodecParameters *pCodecParameters = NULL;
     int video_stream_index = -1;
     int nb_frames = 0;
@@ -238,7 +237,7 @@ FramesResponse get_frames(std::string filename, int timestamp) {
       pLocalCodecParameters = pFormatContext->streams[i]->codecpar;
 
       // Print out the decoded frame info.
-      AVCodec *pLocalCodec = avcodec_find_decoder(pLocalCodecParameters->codec_id);
+      const AVCodec *pLocalCodec = avcodec_find_decoder(pLocalCodecParameters->codec_id);
       if (pLocalCodecParameters->codec_type == AVMEDIA_TYPE_VIDEO) {
         if (video_stream_index == -1) {
           video_stream_index = i;
@@ -296,7 +295,7 @@ FramesResponse get_frames(std::string filename, int timestamp) {
             }
 
             // Track keyframes so we paginate by each GOP.
-            if (pFrame->key_frame == 1) key_frames++;
+            if (pFrame->flags & AV_FRAME_FLAG_KEY) key_frames++;
 
             // Break at the next keyframe found.
             if (key_frames > 1) break;
@@ -307,7 +306,7 @@ FramesResponse get_frames(std::string filename, int timestamp) {
               .pts = (int) pPacket->pts,
               .dts = (int) pPacket->dts,
               .pos = (int) pPacket->pos,
-              .pkt_size = pFrame->pkt_size,
+              .pkt_size = pPacket->size,
             };
             r.frames.push_back(f);
 
@@ -399,4 +398,4 @@ EMSCRIPTEN_BINDINGS(structs) {
   .field("avg_frame_rate", &FramesResponse::avg_frame_rate)
   ;
   function("get_frames", &get_frames);
-}
+}