Update ffmpeg

xfangfang · Feb 7, 2025 · 4f2fea8 · 4f2fea8
1 parent d3a2e64
commit 4f2fea8
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/scripts/psv/ffmpeg/VITABUILD b/scripts/psv/ffmpeg/VITABUILD
@@ -20,8 +20,6 @@ build() {
         --disable-runtime-cpudetect \
         --disable-armv5te \
         --cross-prefix=$VITASDK/bin/arm-vita-eabi- \
-        --extra-cflags=" -Wl,-q -O2 -ftree-vectorize -fomit-frame-pointer -ffast-math -D_BSD_SOURCE" \
-        --extra-cxxflags=" -Wl,-q -O2 -ftree-vectorize -fomit-frame-pointer -ffast-math -fno-rtti -fno-exceptions -std=gnu++11 -D_BSD_SOURCE" \
         --extra-ldflags=" -L$VITASDK/lib " \
         --disable-shared \
         --enable-static \

diff --git a/scripts/psv/ffmpeg/optimize.patch b/scripts/psv/ffmpeg/optimize.patch
@@ -1,5 +1,5 @@
 diff --git a/libavcodec/vitadec_video.c b/libavcodec/vitadec_video.c
-index 8e0b6348c5..6a391be944 100644
+index 8e0b634..48b63f3 100644
 --- a/libavcodec/vitadec_video.c
 +++ b/libavcodec/vitadec_video.c
 @@ -270,7 +270,7 @@ fail:
@@ -29,3 +29,22 @@ index 8e0b6348c5..6a391be944 100644
  {
      SceUID *unmap = p->ref;
      SceUIntVAddr *vaddr = p->ptr;
+@@ -917,17 +917,11 @@ static int vita_decode(AVCodecContext *avctx, AVFrame *frame, int *got_frame, AV
+         to_timestamp_vita(avpkt->pts, time_base,  &au.pts);
+         to_timestamp_vita(avpkt->dts, time_base, &au.dts);
+
+-        ret = sceAvcdecDecodeAuInternal(&ctx->decoder_ctrl, &au, &ctx->decoder_picture_int);
++        ret = sceAvcdecDecode(&ctx->decoder_ctrl, &au, &ap);
+         if (ret < 0) {
+             av_log(avctx, AV_LOG_ERROR, "vita_h264 decode: decode au failed 0x%x\n", ret);
+             return AVERROR_UNKNOWN;
+         }
+-
+-        ret = sceAvcdecDecodeGetPictureWithWorkPictureInternal(&ctx->decoder_ctrl, &ap, &wap, &ctx->decoder_picture_int);
+-        if (ret < 0) {
+-            av_log(avctx, AV_LOG_ERROR, "vita_h264 decode: decode work picture failed 0x%x\n", ret);
+-            return AVERROR_UNKNOWN;
+-        }
+     }
+
+     if (!ap.numOfOutput)